Skip to content

Commit fea0b84

Browse files
tlabajtlabaj
authored
chore(deps): Bump core alphas to latest (#9930)
* chore(deps): Bump core alphas to latest * fix integration tests
1 parent e911735 commit fea0b84

File tree

19 files changed

+100
-109
lines changed

19 files changed

+100
-109
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.38",
57+
"@patternfly/patternfly": "6.0.0-alpha.49",
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/Button/Button.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
9494
children = null,
9595
className = '',
9696
component = 'button',
97+
// TODO: Update eslint ignore when issue #9907 is resolved
98+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
9799
isActive = false,
98100
isBlock = false,
99101
isDisabled = false,
@@ -155,7 +157,8 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
155157
isBlock && styles.modifiers.block,
156158
isDisabled && styles.modifiers.disabled,
157159
isAriaDisabled && styles.modifiers.ariaDisabled,
158-
isActive && styles.modifiers.active,
160+
// TODO: Update when issue #9907 is resolved
161+
// isActive && styles.modifiers.active,
159162
isInline && variant === ButtonVariant.link && styles.modifiers.inline,
160163
isDanger && (variant === ButtonVariant.secondary || variant === ButtonVariant.link) && styles.modifiers.danger,
161164
isLoading !== null && variant !== ButtonVariant.plain && styles.modifiers.progress,

‎packages/react-core/src/components/Button/__tests__/Button.test.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ test('Renders with class pf-m-block when isBlock = true', () => {
5555
expect(screen.getByRole('button')).toHaveClass('pf-m-block');
5656
});
5757

58-
test('Renders with class pf-m-active when isActive = true', () => {
58+
// TODO: Reenable or remove with issue #9907
59+
xtest('Renders with class pf-m-active when isActive = true', () => {
5960
render(<Button isActive>Active Button</Button>);
6061
expect(screen.getByRole('button')).toHaveClass('pf-m-active');
6162
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports[`Renders basic button 1`] = `
66
aria-disabled="false"
77
aria-label="basic button"
88
class="pf-v5-c-button pf-m-primary"
9-
data-ouia-component-id="OUIA-Generated-Button-primary-27"
9+
data-ouia-component-id="OUIA-Generated-Button-primary-26"
1010
data-ouia-component-type="PF5/Button"
1111
data-ouia-safe="true"
1212
type="button"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ exports[`Masthead verify inline display breakpoints 1`] = `
6363
exports[`Masthead verify inset2xl inset breakpoints 1`] = `
6464
<DocumentFragment>
6565
<header
66-
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-2xl pf-m-inset-2xl-on-sm pf-m-inset-2xl-on-md pf-m-inset-2xl-on-lg pf-m-inset-2xl-on-xl pf-m-inset-2xl-on-2xl"
66+
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-2xl"
6767
>
6868
test
6969
</header>
@@ -83,7 +83,7 @@ exports[`Masthead verify inset3xl inset breakpoints 1`] = `
8383
exports[`Masthead verify insetLg inset breakpoints 1`] = `
8484
<DocumentFragment>
8585
<header
86-
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-lg pf-m-inset-lg-on-sm pf-m-inset-lg-on-md pf-m-inset-lg-on-lg pf-m-inset-lg-on-xl pf-m-inset-lg-on-2xl"
86+
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-lg"
8787
>
8888
test
8989
</header>
@@ -93,7 +93,7 @@ exports[`Masthead verify insetLg inset breakpoints 1`] = `
9393
exports[`Masthead verify insetMd inset breakpoints 1`] = `
9494
<DocumentFragment>
9595
<header
96-
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-md pf-m-inset-md-on-sm pf-m-inset-md-on-md pf-m-inset-md-on-lg pf-m-inset-md-on-xl pf-m-inset-md-on-2xl"
96+
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-md"
9797
>
9898
test
9999
</header>
@@ -103,7 +103,7 @@ exports[`Masthead verify insetMd inset breakpoints 1`] = `
103103
exports[`Masthead verify insetNone inset breakpoints 1`] = `
104104
<DocumentFragment>
105105
<header
106-
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-none pf-m-inset-none-on-sm pf-m-inset-none-on-md pf-m-inset-none-on-lg pf-m-inset-none-on-xl pf-m-inset-none-on-2xl"
106+
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-none"
107107
>
108108
test
109109
</header>
@@ -113,7 +113,7 @@ exports[`Masthead verify insetNone inset breakpoints 1`] = `
113113
exports[`Masthead verify insetSm inset breakpoints 1`] = `
114114
<DocumentFragment>
115115
<header
116-
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-sm pf-m-inset-sm-on-sm pf-m-inset-sm-on-md pf-m-inset-sm-on-lg pf-m-inset-sm-on-xl pf-m-inset-sm-on-2xl"
116+
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-sm"
117117
>
118118
test
119119
</header>
@@ -123,7 +123,7 @@ exports[`Masthead verify insetSm inset breakpoints 1`] = `
123123
exports[`Masthead verify insetXl inset breakpoints 1`] = `
124124
<DocumentFragment>
125125
<header
126-
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-xl pf-m-inset-xl-on-sm pf-m-inset-xl-on-md pf-m-inset-xl-on-lg pf-m-inset-xl-on-xl pf-m-inset-xl-on-2xl"
126+
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-xl"
127127
>
128128
test
129129
</header>

‎packages/react-core/src/components/Tabs/TabContent.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ export interface TabContentProps extends Omit<React.HTMLProps<HTMLElement>, 'ref
2727
ouiaSafe?: boolean;
2828
}
2929

30-
const variantStyle = {
31-
default: '',
32-
light300: styles.modifiers.light_300
33-
};
30+
// TODO: Update with issue #9909
31+
// const variantStyle = {
32+
// default: ''
33+
// };
3434

3535
const TabContentBase: React.FunctionComponent<TabContentProps> = ({
3636
id,
@@ -60,10 +60,11 @@ const TabContentBase: React.FunctionComponent<TabContentProps> = ({
6060
<section
6161
ref={innerRef}
6262
hidden={children ? null : child.props.eventKey !== activeKey}
63+
// TODO: Update "variant" with issue #9909
6364
className={
6465
children
65-
? css(styles.tabContent, className, variantStyle[variant])
66-
: css(styles.tabContent, child.props.className, variantStyle[variant])
66+
? css(styles.tabContent, className, variant)
67+
: css(styles.tabContent, child.props.className, variant)
6768
}
6869
id={children ? id : `pf-tab-section-${child.props.eventKey}-${id}`}
6970
aria-label={ariaLabel}

‎packages/react-core/src/components/Tabs/Tabs.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface TabsProps extends Omit<React.HTMLProps<HTMLElement | HTMLDivEle
3838
/** Additional classes added to the tabs */
3939
className?: string;
4040
/** Tabs background color variant */
41-
variant?: 'default' | 'light300';
41+
variant?: 'default';
4242
/** The index of the active tab */
4343
activeKey?: number | string;
4444
/** The index of the default active tab. Set this for uncontrolled Tabs */

‎packages/react-core/src/components/Tabs/__tests__/Generated/__snapshots__/TabContent.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`TabContent should match snapshot (auto-generated) 1`] = `
44
<DocumentFragment>
55
<section
66
aria-label="string"
7-
class="pf-v5-c-tab-content string"
7+
class="pf-v5-c-tab-content string default"
88
data-ouia-component-type="PF5/TabContent"
99
data-ouia-safe="true"
1010
id="string"

0 commit comments

Comments
 (0)