Skip to content

Commit 5764c8f

Browse files
tlabajtlabaj
authored
Bump core lts alphas (#10022)
* chore(deps): Bump core alpha version * update snpshots * rebase and bump to 66
1 parent 81bc2ca commit 5764c8f

File tree

14 files changed

+45
-60
lines changed

14 files changed

+45
-60
lines changed

‎packages/react-core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"tslib": "^2.5.0"
5555
},
5656
"devDependencies": {
57-
"@patternfly/patternfly": "6.0.0-alpha.63",
57+
"@patternfly/patternfly": "6.0.0-alpha.66",
5858
"@rollup/plugin-commonjs": "^25.0.0",
5959
"@rollup/plugin-node-resolve": "^15.0.2",
6060
"@rollup/plugin-replace": "^5.0.2",

‎packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent<MultipleFileU
165165
helperText={progressHelperText}
166166
/>
167167
</div>
168-
<div className={styles.multipleFileUploadStatusItemClose}>
168+
{/* TODO: Update with issue #9997. Removed class "styles.multipleFileUploadStatusItemClose" that no longer exists */}
169+
<div>
169170
<Button variant="plain" aria-label={buttonAriaLabel} onClick={onClearClick}>
170171
<TimesCircleIcon />
171172
</Button>

‎packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = `
8585
</div>
8686
</div>
8787
</div>
88-
<div
89-
class="pf-v5-c-multiple-file-upload__status-item-close"
90-
>
88+
<div>
9189
<button
9290
aria-disabled="false"
9391
aria-label="buttonAriaLabel"
@@ -198,9 +196,7 @@ exports[`MultipleFileUploadStatusItem renders custom class names 1`] = `
198196
</div>
199197
</div>
200198
</div>
201-
<div
202-
class="pf-v5-c-multiple-file-upload__status-item-close"
203-
>
199+
<div>
204200
<button
205201
aria-disabled="false"
206202
aria-label="Remove from list"
@@ -313,9 +309,7 @@ exports[`MultipleFileUploadStatusItem renders custom file name/size/icon/progres
313309
</div>
314310
</div>
315311
</div>
316-
<div
317-
class="pf-v5-c-multiple-file-upload__status-item-close"
318-
>
312+
<div>
319313
<button
320314
aria-disabled="false"
321315
aria-label="Remove from list"
@@ -428,9 +422,7 @@ exports[`MultipleFileUploadStatusItem renders custom function progressAriaLiveMe
428422
</div>
429423
</div>
430424
</div>
431-
<div
432-
class="pf-v5-c-multiple-file-upload__status-item-close"
433-
>
425+
<div>
434426
<button
435427
aria-disabled="false"
436428
aria-label="Remove from list"
@@ -560,9 +552,7 @@ exports[`MultipleFileUploadStatusItem renders custom progress value/variant when
560552
</div>
561553
</div>
562554
</div>
563-
<div
564-
class="pf-v5-c-multiple-file-upload__status-item-close"
565-
>
555+
<div>
566556
<button
567557
aria-disabled="false"
568558
aria-label="Remove from list"
@@ -675,9 +665,7 @@ exports[`MultipleFileUploadStatusItem renders expected values from a passed file
675665
</div>
676666
</div>
677667
</div>
678-
<div
679-
class="pf-v5-c-multiple-file-upload__status-item-close"
680-
>
668+
<div>
681669
<button
682670
aria-disabled="false"
683671
aria-label="Remove from list"
@@ -788,9 +776,7 @@ exports[`MultipleFileUploadStatusItem renders with expected class names 1`] = `
788776
</div>
789777
</div>
790778
</div>
791-
<div
792-
class="pf-v5-c-multiple-file-upload__status-item-close"
793-
>
779+
<div>
794780
<button
795781
aria-disabled="false"
796782
aria-label="Remove from list"
@@ -903,9 +889,7 @@ exports[`MultipleFileUploadStatusItem rendersdefault progressAriaLiveMessage whe
903889
</div>
904890
</div>
905891
</div>
906-
<div
907-
class="pf-v5-c-multiple-file-upload__status-item-close"
908-
>
892+
<div>
909893
<button
910894
aria-disabled="false"
911895
aria-label="Remove from list"

‎packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ class ToolbarChipGroupContent extends React.Component<ToolbarChipGroupContentPro
7474
<div
7575
className={css(
7676
styles.toolbarContent,
77-
!isHidden && !collapseListedFilters && styles.modifiers.chipContainer,
77+
// TODO: Update with issue issue #9677
78+
// !isHidden && !collapseListedFilters && styles.modifiers.chipContainer,
7879
isHidden && styles.modifiers.hidden,
7980
className
8081
)}

‎packages/react-core/src/components/Toolbar/ToolbarExpandableContent.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class ToolbarExpandableContent extends React.Component<ToolbarExpandableContentP
6161
>
6262
<ToolbarGroup>{children}</ToolbarGroup>
6363
{numberOfFilters > 0 && (
64-
<ToolbarGroup className={styles.modifiers.chipContainer}>
64+
// TODO: Update with issue issue #9677. Removed 'chipContainer' modifier
65+
<ToolbarGroup>
6566
<ToolbarGroup ref={chipContainerRef} />
6667
{showClearFiltersButton && !customChipGroupContent && (
6768
<ToolbarItem>

‎packages/react-core/src/components/Toolbar/ToolbarGroup.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ class ToolbarGroupWithRef extends React.Component<ToolbarGroupProps> {
8282
<div
8383
className={css(
8484
styles.toolbarGroup,
85-
variant && styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup' | 'buttonGroup'],
85+
// TODO: Update with issue #9677. Removed "buttonGroup" modifier
86+
variant && styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup'],
8687
formatBreakpointMods(visibility, styles, '', getBreakpoint(width)),
8788
formatBreakpointMods(align, styles, '', getBreakpoint(width)),
8889
formatBreakpointMods(spacer, styles, '', getBreakpoint(width)),

‎packages/react-core/src/components/Toolbar/ToolbarItem.tsx‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as React from 'react';
22
import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
33
import { css } from '@patternfly/react-styles';
4-
import cssWidth from '@patternfly/react-tokens/dist/esm/c_toolbar__item_Width';
4+
// TODO: Update with issue #9677
5+
// import cssWidth from '@patternfly/react-tokens/dist/esm/c_toolbar__item_Width';
56

67
import { formatBreakpointMods, toCamel } from '../../helpers/util';
78
import { Divider } from '../Divider';
@@ -84,7 +85,8 @@ export const ToolbarItem: React.FunctionComponent<ToolbarItemProps> = ({
8485
variant,
8586
visibility,
8687
spacer,
87-
widths,
88+
// TODO: Update with issue #9677
89+
// widths,
8890
align,
8991
alignSelf,
9092
alignItems,
@@ -95,16 +97,17 @@ export const ToolbarItem: React.FunctionComponent<ToolbarItemProps> = ({
9597
...props
9698
}: ToolbarItemProps) => {
9799
if (variant === ToolbarItemVariant.separator) {
98-
return <Divider className={css(styles.modifiers.vertical, className)} {...props} />;
100+
return <Divider className={css(className)} orientation={{ default: 'vertical' }} {...props} />;
99101
}
100102

101-
const widthStyles: any = {};
102-
if (widths) {
103-
Object.entries(widths || {}).map(
104-
([breakpoint, value]) =>
105-
(widthStyles[`${cssWidth.name}${breakpoint !== 'default' ? `-on-${breakpoint}` : ''}`] = value)
106-
);
107-
}
103+
// TODO: Update with issue #9677
104+
// const widthStyles: any = {};
105+
// if (widths) {
106+
// Object.entries(widths || {}).map(
107+
// ([breakpoint, value]) =>
108+
// (widthStyles[`${cssWidth.name}${breakpoint !== 'default' ? `-on-${breakpoint}` : ''}`] = value)
109+
// );
110+
// }
108111

109112
return (
110113
<PageContext.Consumer>
@@ -113,15 +116,8 @@ export const ToolbarItem: React.FunctionComponent<ToolbarItemProps> = ({
113116
className={css(
114117
styles.toolbarItem,
115118
variant &&
116-
styles.modifiers[
117-
toCamel(variant) as
118-
| 'bulkSelect'
119-
| 'overflowMenu'
120-
| 'pagination'
121-
| 'searchFilter'
122-
| 'label'
123-
| 'chipGroup'
124-
],
119+
// TODO: Update with issue #9677. Removed "bulkSleect", "overflowMenu" and "searchFilter" modifiers
120+
styles.modifiers[toCamel(variant) as 'pagination' | 'label' | 'chipGroup'],
125121
isAllExpanded && styles.modifiers.expanded,
126122
isOverflowContainer && styles.modifiers.overflowContainer,
127123
formatBreakpointMods(visibility, styles, '', getBreakpoint(width)),
@@ -138,7 +134,8 @@ export const ToolbarItem: React.FunctionComponent<ToolbarItemProps> = ({
138134
{...(variant === 'label' && { 'aria-hidden': true })}
139135
id={id}
140136
{...props}
141-
{...(widths && { style: { ...widthStyles, ...props.style } as React.CSSProperties })}
137+
// TODO: Update with issue #9677
138+
// {...(widths && { style: { ...widthStyles, ...props.style } as React.CSSProperties })}
142139
>
143140
{children}
144141
</div>

‎packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ class ToolbarToggleGroup extends React.Component<ToolbarToggleGroupProps> {
162162
className={css(
163163
styles.toolbarGroup,
164164
styles.modifiers.toggleGroup,
165-
variant &&
166-
styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup' | 'buttonGroup'],
165+
// TODO: Update with issue #9677. Removed "buttonGroup" modifier
166+
variant && styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup'],
167167
formatBreakpointMods(breakpointMod, styles, '', getBreakpoint(width)),
168168
formatBreakpointMods(visibility, styles, '', getBreakpoint(width)),
169169
formatBreakpointMods(alignment, styles, '', getBreakpoint(width)),

‎packages/react-core/src/components/Toolbar/__tests__/__snapshots__/ToolbarItem.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`ToolbarItem should map width breakpoints 1`] = `
44
<DocumentFragment>
55
<div
66
class="pf-v5-c-toolbar__item"
7-
style="--pf-v5-c-toolbar__item--Width: 100px; --pf-v5-c-toolbar__item--Width-on-sm: 80px; --pf-v5-c-toolbar__item--Width-on-md: 150px; --pf-v5-c-toolbar__item--Width-on-lg: 200px; --pf-v5-c-toolbar__item--Width-on-xl: 250px; --pf-v5-c-toolbar__item--Width-on-2xl: 300px;"
7+
widths="[object Object]"
88
>
99
Test
1010
</div>

‎packages/react-docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"test:a11y": "patternfly-a11y --config patternfly-a11y.config"
2424
},
2525
"dependencies": {
26-
"@patternfly/patternfly": "6.0.0-alpha.63",
26+
"@patternfly/patternfly": "6.0.0-alpha.66",
2727
"@patternfly/react-charts": "^8.0.0-alpha.8",
2828
"@patternfly/react-code-editor": "^6.0.0-alpha.18",
2929
"@patternfly/react-core": "^6.0.0-alpha.18",

0 commit comments

Comments
 (0)