Skip to content

fix(SideNavigation): fix tooltip support #156

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 2 commits into from
Sep 26, 2019
Merged

fix(SideNavigation): fix tooltip support #156

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
868eeca
fix(SideNavigation): fix tooltip support
MarcusNotheis Sep 26, 2019
f763133
Merge branch 'master' into fix/side-navigation
MarcusNotheis Sep 26, 2019
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/main/src/components/SideNavigation/SideNavigation.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('SideNavigation', () => {
<SideNavigationListItem text="Useful Links" icon="sap-icon://chain-link" />
]}
>
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" />
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" tooltip="Nav To Home Tooltip" />
<SideNavigationListItem text="Calendar" icon="sap-icon://calendar" id="calendar" />
<SideNavigationListItem text="Customers" icon="sap-icon://employee" id="customers" />
<SideNavigationListItem text="Sales" icon="sap-icon://lead" id="sales">
Expand Down
7 changes: 7 additions & 0 deletions packages/main/src/components/SideNavigation/__snapshots__/SideNavigation.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ exports[`SideNavigation Collapsed 1`] = `
data-id="sales-opportunities"
data-parent-id="sales"
info-state="None"
title="My Opportunities"
type="Active"
>
My Opportunities
Expand All @@ -98,6 +99,7 @@ exports[`SideNavigation Collapsed 1`] = `
data-parent-id="sales"
info-state="None"
selected="true"
title="My Leads"
type="Active"
>
My Leads
Expand All @@ -107,6 +109,7 @@ exports[`SideNavigation Collapsed 1`] = `
data-id="sales-cpqs"
data-parent-id="sales"
info-state="None"
title="My CPQS"
type="Active"
>
My CPQS
Expand Down Expand Up @@ -255,6 +258,7 @@ exports[`SideNavigation Condensed 1`] = `
data-id="sales-opportunities"
data-parent-id="sales"
info-state="None"
title="My Opportunities"
type="Active"
>
My Opportunities
Expand All @@ -265,6 +269,7 @@ exports[`SideNavigation Condensed 1`] = `
data-parent-id="sales"
info-state="None"
selected="true"
title="My Leads"
type="Active"
>
My Leads
Expand All @@ -274,6 +279,7 @@ exports[`SideNavigation Condensed 1`] = `
data-id="sales-cpqs"
data-parent-id="sales"
info-state="None"
title="My CPQS"
type="Active"
>
My CPQS
Expand Down Expand Up @@ -350,6 +356,7 @@ exports[`SideNavigation Expanded 1`] = `
class="SideNavigationListItem--listItem-"
data-has-children="false"
data-id="home"
title="Nav To Home Tooltip"
type="Active"
>
<ui5-icon
Expand Down
11 changes: 8 additions & 3 deletions packages/main/src/components/SideNavigation/demo.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ export const defaultStory = () => (
<SideNavigationListItem id="footer2" text="Useful Links" icon="sap-icon://chain-link" />
]}
>
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" />
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" tooltip="Nav To Home" />
<SideNavigationListItem text="Calendar" icon="sap-icon://calendar" id="calendar" />
<SideNavigationListItem text="Customers" icon="sap-icon://employee" id="customers" />
<SideNavigationListItem text="Sales" icon="sap-icon://lead" id="sales">
<SideNavigationListItem text="My Opportunities" icon="sap-icon://home" id="sales-opportunities" />
<SideNavigationListItem text="Sales" icon="sap-icon://lead" id="sales" tooltip="Sales">
<SideNavigationListItem
text="My Opportunities"
icon="sap-icon://home"
id="sales-opportunities"
tooltip="sales-opportunities"
/>
<SideNavigationListItem text="My Leads" icon="sap-icon://home" id="sales-leads" />
<SideNavigationListItem text="My CPQS" icon="sap-icon://home" id="sales-cpqs" />
</SideNavigationListItem>
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/components/SideNavigation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const useStyles = createUseStyles<JSSTheme, keyof ReturnType<typeof sideNavigati
});

const SideNavigation: FC<SideNavigationProps> = forwardRef((props: SideNavigationProps, ref: Ref<HTMLDivElement>) => {
const { children, openState, footerItems, selectedId, onItemSelect, noIcons, style, className } = props;
const { children, openState, footerItems, selectedId, onItemSelect, noIcons, style, className, tooltip } = props;

const classes = useStyles();

Expand Down Expand Up @@ -85,7 +85,7 @@ const SideNavigation: FC<SideNavigationProps> = forwardRef((props: SideNavigatio
);

return (
<div ref={ref} className={sideNavigationClasses.valueOf()} style={style}>
<div ref={ref} className={sideNavigationClasses.valueOf()} style={style} title={tooltip}>
<List onItemClick={onListItemSelected}>
{Children.map(children, (child: any) =>
cloneElement(child, {
Expand Down
10 changes: 8 additions & 2 deletions packages/main/src/components/SideNavigationListItem/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,13 @@ const SideNavigationListItem: FC<SideNavigationListItemProps> = forwardRef(

return (
<>
{/*
// @ts-ignore */}
<CustomListItem
selected={isSelfSelected || hasSelectedChild}
ref={ref}
className={listItemClasses.valueOf()}
tooltip={tooltip}
title={tooltip}
slot={slot}
style={style}
data-id={id}
Expand All @@ -112,16 +114,20 @@ const SideNavigationListItem: FC<SideNavigationListItemProps> = forwardRef(
openBy={<Icon src={icon} className={classes.icon} />}
>
<List>
<StandardListItem selected={isSelfSelected} data-id={id}>
{/*
// @ts-ignore */}
<StandardListItem selected={isSelfSelected} data-id={id} title={tooltip}>
{text}
</StandardListItem>
{validChildren.map((child: any, index) => {
return (
// @ts-ignore
<StandardListItem
selected={props['selectedId'] === child.props.id}
key={index}
data-id={child.props.id}
data-parent-id={id}
title={child.props.tooltip || child.props.text}
>
{child.props.text}
</StandardListItem>
Expand Down