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

fix(SideNavigation): Fix Rendering and Event Handling #189

Merged
merged 3 commits into from
Oct 18, 2019
Merged

fix(SideNavigation): Fix Rendering and Event Handling #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f41b822
fix(SideNavigationListItem): Fire Click Event on Icon Press
MarcusNotheis Oct 17, 2019
9c44dde
WIP: Fixed event handling
MarcusNotheis Oct 17, 2019
e83453f
WIP: Updated Snapshots
MarcusNotheis Oct 17, 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
16 changes: 8 additions & 8 deletions packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px); display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
>
<div
class="TableColumnHeader--header-"
Expand Down Expand Up @@ -106,7 +106,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px); display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
>
<div
class="TableColumnHeader--header-"
Expand Down Expand Up @@ -186,7 +186,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px); display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
>
<div
class="TableColumnHeader--header-"
Expand Down Expand Up @@ -266,7 +266,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden;"
>
<div
class="TableColumnHeader--header-"
Expand Down Expand Up @@ -536,7 +536,7 @@ exports[`AnalyticalTable test Asc desc 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px); display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
>
<div
class="TableColumnHeader--header-"
Expand Down Expand Up @@ -595,7 +595,7 @@ exports[`AnalyticalTable test Asc desc 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px); display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
>
<div
class="TableColumnHeader--header-"
Expand Down Expand Up @@ -654,7 +654,7 @@ exports[`AnalyticalTable test Asc desc 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px); display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
>
<div
class="TableColumnHeader--header-"
Expand Down Expand Up @@ -713,7 +713,7 @@ exports[`AnalyticalTable test Asc desc 1`] = `
class="AnalyticalTable--th-"
>
<div
style="width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; display: inline-block;"
style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden;"
>
<div
class="TableColumnHeader--header-"
Expand Down
6 changes: 3 additions & 3 deletions packages/main/src/components/FilterBar/__snapshots__/FilterBar.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`FilterBar Hide Filter Bar 1`] = `
class="FilterBar--filterBarHeader-"
>
<div
style="pointer-events: auto; display: inline-block;"
style="display: inline-block; pointer-events: auto;"
>
<div
class="Variant-Management--VariantManagement-"
Expand Down Expand Up @@ -172,7 +172,7 @@ exports[`FilterBar Render without crashing 1`] = `
class="FilterBar--filterBarHeader-"
>
<div
style="pointer-events: auto; display: inline-block;"
style="display: inline-block; pointer-events: auto;"
>
<div
class="Variant-Management--VariantManagement-"
Expand Down Expand Up @@ -325,7 +325,7 @@ exports[`FilterBar Select Filter Item 1`] = `
class="FilterBar--filterBarHeader-"
>
<div
style="pointer-events: auto; display: inline-block;"
style="display: inline-block; pointer-events: auto;"
>
<div
class="Variant-Management--VariantManagement-"
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/components/SideNavigation/SideNavigation.jss.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const sideNavigationStyles = ({ parameters }: JSSTheme) => ({
},

condensed: {
width: '2.75rem',
width: '3rem',
'& $footerItemsSeparator': {
marginLeft: '0.5rem',
marginRight: '0.5rem'
Expand Down
16 changes: 8 additions & 8 deletions 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 @@ -11,8 +11,8 @@ describe('SideNavigation', () => {
openState={SideNavigationOpenState.Expandend}
selectedId={'sales-leads'}
footerItems={[
<SideNavigationListItem text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem text="Useful Links" icon="sap-icon://chain-link" />
<SideNavigationListItem id="1" text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem id="2" text="Useful Links" icon="sap-icon://chain-link" />
]}
>
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" tooltip="Nav To Home Tooltip" />
Expand All @@ -36,8 +36,8 @@ describe('SideNavigation', () => {
selectedId={'sales-leads'}
noIcons
footerItems={[
<SideNavigationListItem text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem text="Useful Links" icon="sap-icon://chain-link" />
<SideNavigationListItem id="1" text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem id="2" text="Useful Links" icon="sap-icon://chain-link" />
]}
>
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" />
Expand All @@ -60,8 +60,8 @@ describe('SideNavigation', () => {
openState={SideNavigationOpenState.Condensed}
selectedId={'sales-leads'}
footerItems={[
<SideNavigationListItem text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem text="Useful Links" icon="sap-icon://chain-link" />
<SideNavigationListItem id="1" text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem id="2" text="Useful Links" icon="sap-icon://chain-link" />
]}
>
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" />
Expand All @@ -83,8 +83,8 @@ describe('SideNavigation', () => {
openState={SideNavigationOpenState.Collapsed}
selectedId={'sales-leads'}
footerItems={[
<SideNavigationListItem text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem text="Useful Links" icon="sap-icon://chain-link" />
<SideNavigationListItem id="1" text="Legal Information" icon="sap-icon://compare" />,
<SideNavigationListItem id="2" text="Useful Links" icon="sap-icon://chain-link" />
]}
>
<SideNavigationListItem text="Overview" icon="sap-icon://home" id="home" />
Expand Down
Loading