Skip to content

Commit 314a04d

Browse files
kmcfaulfhlavac
kmcfaul
authored and
fhlavac
committed
feat(ver): update to rc versions (patternfly#357)
* feat(ver): update to rc versions * updates to fix tests, update DataListCheck
1 parent 0ff3f7f commit 314a04d

File tree

9 files changed

+887
-1010
lines changed

9 files changed

+887
-1010
lines changed

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
"whatwg-fetch": "^3.6.20"
8484
},
8585
"dependencies": {
86-
"@patternfly/react-tokens": "^6.0.0-alpha.35",
86+
"@patternfly/react-tokens": "^6.0.0-prerelease.7",
8787
"sharp": "^0.33.4"
88-
}
88+
},
89+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
8990
}

‎packages/module/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"access": "public"
3131
},
3232
"dependencies": {
33-
"@patternfly/react-core": "^6.0.0-alpha.101",
34-
"@patternfly/react-icons": "^6.0.0-alpha.36",
35-
"@patternfly/react-table": "^6.0.0-alpha.102",
33+
"@patternfly/react-core": "^6.0.0-prerelease.21",
34+
"@patternfly/react-icons": "^6.0.0-prerelease.7",
35+
"@patternfly/react-table": "^6.0.0-prerelease.22",
3636
"react-jss": "^10.10.0",
3737
"clsx": "^2.1.1"
3838
},
@@ -42,8 +42,8 @@
4242
},
4343
"devDependencies": {
4444
"@patternfly/patternfly-a11y": "^4.3.1",
45-
"@patternfly/documentation-framework": "^6.0.0-alpha.83",
46-
"@patternfly/patternfly": "6.0.0-alpha.210",
45+
"@patternfly/documentation-framework": "^6.0.0-alpha.108",
46+
"@patternfly/patternfly": "6.0.0-prerelease.15",
4747
"@types/react": "^18.2.33",
4848
"@types/react-dom": "^18.2.14",
4949
"react": "^18.3.1",

‎packages/module/src/BulkSelect/BulkSelect.tsx‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const BulkSelectValue = {
1717
nonePage: 'nonePage'
1818
} as const;
1919

20-
export type BulkSelectValue = typeof BulkSelectValue[keyof typeof BulkSelectValue];
20+
export type BulkSelectValue = (typeof BulkSelectValue)[keyof typeof BulkSelectValue];
2121

2222
export interface BulkSelectProps extends Omit<DropdownProps, 'toggle' | 'onSelect'> {
2323
/** BulkSelect className */
@@ -102,29 +102,27 @@ export const BulkSelect: React.FC<BulkSelectProps> = ({
102102
onClick={onToggleClick}
103103
aria-label="Bulk select toggle"
104104
ouiaId={`${ouiaId}-toggle`}
105-
splitButtonOptions={{
106-
items: [
107-
<MenuToggleCheckbox
108-
ouiaId={`${ouiaId}-checkbox`}
109-
id={`${ouiaId}-checkbox`}
110-
key="bulk-select-checkbox"
111-
aria-label={`Select ${allOption}`}
112-
isChecked={
113-
(isDataPaginated && pagePartiallySelected) ||
114-
(!isDataPaginated && selectedCount > 0 && selectedCount < totalCount)
115-
? null
116-
: pageSelected || (selectedCount === totalCount && totalCount > 0)
117-
}
118-
onChange={(checked) => onSelect?.(!checked || checked === null ? noneOption : allOption)}
119-
{...menuToggleCheckboxProps}
120-
/>,
121-
selectedCount > 0 ? (
122-
<span onClick={onToggleClick} data-ouia-component-id={`${ouiaId}-text`} key="bulk-select-text">
123-
{`${selectedCount} selected`}
124-
</span>
125-
) : null
126-
]
127-
}}
105+
splitButtonItems={[
106+
<MenuToggleCheckbox
107+
ouiaId={`${ouiaId}-checkbox`}
108+
id={`${ouiaId}-checkbox`}
109+
key="bulk-select-checkbox"
110+
aria-label={`Select ${allOption}`}
111+
isChecked={
112+
(isDataPaginated && pagePartiallySelected) ||
113+
(!isDataPaginated && selectedCount > 0 && selectedCount < totalCount)
114+
? null
115+
: pageSelected || (selectedCount === totalCount && totalCount > 0)
116+
}
117+
onChange={(checked) => onSelect?.(!checked || checked === null ? noneOption : allOption)}
118+
{...menuToggleCheckboxProps}
119+
/>,
120+
selectedCount > 0 ? (
121+
<span onClick={onToggleClick} data-ouia-component-id={`${ouiaId}-text`} key="bulk-select-text">
122+
{`${selectedCount} selected`}
123+
</span>
124+
) : null
125+
]}
128126
/>
129127
)}
130128
{...props}

‎packages/module/src/ColumnManagementModal/ColumnManagementModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ const ColumnManagementModal: React.FunctionComponent<ColumnManagementModalProps>
129129
<DataListItem key={column.key}>
130130
<DataListItemRow>
131131
<DataListCheck
132-
checked={column.isShown}
132+
isChecked={column.isShown}
133133
onChange={() => handleChange(index)}
134134
isDisabled={column.isUntoggleable}
135135
aria-labelledby={`${ouiaId}-column${index}-label`}
136-
data-ouia-component-id={`${ouiaId}-column${index}-checkbox`}
136+
ouiaId={`${ouiaId}-column${index}-checkbox`}
137137
id={`${ouiaId}-column${index}-checkbox`}
138138
/>
139139
<DataListItemCells

‎packages/module/src/MultiContentCard/__snapshots__/MultiContentCard.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ exports[`MultiContentCard component should render expandable multi-content card
411411
type="button"
412412
>
413413
<span
414-
class="pf-v6-c-button__icon pf-m-start"
414+
class="pf-v6-c-button__icon"
415415
>
416416
<span
417417
class="pf-v6-c-card__header-toggle-icon"
@@ -480,7 +480,7 @@ exports[`MultiContentCard component should render expandable multi-content card
480480
type="button"
481481
>
482482
<span
483-
class="pf-v6-c-button__icon pf-m-start"
483+
class="pf-v6-c-button__icon"
484484
>
485485
<span
486486
class="pf-v6-c-card__header-toggle-icon"
@@ -928,7 +928,7 @@ exports[`MultiContentCard component should render expandable multi-content card
928928
type="button"
929929
>
930930
<span
931-
class="pf-v6-c-button__icon pf-m-start"
931+
class="pf-v6-c-button__icon"
932932
>
933933
<span
934934
class="pf-v6-c-card__header-toggle-icon"

‎packages/module/src/TagCount/__snapshots__/TagCount.test.tsx.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ exports[`TagCount component should render a disabled tag count with no value 1`]
1616
type="button"
1717
>
1818
<span
19-
class="pf-v6-c-button__icon pf-m-start"
19+
class="pf-v6-c-button__icon"
2020
>
2121
<span
2222
class="pf-v6-c-icon"
@@ -60,7 +60,7 @@ exports[`TagCount component should render a disabled tag count with no value 1`]
6060
type="button"
6161
>
6262
<span
63-
class="pf-v6-c-button__icon pf-m-start"
63+
class="pf-v6-c-button__icon"
6464
>
6565
<span
6666
class="pf-v6-c-icon"
@@ -160,7 +160,7 @@ exports[`TagCount component should render a tag count of 11 1`] = `
160160
type="button"
161161
>
162162
<span
163-
class="pf-v6-c-button__icon pf-m-start"
163+
class="pf-v6-c-button__icon"
164164
>
165165
<span
166166
class="pf-v6-c-icon"
@@ -205,7 +205,7 @@ exports[`TagCount component should render a tag count of 11 1`] = `
205205
type="button"
206206
>
207207
<span
208-
class="pf-v6-c-button__icon pf-m-start"
208+
class="pf-v6-c-button__icon"
209209
>
210210
<span
211211
class="pf-v6-c-icon"

‎packages/module/src/WarningModal/__snapshots__/WarningModal.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ exports[`WarningModal component should render 1`] = `
4040
type="button"
4141
>
4242
<span
43-
class="pf-v6-c-button__icon pf-m-start"
43+
class="pf-v6-c-button__icon"
4444
>
4545
<svg
4646
aria-hidden="true"

‎packages/module/src/index.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ export * from './WarningModal';
66
export { default as UnavailableContent } from './UnavailableContent';
77
export * from './UnavailableContent';
88

9+
export { default as UnauthorizedAccess } from './UnauthorizedAccess';
10+
export * from './UnauthorizedAccess';
11+
912
export { default as TagCount } from './TagCount';
1013
export * from './TagCount';
1114

@@ -33,21 +36,21 @@ export * from './ResponsiveActions';
3336
export { default as ResponsiveAction } from './ResponsiveAction';
3437
export * from './ResponsiveAction';
3538

39+
export { default as PageHeader } from './PageHeader';
40+
export * from './PageHeader';
41+
3642
export { default as NotFoundIcon } from './NotFoundIcon';
3743
export * from './NotFoundIcon';
3844

39-
export { default as UnauthorizedAccess } from './UnauthorizedAccess';
40-
export * from './UnauthorizedAccess';
41-
4245
export { default as MultiContentCard } from './MultiContentCard';
4346
export * from './MultiContentCard';
4447

45-
export { default as LogSnippet } from './LogSnippet';
46-
export * from './LogSnippet';
47-
4848
export { default as MissingPage } from './MissingPage';
4949
export * from './MissingPage';
5050

51+
export { default as LogSnippet } from './LogSnippet';
52+
export * from './LogSnippet';
53+
5154
export { default as HorizontalNav } from './HorizontalNav';
5255
export * from './HorizontalNav';
5356

@@ -66,9 +69,6 @@ export * from './DetailsPageHeader';
6669
export { default as DetailsPage } from './DetailsPage';
6770
export * from './DetailsPage';
6871

69-
export { default as PageHeader } from './PageHeader';
70-
export * from './PageHeader';
71-
7272
export { default as ColumnManagementModal } from './ColumnManagementModal';
7373
export * from './ColumnManagementModal';
7474

@@ -81,8 +81,8 @@ export * from './BulkSelect';
8181
export { default as Battery } from './Battery';
8282
export * from './Battery';
8383

84-
export { default as Ansible } from './AnsibleSupport';
85-
export * from './AnsibleSupport';
84+
export { default as Ansible } from './Ansible';
85+
export * from './Ansible';
8686

8787
export { default as ActionMenu } from './ActionMenu';
8888
export * from './ActionMenu';

0 commit comments

Comments
 (0)