From 9e475ce8ca785ad6ebd268d974ade066dacde9fc Mon Sep 17 00:00:00 2001 From: Titani Date: Thu, 18 Jan 2024 15:15:22 -0500 Subject: [PATCH 1/3] chore(deps): Bump core alpha version --- packages/react-core/package.json | 2 +- .../MultipleFileUploadStatusItem.tsx | 3 +- .../Toolbar/ToolbarChipGroupContent.tsx | 3 +- .../Toolbar/ToolbarExpandableContent.tsx | 3 +- .../src/components/Toolbar/ToolbarGroup.tsx | 3 +- .../src/components/Toolbar/ToolbarItem.tsx | 37 +++++++++---------- .../components/Toolbar/ToolbarToggleGroup.tsx | 4 +- packages/react-icons/package.json | 2 +- packages/react-styles/package.json | 2 +- packages/react-tokens/package.json | 2 +- yarn.lock | 8 ++-- 11 files changed, 35 insertions(+), 34 deletions(-) diff --git a/packages/react-core/package.json b/packages/react-core/package.json index c4a056eb758..4cd15931c4f 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -54,7 +54,7 @@ "tslib": "^2.5.0" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-alpha.63", + "@patternfly/patternfly": "6.0.0-alpha.65", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx index 5cafa5c9033..208fd15e103 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx @@ -165,7 +165,8 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent -
+ {/* TODO: Update with issue #9997. Removed class "styles.multipleFileUploadStatusItemClose" that no longer exists */} +
diff --git a/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx b/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx index 9d3bf2d2550..cde664e58cf 100644 --- a/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx +++ b/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx @@ -74,7 +74,8 @@ class ToolbarChipGroupContent extends React.Component {children} {numberOfFilters > 0 && ( - + // TODO: Update with issue issue #9677. Removed 'chipContainer' modifier + {showClearFiltersButton && !customChipGroupContent && ( diff --git a/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx b/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx index cfd28b2638c..78e351aa454 100644 --- a/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx +++ b/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx @@ -82,7 +82,8 @@ class ToolbarGroupWithRef extends React.Component {
= ({ variant, visibility, spacer, - widths, + // TODO: Update with issue #9677 + // widths, align, alignSelf, alignItems, @@ -95,16 +97,17 @@ export const ToolbarItem: React.FunctionComponent = ({ ...props }: ToolbarItemProps) => { if (variant === ToolbarItemVariant.separator) { - return ; + return ; } - const widthStyles: any = {}; - if (widths) { - Object.entries(widths || {}).map( - ([breakpoint, value]) => - (widthStyles[`${cssWidth.name}${breakpoint !== 'default' ? `-on-${breakpoint}` : ''}`] = value) - ); - } + // TODO: Update with issue #9677 + // const widthStyles: any = {}; + // if (widths) { + // Object.entries(widths || {}).map( + // ([breakpoint, value]) => + // (widthStyles[`${cssWidth.name}${breakpoint !== 'default' ? `-on-${breakpoint}` : ''}`] = value) + // ); + // } return ( @@ -113,15 +116,8 @@ export const ToolbarItem: React.FunctionComponent = ({ className={css( styles.toolbarItem, variant && - styles.modifiers[ - toCamel(variant) as - | 'bulkSelect' - | 'overflowMenu' - | 'pagination' - | 'searchFilter' - | 'label' - | 'chipGroup' - ], + // TODO: Update with issue #9677. Removed "bulkSleect", "overflowMenu" and "searchFilter" modifiers + styles.modifiers[toCamel(variant) as 'pagination' | 'label' | 'chipGroup'], isAllExpanded && styles.modifiers.expanded, isOverflowContainer && styles.modifiers.overflowContainer, formatBreakpointMods(visibility, styles, '', getBreakpoint(width)), @@ -138,7 +134,8 @@ export const ToolbarItem: React.FunctionComponent = ({ {...(variant === 'label' && { 'aria-hidden': true })} id={id} {...props} - {...(widths && { style: { ...widthStyles, ...props.style } as React.CSSProperties })} + // TODO: Update with issue #9677 + // {...(widths && { style: { ...widthStyles, ...props.style } as React.CSSProperties })} > {children}
diff --git a/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx b/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx index 05a2f40b1a2..dc2530f2249 100644 --- a/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx +++ b/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx @@ -162,8 +162,8 @@ class ToolbarToggleGroup extends React.Component { className={css( styles.toolbarGroup, styles.modifiers.toggleGroup, - variant && - styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup' | 'buttonGroup'], + // TODO: Update with issue #9677. Removed "buttonGroup" modifier + variant && styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup'], formatBreakpointMods(breakpointMod, styles, '', getBreakpoint(width)), formatBreakpointMods(visibility, styles, '', getBreakpoint(width)), formatBreakpointMods(alignment, styles, '', getBreakpoint(width)), diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index bf8a1850ce5..6eca99f05b3 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -33,7 +33,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": "6.0.0-alpha.63", + "@patternfly/patternfly": "6.0.0-alpha.65", "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 2d46b275065..283b86bb228 100644 --- a/packages/react-styles/package.json +++ b/packages/react-styles/package.json @@ -19,7 +19,7 @@ "clean": "rimraf dist css" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-alpha.63", + "@patternfly/patternfly": "6.0.0-alpha.65", "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 763dab1cefb..66373abe092 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -29,7 +29,7 @@ "clean": "rimraf dist" }, "devDependencies": { - "@patternfly/patternfly": "6.0.0-alpha.63", + "@patternfly/patternfly": "6.0.0-alpha.65", "css": "^2.2.3", "fs-extra": "^11.1.1", "glob": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index 060bbe44bd4..f37e0d25c6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3975,10 +3975,10 @@ puppeteer-cluster "^0.23.0" xmldoc "^1.1.2" -"@patternfly/patternfly@6.0.0-alpha.63": - version "6.0.0-alpha.63" - resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-alpha.63.tgz#8342777ebc70be8ebc9c5e18be3bc9818d70044d" - integrity sha512-RlgJcurd4lvqH98uZx+hrj+AY5gq5MRyXtSo/M6fEdW0LREi2xhHv4XeXD+f2npWk9VKTLzUl2AcxwzKMG4p/Q== +"@patternfly/patternfly@6.0.0-alpha.65": + version "6.0.0-alpha.65" + resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.0.0-alpha.65.tgz#5efb8518215e44c571d94e9c1b90e790be708103" + integrity sha512-cA2WZrWUdpOEEErei8MiYGq6GaecyhWnFDwm54N02uUs4YscnmcY4GQlCQCPDYQrkghLAhFA64MCs99kRuUcJw== "@pkgjs/parseargs@^0.11.0": version "0.11.0" From e7f6d8ca113d5bd0f72129f4d40a1e898a6ea575 Mon Sep 17 00:00:00 2001 From: Titani Date: Thu, 18 Jan 2024 15:46:50 -0500 Subject: [PATCH 2/3] update snpshots --- ...MultipleFileUploadStatusItem.test.tsx.snap | 32 +++++-------------- .../__snapshots__/ToolbarItem.test.tsx.snap | 2 +- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap index d99f2fb44b5..84d669dd182 100644 --- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap +++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap @@ -85,9 +85,7 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = `
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+