From bac1559199199960da0e803534f55cf6b080ec43 Mon Sep 17 00:00:00 2001 From: kmcfaul <45077788+kmcfaul@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:28:26 -0400 Subject: [PATCH] feat(ver): update to rc versions (#357) * feat(ver): update to rc versions * updates to fix tests, update DataListCheck --- package.json | 5 +- packages/module/package.json | 10 +- packages/module/src/BulkSelect/BulkSelect.tsx | 46 +- .../ColumnManagementModal.tsx | 4 +- .../MultiContentCard.test.tsx.snap | 6 +- .../__snapshots__/TagCount.test.tsx.snap | 8 +- .../__snapshots__/WarningModal.test.tsx.snap | 2 +- packages/module/src/index.ts | 22 +- yarn.lock | 1794 ++++++++--------- 9 files changed, 887 insertions(+), 1010 deletions(-) diff --git a/package.json b/package.json index 4311a009..d67769b4 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,8 @@ "whatwg-fetch": "^3.6.20" }, "dependencies": { - "@patternfly/react-tokens": "^6.0.0-alpha.35", + "@patternfly/react-tokens": "^6.0.0-prerelease.7", "sharp": "^0.33.4" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/packages/module/package.json b/packages/module/package.json index c5109e2d..d07f9a20 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -31,9 +31,9 @@ "tag": "alpha" }, "dependencies": { - "@patternfly/react-core": "^6.0.0-alpha.101", - "@patternfly/react-icons": "^6.0.0-alpha.36", - "@patternfly/react-table": "^6.0.0-alpha.102", + "@patternfly/react-core": "^6.0.0-prerelease.21", + "@patternfly/react-icons": "^6.0.0-prerelease.7", + "@patternfly/react-table": "^6.0.0-prerelease.22", "react-jss": "^10.10.0", "clsx": "^2.1.1" }, @@ -43,8 +43,8 @@ }, "devDependencies": { "@patternfly/patternfly-a11y": "^4.3.1", - "@patternfly/documentation-framework": "^6.0.0-alpha.83", - "@patternfly/patternfly": "6.0.0-alpha.210", + "@patternfly/documentation-framework": "^6.0.0-alpha.108", + "@patternfly/patternfly": "6.0.0-prerelease.15", "@types/react": "^18.2.33", "@types/react-dom": "^18.2.14", "react": "^18.3.1", diff --git a/packages/module/src/BulkSelect/BulkSelect.tsx b/packages/module/src/BulkSelect/BulkSelect.tsx index 3de0a3bb..ee472163 100644 --- a/packages/module/src/BulkSelect/BulkSelect.tsx +++ b/packages/module/src/BulkSelect/BulkSelect.tsx @@ -17,7 +17,7 @@ export const BulkSelectValue = { nonePage: 'nonePage' } as const; -export type BulkSelectValue = typeof BulkSelectValue[keyof typeof BulkSelectValue]; +export type BulkSelectValue = (typeof BulkSelectValue)[keyof typeof BulkSelectValue]; export interface BulkSelectProps extends Omit { /** BulkSelect className */ @@ -102,29 +102,27 @@ export const BulkSelect: React.FC = ({ onClick={onToggleClick} aria-label="Bulk select toggle" ouiaId={`${ouiaId}-toggle`} - splitButtonOptions={{ - items: [ - 0 && selectedCount < totalCount) - ? null - : pageSelected || selectedCount === totalCount - } - onChange={(checked) => onSelect?.(!checked || checked === null ? noneOption : allOption)} - {...menuToggleCheckboxProps} - />, - selectedCount > 0 ? ( - - {`${selectedCount} selected`} - - ) : null - ] - }} + splitButtonItems={[ + 0 && selectedCount < totalCount) + ? null + : pageSelected || selectedCount === totalCount + } + onChange={(checked) => onSelect?.(!checked || checked === null ? noneOption : allOption)} + {...menuToggleCheckboxProps} + />, + selectedCount > 0 ? ( + + {`${selectedCount} selected`} + + ) : null + ]} /> )} {...props} diff --git a/packages/module/src/ColumnManagementModal/ColumnManagementModal.tsx b/packages/module/src/ColumnManagementModal/ColumnManagementModal.tsx index 0b6f455b..d9babd8b 100644 --- a/packages/module/src/ColumnManagementModal/ColumnManagementModal.tsx +++ b/packages/module/src/ColumnManagementModal/ColumnManagementModal.tsx @@ -129,11 +129,11 @@ const ColumnManagementModal: React.FunctionComponent handleChange(index)} isDisabled={column.isUntoggleable} aria-labelledby={`${ouiaId}-column${index}-label`} - data-ouia-component-id={`${ouiaId}-column${index}-checkbox`} + ouiaId={`${ouiaId}-column${index}-checkbox`} id={`${ouiaId}-column${index}-checkbox`} />