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

chore(deps): Bump v6 branch to latest core alpha #9774

Merged
merged 12 commits into from
Nov 15, 2023
Merged

chore(deps): Bump v6 branch to latest core alpha #9774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d5613e1
chore(deps): Bump v6 branch to latest core alpha
tlabaj Oct 26, 2023
0d59f4f
update snapshts
tlabaj Oct 27, 2023
e09fa6e
fixes from review
tlabaj Oct 27, 2023
3d5b7cc
fix test
tlabaj Oct 27, 2023
d59a2d3
update to alpha 12 to fix table issue
tlabaj Oct 31, 2023
0681f92
more fixes
tlabaj Oct 31, 2023
7db314f
update snapshots
tlabaj Nov 1, 2023
3bb3f11
remove Page setion variants that are no longer needed and update snap…
tlabaj Nov 1, 2023
d639fb7
rebase
tlabaj Nov 1, 2023
f98e496
fix docs
tlabaj Nov 1, 2023
45e7ad1
fix broken tests
tlabaj Nov 2, 2023
b588666
fix token genration
tlabaj Nov 13, 2023
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": "5.2.0-prerelease.3",
"@patternfly/patternfly": "6.0.0-alpha.12",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@rollup/plugin-replace": "^5.0.2",
Expand Down
5 changes: 0 additions & 5 deletions packages/react-core/src/components/Masthead/Masthead.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export interface MastheadProps extends React.DetailedHTMLProps<React.HTMLProps<H
children?: React.ReactNode;
/** Additional classes added to the masthead */
className?: string;
/** Background theme color of the masthead */
backgroundColor?: 'dark' | 'light' | 'light200';
/** Display type at various breakpoints */
display?: {
default?: 'inline' | 'stack';
Expand All @@ -34,7 +32,6 @@ export interface MastheadProps extends React.DetailedHTMLProps<React.HTMLProps<H
export const Masthead: React.FunctionComponent<MastheadProps> = ({
children,
className,
backgroundColor = 'dark',
display = {
md: 'inline'
},
Expand All @@ -48,8 +45,6 @@ export const Masthead: React.FunctionComponent<MastheadProps> = ({
styles.masthead,
formatBreakpointMods(display, styles, 'display-', getBreakpoint(width)),
formatBreakpointMods(inset, styles, '', getBreakpoint(width)),
backgroundColor === 'light' && styles.modifiers.light,
backgroundColor === 'light200' && styles.modifiers.light_200,
className
)}
{...props}
Expand Down
44 changes: 0 additions & 44 deletions packages/react-core/src/components/Masthead/examples/Masthead.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,50 +140,6 @@ import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
</Masthead>;
```

### Light variant

```ts
import React from 'react';
import { Masthead, MastheadToggle, MastheadMain, MastheadBrand, MastheadContent, Button } from '@patternfly/react-core';
import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';

<Masthead id="light-masthead" backgroundColor="light">
<MastheadToggle>
<Button variant="plain" onClick={() => {}} aria-label="Global navigation">
<BarsIcon />
</Button>
</MastheadToggle>
<MastheadMain>
<MastheadBrand>Logo</MastheadBrand>
</MastheadMain>
<MastheadContent>
<span>Content</span>
</MastheadContent>
</Masthead>;
```

### Light 200 variant

```ts
import React from 'react';
import { Masthead, MastheadToggle, MastheadMain, MastheadBrand, MastheadContent, Button } from '@patternfly/react-core';
import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';

<Masthead id="light200-masthead" backgroundColor="light200">
<MastheadToggle>
<Button variant="plain" onClick={() => {}} aria-label="Global navigation">
<BarsIcon />
</Button>
</MastheadToggle>
<MastheadMain>
<MastheadBrand>Logo</MastheadBrand>
</MastheadMain>
<MastheadContent>
<span>Content</span>
</MastheadContent>
</Masthead>;
```

### Inset

```ts
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/NotificationBadge/NotificationBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const NotificationBadge: React.FunctionComponent<NotificationBadgeProps>
className={css(styles.notificationBadge, styles.modifiers[variant], isExpanded && styles.modifiers.expanded)}
>
{notificationChild}
{count > 0 && <span className={css(styles.notificationBadgeCount)}>{count}</span>}
{count > 0 && <span className={css(`${styles.notificationBadge}__count`)}>{count}</span>}
</span>
</Button>
);
Expand Down
12 changes: 3 additions & 9 deletions packages/react-core/src/components/Page/PageSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ import { formatBreakpointMods } from '../../helpers/util';
import { PageContext } from './PageContext';

export enum PageSectionVariants {
default = 'default',
light = 'light',
dark = 'dark',
darker = 'darker'
default = 'default'
}

export enum PageSectionTypes {
Expand All @@ -26,7 +23,7 @@ export interface PageSectionProps extends React.HTMLProps<HTMLDivElement> {
/** Additional classes added to the section */
className?: string;
/** Section background color variant */
variant?: 'default' | 'light' | 'dark' | 'darker';
variant?: 'default';
/** Section type variant */
type?: 'default' | 'nav' | 'subnav' | 'breadcrumb' | 'tabs' | 'wizard';
/** Enables the page section to fill the available vertical space */
Expand Down Expand Up @@ -77,10 +74,7 @@ const variantType = {
};

const variantStyle = {
[PageSectionVariants.default]: '',
[PageSectionVariants.light]: styles.modifiers.light,
[PageSectionVariants.dark]: styles.modifiers.dark_200,
[PageSectionVariants.darker]: styles.modifiers.dark_100
[PageSectionVariants.default]: ''
};

export const PageSection: React.FunctionComponent<PageSectionProps> = ({
Expand Down
4 changes: 0 additions & 4 deletions packages/react-core/src/components/Page/PageSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ export interface PageSidebarProps extends React.HTMLProps<HTMLDivElement> {
isManagedSidebar?: boolean;
/** Programmatically manage if the sidebar is shown, if isManagedSidebar is set to true in the Page component, this prop is managed */
isSidebarOpen?: boolean;
/** Indicates the color scheme of the sidebar */
theme?: 'dark' | 'light';
/** Sidebar id */
id?: string;
}
Expand All @@ -33,7 +31,6 @@ export const PageSidebar: React.FunctionComponent<PageSidebarProps> = ({
className = '',
children,
isSidebarOpen = true,
theme = 'dark',
id = 'page-sidebar',
...props
}: PageSidebarProps) => (
Expand All @@ -46,7 +43,6 @@ export const PageSidebar: React.FunctionComponent<PageSidebarProps> = ({
id={id}
className={css(
styles.pageSidebar,
theme === 'light' && styles.modifiers.light,
sidebarOpen && styles.modifiers.expanded,
!sidebarOpen && styles.modifiers.collapsed,
className
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/src/components/Page/__tests__/Generated/PageSidebar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {} from '../..';

it('PageSidebar should match snapshot (auto-generated)', () => {
const { asFragment } = render(
<PageSidebar className={"''"} isManagedSidebar={true} isSidebarOpen={true} theme={'dark'}>
<PageSidebar className={"''"} isManagedSidebar={true} isSidebarOpen={true}>
<div>ReactNode</div>
</PageSidebar>
);
Expand Down
41 changes: 1 addition & 40 deletions packages/react-core/src/components/Page/__tests__/Page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ describe('Page', () => {
const { asFragment } = render(
<Page {...props} header={Header} sidebar={Sidebar}>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand All @@ -44,17 +41,14 @@ describe('Page', () => {
test('Check dark page against snapshot', () => {
const Header = <PageHeader logo="Logo" headerTools="PageHeaderTools | Avatar" onNavToggle={() => undefined} />;
const Sidebar = (
<PageSidebar isSidebarOpen theme="dark">
<PageSidebar isSidebarOpen>
<PageSidebarBody>Navigation</PageSidebarBody>
</PageSidebar>
);

const { asFragment } = render(
<Page {...props} header={Header} sidebar={Sidebar}>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand All @@ -68,9 +62,6 @@ describe('Page', () => {
const { asFragment } = render(
<Page {...props} header={Header} sidebar={Sidebar}>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand All @@ -94,9 +85,6 @@ describe('Page', () => {
const { asFragment } = render(
<Page {...props} header={Header} sidebar={Sidebar} breadcrumb={<PageBreadcrumb />}>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand Down Expand Up @@ -127,9 +115,6 @@ describe('Page', () => {
breadcrumbProps={{ stickyOnBreakpoint: { sm: 'top', md: 'top', lg: 'top', xl: 'top', '2xl': 'top' } }}
>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand Down Expand Up @@ -162,9 +147,6 @@ describe('Page', () => {
}}
>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand All @@ -189,9 +171,6 @@ describe('Page', () => {
</Breadcrumb>
</PageBreadcrumb>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand All @@ -216,9 +195,6 @@ describe('Page', () => {
</Breadcrumb>
</PageBreadcrumb>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand All @@ -245,9 +221,6 @@ describe('Page', () => {
</Breadcrumb>
</PageBreadcrumb>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand Down Expand Up @@ -275,9 +248,6 @@ describe('Page', () => {
</Nav>
</PageNavigation>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand Down Expand Up @@ -317,9 +287,6 @@ describe('Page', () => {
</PageNavigation>
</PageGroup>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand Down Expand Up @@ -373,9 +340,6 @@ describe('Page', () => {
}}
>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand Down Expand Up @@ -411,9 +375,6 @@ describe('Page', () => {
data-testid="page-test-id"
>
<PageSection variant="default">Section with default background</PageSection>
<PageSection variant="light">Section with light background</PageSection>
<PageSection variant="dark">Section with dark background</PageSection>
<PageSection variant="darker">Section with darker background</PageSection>
</Page>
);

Expand Down
Loading
Loading