From 1a9deac27beb34512218506a44536417a9c2910b Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Wed, 17 May 2023 16:43:15 -0400 Subject: [PATCH 1/3] feat(Flex): add plain gap spacing --- packages/react-core/src/layouts/Flex/Flex.tsx | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/react-core/src/layouts/Flex/Flex.tsx b/packages/react-core/src/layouts/Flex/Flex.tsx index c5ae24928ce..92399cc7aca 100644 --- a/packages/react-core/src/layouts/Flex/Flex.tsx +++ b/packages/react-core/src/layouts/Flex/Flex.tsx @@ -138,16 +138,17 @@ export interface FlexProps extends React.HTMLProps { }; /** 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' @@ -158,6 +159,7 @@ export interface FlexProps extends React.HTMLProps { | 'rowGap3xl' | 'rowGap4xl'; sm?: + | 'rowGap' | 'rowGapNone' | 'rowGapXs' | 'rowGapSm' @@ -168,6 +170,7 @@ export interface FlexProps extends React.HTMLProps { | 'rowGap3xl' | 'rowGap4xl'; md?: + | 'rowGap' | 'rowGapNone' | 'rowGapXs' | 'rowGapSm' @@ -178,6 +181,7 @@ export interface FlexProps extends React.HTMLProps { | 'rowGap3xl' | 'rowGap4xl'; lg?: + | 'rowGap' | 'rowGapNone' | 'rowGapXs' | 'rowGapSm' @@ -188,6 +192,7 @@ export interface FlexProps extends React.HTMLProps { | 'rowGap3xl' | 'rowGap4xl'; xl?: + | 'rowGap' | 'rowGapNone' | 'rowGapXs' | 'rowGapSm' @@ -198,6 +203,7 @@ export interface FlexProps extends React.HTMLProps { | 'rowGap3xl' | 'rowGap4xl'; '2xl'?: + | 'rowGap' | 'rowGapNone' | 'rowGapXs' | 'rowGapSm' @@ -211,6 +217,7 @@ export interface FlexProps extends React.HTMLProps { /** Gap beween columns at various breakpoints. This will override spacers for the main axis. */ columnGap?: { default?: + | 'columnGap' | 'columnGapNone' | 'columnGapXs' | 'columnGapSm' @@ -221,6 +228,7 @@ export interface FlexProps extends React.HTMLProps { | 'columnGap3xl' | 'columnGap4xl'; sm?: + | 'columnGap' | 'columnGapNone' | 'columnGapXs' | 'columnGapSm' @@ -231,6 +239,7 @@ export interface FlexProps extends React.HTMLProps { | 'columnGap3xl' | 'columnGap4xl'; md?: + | 'columnGap' | 'columnGapNone' | 'columnGapXs' | 'columnGapSm' @@ -241,6 +250,7 @@ export interface FlexProps extends React.HTMLProps { | 'columnGap3xl' | 'columnGap4xl'; lg?: + | 'columnGap' | 'columnGapNone' | 'columnGapXs' | 'columnGapSm' @@ -251,6 +261,7 @@ export interface FlexProps extends React.HTMLProps { | 'columnGap3xl' | 'columnGap4xl'; xl?: + | 'columnGap' | 'columnGapNone' | 'columnGapXs' | 'columnGapSm' @@ -261,6 +272,7 @@ export interface FlexProps extends React.HTMLProps { | 'columnGap3xl' | 'columnGap4xl'; '2xl'?: + | 'columnGap' | 'columnGapNone' | 'columnGapXs' | 'columnGapSm' From cfcac45bcbd3f97996dfdfd76927b0ec45198830 Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Wed, 17 May 2023 17:11:06 -0400 Subject: [PATCH 2/3] update core dep --- packages/react-core/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-icons/package.json | 2 +- packages/react-styles/package.json | 2 +- packages/react-tokens/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 47d3c6ac179..070b279ca23 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.55", + "@patternfly/patternfly": "5.0.0-alpha.58", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 6cb5132eb39..92c42e78859 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -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.58", "@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", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index 8b0c09303a1..48a85611e06 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -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.58", "fs-extra": "^11.1.1", "glob": "^7.1.2", "rimraf": "^2.6.2", diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index 8bbfee8bba3..88effa2206b 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.55", + "@patternfly/patternfly": "5.0.0-alpha.58", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^11.1.1", diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index 01e1b444384..b1ab3beb7a6 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.55", + "@patternfly/patternfly": "5.0.0-alpha.58", "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index 0164cfd6bd0..c599dcb0d64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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.58": + version "5.0.0-alpha.58" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.58.tgz#fee55c0a2a7b3296806c1aadabbda54077e1d127" + integrity sha512-2bKJSB8WZ5by52JMR2fQypXj+wb9sKK/RD1ei1EpCqMHzBreE9e4gPf98gyRU1doe6+yTlxGhBCh6rYGgKIrYQ== "@phenomnomnominal/tsquery@4.1.1": version "4.1.1" From 7d0b825a7cf9883844116032d8d7e3ef2b65bae5 Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Wed, 17 May 2023 17:27:21 -0400 Subject: [PATCH 3/3] bump core --- packages/react-core/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-icons/package.json | 2 +- packages/react-styles/package.json | 2 +- packages/react-tokens/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 070b279ca23..3c48766a64d 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.58", + "@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", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 92c42e78859..fe31cf6739a 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -23,7 +23,7 @@ "test:a11y": "patternfly-a11y --config patternfly-a11y.config" }, "dependencies": { - "@patternfly/patternfly": "5.0.0-alpha.58", + "@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", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index 48a85611e06..f42e7f65102 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -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.58", + "@patternfly/patternfly": "5.0.0-alpha.59", "fs-extra": "^11.1.1", "glob": "^7.1.2", "rimraf": "^2.6.2", diff --git a/packages/react-styles/package.json b/packages/react-styles/package.json index 88effa2206b..026301bea99 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.58", + "@patternfly/patternfly": "5.0.0-alpha.59", "camel-case": "^3.0.0", "css": "^2.2.3", "fs-extra": "^11.1.1", diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index b1ab3beb7a6..5c06501391c 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "5.0.0-alpha.58", + "@patternfly/patternfly": "5.0.0-alpha.59", "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index c599dcb0d64..d7e276c0206 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4091,10 +4091,10 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@5.0.0-alpha.58": - version "5.0.0-alpha.58" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.0.0-alpha.58.tgz#fee55c0a2a7b3296806c1aadabbda54077e1d127" - integrity sha512-2bKJSB8WZ5by52JMR2fQypXj+wb9sKK/RD1ei1EpCqMHzBreE9e4gPf98gyRU1doe6+yTlxGhBCh6rYGgKIrYQ== +"@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"