diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 976472beeb6..e41fd175b28 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.38", + "@patternfly/patternfly": "6.0.0-alpha.49", "@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/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx index 4f0a834ceb6..d9b2ff8f8a5 100644 --- a/packages/react-core/src/components/Button/Button.tsx +++ b/packages/react-core/src/components/Button/Button.tsx @@ -94,6 +94,8 @@ const ButtonBase: React.FunctionComponent = ({ children = null, className = '', component = 'button', + // TODO: Update eslint ignore when issue #9907 is resolved + // eslint-disable-next-line @typescript-eslint/no-unused-vars isActive = false, isBlock = false, isDisabled = false, @@ -155,7 +157,8 @@ const ButtonBase: React.FunctionComponent = ({ isBlock && styles.modifiers.block, isDisabled && styles.modifiers.disabled, isAriaDisabled && styles.modifiers.ariaDisabled, - isActive && styles.modifiers.active, + // TODO: Update when issue #9907 is resolved + // isActive && styles.modifiers.active, isInline && variant === ButtonVariant.link && styles.modifiers.inline, isDanger && (variant === ButtonVariant.secondary || variant === ButtonVariant.link) && styles.modifiers.danger, isLoading !== null && variant !== ButtonVariant.plain && styles.modifiers.progress, diff --git a/packages/react-core/src/components/Button/__tests__/Button.test.tsx b/packages/react-core/src/components/Button/__tests__/Button.test.tsx index a9d57d538f3..738821facff 100644 --- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx +++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx @@ -55,7 +55,8 @@ test('Renders with class pf-m-block when isBlock = true', () => { expect(screen.getByRole('button')).toHaveClass('pf-m-block'); }); -test('Renders with class pf-m-active when isActive = true', () => { +// TODO: Reenable or remove with issue #9907 +xtest('Renders with class pf-m-active when isActive = true', () => { render(); expect(screen.getByRole('button')).toHaveClass('pf-m-active'); }); diff --git a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap index b0cb22e0620..f5f4828c50f 100644 --- a/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap +++ b/packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap @@ -6,7 +6,7 @@ exports[`Renders basic button 1`] = ` aria-disabled="false" aria-label="basic button" class="pf-v5-c-button pf-m-primary" - data-ouia-component-id="OUIA-Generated-Button-primary-27" + data-ouia-component-id="OUIA-Generated-Button-primary-26" data-ouia-component-type="PF5/Button" data-ouia-safe="true" type="button" diff --git a/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap b/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap index bc145d4fd10..c3e0bc73c1a 100644 --- a/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap +++ b/packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap @@ -63,7 +63,7 @@ exports[`Masthead verify inline display breakpoints 1`] = ` exports[`Masthead verify inset2xl inset breakpoints 1`] = `
test
@@ -83,7 +83,7 @@ exports[`Masthead verify inset3xl inset breakpoints 1`] = ` exports[`Masthead verify insetLg inset breakpoints 1`] = `
test
@@ -93,7 +93,7 @@ exports[`Masthead verify insetLg inset breakpoints 1`] = ` exports[`Masthead verify insetMd inset breakpoints 1`] = `
test
@@ -103,7 +103,7 @@ exports[`Masthead verify insetMd inset breakpoints 1`] = ` exports[`Masthead verify insetNone inset breakpoints 1`] = `
test
@@ -113,7 +113,7 @@ exports[`Masthead verify insetNone inset breakpoints 1`] = ` exports[`Masthead verify insetSm inset breakpoints 1`] = `
test
@@ -123,7 +123,7 @@ exports[`Masthead verify insetSm inset breakpoints 1`] = ` exports[`Masthead verify insetXl inset breakpoints 1`] = `
test
diff --git a/packages/react-core/src/components/Tabs/TabContent.tsx b/packages/react-core/src/components/Tabs/TabContent.tsx index 53d479d8b24..ababc391f22 100644 --- a/packages/react-core/src/components/Tabs/TabContent.tsx +++ b/packages/react-core/src/components/Tabs/TabContent.tsx @@ -27,10 +27,10 @@ export interface TabContentProps extends Omit, 'ref ouiaSafe?: boolean; } -const variantStyle = { - default: '', - light300: styles.modifiers.light_300 -}; +// TODO: Update with issue #9909 +// const variantStyle = { +// default: '' +// }; const TabContentBase: React.FunctionComponent = ({ id, @@ -60,10 +60,11 @@ const TabContentBase: React.FunctionComponent = ({