Skip to content

feat(Flex): add plain gap spacing #9143

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

Merged
merged 3 commits into from
May 18, 2023
Merged

feat(Flex): add plain gap spacing #9143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a9deac
feat(Flex): add plain gap spacing
kmcfaul May 17, 2023
cfcac45
update core dep
kmcfaul May 17, 2023
7d0b825
bump core
kmcfaul May 17, 2023
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
2 changes: 1 addition & 1 deletion packages/react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"tslib": "^2.5.0"
},
"devDependencies": {
"@patternfly/patternfly": "5.0.0-alpha.55",
"@patternfly/patternfly": "5.0.0-alpha.59",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@rollup/plugin-replace": "^5.0.2",
Expand Down
24 changes: 18 additions & 6 deletions packages/react-core/src/layouts/Flex/Flex.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,17 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
};
/** Gap between items at various breakpoints. This will override spacers for the main axis. */
gap?: {
default?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
sm?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
md?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
lg?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
xl?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
'2xl'?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
default?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
sm?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
md?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
lg?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
xl?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
'2xl'?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
};
/** Gap between rows at various breakpoints. This will override spacers for the main axis. */
rowGap?: {
default?:
| 'rowGap'
| 'rowGapNone'
| 'rowGapXs'
| 'rowGapSm'
Expand All @@ -158,6 +159,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'rowGap3xl'
| 'rowGap4xl';
sm?:
| 'rowGap'
| 'rowGapNone'
| 'rowGapXs'
| 'rowGapSm'
Expand All @@ -168,6 +170,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'rowGap3xl'
| 'rowGap4xl';
md?:
| 'rowGap'
| 'rowGapNone'
| 'rowGapXs'
| 'rowGapSm'
Expand All @@ -178,6 +181,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'rowGap3xl'
| 'rowGap4xl';
lg?:
| 'rowGap'
| 'rowGapNone'
| 'rowGapXs'
| 'rowGapSm'
Expand All @@ -188,6 +192,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'rowGap3xl'
| 'rowGap4xl';
xl?:
| 'rowGap'
| 'rowGapNone'
| 'rowGapXs'
| 'rowGapSm'
Expand All @@ -198,6 +203,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'rowGap3xl'
| 'rowGap4xl';
'2xl'?:
| 'rowGap'
| 'rowGapNone'
| 'rowGapXs'
| 'rowGapSm'
Expand All @@ -211,6 +217,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
/** Gap beween columns at various breakpoints. This will override spacers for the main axis. */
columnGap?: {
default?:
| 'columnGap'
| 'columnGapNone'
| 'columnGapXs'
| 'columnGapSm'
Expand All @@ -221,6 +228,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'columnGap3xl'
| 'columnGap4xl';
sm?:
| 'columnGap'
| 'columnGapNone'
| 'columnGapXs'
| 'columnGapSm'
Expand All @@ -231,6 +239,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'columnGap3xl'
| 'columnGap4xl';
md?:
| 'columnGap'
| 'columnGapNone'
| 'columnGapXs'
| 'columnGapSm'
Expand All @@ -241,6 +250,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'columnGap3xl'
| 'columnGap4xl';
lg?:
| 'columnGap'
| 'columnGapNone'
| 'columnGapXs'
| 'columnGapSm'
Expand All @@ -251,6 +261,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'columnGap3xl'
| 'columnGap4xl';
xl?:
| 'columnGap'
| 'columnGapNone'
| 'columnGapXs'
| 'columnGapSm'
Expand All @@ -261,6 +272,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
| 'columnGap3xl'
| 'columnGap4xl';
'2xl'?:
| 'columnGap'
| 'columnGapNone'
| 'columnGapXs'
| 'columnGapSm'
Expand Down
2 changes: 1 addition & 1 deletion packages/react-docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test:a11y": "patternfly-a11y --config patternfly-a11y.config"
},
"dependencies": {
"@patternfly/patternfly": "5.0.0-alpha.55",
"@patternfly/patternfly": "5.0.0-alpha.59",
"@patternfly/react-charts": "^7.0.0-alpha.28",
"@patternfly/react-code-editor": "^5.0.0-alpha.112",
"@patternfly/react-core": "^5.0.0-alpha.111",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-icons/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@fortawesome/free-brands-svg-icons": "^5.14.0",
"@fortawesome/free-regular-svg-icons": "^5.14.0",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@patternfly/patternfly": "5.0.0-alpha.55",
"@patternfly/patternfly": "5.0.0-alpha.59",
"fs-extra": "^11.1.1",
"glob": "^7.1.2",
"rimraf": "^2.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-styles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"clean": "rimraf dist css"
},
"devDependencies": {
"@patternfly/patternfly": "5.0.0-alpha.55",
"@patternfly/patternfly": "5.0.0-alpha.59",
"camel-case": "^3.0.0",
"css": "^2.2.3",
"fs-extra": "^11.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-tokens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"clean": "rimraf dist"
},
"devDependencies": {
"@patternfly/patternfly": "5.0.0-alpha.55",
"@patternfly/patternfly": "5.0.0-alpha.59",
"css": "^2.2.3",
"fs-extra": "^11.1.1",
"glob": "^7.1.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4091,10 +4091,10 @@
puppeteer-cluster "^0.23.0"
xmldoc "^1.1.2"

"@patternfly/patternfly@5.0.0-alpha.55":
version "5.0.0-alpha.55"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.55.tgz#93e7340a23c55908ea452ccef40ead675d84298f"
integrity sha512-DzPT6DmT3u8XR61hhT6d0I3uKZWhPv62ODLo30imLLwIgASWmEW6nR8+ef1YL94Ja7BJt22RlBnZiFKf2utUCg==
"@patternfly/patternfly@5.0.0-alpha.59":
version "5.0.0-alpha.59"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.59.tgz#835957bbf90ade67008f93d795a4106ccd5a47aa"
integrity sha512-lLjG/+emllOBWExMWMynwqHqJKM/8QpYPsWWIZ9wqkQK35HrAuImD/isWkLMQRXBZhCMHDdwM6xE9boUaVn4dw==

"@phenomnomnominal/tsquery@4.1.1":
version "4.1.1"
Expand Down