Skip to content

[7.14] [KibanaPageTemplate] Fix custom sidebar classes overriding kbnPageTemplate class (#103715) #108234

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
kibanamachine merged 1 commit into from
Aug 11, 2021
Merged

[7.14] [KibanaPageTemplate] Fix custom sidebar classes overriding kbnPageTemplate class (#103715) #108234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions src/plugins/kibana_react/public/page_template/page_template.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,20 @@ describe('KibanaPageTemplate', () => {
);
expect(component).toMatchSnapshot();
});

test('render sidebar classes', () => {
const component = shallow(
<KibanaPageTemplate
solutionNav={{
name: 'Solution',
icon: 'solution',
items: navItems,
}}
pageSideBarProps={{ className: 'customClass' }}
/>
);
expect(component.prop('pageSideBarProps').className).toEqual(
'kbnPageTemplate__pageSideBar customClass'
);
});
});
5 changes: 3 additions & 2 deletions src/plugins/kibana_react/public/page_template/page_template.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const KibanaPageTemplate: FunctionComponent<KibanaPageTemplateProps> = ({
isEmptyState,
restrictWidth = true,
pageSideBar,
pageSideBarProps,
solutionNav,
...rest
}) => {
Expand Down Expand Up @@ -116,8 +117,8 @@ export const KibanaPageTemplate: FunctionComponent<KibanaPageTemplateProps> = ({
pageSideBar={pageSideBar}
pageSideBarProps={{
paddingSize: solutionNav ? 'none' : 'l',
...rest.pageSideBarProps,
className: classNames(sideBarClasses, rest.pageSideBarProps?.className),
...pageSideBarProps,
className: classNames(sideBarClasses, pageSideBarProps?.className),
}}
{...rest}
>
Expand Down