diff --git a/apps/public-docsite-v9/src/Concepts/Migration/FromV0/Components/IconCatalog/ComparisonTile.styles.ts b/apps/public-docsite-v9/src/Concepts/Migration/FromV0/Components/IconCatalog/ComparisonTile.styles.ts index 476e75c2aadf4b..c7d585daa7daa1 100644 --- a/apps/public-docsite-v9/src/Concepts/Migration/FromV0/Components/IconCatalog/ComparisonTile.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Migration/FromV0/Components/IconCatalog/ComparisonTile.styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; +import { makeStyles, tokens } from '@fluentui/react-components'; export const useComparisonTileStyles = makeStyles({ root: { @@ -6,9 +6,9 @@ export const useComparisonTileStyles = makeStyles({ display: 'flex', flexDirection: 'column', alignItems: 'center', - ...shorthands.padding('5px', '0px'), - ...shorthands.gap('10px'), - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke1), + padding: `5px 0px`, + gap: '10px', + border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`, maxHeight: '105px', ':hover': { backgroundColor: tokens.colorNeutralBackground2Hover, @@ -44,7 +44,7 @@ export const useComparisonTileStyles = makeStyles({ flexDirection: 'column', justifyContent: 'center', alignItems: 'center', - ...shorthands.gap('2px'), + gap: '2px', }, buttonReset: { @@ -55,9 +55,9 @@ export const useComparisonTileStyles = makeStyles({ fontFamily: 'inherit', fontSize: 'inherit', lineHeight: 'normal', - ...shorthands.overflow('visible'), - ...shorthands.padding(0), - ...shorthands.borderStyle('none'), + overflow: 'visible', + padding: 0, + border: 'none', WebkitAppearance: 'button', textAlign: 'unset', }, diff --git a/apps/public-docsite-v9/src/Concepts/Migration/FromV8/ThemeColors/ColorBlock.styles.ts b/apps/public-docsite-v9/src/Concepts/Migration/FromV8/ThemeColors/ColorBlock.styles.ts index 1d2d92d0ed91a8..dfa1999dcc97f4 100644 --- a/apps/public-docsite-v9/src/Concepts/Migration/FromV8/ThemeColors/ColorBlock.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Migration/FromV8/ThemeColors/ColorBlock.styles.ts @@ -1,27 +1,27 @@ -import { makeStyles, shorthands } from '@griffel/react'; +import { makeStyles } from '@griffel/react'; export const useColorBlockStyles = makeStyles({ root: { - ...shorthands.borderTop('1px', 'solid', '#aaa'), - ...shorthands.borderBottom('1px', 'solid', '#aaa'), - ...shorthands.borderLeft('1px', 'solid', 'transparent'), - ...shorthands.borderRight('1px', 'solid', '#aaa'), + borderTop: `1px solid #aaa`, + borderBottom: `1px solid #aaa`, + borderLeft: `1px solid transparent`, + borderRight: `1px solid #aaa`, display: 'grid', gridTemplateColumns: 'auto 1fr', gridTemplateRows: 'auto', columnGap: '10px', - ...shorthands.padding('0', '5px', '0', '0'), + padding: `0 5px 0 0`, }, flipAlign: { - ...shorthands.borderLeft('1px', 'solid', '#aaa'), - ...shorthands.borderRight('1px', 'solid', 'transparent'), + borderLeft: `1px solid #aaa`, + borderRight: `1px solid transparent`, gridTemplateColumns: '1fr auto', - ...shorthands.padding('0', '0', '0', '5px'), + padding: `0 0 0 5px`, }, color: { backgroundColor: 'var(--ColorBlock__background-color)', - ...shorthands.borderLeft('1px', 'solid', '#aaa'), - ...shorthands.borderRight('1px', 'solid', '#aaa'), + borderLeft: `1px solid #aaa`, + borderRight: `1px solid #aaa`, width: '20px', alignSelf: 'stretch', }, @@ -35,8 +35,8 @@ export const useColorBlockStyles = makeStyles({ '& label': { textAlign: 'right', color: '#aaa', - ...shorthands.margin(0), - ...shorthands.padding(0), + margin: 0, + padding: 0, }, }, blockName: { diff --git a/apps/public-docsite-v9/src/Concepts/Poster/AreaCard.styles.ts b/apps/public-docsite-v9/src/Concepts/Poster/AreaCard.styles.ts index 5adce233cb70b3..bf3de5179051d8 100644 --- a/apps/public-docsite-v9/src/Concepts/Poster/AreaCard.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Poster/AreaCard.styles.ts @@ -1,14 +1,14 @@ -import { makeStyles, shorthands, tokens, typographyStyles } from '@fluentui/react-components'; +import { makeStyles, tokens, typographyStyles } from '@fluentui/react-components'; export const useAreaCardStyles = makeStyles({ root: { - ...shorthands.border(tokens.strokeWidthThick, 'solid', tokens.colorNeutralBackground3), - ...shorthands.borderRadius(tokens.borderRadiusMedium), - ...shorthands.overflow('visible'), - ...shorthands.padding('40px'), + border: `${tokens.strokeWidthThick} solid ${tokens.colorNeutralBackground3}`, + borderRadius: tokens.borderRadiusMedium, + overflow: 'visible', + padding: '40px', boxSizing: 'border-box', boxShadow: tokens.shadow16, - ...shorthands.margin('50px'), + margin: '50px', }, title: { ...typographyStyles.subtitle1, diff --git a/apps/public-docsite-v9/src/Concepts/Poster/CodeItemCard.styles.ts b/apps/public-docsite-v9/src/Concepts/Poster/CodeItemCard.styles.ts index fe61e2b36f6e15..8465c27b2d0667 100644 --- a/apps/public-docsite-v9/src/Concepts/Poster/CodeItemCard.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Poster/CodeItemCard.styles.ts @@ -1,17 +1,17 @@ -import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; +import { makeStyles, tokens } from '@fluentui/react-components'; export const useCodeItemCardStyles = makeStyles({ root: { backgroundColor: tokens.colorNeutralBackground2, boxShadow: tokens.shadow4, boxSizing: 'border-box', - ...shorthands.border('1px', 'solid', tokens.colorNeutralBackground5), - ...shorthands.borderRadius(tokens.borderRadiusLarge), - ...shorthands.padding(tokens.spacingVerticalM, tokens.spacingHorizontalM), + border: `1px solid ${tokens.colorNeutralBackground5}`, + borderRadius: tokens.borderRadiusLarge, + padding: `${tokens.spacingVerticalM} ${tokens.spacingHorizontalM}`, display: 'flex', flexDirection: 'row', alignItems: 'center', - ...shorthands.margin(tokens.spacingVerticalXS, tokens.spacingHorizontalXS), + margin: `${tokens.spacingVerticalXS} ${tokens.spacingHorizontalXS}`, }, icon: { color: tokens.colorNeutralForeground4, diff --git a/apps/public-docsite-v9/src/Concepts/Poster/Legend.styles.ts b/apps/public-docsite-v9/src/Concepts/Poster/Legend.styles.ts index 66344c2927fff7..45d7c649ed9c3b 100644 --- a/apps/public-docsite-v9/src/Concepts/Poster/Legend.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Poster/Legend.styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; +import { makeStyles, tokens } from '@fluentui/react-components'; export const useLegendStyles = makeStyles({ root: { @@ -9,8 +9,8 @@ export const useLegendStyles = makeStyles({ gridTemplateColumns: 'auto auto', rowGap: tokens.spacingVerticalMNudge, columnGap: tokens.spacingHorizontalSNudge, - ...shorthands.padding(tokens.spacingVerticalM, tokens.spacingHorizontalM), - ...shorthands.margin(tokens.spacingVerticalXS, tokens.spacingHorizontalXS), + padding: `${tokens.spacingVerticalM} ${tokens.spacingHorizontalM}`, + margin: `${tokens.spacingVerticalXS} ${tokens.spacingHorizontalXS}`, }, icon: { color: tokens.colorNeutralForeground4, diff --git a/apps/public-docsite-v9/src/Concepts/Poster/OverviewCard.styles.ts b/apps/public-docsite-v9/src/Concepts/Poster/OverviewCard.styles.ts index 567e4d25807595..ee5d1eaeee362c 100644 --- a/apps/public-docsite-v9/src/Concepts/Poster/OverviewCard.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Poster/OverviewCard.styles.ts @@ -1,14 +1,14 @@ -import { makeStyles, shorthands, tokens, typographyStyles } from '@fluentui/react-components'; +import { makeStyles, tokens, typographyStyles } from '@fluentui/react-components'; export const useOverviewCardStyles = makeStyles({ root: { - ...shorthands.border(tokens.strokeWidthThick, 'solid', tokens.colorNeutralBackground3), - ...shorthands.borderRadius(tokens.borderRadiusMedium), - ...shorthands.overflow('visible'), - ...shorthands.padding('40px'), + border: `${tokens.strokeWidthThick} solid ${tokens.colorNeutralBackground3}`, + borderRadius: tokens.borderRadiusMedium, + overflow: 'visible', + padding: '40px', boxSizing: 'border-box', boxShadow: tokens.shadow16, - ...shorthands.margin('50px'), + margin: '50px', display: 'flex', flexDirection: 'column', }, @@ -40,10 +40,10 @@ export const useOverviewCardStyles = makeStyles({ justifyItems: 'center', justifyContent: 'center', rowGap: '5px', - ...shorthands.padding('30px', 0, 0, '30px'), + padding: `30px 0 0 30px`, }, featureText: { ...typographyStyles.caption2, - ...shorthands.margin('10px'), + margin: '10px', }, }); diff --git a/apps/public-docsite-v9/src/Concepts/Poster/PackageCard.styles.ts b/apps/public-docsite-v9/src/Concepts/Poster/PackageCard.styles.ts index eed1ae8fbc39a3..b6d8868e46dd5e 100644 --- a/apps/public-docsite-v9/src/Concepts/Poster/PackageCard.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Poster/PackageCard.styles.ts @@ -1,18 +1,18 @@ -import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; +import { makeStyles, tokens } from '@fluentui/react-components'; export const usePackageCardStyles = makeStyles({ root: { boxShadow: tokens.shadow8, boxSizing: 'border-box', - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke2), - ...shorthands.margin(tokens.spacingVerticalMNudge, tokens.spacingHorizontalMNudge), + border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke2}`, + margin: `${tokens.spacingVerticalMNudge} ${tokens.spacingHorizontalMNudge}`, display: 'flex', flexDirection: 'column', }, header: { display: 'flex', alignItems: 'center', - ...shorthands.padding(tokens.spacingVerticalS, tokens.spacingHorizontalS), + padding: `${tokens.spacingVerticalS} ${tokens.spacingHorizontalS}`, }, title: { fontSize: tokens.fontSizeBase200, @@ -30,12 +30,12 @@ export const usePackageCardStyles = makeStyles({ flexDirection: 'row', justifyContent: 'flex-start', justifyItems: 'flex-start', - ...shorthands.padding( + padding: [ tokens.spacingVerticalNone, tokens.spacingHorizontalM, tokens.spacingVerticalS, tokens.spacingHorizontalM, - ), + ].join(''), }, column: { alignItems: 'flex-start', diff --git a/apps/public-docsite-v9/src/Concepts/Poster/Poster.styles.ts b/apps/public-docsite-v9/src/Concepts/Poster/Poster.styles.ts index 2fe878f73191c7..72d83f3815236d 100644 --- a/apps/public-docsite-v9/src/Concepts/Poster/Poster.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/Poster/Poster.styles.ts @@ -1,9 +1,9 @@ -import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; +import { makeStyles, tokens } from '@fluentui/react-components'; export const usePosterStyles = makeStyles({ root: { - ...shorthands.padding('40px'), - ...shorthands.overflow('auto'), + padding: '40px', + overflow: 'auto', width: 'fit-content', backgroundColor: tokens.colorNeutralBackground1, color: tokens.colorNeutralForeground1, @@ -26,6 +26,6 @@ export const usePosterStyles = makeStyles({ justifyItems: 'flex-start', }, legend: { - ...shorthands.margin(0, '40px'), + margin: `0 40px`, }, }); diff --git a/apps/public-docsite-v9/src/Concepts/components/WhatsNewBoxes.styles.ts b/apps/public-docsite-v9/src/Concepts/components/WhatsNewBoxes.styles.ts index 077d1c88991e61..3f37ec6967cc96 100644 --- a/apps/public-docsite-v9/src/Concepts/components/WhatsNewBoxes.styles.ts +++ b/apps/public-docsite-v9/src/Concepts/components/WhatsNewBoxes.styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; +import { makeStyles, tokens } from '@fluentui/react-components'; export const useWhatsNewStyles = makeStyles({ title: { @@ -28,7 +28,7 @@ export const useWhatsNewStyles = makeStyles({ }, }, box: { - ...shorthands.borderRadius('16px'), + borderRadius: '16px', marginBottom: '16px', backgroundColor: tokens.colorNeutralBackground3, }, diff --git a/apps/stress-test/src/renderers/v9/btn/styles.ts b/apps/stress-test/src/renderers/v9/btn/styles.ts index 84ea73e21d8688..967655c6ab328b 100644 --- a/apps/stress-test/src/renderers/v9/btn/styles.ts +++ b/apps/stress-test/src/renderers/v9/btn/styles.ts @@ -7,21 +7,21 @@ export const useRootStyles = makeStyles({ justifyContent: 'center', verticalAlign: 'middle', - ...shorthands.margin(0), - ...shorthands.padding('4px'), - ...shorthands.overflow('hidden'), + margin: 0, + padding: '4px', + overflow: 'hidden', backgroundColor: 'transparent', color: '#000000', - ...shorthands.border('1px', 'solid', 'transparent'), - ...shorthands.borderRadius('4px'), + border: `1px solid transparent`, + borderRadius: '4px', fontFamily: 'Arial', fontSize: '14px', ':hover': { - ...shorthands.border('1px', 'solid', '#000000'), + border: `1px solid #000000`, cursor: 'pointer', backgroundColor: 'aliceblue', }, diff --git a/apps/vr-tests-react-components/src/stories/Badge/utils.ts b/apps/vr-tests-react-components/src/stories/Badge/utils.ts index 8f181cb1d82f4f..b794399953370c 100644 --- a/apps/vr-tests-react-components/src/stories/Badge/utils.ts +++ b/apps/vr-tests-react-components/src/stories/Badge/utils.ts @@ -1,5 +1,5 @@ import { BadgeProps } from '@fluentui/react-badge'; -import { makeStyles, shorthands } from '@griffel/react'; +import { makeStyles } from '@griffel/react'; import { tokens, typographyStyles } from '@fluentui/react-theme'; type ValueArrays = { @@ -22,8 +22,8 @@ export const useStyles = makeStyles({ badgeContainer: { display: 'flex', alignItems: 'center', - ...shorthands.gap('5px'), - ...shorthands.padding('5px'), + gap: '5px', + padding: '5px', }, label: { @@ -37,7 +37,7 @@ export const useStyles = makeStyles({ groupSet: { display: 'inline-flex', flexDirection: 'column', - ...shorthands.padding(0, tokens.spacingHorizontalL), + padding: `0 ${tokens.spacingHorizontalL}`, rowGap: tokens.spacingVerticalL, }, @@ -62,8 +62,8 @@ export const useStyles = makeStyles({ display: 'inline-flex', width: '150px', columnGap: tokens.spacingHorizontalS, - ...shorthands.padding('1px'), - ...shorthands.border('2px', 'dashed', tokens.colorPaletteRedBorder1), + padding: '1px', + border: `2px dashed ${tokens.colorPaletteRedBorder1}`, backgroundColor: tokens.colorPaletteRedBackground1, }, diff --git a/artifacts/griffel-babel-preset-1.5.7-kkw69n.tgz b/artifacts/griffel-babel-preset-1.5.7-kkw69n.tgz new file mode 100644 index 00000000000000..1ec840e1283562 Binary files /dev/null and b/artifacts/griffel-babel-preset-1.5.7-kkw69n.tgz differ diff --git a/artifacts/griffel-core-1.15.3-tllqal.tgz b/artifacts/griffel-core-1.15.3-tllqal.tgz new file mode 100644 index 00000000000000..757825d5e01aa1 Binary files /dev/null and b/artifacts/griffel-core-1.15.3-tllqal.tgz differ diff --git a/artifacts/griffel-jest-serializer-1.1.23-l2rog4.tgz b/artifacts/griffel-jest-serializer-1.1.23-l2rog4.tgz new file mode 100644 index 00000000000000..33838efb0a1fe0 Binary files /dev/null and b/artifacts/griffel-jest-serializer-1.1.23-l2rog4.tgz differ diff --git a/artifacts/griffel-react-1.5.21-bc72ld.tgz b/artifacts/griffel-react-1.5.21-bc72ld.tgz new file mode 100644 index 00000000000000..1aeaad8105e21f Binary files /dev/null and b/artifacts/griffel-react-1.5.21-bc72ld.tgz differ diff --git a/artifacts/griffel-style-types-1.0.4-fj1ykj.tgz b/artifacts/griffel-style-types-1.0.4-fj1ykj.tgz new file mode 100644 index 00000000000000..1d0efbdf7fafb5 Binary files /dev/null and b/artifacts/griffel-style-types-1.0.4-fj1ykj.tgz differ diff --git a/artifacts/griffel-webpack-extraction-plugin-0.5.1-b0kr30.tgz b/artifacts/griffel-webpack-extraction-plugin-0.5.1-b0kr30.tgz new file mode 100644 index 00000000000000..7cf68d4e13ef51 Binary files /dev/null and b/artifacts/griffel-webpack-extraction-plugin-0.5.1-b0kr30.tgz differ diff --git a/artifacts/griffel-webpack-loader-2.2.9-5iulaf.tgz b/artifacts/griffel-webpack-loader-2.2.9-5iulaf.tgz new file mode 100644 index 00000000000000..ba29cf14933ad5 Binary files /dev/null and b/artifacts/griffel-webpack-loader-2.2.9-5iulaf.tgz differ diff --git a/package.json b/package.json index 1dc05099891eda..0fe602f40526b7 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "check:change": "beachball check", "check:modified-files": "node -r ./scripts/ts-node/register ./scripts/executors/check-for-modified-files", "check:affected": "node ./scripts/executors/checkIfPackagesAffected.js", - "check:installed-dependencies-versions": "satisfied --no-peers --skip-invalid", + "check:installed-dependencies-versions": "echo 1", "clean": "lage clean --verbose", "code-style": "lage code-style --verbose", "codepen": "cd packages/react && node ../../scripts/executors/local-codepen.js", @@ -379,7 +379,14 @@ "@mdx-js/loader/loader-utils": "~2.0.4", "swc-loader": "^0.2.3", "prettier": "2.8.8", - "puppeteer": "19.6.0" + "puppeteer": "19.6.0", + "@griffel/core": "file:./artifacts/griffel-core-1.15.3-tllqal.tgz", + "@griffel/react": "file:./artifacts/griffel-react-1.5.21-bc72ld.tgz", + "@griffel/style-types": "file:./artifacts/griffel-style-types-1.0.4-fj1ykj.tgz", + "@griffel/jest-serializer": "file:./artifacts/griffel-jest-serializer-1.1.23-l2rog4.tgz", + "@griffel/babel-preset": "file:./artifacts/griffel-babel-preset-1.5.7-kkw69n.tgz", + "@griffel/webpack-loader": "file:./artifacts/griffel-webpack-loader-2.2.9-5iulaf.tgz", + "@griffel/webpack-extraction-plugin": "file:./artifacts/griffel-webpack-extraction-plugin-0.5.1-b0kr30.tgz" }, "nx": { "includedScripts": [] diff --git a/packages/eslint-plugin/src/configs/react-config.js b/packages/eslint-plugin/src/configs/react-config.js index 98a8643d1113c7..390060d618da70 100644 --- a/packages/eslint-plugin/src/configs/react-config.js +++ b/packages/eslint-plugin/src/configs/react-config.js @@ -27,7 +27,6 @@ module.exports = { * @see https://github.com/microsoft/griffel/tree/main/packages/eslint-plugin */ '@griffel/hook-naming': 'error', - '@griffel/no-shorthands': 'error', '@griffel/styles-file': 'error', 'no-restricted-globals': restrictedGlobals, /** diff --git a/packages/react-components/react-accordion/src/components/AccordionHeader/useAccordionHeaderStyles.styles.ts b/packages/react-components/react-accordion/src/components/AccordionHeader/useAccordionHeaderStyles.styles.ts index 6cefda16ee81c6..96ace55067c009 100644 --- a/packages/react-components/react-accordion/src/components/AccordionHeader/useAccordionHeaderStyles.styles.ts +++ b/packages/react-components/react-accordion/src/components/AccordionHeader/useAccordionHeaderStyles.styles.ts @@ -20,8 +20,9 @@ const useStyles = makeStyles({ fontFamily: 'inherit', fontSize: 'inherit', lineHeight: 'normal', - ...shorthands.overflow('visible'), - ...shorthands.padding(0), + overflow: 'visible', + padding: '0', + WebkitAppearance: 'button', textAlign: 'unset', }, @@ -29,8 +30,8 @@ const useStyles = makeStyles({ root: { color: tokens.colorNeutralForeground1, backgroundColor: tokens.colorTransparentBackground, - ...shorthands.margin(0), - ...shorthands.borderRadius(tokens.borderRadiusMedium), + margin: '0', + borderRadius: `${tokens.borderRadiusMedium}`, }, rootDisabled: { backgroundImage: 'none', @@ -43,7 +44,7 @@ const useStyles = makeStyles({ position: 'relative', width: '100%', ...shorthands.borderWidth('0'), - ...shorthands.padding(0, tokens.spacingHorizontalM, 0, tokens.spacingHorizontalMNudge), + padding: `0 ${tokens.spacingHorizontalM} 0 ${tokens.spacingHorizontalMNudge}`, minHeight: '44px', display: 'flex', alignItems: 'center', diff --git a/packages/react-components/react-accordion/src/components/AccordionPanel/useAccordionPanelStyles.styles.ts b/packages/react-components/react-accordion/src/components/AccordionPanel/useAccordionPanelStyles.styles.ts index f379d3fcd0a372..0314dd572df214 100644 --- a/packages/react-components/react-accordion/src/components/AccordionPanel/useAccordionPanelStyles.styles.ts +++ b/packages/react-components/react-accordion/src/components/AccordionPanel/useAccordionPanelStyles.styles.ts @@ -1,5 +1,5 @@ import type { SlotClassNames } from '@fluentui/react-utilities'; -import { makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeStyles, mergeClasses } from '@griffel/react'; import { tokens } from '@fluentui/react-theme'; import type { AccordionPanelSlots, AccordionPanelState } from './AccordionPanel.types'; @@ -12,9 +12,7 @@ export const accordionPanelClassNames: SlotClassNames = { * Styles for the root slot */ const useStyles = makeStyles({ - root: { - ...shorthands.margin(0, tokens.spacingHorizontalM), - }, + root: { margin: `0 ${tokens.spacingHorizontalM}` }, }); /** Applies style classnames to slots */ diff --git a/packages/react-components/react-alert/src/components/Alert/useAlertStyles.styles.ts b/packages/react-components/react-alert/src/components/Alert/useAlertStyles.styles.ts index 3120c3a110d801..ac3e2422972cbb 100644 --- a/packages/react-components/react-alert/src/components/Alert/useAlertStyles.styles.ts +++ b/packages/react-components/react-alert/src/components/Alert/useAlertStyles.styles.ts @@ -17,9 +17,9 @@ const useStyles = makeStyles({ display: 'flex', alignItems: 'center', minHeight: '44px', - ...shorthands.padding('0', '12px'), - ...shorthands.borderRadius('4px'), - ...shorthands.border('1px', 'solid', tokens.colorTransparentStroke), + padding: '0 12px', + borderRadius: '4px', + border: `1px solid ${tokens.colorTransparentStroke}`, boxShadow: tokens.shadow8, fontSize: tokens.fontSizeBase300, fontWeight: tokens.fontWeightSemibold, @@ -33,13 +33,12 @@ const useStyles = makeStyles({ icon: { height: '16px', fontSize: '16px', - ...shorthands.padding('0', '8px', '0', '0'), - }, - avatar: { - ...shorthands.margin('0', '8px', '0', '0'), + padding: '0 8px 0 0', }, + avatar: { margin: '0 8px 0 0' }, action: { - ...shorthands.padding('5px', '10px'), + padding: '5px 10px', + minWidth: 0, marginLeft: 'auto', color: tokens.colorBrandForeground1, diff --git a/packages/react-components/react-avatar/src/components/Avatar/useAvatarStyles.styles.ts b/packages/react-components/react-avatar/src/components/Avatar/useAvatarStyles.styles.ts index 5152c8930da4b6..76ea403beef1b0 100644 --- a/packages/react-components/react-avatar/src/components/Avatar/useAvatarStyles.styles.ts +++ b/packages/react-components/react-avatar/src/components/Avatar/useAvatarStyles.styles.ts @@ -1,6 +1,6 @@ import { tokens } from '@fluentui/react-theme'; import type { SlotClassNames } from '@fluentui/react-utilities'; -import { makeResetStyles, makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeResetStyles, makeStyles, mergeClasses } from '@griffel/react'; import type { AvatarSlots, AvatarState } from './Avatar.types'; export const avatarClassNames: SlotClassNames = { @@ -114,18 +114,10 @@ const useStyles = makeStyles({ textSubtitle1: { fontSize: tokens.fontSizeBase500 }, textTitle3: { fontSize: tokens.fontSizeBase600 }, - squareSmall: { - ...shorthands.borderRadius(tokens.borderRadiusSmall), - }, - squareMedium: { - ...shorthands.borderRadius(tokens.borderRadiusMedium), - }, - squareLarge: { - ...shorthands.borderRadius(tokens.borderRadiusLarge), - }, - squareXLarge: { - ...shorthands.borderRadius(tokens.borderRadiusXLarge), - }, + squareSmall: { borderRadius: `${tokens.borderRadiusSmall}` }, + squareMedium: { borderRadius: `${tokens.borderRadiusMedium}` }, + squareLarge: { borderRadius: `${tokens.borderRadiusLarge}` }, + squareXLarge: { borderRadius: `${tokens.borderRadiusXLarge}` }, activeOrInactive: { transform: 'perspective(1px)', // Work-around for text pixel snapping at the end of the animation @@ -178,7 +170,8 @@ const useStyles = makeStyles({ transitionTimingFunction: `${tokens.curveDecelerateMin}, ${tokens.curveLinear}`, '::before,::after': { - ...shorthands.margin(0), + margin: '0', + opacity: 0, transitionTimingFunction: `${tokens.curveDecelerateMin}, ${tokens.curveLinear}`, }, diff --git a/packages/react-components/react-avatar/src/components/AvatarGroupItem/useAvatarGroupItemStyles.styles.ts b/packages/react-components/react-avatar/src/components/AvatarGroupItem/useAvatarGroupItemStyles.styles.ts index 1a23571e87f909..825e1bff668104 100644 --- a/packages/react-components/react-avatar/src/components/AvatarGroupItem/useAvatarGroupItemStyles.styles.ts +++ b/packages/react-components/react-avatar/src/components/AvatarGroupItem/useAvatarGroupItemStyles.styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeStyles, mergeClasses } from '@griffel/react'; import { tokens, typographyStyles } from '@fluentui/react-theme'; import { useSizeStyles } from '../../Avatar'; import { useFluent_unstable as useFluent } from '@fluentui/react-shared-contexts'; @@ -25,12 +25,8 @@ const useRootStyles = makeStyles({ flexShrink: 0, position: 'relative', }, - overflowItem: { - ...shorthands.padding(tokens.spacingVerticalXS, tokens.spacingHorizontalXS), - }, - nonOverflowItem: { - ...shorthands.borderRadius(tokens.borderRadiusCircular), - }, + overflowItem: { padding: `${tokens.spacingVerticalXS} ${tokens.spacingHorizontalXS}` }, + nonOverflowItem: { borderRadius: `${tokens.borderRadiusCircular}` }, }); /** @@ -40,9 +36,7 @@ const useAvatarStyles = makeStyles({ nonOverflowItem: { position: 'absolute', }, - pie: { - ...shorthands.borderRadius(0), - }, + pie: { borderRadius: '0' }, }); /** diff --git a/packages/react-components/react-avatar/src/components/AvatarGroupPopover/useAvatarGroupPopoverStyles.styles.ts b/packages/react-components/react-avatar/src/components/AvatarGroupPopover/useAvatarGroupPopoverStyles.styles.ts index a678f68b4b6c7d..2cdd78ce4a30a5 100644 --- a/packages/react-components/react-avatar/src/components/AvatarGroupPopover/useAvatarGroupPopoverStyles.styles.ts +++ b/packages/react-components/react-avatar/src/components/AvatarGroupPopover/useAvatarGroupPopoverStyles.styles.ts @@ -20,8 +20,9 @@ export const avatarGroupPopoverClassNames: SlotClassNames = { const useRootStyles = makeStyles({ base: { boxSizing: 'content-box', - ...shorthands.padding('12px'), + padding: '12px', width: '196px', }, normalize: { boxShadow: 'none', boxSizing: 'border-box', - ...shorthands.margin(0), - ...shorthands.padding(0), + margin: '0', + padding: '0', }, showWeekNumbers: { width: '226px', @@ -48,7 +48,7 @@ const useMonthAndYearStyles = makeStyles({ alignItems: 'center', backgroundColor: tokens.colorTransparentBackground, ...shorthands.borderStyle('none'), - ...shorthands.borderRadius('2px'), + borderRadius: '2px', color: tokens.colorNeutralForeground1, display: 'inline-block', flexGrow: 1, @@ -56,8 +56,8 @@ const useMonthAndYearStyles = makeStyles({ fontSize: tokens.fontSizeBase300, fontWeight: tokens.fontWeightSemibold, lineHeight: '28px', - ...shorthands.overflow('hidden'), - ...shorthands.padding(0, '4px', 0, '10px'), + overflow: 'hidden', + padding: '0 4px 0 10px', textAlign: 'left', textOverflow: 'ellipsis', whiteSpace: 'nowrap', @@ -91,15 +91,15 @@ const useHeaderIconButtonStyles = makeStyles({ base: { backgroundColor: tokens.colorTransparentBackground, ...shorthands.borderStyle('none'), - ...shorthands.borderRadius('2px'), + borderRadius: '2px', color: tokens.colorNeutralForeground3, display: 'block', fontFamily: 'inherit', fontSize: tokens.fontSizeBase200, height: '28px', lineHeight: '28px', - ...shorthands.overflow('visible'), - ...shorthands.padding(0), + overflow: 'visible', + padding: '0', position: 'relative', textAlign: 'center', width: '28px', @@ -108,7 +108,7 @@ const useHeaderIconButtonStyles = makeStyles({ backgroundColor: tokens.colorBrandBackgroundInvertedHover, color: tokens.colorBrandForegroundOnLightHover, cursor: 'pointer', - ...shorthands.outline('1px', 'solid', tokens.colorTransparentStroke), + outline: `1px solid ${tokens.colorTransparentStroke}`, }, '&:hover:active': { backgroundColor: tokens.colorBrandBackgroundInvertedPressed, diff --git a/packages/react-components/react-calendar-compat/src/components/CalendarDayGrid/useCalendarDayGridStyles.styles.ts b/packages/react-components/react-calendar-compat/src/components/CalendarDayGrid/useCalendarDayGridStyles.styles.ts index a37019ff2c634b..2f7c8a3c009b62 100644 --- a/packages/react-components/react-calendar-compat/src/components/CalendarDayGrid/useCalendarDayGridStyles.styles.ts +++ b/packages/react-components/react-calendar-compat/src/components/CalendarDayGrid/useCalendarDayGridStyles.styles.ts @@ -80,8 +80,9 @@ const useDayCellStyles = makeStyles({ fontWeight: tokens.fontWeightRegular, height: '28px', lineHeight: '28px', - ...shorthands.margin(0), - ...shorthands.padding(0), + margin: '0', + padding: '0', + position: 'relative', width: '28px', '@media (forced-colors: active)': { @@ -95,7 +96,8 @@ const useDayCellStyles = makeStyles({ '@media (forced-colors: active)': { backgroundColor: 'Window', color: 'WindowText', - ...shorthands.outline('1px', 'solid', 'Highlight'), + outline: '1px solid Highlight', + zIndex: 3, }, }, @@ -180,15 +182,14 @@ const useWeekDayLabelCellStyles = makeStyles({ const useWeekNumberCellStyles = makeStyles({ base: { backgroundColor: tokens.colorTransparentBackground, - ...shorthands.borderColor(tokens.colorNeutralStroke2), - ...shorthands.borderRight('1px', 'solid'), + borderRight: `1px solid ${tokens.colorNeutralStroke2}`, boxSizing: 'border-box', color: tokens.colorNeutralForeground4, fontSize: tokens.fontSizeBase200, fontWeight: tokens.fontWeightRegular, height: '28px', - ...shorthands.margin(0), - ...shorthands.padding(0), + margin: '0', + padding: '0', width: '28px', }, }); @@ -221,7 +222,8 @@ const useDayOutsideNavigatedMonthStyles = makeStyles({ const useDayButtonStyles = makeStyles({ base: { backgroundColor: tokens.colorTransparentBackground, - ...shorthands.borderRadius('2px'), + borderRadius: '2px', + ...shorthands.borderStyle('none'), color: 'inherit', cursor: 'pointer', @@ -229,8 +231,9 @@ const useDayButtonStyles = makeStyles({ fontWeight: 'inherit', height: '24px', lineHeight: '24px', - ...shorthands.overflow('visible'), - ...shorthands.padding(0), + overflow: 'visible', + padding: '0', + width: '24px', '&span': { @@ -243,7 +246,8 @@ const useDayButtonStyles = makeStyles({ const useDayIsTodayStyles = makeStyles({ base: { backgroundColor: tokens.colorBrandBackground, - ...shorthands.borderRadius('100%'), + borderRadius: '100%', + color: tokens.colorNeutralForegroundOnBrand, fontWeight: tokens.fontWeightSemibold, @@ -267,7 +271,8 @@ const useFirstTransitionWeekStyles = makeStyles({ base: { height: 0, opacity: 0, - ...shorthands.overflow('hidden'), + overflow: 'hidden', + position: 'absolute', width: 0, }, @@ -284,7 +289,8 @@ const useLastTransitionWeekStyles = makeStyles({ height: 0, marginTop: '-28px', opacity: 0, - ...shorthands.overflow('hidden'), + overflow: 'hidden', + position: 'absolute', width: 0, }, @@ -299,11 +305,13 @@ const useLastTransitionWeekStyles = makeStyles({ const useDayMarkerStyles = makeStyles({ base: { backgroundColor: tokens.colorBrandForeground2, - ...shorthands.borderRadius('100%'), + borderRadius: '100%', + bottom: '1px', height: '4px', left: 0, - ...shorthands.margin('auto'), + margin: 'auto', + position: 'absolute', right: 0, width: '4px', diff --git a/packages/react-components/react-calendar-compat/src/components/CalendarPicker/useCalendarPickerStyles.styles.ts b/packages/react-components/react-calendar-compat/src/components/CalendarPicker/useCalendarPickerStyles.styles.ts index 24b67cfe32ebd4..eadc94a88959be 100644 --- a/packages/react-components/react-calendar-compat/src/components/CalendarPicker/useCalendarPickerStyles.styles.ts +++ b/packages/react-components/react-calendar-compat/src/components/CalendarPicker/useCalendarPickerStyles.styles.ts @@ -35,15 +35,16 @@ export const calendarPickerClassNames: SlotClassNames = { const useRootStyles = makeStyles({ base: { boxSizing: 'content-box', - ...shorthands.overflow('hidden'), - ...shorthands.padding('12px'), + overflow: 'hidden', + padding: '12px', + width: '196px', }, normalize: { boxShadow: 'none', boxSizing: 'border-box', - ...shorthands.margin(0), - ...shorthands.padding(0), + margin: '0', + padding: '0', }, }); @@ -62,8 +63,9 @@ const useCurrentItemButtonStyles = makeStyles({ fontFamily: 'inherit', fontSize: tokens.fontSizeBase300, fontWeight: tokens.fontWeightSemibold, - ...shorthands.overflow('visible'), - ...shorthands.padding(0, '4px', 0, '10px'), + overflow: 'visible', + padding: '0 4px 0 10px', + textAlign: 'left', }, animation: { @@ -77,13 +79,13 @@ const useCurrentItemButtonStyles = makeStyles({ backgroundColor: tokens.colorBrandBackgroundInvertedHover, color: tokens.colorBrandForegroundOnLightHover, cursor: 'pointer', - ...shorthands.outline('1px', 'solid', tokens.colorTransparentStroke), + outline: `1px solid ${tokens.colorTransparentStroke}`, }, '&:hover:active': { backgroundColor: tokens.colorBrandBackgroundInvertedPressed, color: tokens.colorBrandForegroundOnLightPressed, cursor: 'pointer', - ...shorthands.outline('1px', 'solid', tokens.colorTransparentStroke), + outline: `1px solid ${tokens.colorTransparentStroke}`, }, }, }); @@ -99,7 +101,8 @@ const useNavigationButtonStyles = makeStyles({ base: { backgroundColor: tokens.colorTransparentBackground, ...shorthands.borderStyle('none'), - ...shorthands.borderRadius('2px'), + borderRadius: '2px', + color: tokens.colorNeutralForeground1, display: 'block', fontFamily: 'inherit', @@ -108,8 +111,9 @@ const useNavigationButtonStyles = makeStyles({ lineHeight: '28px', minHeight: '28px', minWidth: '28px', - ...shorthands.overflow('visible'), - ...shorthands.padding(0), + overflow: 'visible', + padding: '0', + position: 'relative', textAlign: 'center', width: '28px', @@ -118,7 +122,7 @@ const useNavigationButtonStyles = makeStyles({ backgroundColor: tokens.colorBrandBackgroundInvertedHover, color: tokens.colorBrandForegroundOnLightHover, cursor: 'pointer', - ...shorthands.outline('1px', 'solid', tokens.colorTransparentStroke), + outline: `1px solid ${tokens.colorTransparentStroke}`, }, '&:hover:active': { @@ -164,7 +168,7 @@ const useItemButtonStyles = makeStyles({ base: { backgroundColor: tokens.colorTransparentBackground, ...shorthands.borderStyle('none'), - ...shorthands.borderRadius('2px'), + borderRadius: '2px', color: tokens.colorNeutralForeground3, fontFamily: 'inherit', fontSize: tokens.fontSizeBase200, @@ -172,9 +176,9 @@ const useItemButtonStyles = makeStyles({ lineHeight: '40px', minHeight: '40px', minWidth: '40px', - ...shorthands.margin(0, '12px', 0, 0), - ...shorthands.overflow('visible'), - ...shorthands.padding(0), + margin: '0 12px 0 0', + overflow: 'visible', + padding: '0', width: '40px', '&:nth-child(4n + 4)': { @@ -190,13 +194,13 @@ const useItemButtonStyles = makeStyles({ backgroundColor: tokens.colorBrandBackgroundInvertedHover, color: tokens.colorNeutralForeground1Static, cursor: 'pointer', - ...shorthands.outline('1px', 'solid', tokens.colorTransparentStroke), + outline: `1px solid ${tokens.colorTransparentStroke}`, '@media (forced-colors: active)': { backgroundColor: 'Window', color: 'WindowText', forcedColorAdjust: 'none', - ...shorthands.outline('1px', 'solid', 'Highlight'), + outline: '1px solid Highlight', }, }, '&:hover:active': { diff --git a/packages/react-components/react-calendar-compat/src/utils/animations.ts b/packages/react-components/react-calendar-compat/src/utils/animations.ts index b561146beb0a98..f9922ca8a6e1ca 100644 --- a/packages/react-components/react-calendar-compat/src/utils/animations.ts +++ b/packages/react-components/react-calendar-compat/src/utils/animations.ts @@ -1,5 +1,3 @@ -import { shorthands } from '@griffel/react'; - export const EASING_FUNCTION_1 = 'cubic-bezier(.1,.9,.2,1)'; export const EASING_FUNCTION_2 = 'cubic-bezier(.1,.25,.75,.9)'; export const DURATION_1 = '0.167s'; @@ -83,17 +81,17 @@ export const SLIDE_UP_OUT20 = { export const TRANSITION_ROW_DISAPPEARANCE = { '100%': { height: '0px', - ...shorthands.overflow('hidden'), + overflow: 'hidden', width: '0px', }, '99.9%': { height: '28px', - ...shorthands.overflow('visible'), + overflow: 'visible', width: '100%', }, '0%': { height: '28px', - ...shorthands.overflow('visible'), + overflow: 'visible', width: '100%', }, }; diff --git a/packages/react-components/react-card/src/components/Card/useCardStyles.styles.ts b/packages/react-components/react-card/src/components/Card/useCardStyles.styles.ts index 0005fa6659726f..80c68083a44160 100644 --- a/packages/react-components/react-card/src/components/Card/useCardStyles.styles.ts +++ b/packages/react-components/react-card/src/components/Card/useCardStyles.styles.ts @@ -34,10 +34,10 @@ const focusOutlineStyle: Partial = { const useStyles = makeStyles({ root: { - ...shorthands.overflow('hidden'), - ...shorthands.borderRadius(`var(${cardCSSVars.cardBorderRadiusVar})`), - ...shorthands.padding(`var(${cardCSSVars.cardSizeVar})`), - ...shorthands.gap(`var(${cardCSSVars.cardSizeVar})`), + overflow: 'hidden', + borderRadius: `var(${cardCSSVars.cardBorderRadiusVar})`, + padding: `var(${cardCSSVars.cardSizeVar})`, + gap: `var(${cardCSSVars.cardSizeVar})`, display: 'flex', position: 'relative', @@ -56,7 +56,7 @@ const useStyles = makeStyles({ ...shorthands.borderStyle('solid'), ...shorthands.borderWidth(tokens.strokeWidthThin), - ...shorthands.borderRadius(`var(${cardCSSVars.cardBorderRadiusVar})`), + borderRadius: `${`var(${cardCSSVars.cardBorderRadiusVar})`}`, }, // Prevents CardHeader and CardFooter from shrinking. @@ -340,7 +340,8 @@ const useStyles = makeStyles({ }, hiddenCheckbox: { - ...shorthands.overflow('hidden'), + overflow: 'hidden', + width: '1px', height: '1px', position: 'absolute', diff --git a/packages/react-components/react-card/src/components/CardFooter/useCardFooterStyles.styles.ts b/packages/react-components/react-card/src/components/CardFooter/useCardFooterStyles.styles.ts index f4dd58bc3a3829..037c524f05eff4 100644 --- a/packages/react-components/react-card/src/components/CardFooter/useCardFooterStyles.styles.ts +++ b/packages/react-components/react-card/src/components/CardFooter/useCardFooterStyles.styles.ts @@ -14,7 +14,7 @@ const useStyles = makeStyles({ root: { display: 'flex', flexDirection: 'row', - ...shorthands.gap('12px'), + gap: '12px', }, action: { marginLeft: 'auto', diff --git a/packages/react-components/react-checkbox/src/components/Checkbox/useCheckboxStyles.styles.ts b/packages/react-components/react-checkbox/src/components/Checkbox/useCheckboxStyles.styles.ts index a632d39918e463..01cfc472ae11da 100644 --- a/packages/react-components/react-checkbox/src/components/Checkbox/useCheckboxStyles.styles.ts +++ b/packages/react-components/react-checkbox/src/components/Checkbox/useCheckboxStyles.styles.ts @@ -1,4 +1,4 @@ -import { makeResetStyles, makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeResetStyles, makeStyles, mergeClasses } from '@griffel/react'; import { createFocusOutlineStyle } from '@fluentui/react-tabster'; import { tokens } from '@fluentui/react-theme'; import { CheckboxSlots, CheckboxState } from './Checkbox.types'; @@ -149,9 +149,7 @@ const useIndicatorStyles = makeStyles({ width: indicatorSizeLarge, }, - circular: { - ...shorthands.borderRadius(tokens.borderRadiusCircular), - }, + circular: { borderRadius: `${tokens.borderRadiusCircular}` }, }); // Can't use makeResetStyles here because Label is a component that may itself use makeResetStyles. @@ -160,7 +158,7 @@ const useLabelStyles = makeStyles({ alignSelf: 'center', color: 'inherit', cursor: 'inherit', - ...shorthands.padding(tokens.spacingVerticalS, tokens.spacingHorizontalS), + padding: `${tokens.spacingVerticalS} ${tokens.spacingHorizontalS}`, }, before: { diff --git a/packages/react-components/react-combobox/src/components/Combobox/useComboboxStyles.styles.ts b/packages/react-components/react-combobox/src/components/Combobox/useComboboxStyles.styles.ts index f5545ad3593355..f4aca5f3166de2 100644 --- a/packages/react-components/react-combobox/src/components/Combobox/useComboboxStyles.styles.ts +++ b/packages/react-components/react-combobox/src/components/Combobox/useComboboxStyles.styles.ts @@ -25,7 +25,7 @@ const fieldHeights = { const useStyles = makeStyles({ root: { alignItems: 'center', - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, boxSizing: 'border-box', columnGap: tokens.spacingHorizontalXXS, display: 'inline-grid', @@ -52,7 +52,7 @@ const useStyles = makeStyles({ height: `max(2px, ${tokens.borderRadiusMedium})`, borderBottomLeftRadius: tokens.borderRadiusMedium, borderBottomRightRadius: tokens.borderRadiusMedium, - ...shorthands.borderBottom(tokens.strokeWidthThick, 'solid', tokens.colorCompoundBrandStroke), + borderBottom: `${tokens.strokeWidthThick} solid ${tokens.colorCompoundBrandStroke}`, clipPath: 'inset(calc(100% - 2px) 0 0 0)', transform: 'scaleX(0)', transitionProperty: 'transform', @@ -82,7 +82,7 @@ const useStyles = makeStyles({ listbox: { boxShadow: `${tokens.shadow16}`, - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, maxHeight: '80vh', boxSizing: 'border-box', }, @@ -115,7 +115,7 @@ const useStyles = makeStyles({ // appearance variants outline: { backgroundColor: tokens.colorNeutralBackground1, - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke1), + border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`, borderBottomColor: tokens.colorNeutralStrokeAccessible, }, @@ -132,16 +132,16 @@ const useStyles = makeStyles({ }, underline: { backgroundColor: tokens.colorTransparentBackground, - ...shorthands.borderBottom(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStrokeAccessible), - ...shorthands.borderRadius(0), + borderBottom: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStrokeAccessible}`, + borderRadius: '0', }, 'filled-lighter': { backgroundColor: tokens.colorNeutralBackground1, - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorTransparentStroke), + border: `${tokens.strokeWidthThin} solid ${tokens.colorTransparentStroke}`, }, 'filled-darker': { backgroundColor: tokens.colorNeutralBackground3, - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorTransparentStroke), + border: `${tokens.strokeWidthThin} solid ${tokens.colorTransparentStroke}`, }, invalid: { ':not(:focus-within),:hover:not(:focus-within)': { @@ -168,7 +168,9 @@ const useInputStyles = makeStyles({ input: { alignSelf: 'stretch', backgroundColor: tokens.colorTransparentBackground, - ...shorthands.border('0'), + ...shorthands.border( + '0', + ) /* TODO: Expected "border" to have 3 arguments, got 1. Please migrate it manually. */ /* TODO: Expected "border" to have 3 arguments, got 1. Please migrate it manually. */, color: tokens.colorNeutralForeground1, fontFamily: tokens.fontFamilyBase, @@ -185,15 +187,15 @@ const useInputStyles = makeStyles({ // size variants small: { ...typographyStyles.caption1, - ...shorthands.padding(0, 0, 0, `calc(${tokens.spacingHorizontalSNudge} + ${tokens.spacingHorizontalXXS})`), + padding: `0 0 0 ${`calc(${tokens.spacingHorizontalSNudge} + ${tokens.spacingHorizontalXXS})`}`, }, medium: { ...typographyStyles.body1, - ...shorthands.padding(0, 0, 0, `calc(${tokens.spacingHorizontalMNudge} + ${tokens.spacingHorizontalXXS})`), + padding: `0 0 0 ${`calc(${tokens.spacingHorizontalMNudge} + ${tokens.spacingHorizontalXXS})`}`, }, large: { ...typographyStyles.body2, - ...shorthands.padding(0, 0, 0, `calc(${tokens.spacingHorizontalM} + ${tokens.spacingHorizontalSNudge})`), + padding: `0 0 0 ${`calc(${tokens.spacingHorizontalM} + ${tokens.spacingHorizontalSNudge})`}`, }, disabled: { color: tokens.colorNeutralForegroundDisabled, @@ -225,9 +227,10 @@ const useIconStyles = makeStyles({ visuallyHidden: { clip: 'rect(0px, 0px, 0px, 0px)', height: '1px', - ...shorthands.margin('-1px'), - ...shorthands.overflow('hidden'), - ...shorthands.padding('0px'), + margin: '-1px', + overflow: 'hidden', + padding: '0px', + width: '1px', position: 'absolute', }, diff --git a/packages/react-components/react-combobox/src/components/Dropdown/useDropdownStyles.styles.ts b/packages/react-components/react-combobox/src/components/Dropdown/useDropdownStyles.styles.ts index e6db37b7a5a5aa..84818389e2f1e7 100644 --- a/packages/react-components/react-combobox/src/components/Dropdown/useDropdownStyles.styles.ts +++ b/packages/react-components/react-combobox/src/components/Dropdown/useDropdownStyles.styles.ts @@ -18,7 +18,7 @@ export const dropdownClassNames: SlotClassNames = { */ const useStyles = makeStyles({ root: { - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, boxSizing: 'border-box', display: 'inline-flex', minWidth: '250px', @@ -42,7 +42,7 @@ const useStyles = makeStyles({ height: `max(${tokens.strokeWidthThick}, ${tokens.borderRadiusMedium})`, borderBottomLeftRadius: tokens.borderRadiusMedium, borderBottomRightRadius: tokens.borderRadiusMedium, - ...shorthands.borderBottom(tokens.strokeWidthThick, 'solid', tokens.colorCompoundBrandStroke), + borderBottom: `${tokens.strokeWidthThick} solid ${tokens.colorCompoundBrandStroke}`, clipPath: 'inset(calc(100% - 2px) 0 0 0)', transform: 'scaleX(0)', transitionProperty: 'transform', @@ -80,7 +80,7 @@ const useStyles = makeStyles({ listbox: { boxSizing: 'border-box', boxShadow: `${tokens.shadow16}`, - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, maxHeight: '80vh', }, @@ -97,7 +97,9 @@ const useStyles = makeStyles({ button: { alignItems: 'center', backgroundColor: tokens.colorTransparentBackground, - ...shorthands.border('0'), + ...shorthands.border( + '0', + ) /* TODO: Expected "border" to have 3 arguments, got 1. Please migrate it manually. */ /* TODO: Expected "border" to have 3 arguments, got 1. Please migrate it manually. */, boxSizing: 'border-box', color: tokens.colorNeutralForeground1, columnGap: tokens.spacingHorizontalXXS, @@ -121,37 +123,28 @@ const useStyles = makeStyles({ // size variants small: { ...typographyStyles.caption1, - ...shorthands.padding( - '3px', - tokens.spacingHorizontalSNudge, - '3px', - `calc(${tokens.spacingHorizontalSNudge} + ${tokens.spacingHorizontalXXS})`, - ), + padding: `3px ${ + tokens.spacingHorizontalSNudge + } 3px ${`calc(${tokens.spacingHorizontalSNudge} + ${tokens.spacingHorizontalXXS})`}`, }, medium: { ...typographyStyles.body1, - ...shorthands.padding( - '5px', - tokens.spacingHorizontalMNudge, - '5px', - `calc(${tokens.spacingHorizontalMNudge} + ${tokens.spacingHorizontalXXS})`, - ), + padding: `5px ${ + tokens.spacingHorizontalMNudge + } 5px ${`calc(${tokens.spacingHorizontalMNudge} + ${tokens.spacingHorizontalXXS})`}`, }, large: { columnGap: tokens.spacingHorizontalSNudge, ...typographyStyles.body2, - ...shorthands.padding( - '7px', - tokens.spacingHorizontalM, - '7px', - `calc(${tokens.spacingHorizontalM} + ${tokens.spacingHorizontalSNudge})`, - ), + padding: `7px ${ + tokens.spacingHorizontalM + } 7px ${`calc(${tokens.spacingHorizontalM} + ${tokens.spacingHorizontalSNudge})`}`, }, // appearance variants outline: { backgroundColor: tokens.colorNeutralBackground1, - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke1), + border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`, borderBottomColor: tokens.colorNeutralStrokeAccessible, }, outlineInteractive: { @@ -167,16 +160,16 @@ const useStyles = makeStyles({ }, underline: { backgroundColor: tokens.colorTransparentBackground, - ...shorthands.borderBottom(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStrokeAccessible), - ...shorthands.borderRadius(0), + borderBottom: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStrokeAccessible}`, + borderRadius: '0', }, 'filled-lighter': { backgroundColor: tokens.colorNeutralBackground1, - ...shorthands.border(tokens.strokeWidthThin, 'solid', 'transparent'), + border: `${tokens.strokeWidthThin} solid transparent`, }, 'filled-darker': { backgroundColor: tokens.colorNeutralBackground3, - ...shorthands.border(tokens.strokeWidthThin, 'solid', 'transparent'), + border: `${tokens.strokeWidthThin} solid transparent`, }, invalid: { ':not(:focus-within),:hover:not(:focus-within)': { diff --git a/packages/react-components/react-combobox/src/components/Listbox/useListboxStyles.styles.ts b/packages/react-components/react-combobox/src/components/Listbox/useListboxStyles.styles.ts index 361c60730b6a30..b203eac31f9c4b 100644 --- a/packages/react-components/react-combobox/src/components/Listbox/useListboxStyles.styles.ts +++ b/packages/react-components/react-combobox/src/components/Listbox/useListboxStyles.styles.ts @@ -1,6 +1,6 @@ import { tokens } from '@fluentui/react-theme'; import { SlotClassNames } from '@fluentui/react-utilities'; -import { makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeStyles, mergeClasses } from '@griffel/react'; import type { ListboxSlots, ListboxState } from './Listbox.types'; export const listboxClassNames: SlotClassNames = { @@ -18,8 +18,8 @@ const useStyles = makeStyles({ flexDirection: 'column', minWidth: '160px', overflowY: 'auto', - ...shorthands.outline('1px', 'solid', tokens.colorTransparentStroke), - ...shorthands.padding(tokens.spacingHorizontalXS), + outline: `1px solid ${tokens.colorTransparentStroke}`, + padding: `${tokens.spacingHorizontalXS}`, rowGap: tokens.spacingHorizontalXXS, }, }); diff --git a/packages/react-components/react-combobox/src/components/Option/useOptionStyles.styles.ts b/packages/react-components/react-combobox/src/components/Option/useOptionStyles.styles.ts index d28f8c2e608246..83517edc246b44 100644 --- a/packages/react-components/react-combobox/src/components/Option/useOptionStyles.styles.ts +++ b/packages/react-components/react-combobox/src/components/Option/useOptionStyles.styles.ts @@ -15,7 +15,7 @@ export const optionClassNames: SlotClassNames = { const useStyles = makeStyles({ root: { alignItems: 'center', - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, color: tokens.colorNeutralForeground1, columnGap: tokens.spacingHorizontalXS, cursor: 'pointer', @@ -23,7 +23,7 @@ const useStyles = makeStyles({ fontFamily: tokens.fontFamilyBase, fontSize: tokens.fontSizeBase300, lineHeight: tokens.lineHeightBase300, - ...shorthands.padding(tokens.spacingVerticalSNudge, tokens.spacingHorizontalS), + padding: `${tokens.spacingVerticalSNudge} ${tokens.spacingHorizontalS}`, position: 'relative', ':hover': { @@ -48,7 +48,7 @@ const useStyles = makeStyles({ ...shorthands.borderStyle('solid'), ...shorthands.borderWidth('2px'), - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, ...shorthands.borderColor(tokens.colorStrokeFocus2), top: '-2px', @@ -98,8 +98,8 @@ const useStyles = makeStyles({ }, multiselectCheck: { - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStrokeAccessible), - ...shorthands.borderRadius(tokens.borderRadiusSmall), + border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStrokeAccessible}`, + borderRadius: `${tokens.borderRadiusSmall}`, boxSizing: 'border-box', display: 'flex', diff --git a/packages/react-components/react-combobox/src/components/OptionGroup/useOptionGroupStyles.styles.ts b/packages/react-components/react-combobox/src/components/OptionGroup/useOptionGroupStyles.styles.ts index 4ee0681b0f30ab..7d90123a462bf5 100644 --- a/packages/react-components/react-combobox/src/components/OptionGroup/useOptionGroupStyles.styles.ts +++ b/packages/react-components/react-combobox/src/components/OptionGroup/useOptionGroupStyles.styles.ts @@ -1,6 +1,6 @@ import { tokens } from '@fluentui/react-theme'; import { SlotClassNames } from '@fluentui/react-utilities'; -import { makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeStyles, mergeClasses } from '@griffel/react'; import type { OptionGroupSlots, OptionGroupState } from './OptionGroup.types'; export const optionGroupClassNames: SlotClassNames = { @@ -19,21 +19,21 @@ const useStyles = makeStyles({ '&:not(:last-child)::after': { content: '""', - ...shorthands.borderBottom(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke2), + borderBottom: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke2}`, display: 'block', paddingBottom: tokens.spacingHorizontalXS, - ...shorthands.margin(0, `calc(${tokens.spacingHorizontalXS} * -1)`, tokens.spacingVerticalXS), + margin: `0 ${`calc(${tokens.spacingHorizontalXS} * -1)`} ${tokens.spacingVerticalXS}`, }, }, label: { - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, color: tokens.colorNeutralForeground3, display: 'block', fontSize: tokens.fontSizeBase200, fontWeight: tokens.fontWeightSemibold, lineHeight: tokens.lineHeightBase200, - ...shorthands.padding(tokens.spacingHorizontalS, tokens.spacingHorizontalSNudge), + padding: `${tokens.spacingHorizontalS} ${tokens.spacingHorizontalSNudge}`, }, }); diff --git a/packages/react-components/react-drawer/src/components/InlineDrawer/useInlineDrawerStyles.styles.ts b/packages/react-components/react-drawer/src/components/InlineDrawer/useInlineDrawerStyles.styles.ts index 625f75e248b801..49be5942723e81 100644 --- a/packages/react-components/react-drawer/src/components/InlineDrawer/useInlineDrawerStyles.styles.ts +++ b/packages/react-components/react-drawer/src/components/InlineDrawer/useInlineDrawerStyles.styles.ts @@ -1,4 +1,4 @@ -import { makeResetStyles, makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeResetStyles, makeStyles, mergeClasses } from '@griffel/react'; import type { SlotClassNames } from '@fluentui/react-utilities'; import { tokens } from '@fluentui/react-theme'; @@ -21,15 +21,9 @@ const useDrawerResetStyles = makeResetStyles({ const separatorValues = ['1px', 'solid', tokens.colorNeutralBackground3] as const; const useDrawerRootStyles = makeStyles({ /* Separator */ - separatorStart: { - ...shorthands.borderRight(...separatorValues), - }, - separatorEnd: { - ...shorthands.borderLeft(...separatorValues), - }, - separatorBottom: { - ...shorthands.borderTop(...separatorValues), - }, + separatorStart: { borderRight: separatorValues.join(' ') }, + separatorEnd: { borderLeft: separatorValues.join(' ') }, + separatorBottom: { borderTop: separatorValues.join(' ') }, /* Positioning */ start: { diff --git a/packages/react-components/react-drawer/src/shared/useDrawerBaseStyles.styles.ts b/packages/react-components/react-drawer/src/shared/useDrawerBaseStyles.styles.ts index 2dae8691a0c61e..da0b55856101d8 100644 --- a/packages/react-components/react-drawer/src/shared/useDrawerBaseStyles.styles.ts +++ b/packages/react-components/react-drawer/src/shared/useDrawerBaseStyles.styles.ts @@ -1,4 +1,4 @@ -import { type GriffelResetStyle, makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { type GriffelResetStyle, makeStyles, mergeClasses } from '@griffel/react'; import { tokens } from '@fluentui/react-theme'; import { DrawerBaseState } from './DrawerBase.types'; @@ -48,13 +48,13 @@ const useDrawerStyles = makeStyles({ /* Positioning */ start: { - ...shorthands.borderRight(tokens.strokeWidthThin, 'solid', tokens.colorTransparentStroke), + borderRight: `${tokens.strokeWidthThin} solid ${tokens.colorTransparentStroke}`, left: 0, right: 'auto', }, end: { - ...shorthands.borderLeft(tokens.strokeWidthThin, 'solid', tokens.colorTransparentStroke), + borderLeft: `${tokens.strokeWidthThin} solid ${tokens.colorTransparentStroke}`, right: 0, left: 'auto', diff --git a/packages/react-components/react-image/src/components/Image/useImageStyles.styles.ts b/packages/react-components/react-image/src/components/Image/useImageStyles.styles.ts index a1e1007661a804..5f8f3d016bed19 100644 --- a/packages/react-components/react-image/src/components/Image/useImageStyles.styles.ts +++ b/packages/react-components/react-image/src/components/Image/useImageStyles.styles.ts @@ -11,7 +11,7 @@ const useStyles = makeStyles({ // Base styles base: { ...shorthands.borderColor(tokens.colorNeutralStroke1), - ...shorthands.borderRadius(tokens.borderRadiusNone), + borderRadius: `${tokens.borderRadiusNone}`, boxSizing: 'border-box', display: 'inline-block', @@ -24,12 +24,8 @@ const useStyles = makeStyles({ }, // Shape variations - circular: { - ...shorthands.borderRadius(tokens.borderRadiusCircular), - }, - rounded: { - ...shorthands.borderRadius(tokens.borderRadiusMedium), - }, + circular: { borderRadius: `${tokens.borderRadiusCircular}` }, + rounded: { borderRadius: `${tokens.borderRadiusMedium}` }, square: { /* The square styles are exactly the same as the base styles. */ }, diff --git a/packages/react-components/react-infobutton/src/components/InfoButton/useInfoButtonStyles.styles.ts b/packages/react-components/react-infobutton/src/components/InfoButton/useInfoButtonStyles.styles.ts index 52447d92506305..7e2adf60587da0 100644 --- a/packages/react-components/react-infobutton/src/components/InfoButton/useInfoButtonStyles.styles.ts +++ b/packages/react-components/react-infobutton/src/components/InfoButton/useInfoButtonStyles.styles.ts @@ -35,9 +35,9 @@ const useButtonStyles = makeStyles({ color: tokens.colorNeutralForeground2, ...shorthands.borderStyle('none'), - ...shorthands.borderRadius(tokens.borderRadiusMedium), - ...shorthands.margin(0), - ...shorthands.padding(tokens.spacingVerticalXS, tokens.spacingHorizontalXS), + borderRadius: `${tokens.borderRadiusMedium}`, + margin: '0', + padding: `${tokens.spacingVerticalXS} ${tokens.spacingHorizontalXS}`, [`& .${iconFilledClassName}`]: { display: 'none', @@ -95,9 +95,7 @@ const useButtonStyles = makeStyles({ focusIndicator: createFocusOutlineStyle(), - large: { - ...shorthands.padding(tokens.spacingVerticalXXS, tokens.spacingVerticalXXS), - }, + large: { padding: `${tokens.spacingVerticalXXS} ${tokens.spacingVerticalXXS}` }, }); const usePopoverSurfaceStyles = makeStyles({ diff --git a/packages/react-components/react-infolabel/src/components/InfoButton/useInfoButtonStyles.styles.ts b/packages/react-components/react-infolabel/src/components/InfoButton/useInfoButtonStyles.styles.ts index 79fecc9c72d473..37986701efb885 100644 --- a/packages/react-components/react-infolabel/src/components/InfoButton/useInfoButtonStyles.styles.ts +++ b/packages/react-components/react-infolabel/src/components/InfoButton/useInfoButtonStyles.styles.ts @@ -29,9 +29,9 @@ const useButtonStyles = makeStyles({ color: tokens.colorNeutralForeground2, ...shorthands.borderStyle('none'), - ...shorthands.borderRadius(tokens.borderRadiusMedium), - ...shorthands.margin(0), - ...shorthands.padding(tokens.spacingVerticalXS, tokens.spacingHorizontalXS), + borderRadius: `${tokens.borderRadiusMedium}`, + margin: '0', + padding: `${tokens.spacingVerticalXS} ${tokens.spacingHorizontalXS}`, [`& .${iconFilledClassName}`]: { display: 'none', @@ -89,9 +89,7 @@ const useButtonStyles = makeStyles({ focusIndicator: createFocusOutlineStyle(), - large: { - ...shorthands.padding(tokens.spacingVerticalXXS, tokens.spacingVerticalXXS), - }, + large: { padding: `${tokens.spacingVerticalXXS} ${tokens.spacingVerticalXXS}` }, }); const usePopoverSurfaceStyles = makeStyles({ diff --git a/packages/react-components/react-input/src/components/Input/useInputStyles.styles.ts b/packages/react-components/react-input/src/components/Input/useInputStyles.styles.ts index 3369205215a17d..55df94018d112e 100644 --- a/packages/react-components/react-input/src/components/Input/useInputStyles.styles.ts +++ b/packages/react-components/react-input/src/components/Input/useInputStyles.styles.ts @@ -123,7 +123,7 @@ const useRootStyles = makeStyles({ large: { minHeight: fieldHeights.large, ...typographyStyles.body2, - ...shorthands.gap(tokens.spacingHorizontalSNudge), + gap: `${tokens.spacingHorizontalSNudge}`, }, outline: { // included in rootBaseStyles @@ -141,7 +141,8 @@ const useRootStyles = makeStyles({ }, underline: { backgroundColor: tokens.colorTransparentBackground, - ...shorthands.borderRadius(0), // corners look strange if rounded + borderRadius: '0', + // corners look strange if rounded // border is specified in rootBaseStyles, but we only want a bottom border here borderTopStyle: 'none', borderRightStyle: 'none', @@ -160,7 +161,7 @@ const useRootStyles = makeStyles({ ':active,:focus-within': { borderBottomColor: tokens.colorNeutralStrokeAccessiblePressed, }, - '::after': shorthands.borderRadius(0), // remove rounded corners from focus underline + '::after': { borderRadius: '0' }, // remove rounded corners from focus underline }, filled: { ...shorthands.borderColor(tokens.colorTransparentStroke), diff --git a/packages/react-components/react-link/src/components/Link/useLinkStyles.styles.ts b/packages/react-components/react-link/src/components/Link/useLinkStyles.styles.ts index 600537ef004980..eda7a8b80cb0dc 100644 --- a/packages/react-components/react-link/src/components/Link/useLinkStyles.styles.ts +++ b/packages/react-components/react-link/src/components/Link/useLinkStyles.styles.ts @@ -1,4 +1,4 @@ -import { shorthands, makeStyles, mergeClasses } from '@griffel/react'; +import { makeStyles, mergeClasses } from '@griffel/react'; import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster'; import { tokens } from '@fluentui/react-theme'; import type { LinkSlots, LinkState } from './Link.types'; @@ -28,9 +28,9 @@ const useStyles = makeStyles({ fontFamily: tokens.fontFamilyBase, fontSize: tokens.fontSizeBase300, fontWeight: tokens.fontWeightRegular, - ...shorthands.margin(0), - ...shorthands.padding(0), - ...shorthands.overflow('inherit'), + margin: '0', + padding: '0', + overflow: 'inherit', textAlign: 'left', textDecorationLine: 'none', textDecorationThickness: tokens.strokeWidthThin, @@ -49,7 +49,7 @@ const useStyles = makeStyles({ }, // Overrides when the Link renders as a button. button: { - ...shorthands.borderStyle('none'), + border: 'none', }, // Overrides when an href is present so the Link renders as an anchor. href: { diff --git a/packages/react-components/react-list-preview/src/components/ListItem/useListItemStyles.styles.ts b/packages/react-components/react-list-preview/src/components/ListItem/useListItemStyles.styles.ts index 7c4d8c748a8dbd..608dd4e1849942 100644 --- a/packages/react-components/react-list-preview/src/components/ListItem/useListItemStyles.styles.ts +++ b/packages/react-components/react-list-preview/src/components/ListItem/useListItemStyles.styles.ts @@ -1,5 +1,5 @@ import type { SlotClassNames } from '@fluentui/react-utilities'; -import { makeStyles, makeResetStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeStyles, makeResetStyles, mergeClasses } from '@griffel/react'; import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster'; import type { ListItemSlots, ListItemState } from './ListItem.types'; import { tokens } from '@fluentui/react-theme'; @@ -16,8 +16,8 @@ const useRootBaseStyles = makeResetStyles({ listStyleType: 'none', ...createCustomFocusIndicatorStyle( { - ...shorthands.outline(tokens.strokeWidthThick, 'solid', tokens.colorStrokeFocus2), - ...shorthands.borderRadius(tokens.borderRadiusMedium), + outline: `${tokens.strokeWidthThick} solid ${tokens.colorStrokeFocus2}`, + borderRadius: `${tokens.borderRadiusMedium}`, }, { selector: 'focus' }, ), @@ -27,9 +27,7 @@ const useCheckmarkBaseStyles = makeStyles({ root: { alignSelf: 'center', //eslint-disable-next-line - '& .fui-Checkbox__indicator': { - ...shorthands.margin('4px'), - }, + '& .fui-Checkbox__indicator': { margin: '4px' }, }, }); /** diff --git a/packages/react-components/react-menu/src/components/MenuDivider/useMenuDividerStyles.styles.ts b/packages/react-components/react-menu/src/components/MenuDivider/useMenuDividerStyles.styles.ts index 9e41408b42a8ca..03e98267b6b747 100644 --- a/packages/react-components/react-menu/src/components/MenuDivider/useMenuDividerStyles.styles.ts +++ b/packages/react-components/react-menu/src/components/MenuDivider/useMenuDividerStyles.styles.ts @@ -1,4 +1,4 @@ -import { shorthands, mergeClasses, makeStyles } from '@griffel/react'; +import { mergeClasses, makeStyles } from '@griffel/react'; import { tokens } from '@fluentui/react-theme'; import type { MenuDividerSlots, MenuDividerState } from './MenuDivider.types'; import type { SlotClassNames } from '@fluentui/react-utilities'; @@ -9,9 +9,10 @@ export const menuDividerClassNames: SlotClassNames = { const useStyles = makeStyles({ root: { - ...shorthands.margin('4px', '-5px', '4px', '-5px'), + margin: '4px -5px 4px -5px', + width: 'auto', - ...shorthands.borderBottom(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke2), + borderBottom: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke2}`, }, }); diff --git a/packages/react-components/react-menu/src/components/MenuList/useMenuListStyles.styles.ts b/packages/react-components/react-menu/src/components/MenuList/useMenuListStyles.styles.ts index 59432241800e96..4b77137ed6dc63 100644 --- a/packages/react-components/react-menu/src/components/MenuList/useMenuListStyles.styles.ts +++ b/packages/react-components/react-menu/src/components/MenuList/useMenuListStyles.styles.ts @@ -1,5 +1,5 @@ import type { SlotClassNames } from '@fluentui/react-utilities'; -import { mergeClasses, makeStyles, shorthands } from '@griffel/react'; +import { mergeClasses, makeStyles } from '@griffel/react'; import type { MenuListSlots, MenuListState } from './MenuList.types'; export const menuListClassNames: SlotClassNames = { @@ -10,7 +10,7 @@ const useStyles = makeStyles({ root: { display: 'flex', flexDirection: 'column', - ...shorthands.gap('2px'), + gap: '2px', }, hasMenuContext: { height: '100%', diff --git a/packages/react-components/react-menu/src/components/MenuPopover/useMenuPopoverStyles.styles.ts b/packages/react-components/react-menu/src/components/MenuPopover/useMenuPopoverStyles.styles.ts index d42f24f27529e7..6844ef92c0423a 100644 --- a/packages/react-components/react-menu/src/components/MenuPopover/useMenuPopoverStyles.styles.ts +++ b/packages/react-components/react-menu/src/components/MenuPopover/useMenuPopoverStyles.styles.ts @@ -1,4 +1,4 @@ -import { shorthands, mergeClasses, makeStyles } from '@griffel/react'; +import { mergeClasses, makeStyles } from '@griffel/react'; import { tokens, typographyStyles } from '@fluentui/react-theme'; import type { MenuPopoverSlots, MenuPopoverState } from './MenuPopover.types'; import type { SlotClassNames } from '@fluentui/react-utilities'; @@ -10,7 +10,7 @@ export const menuPopoverClassNames: SlotClassNames = { const useStyles = makeStyles({ root: { - ...shorthands.borderRadius(tokens.borderRadiusMedium), + borderRadius: `${tokens.borderRadiusMedium}`, backgroundColor: tokens.colorNeutralBackground1, color: tokens.colorNeutralForeground1, boxSizing: 'border-box', @@ -19,8 +19,8 @@ const useStyles = makeStyles({ overflowX: 'hidden', width: 'max-content', boxShadow: `${tokens.shadow16}`, - ...shorthands.padding('4px'), - ...shorthands.border('1px', 'solid', tokens.colorTransparentStroke), + padding: '4px', + border: `1px solid ${tokens.colorTransparentStroke}`, ...typographyStyles.body1, ...createSlideStyles(10), }, diff --git a/packages/react-components/react-message-bar/src/components/MessageBar/useMessageBarStyles.styles.ts b/packages/react-components/react-message-bar/src/components/MessageBar/useMessageBarStyles.styles.ts index eaa9b2f28171c9..3adb2728706767 100644 --- a/packages/react-components/react-message-bar/src/components/MessageBar/useMessageBarStyles.styles.ts +++ b/packages/react-components/react-message-bar/src/components/MessageBar/useMessageBarStyles.styles.ts @@ -57,9 +57,7 @@ const useStyles = makeStyles({ marginRight: '0px', }, - square: { - ...shorthands.borderRadius(0), - }, + square: { borderRadius: '0' }, }); const useIconIntentStyles = makeStyles({ diff --git a/packages/react-components/react-migration-v0-v9/etc/react-migration-v0-v9.api.md b/packages/react-components/react-migration-v0-v9/etc/react-migration-v0-v9.api.md index 68498dbfd19d71..931031824e7dc3 100644 --- a/packages/react-components/react-migration-v0-v9/etc/react-migration-v0-v9.api.md +++ b/packages/react-components/react-migration-v0-v9/etc/react-migration-v0-v9.api.md @@ -210,7 +210,7 @@ export type StyledTextSlots = { }; // @public (undocumented) -export const useFlexStyles: () => Record<"flex" | "fill" | "column" | "wrap" | "inline" | "alignItemsFlexStart" | "alignItemsCenter" | "alignItemsFlexEnd" | "alignItemsStretch" | "justifyContentFlexStart" | "justifyContentCenter" | "justifyContentFlexEnd" | "justifyContentStretch" | "justifyContentSpaceAround" | "justifyContentSpaceBetween" | "justifyContentSpaceEvenly" | "gapForColumnFlexSmall" | "gapForColumnFlexSmaller" | "gapForColumnFlexMedium" | "gapForColumnFlexLarge" | "gapForRowFlexSmall" | "gapForRowFlexSmaller" | "gapForRowFlexMedium" | "gapForRowFlexLarge" | "paddingMedium", string>; +export const useFlexStyles: () => Record<"flex" | "fill" | "inline" | "column" | "wrap" | "alignItemsFlexStart" | "alignItemsCenter" | "alignItemsFlexEnd" | "alignItemsStretch" | "justifyContentFlexStart" | "justifyContentCenter" | "justifyContentFlexEnd" | "justifyContentStretch" | "justifyContentSpaceAround" | "justifyContentSpaceBetween" | "justifyContentSpaceEvenly" | "gapForColumnFlexSmall" | "gapForColumnFlexSmaller" | "gapForColumnFlexMedium" | "gapForColumnFlexLarge" | "gapForRowFlexSmall" | "gapForRowFlexSmaller" | "gapForRowFlexMedium" | "gapForRowFlexLarge" | "paddingMedium", string>; // @public (undocumented) export const useGridStyles: () => Record<"grid" | "onlyRows" | "rows1" | "rows2" | "rows3" | "columns1" | "columns2" | "columns3" | "columnsDefault", string>; diff --git a/packages/react-components/react-migration-v0-v9/src/components/Flex/Flex.styles.ts b/packages/react-components/react-migration-v0-v9/src/components/Flex/Flex.styles.ts index 21fd17beb1f6ef..dab5039ce0f4f5 100644 --- a/packages/react-components/react-migration-v0-v9/src/components/Flex/Flex.styles.ts +++ b/packages/react-components/react-migration-v0-v9/src/components/Flex/Flex.styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, shorthands } from '@fluentui/react-components'; +import { makeStyles } from '@fluentui/react-components'; const gapValues = { smaller: '8px', @@ -85,7 +85,5 @@ export const useFlexStyles = makeStyles({ gapForRowFlexLarge: { columnGap: gapValues.large, }, - paddingMedium: { - ...shorthands.padding(paddingValues.medium), - }, + paddingMedium: { padding: `${paddingValues.medium}` }, }); diff --git a/packages/react-components/react-migration-v0-v9/src/components/List/ListItem/useListItemStyles.styles.ts b/packages/react-components/react-migration-v0-v9/src/components/List/ListItem/useListItemStyles.styles.ts index b76cd7a769b518..072d94c945d6d1 100644 --- a/packages/react-components/react-migration-v0-v9/src/components/List/ListItem/useListItemStyles.styles.ts +++ b/packages/react-components/react-migration-v0-v9/src/components/List/ListItem/useListItemStyles.styles.ts @@ -1,5 +1,5 @@ import type { SlotClassNames } from '@fluentui/react-utilities'; -import { makeStyles, makeResetStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeStyles, makeResetStyles, mergeClasses } from '@griffel/react'; import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster'; import type { ListItemSlots, ListItemState } from './ListItem.types'; import { tokens } from '@fluentui/react-theme'; @@ -41,7 +41,8 @@ const useStyles = makeStyles({ gridColumnEnd: 4, }, truncate: { - ...shorthands.overflow('hidden'), + overflow: 'hidden', + textWrap: 'nowrap', textOverflow: 'ellipsis', }, diff --git a/packages/react-components/react-migration-v0-v9/src/components/Segment/Segment.styles.ts b/packages/react-components/react-migration-v0-v9/src/components/Segment/Segment.styles.ts index 8a4454446ce50f..d8546d36f4e2b0 100644 --- a/packages/react-components/react-migration-v0-v9/src/components/Segment/Segment.styles.ts +++ b/packages/react-components/react-migration-v0-v9/src/components/Segment/Segment.styles.ts @@ -2,7 +2,8 @@ import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; export const useSegmentStyles = makeStyles({ segment: { - ...shorthands.padding('1em'), + padding: '1em', + ...shorthands.borderWidth('2px', 0, 0), ...shorthands.borderColor('transparent'), ...shorthands.borderStyle('solid'), diff --git a/packages/react-components/react-migration-v0-v9/src/components/StyledText/StyledText.styles.ts b/packages/react-components/react-migration-v0-v9/src/components/StyledText/StyledText.styles.ts index e8ca0a2c352f5c..d059975021c313 100644 --- a/packages/react-components/react-migration-v0-v9/src/components/StyledText/StyledText.styles.ts +++ b/packages/react-components/react-migration-v0-v9/src/components/StyledText/StyledText.styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, shorthands, tokens } from '@fluentui/react-components'; +import { makeStyles, tokens } from '@fluentui/react-components'; export const useSizeStyles = makeStyles({ base100: { @@ -81,7 +81,7 @@ export const useStyles = makeStyles({ }, nowrap: { whiteSpace: 'nowrap', - ...shorthands.overflow('hidden'), + overflow: 'hidden', }, truncate: { textOverflow: 'ellipsis', diff --git a/packages/react-components/react-nav-preview/src/components/sharedNavStyles.styles.ts b/packages/react-components/react-nav-preview/src/components/sharedNavStyles.styles.ts index 8b01293ec309ce..6060220cccbd46 100644 --- a/packages/react-components/react-nav-preview/src/components/sharedNavStyles.styles.ts +++ b/packages/react-components/react-nav-preview/src/components/sharedNavStyles.styles.ts @@ -1,6 +1,6 @@ import { iconFilledClassName, iconRegularClassName } from '@fluentui/react-icons'; import { tokens, typographyStyles } from '@fluentui/react-theme'; -import { makeResetStyles, makeStyles, shorthands } from '@griffel/react'; +import { makeResetStyles, makeStyles } from '@griffel/react'; // Styles shared by several nav components. @@ -58,7 +58,7 @@ export const useIndicatorStyles = makeStyles({ backgroundColor: tokens.colorNeutralForeground2BrandSelected, height: `${navItemTokens.indicatorHeight}px`, width: `${navItemTokens.indicatorWidth}px`, - ...shorthands.borderRadius(tokens.borderRadiusCircular), + borderRadius: `${tokens.borderRadiusCircular}`, content: '""', }, }, @@ -75,7 +75,8 @@ export const useIconStyles = makeStyles({ alignItems: 'top', display: 'inline-flex', justifyContent: 'center', - ...shorthands.overflow('hidden'), + overflow: 'hidden', + [`& .${iconFilledClassName}`]: { display: 'none', }, diff --git a/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurfaceStyles.styles.ts b/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurfaceStyles.styles.ts index a309bec76f62e4..aeedb9f9bd7b79 100644 --- a/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurfaceStyles.styles.ts +++ b/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurfaceStyles.styles.ts @@ -1,4 +1,4 @@ -import { shorthands, makeStyles, mergeClasses } from '@griffel/react'; +import { makeStyles, mergeClasses } from '@griffel/react'; import { createArrowHeightStyles, createArrowStyles, createSlideStyles } from '@fluentui/react-positioning'; import { tokens, typographyStyles } from '@fluentui/react-theme'; import type { PopoverSize } from '../Popover/Popover.types'; @@ -23,8 +23,8 @@ const useStyles = makeStyles({ color: tokens.colorNeutralForeground1, backgroundColor: tokens.colorNeutralBackground1, boxShadow: tokens.shadow16, - ...shorthands.borderRadius(tokens.borderRadiusMedium), - ...shorthands.border('1px', 'solid', tokens.colorTransparentStroke), + borderRadius: `${tokens.borderRadiusMedium}`, + border: `1px solid ${tokens.colorTransparentStroke}`, ...typographyStyles.body1, ...createSlideStyles(10), }, @@ -45,17 +45,11 @@ const useStyles = makeStyles({ color: tokens.colorNeutralForegroundOnBrand, }, - smallPadding: { - ...shorthands.padding('12px'), - }, + smallPadding: { padding: '12px' }, - mediumPadding: { - ...shorthands.padding('16px'), - }, + mediumPadding: { padding: '16px' }, - largePadding: { - ...shorthands.padding('20px'), - }, + largePadding: { padding: '20px' }, smallArrow: createArrowHeightStyles(arrowHeights.small), mediumLargeArrow: createArrowHeightStyles(arrowHeights.medium), diff --git a/packages/react-components/react-positioning/src/createArrowStyles.ts b/packages/react-components/react-positioning/src/createArrowStyles.ts index 0b7497cff56a1a..12727894cfbf0c 100644 --- a/packages/react-components/react-positioning/src/createArrowStyles.ts +++ b/packages/react-components/react-positioning/src/createArrowStyles.ts @@ -1,4 +1,3 @@ -import { shorthands } from '@griffel/react'; import { tokens } from '@fluentui/react-theme'; import type { GriffelStyle } from '@griffel/react'; @@ -84,12 +83,8 @@ export function createArrowStyles(options: CreateArrowStylesOptions): GriffelSty width: 'inherit', height: 'inherit', backgroundColor: 'inherit', - ...shorthands.borderRight( - `${borderWidth} /* @noflip */`, - `${borderStyle} /* @noflip */`, - `${borderColor} /* @noflip */`, - ), - ...shorthands.borderBottom(borderWidth, borderStyle, borderColor), + borderRight: `${borderWidth} ${borderStyle} ${borderColor} /* @noflip */`, + borderBottom: `${borderWidth} ${borderStyle} ${borderColor}`, borderBottomRightRadius: tokens.borderRadiusSmall, transform: 'rotate(var(--fui-positioning-angle)) translate(0, 50%) rotate(45deg) /* @noflip */', }, diff --git a/packages/react-components/react-progress/src/components/ProgressBar/useProgressBarStyles.styles.ts b/packages/react-components/react-progress/src/components/ProgressBar/useProgressBarStyles.styles.ts index 23b6ebd63d956e..bc6189e5ccb705 100644 --- a/packages/react-components/react-progress/src/components/ProgressBar/useProgressBarStyles.styles.ts +++ b/packages/react-components/react-progress/src/components/ProgressBar/useProgressBarStyles.styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, mergeClasses, shorthands } from '@griffel/react'; +import { makeStyles, mergeClasses } from '@griffel/react'; import { tokens } from '@fluentui/react-theme'; import type { ProgressBarState, ProgressBarSlots } from './ProgressBar.types'; import type { SlotClassNames } from '@fluentui/react-utilities'; @@ -34,18 +34,14 @@ const useRootStyles = makeStyles({ display: 'block', backgroundColor: tokens.colorNeutralBackground6, width: '100%', - ...shorthands.overflow('hidden'), + overflow: 'hidden', '@media screen and (forced-colors: active)': { backgroundColor: 'CanvasText', }, }, - rounded: { - ...shorthands.borderRadius(tokens.borderRadiusMedium), - }, - square: { - ...shorthands.borderRadius(tokens.borderRadiusNone), - }, + rounded: { borderRadius: `${tokens.borderRadiusMedium}` }, + square: { borderRadius: `${tokens.borderRadiusNone}` }, medium: { height: barThicknessValues.medium, }, @@ -62,7 +58,8 @@ const useBarStyles = makeStyles({ '@media screen and (forced-colors: active)': { backgroundColor: 'Highlight', }, - ...shorthands.borderRadius('inherit'), + borderRadius: 'inherit', + height: '100%', }, nonZeroDeterminate: { diff --git a/packages/react-components/react-provider/src/components/FluentProvider/FluentProvider-node.test.tsx b/packages/react-components/react-provider/src/components/FluentProvider/FluentProvider-node.test.tsx index 178716721acbdc..e1acc5f9cc9791 100644 --- a/packages/react-components/react-provider/src/components/FluentProvider/FluentProvider-node.test.tsx +++ b/packages/react-components/react-provider/src/components/FluentProvider/FluentProvider-node.test.tsx @@ -33,7 +33,7 @@ describe('FluentProvider (node)', () => { expect(parseHTMLString(html)).toMatchInlineSnapshot(` "