Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { SideNav } from '../components/SideNav';
import { SideNavItems } from '../components/SideNavItems';
import { SideNavMenu } from '../components/SideNavMenu';
import { SideNavLink } from '../components/SideNavLink';
import { SideNavMenuItem } from '../components/SideNavMenuItem';
import { Profile } from '../index';
import { HeaderContainer } from '../components/HeaderContainer';
import { HeaderOverflowPanel } from '../components/HeaderOverflowPanel';
Expand Down Expand Up @@ -148,7 +149,6 @@ export const Default = () => {
isActive={isSideNavExpanded}
aria-expanded={isSideNavExpanded}
isCollapsible //shows menu at desktop
isFixedNav
renderMenuIcon={<SwitcherIcon size={20} />}
/>
<HeaderName href="#" prefix="IBM">
Expand Down Expand Up @@ -235,10 +235,10 @@ export const Default = () => {
title="Settings"
backButtonTitle="Back">
<SideNavDivider />
<SideNavLink renderIcon={ChartCustom} href="#">
<SideNavMenuItem renderIcon={ChartCustom} href="#">
Customize
<Launch />
</SideNavLink>
</SideNavMenuItem>
</SideNavMenu>
<SideNavLink renderIcon={Notification} href="#">
Notifications
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,10 @@ const headerOverflowPanel = (isSm, themeSetting, setThemeSetting) => (
title="Settings"
backButtonTitle="Back">
<SideNavDivider />
<SideNavLink renderIcon={ChartCustom} href="#">
<SideNavMenuItem renderIcon={ChartCustom} href="#">
Customize
<Launch />
</SideNavLink>
</SideNavMenuItem>
</SideNavMenu>
<SideNavLink renderIcon={Notification} href="#">
Notifications
Expand Down Expand Up @@ -390,7 +390,6 @@ export const Demo = () => {
isActive={isSideNavExpanded}
aria-expanded={isSideNavExpanded}
isCollapsible //shows menu at desktop
isFixedNav
renderMenuIcon={<SwitcherIcon size={20} />}
/>
<HeaderName href="#" prefix="IBM">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,26 @@ export function HeaderPopoverButton<T extends React.ElementType>({
[`${prefix}--header-action__button`]: true,
});
const ComponentToggle: any = BaseComponent ?? IconButton;
return (
<ComponentToggle
{...toggletip?.onClick}
className={className}
kind={BaseComponent ? null : 'ghost'}
label={label}
highContrast={false}
{...rest}>
{children}
</ComponentToggle>
);

// Only pass highContrast to IconButton, not to custom components
const componentProps = BaseComponent
? {
...toggletip?.onClick,
className,
kind: null,
label,
...rest,
}
: {
...toggletip?.onClick,
className,
kind: 'ghost',
label,
highContrast: false,
...rest,
};

return <ComponentToggle {...componentProps}>{children}</ComponentToggle>;
}

HeaderPopoverButton.propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const SharkFinIcon: React.FC<SharkFinIconProps> = ({
viewBox="0 0 4 4"
fill="none"
xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_519_52879)">
<g clipPath="url(#clip0_519_52879)">
<path d="M2 2L4 0V4H0L2 2Z" />
</g>
<defs>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,10 @@ export const SideNavMenu = React.forwardRef<HTMLElement, SideNavMenuProps>(
renderIcon={backButtonRenderIcon}>
{backButtonTitle}
</Button>
{childrenToRender}
<SideNavItems
accessibilityLabel={{ 'aria-label': `${title} submenu` }}>
{childrenToRender}
</SideNavItems>
</div>
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ $prefix: 'cds' !default;
padding-block-start: $spacing-05;
}

.#{$prefix}--header-overflow-panel
.#{$prefix}--header-overflow-panel-secondary-container
.#{$prefix}--side-nav__items {
padding: 0;
}

.#{$prefix}--header-overflow-panel
.#{$prefix}--side-nav__menu-secondary-wrapper-expanded {
z-index: 1;
Expand Down