Skip to content

fix(Page) allow change of main tag #9296

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

Merged
merged 5 commits into from
Jul 26, 2023
Merged

fix(Page) allow change of main tag #9296

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7dc5c7
fix(Page) allow change of main tag
dominik-petrik Jun 22, 2023
8405d2f
rename prop and add it to render method
dominik-petrik Jun 26, 2023
2c18074
change prop name and description
dominik-petrik Jul 7, 2023
28916f7
update description
dominik-petrik Jul 11, 2023
6f82495
Reverted prop name
Jul 26, 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
10 changes: 8 additions & 2 deletions packages/react-core/src/components/Page/Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ export interface PageProps extends React.HTMLProps<HTMLDivElement> {
isBreadcrumbGrouped?: boolean;
/** Additional content of the group */
additionalGroupedContent?: React.ReactNode;
/** HTML component used as main component of the page. Defaults to 'main', only pass in 'div' if another 'main' element already exists. */
mainComponent?: 'main' | 'div';
/** Additional props of the group */
groupProps?: PageGroupProps;
/** Additional props of the breadcrumb */
Expand All @@ -104,6 +106,7 @@ export class Page extends React.Component<PageProps, PageState> {
mainTabIndex: -1,
isNotificationDrawerExpanded: false,
onNotificationDrawerExpand: () => null,
mainComponent: 'main',
getBreakpoint,
getVerticalBreakpoint
};
Expand Down Expand Up @@ -229,6 +232,7 @@ export class Page extends React.Component<PageProps, PageState> {
getVerticalBreakpoint,
mainAriaLabel,
mainTabIndex,
mainComponent,
tertiaryNav,
isTertiaryNavGrouped,
isBreadcrumbGrouped,
Expand Down Expand Up @@ -288,8 +292,10 @@ export class Page extends React.Component<PageProps, PageState> {
</PageGroup>
) : null;

const Component: keyof JSX.IntrinsicElements = mainComponent;

const main = (
<main
<Component
ref={this.mainRef}
role={role}
id={mainContainerId}
Expand All @@ -301,7 +307,7 @@ export class Page extends React.Component<PageProps, PageState> {
{!isTertiaryNavGrouped && nav}
{!isBreadcrumbGrouped && crumb}
{children}
</main>
</Component>
);

const panelContent = <DrawerPanelContent>{notificationDrawer}</DrawerPanelContent>;
Expand Down