Skip to content

poc/try shorthands #30765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
layershifter wants to merge 1 commit into from
Closed

poc/try shorthands #30765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...-docsite-v9/src/Concepts/Migration/FromV0/Components/IconCatalog/ComparisonTile.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { makeStyles, shorthands, tokens } from '@fluentui/react-components';
import { makeStyles, tokens } from '@fluentui/react-components';

export const useComparisonTileStyles = makeStyles({
root: {
position: 'relative',
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,
Expand Down Expand Up @@ -44,7 +44,7 @@ export const useComparisonTileStyles = makeStyles({
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
...shorthands.gap('2px'),
gap: '2px',
},

buttonReset: {
Expand All @@ -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',
},
Expand Down
26 changes: 13 additions & 13 deletions apps/public-docsite-v9/src/Concepts/Migration/FromV8/ThemeColors/ColorBlock.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
},
Expand All @@ -35,8 +35,8 @@ export const useColorBlockStyles = makeStyles({
'& label': {
textAlign: 'right',
color: '#aaa',
...shorthands.margin(0),
...shorthands.padding(0),
margin: 0,
padding: 0,
},
},
blockName: {
Expand Down
12 changes: 6 additions & 6 deletions apps/public-docsite-v9/src/Concepts/Poster/AreaCard.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
10 changes: 5 additions & 5 deletions apps/public-docsite-v9/src/Concepts/Poster/CodeItemCard.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions apps/public-docsite-v9/src/Concepts/Poster/Legend.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles, shorthands, tokens } from '@fluentui/react-components';
import { makeStyles, tokens } from '@fluentui/react-components';

export const useLegendStyles = makeStyles({
root: {
Expand All @@ -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,
Expand Down
16 changes: 8 additions & 8 deletions apps/public-docsite-v9/src/Concepts/Poster/OverviewCard.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
},
Expand Down Expand Up @@ -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',
},
});
12 changes: 6 additions & 6 deletions apps/public-docsite-v9/src/Concepts/Poster/PackageCard.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions apps/public-docsite-v9/src/Concepts/Poster/Poster.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -26,6 +26,6 @@ export const usePosterStyles = makeStyles({
justifyItems: 'flex-start',
},
legend: {
...shorthands.margin(0, '40px'),
margin: `0 40px`,
},
});
4 changes: 2 additions & 2 deletions apps/public-docsite-v9/src/Concepts/components/WhatsNewBoxes.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles, shorthands, tokens } from '@fluentui/react-components';
import { makeStyles, tokens } from '@fluentui/react-components';

export const useWhatsNewStyles = makeStyles({
title: {
Expand Down Expand Up @@ -28,7 +28,7 @@ export const useWhatsNewStyles = makeStyles({
},
},
box: {
...shorthands.borderRadius('16px'),
borderRadius: '16px',
marginBottom: '16px',
backgroundColor: tokens.colorNeutralBackground3,
},
Expand Down
12 changes: 6 additions & 6 deletions apps/stress-test/src/renderers/v9/btn/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand Down
12 changes: 6 additions & 6 deletions apps/vr-tests-react-components/src/stories/Badge/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<T> = {
Expand All @@ -22,8 +22,8 @@ export const useStyles = makeStyles({
badgeContainer: {
display: 'flex',
alignItems: 'center',
...shorthands.gap('5px'),
...shorthands.padding('5px'),
gap: '5px',
padding: '5px',
},

label: {
Expand All @@ -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,
},

Expand All @@ -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,
},

Expand Down
Binary file added artifacts/griffel-babel-preset-1.5.7-kkw69n.tgz
View file
Open in desktop
Binary file not shown.
Binary file added artifacts/griffel-core-1.15.3-tllqal.tgz
View file
Open in desktop
Binary file not shown.
Binary file added artifacts/griffel-jest-serializer-1.1.23-l2rog4.tgz
View file
Open in desktop
Binary file not shown.
Binary file added artifacts/griffel-react-1.5.21-bc72ld.tgz
View file
Open in desktop
Binary file not shown.
Binary file added artifacts/griffel-style-types-1.0.4-fj1ykj.tgz
View file
Open in desktop
Binary file not shown.
Binary file added artifacts/griffel-webpack-extraction-plugin-0.5.1-b0kr30.tgz
View file
Open in desktop
Binary file not shown.
Binary file added artifacts/griffel-webpack-loader-2.2.9-5iulaf.tgz
View file
Open in desktop
Binary file not shown.
11 changes: 9 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": []
Expand Down
1 change: 0 additions & 1 deletion packages/eslint-plugin/src/configs/react-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
/**
Expand Down
11 changes: 6 additions & 5 deletions ...ponents/react-accordion/src/components/AccordionHeader/useAccordionHeaderStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ const useStyles = makeStyles({
fontFamily: 'inherit',
fontSize: 'inherit',
lineHeight: 'normal',
...shorthands.overflow('visible'),
...shorthands.padding(0),
overflow: 'visible',
padding: '0',

WebkitAppearance: 'button',
textAlign: 'unset',
},
focusIndicator: createFocusOutlineStyle(),
root: {
color: tokens.colorNeutralForeground1,
backgroundColor: tokens.colorTransparentBackground,
...shorthands.margin(0),
...shorthands.borderRadius(tokens.borderRadiusMedium),
margin: '0',
borderRadius: `${tokens.borderRadiusMedium}`,
},
rootDisabled: {
backgroundImage: 'none',
Expand All @@ -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',
Expand Down
Loading