Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): Bump core alphas to latest #9930

Merged
merged 2 commits into from
Jan 4, 2024
Merged

chore(deps): Bump core alphas to latest #9930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce09a8c
chore(deps): Bump core alphas to latest
tlabaj Jan 3, 2024
9997b51
fix integration tests
tlabaj Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 4 additions & 1 deletion packages/react-core/src/components/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
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,
Expand Down Expand Up @@ -155,7 +157,8 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
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,
Expand Down
3 changes: 2 additions & 1 deletion packages/react-core/src/components/Button/__tests__/Button.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(<Button isActive>Active Button</Button>);
expect(screen.getByRole('button')).toHaveClass('pf-m-active');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ exports[`Masthead verify inline display breakpoints 1`] = `
exports[`Masthead verify inset2xl inset breakpoints 1`] = `
<DocumentFragment>
<header
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"
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-2xl"
>
test
</header>
Expand All @@ -83,7 +83,7 @@ exports[`Masthead verify inset3xl inset breakpoints 1`] = `
exports[`Masthead verify insetLg inset breakpoints 1`] = `
<DocumentFragment>
<header
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"
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-lg"
>
test
</header>
Expand All @@ -93,7 +93,7 @@ exports[`Masthead verify insetLg inset breakpoints 1`] = `
exports[`Masthead verify insetMd inset breakpoints 1`] = `
<DocumentFragment>
<header
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"
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-md"
>
test
</header>
Expand All @@ -103,7 +103,7 @@ exports[`Masthead verify insetMd inset breakpoints 1`] = `
exports[`Masthead verify insetNone inset breakpoints 1`] = `
<DocumentFragment>
<header
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"
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-none"
>
test
</header>
Expand All @@ -113,7 +113,7 @@ exports[`Masthead verify insetNone inset breakpoints 1`] = `
exports[`Masthead verify insetSm inset breakpoints 1`] = `
<DocumentFragment>
<header
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"
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-sm"
>
test
</header>
Expand All @@ -123,7 +123,7 @@ exports[`Masthead verify insetSm inset breakpoints 1`] = `
exports[`Masthead verify insetXl inset breakpoints 1`] = `
<DocumentFragment>
<header
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"
class="pf-v5-c-masthead pf-m-display-inline-on-md pf-m-inset-xl"
>
test
</header>
Expand Down
13 changes: 7 additions & 6 deletions packages/react-core/src/components/Tabs/TabContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ export interface TabContentProps extends Omit<React.HTMLProps<HTMLElement>, 'ref
ouiaSafe?: boolean;
}

const variantStyle = {
default: '',
light300: styles.modifiers.light_300
};
// TODO: Update with issue #9909
// const variantStyle = {
// default: ''
// };

const TabContentBase: React.FunctionComponent<TabContentProps> = ({
id,
Expand Down Expand Up @@ -60,10 +60,11 @@ const TabContentBase: React.FunctionComponent<TabContentProps> = ({
<section
ref={innerRef}
hidden={children ? null : child.props.eventKey !== activeKey}
// TODO: Update "variant" with issue #9909
className={
children
? css(styles.tabContent, className, variantStyle[variant])
: css(styles.tabContent, child.props.className, variantStyle[variant])
? css(styles.tabContent, className, variant)
: css(styles.tabContent, child.props.className, variant)
}
id={children ? id : `pf-tab-section-${child.props.eventKey}-${id}`}
aria-label={ariaLabel}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Tabs/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export interface TabsProps extends Omit<React.HTMLProps<HTMLElement | HTMLDivEle
/** Additional classes added to the tabs */
className?: string;
/** Tabs background color variant */
variant?: 'default' | 'light300';
variant?: 'default';
/** The index of the active tab */
activeKey?: number | string;
/** The index of the default active tab. Set this for uncontrolled Tabs */
Expand Down
2 changes: 1 addition & 1 deletion ...react-core/src/components/Tabs/__tests__/Generated/__snapshots__/TabContent.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`TabContent should match snapshot (auto-generated) 1`] = `
<DocumentFragment>
<section
aria-label="string"
class="pf-v5-c-tab-content string"
class="pf-v5-c-tab-content string default"
data-ouia-component-type="PF5/TabContent"
data-ouia-safe="true"
id="string"
Expand Down
Loading
Loading