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.

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

TabNav component refactoring #900

Merged
merged 5 commits into from
Oct 21, 2019
Merged
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
111 changes: 56 additions & 55 deletions core/src/navigation/TabNav.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
/>
{#if children && pathData.length > 1}
<nav
class="fd-tabs {tabsfullscreen?'fd-tabs-fullscreen':''}"
class="fd-tabs"
role="tablist"
id="tabsContainer"
on:toggleDropdownState="{event => toggleDropdownState(event.name)}"
>
<div class="tabsContainerWrapper">
<div class="tabsContainer luigi__internaltabscontainer">
<div class="tabsContainer luigi-tabsContainer">
{#each Object.entries(children) as [key, nodes], index}
{#if key === 'undefined' || key.indexOf(virtualGroupPrefix) === 0}
{#each nodes as node, index2}
Expand Down Expand Up @@ -82,7 +82,7 @@
</div>
</div>

<div class="luigi__internaltabmorebtn">
<div class="luigi-tabsMoreButton">
<span class="fd-tabs__item" on:click="{event => event.stopPropagation()}">
<div class="fd-popover fd-popover--right">
<a
Expand Down Expand Up @@ -146,8 +146,8 @@
</span>
</div>
</nav>
{/if}

{/if}
<script>
import { beforeUpdate, createEventDispatcher, onMount } from 'svelte';
import { Navigation } from './services/navigation';
Expand All @@ -158,7 +158,6 @@
export let pathData;
let previousPathData;
export let hideNavComponent;
export let tabsfullscreen;
export let virtualGroupPrefix = NavigationHelpers.virtualGroupPrefix;
let selectedNode;
export let selectedNodeForTabNav;
Expand All @@ -169,8 +168,17 @@

//TODO refactor
const __this = {
get: () => ({ children, pathData, hideNavComponent, tabsfullscreen, virtualGroupPrefix, selectedNode, selectedNodeForTabNav, dropDownStates, isMoreBtnExpanded }),
set: (obj) => {
get: () => ({
children,
pathData,
hideNavComponent,
virtualGroupPrefix,
selectedNode,
selectedNodeForTabNav,
dropDownStates,
isMoreBtnExpanded
}),
set: obj => {
if (obj) {
Object.getOwnPropertyNames(obj).forEach(prop => {
if (prop === 'pathData') {
Expand All @@ -194,31 +202,25 @@
const setTabNavData = async () => {
const componentData = __this.get();
let lastNode = [...pathData].pop();
const tabNavData = await Navigation.getTabNavData({...componentData}, componentData);
const tabNavData = await Navigation.getTabNavData(
{ ...componentData },
componentData
);
if (!tabNavData) {
return;
}
__this.set({ ...tabNavData });
previousPathData = pathData;
tabsfullscreen =
lastNode.hideSideNav !== false &&
(lastNode.hideSideNav ||
(lastNode.parent && lastNode.parent.hideSideNav) ||
tabNavData.selectedNodeForTabNav.hideSideNav ||
(tabNavData.selectedNodeForTabNav.parent &&
tabNavData.selectedNodeForTabNav.parent.hideSideNav));
window['LEFTNAVDATA'] = tabNavData.groupedChildren;
setTimeout(calcTabsContainer);
};

const calcTabsContainer = () => {
clearTapNav();
let tabsContainer = document.getElementsByClassName(
'luigi__internaltabscontainer'
)[0];
let morebtn = document.getElementsByClassName(
'luigi__internaltabmorebtn'
'luigi-tabsContainer'
)[0];
let morebtn = document.getElementsByClassName('luigi-tabsMoreButton')[0];
let moreLink = document.getElementsByClassName('luigi__more')[0];
let moreBtnSelected = false;
let tabsContainerOffsetWidth;
Expand Down Expand Up @@ -256,7 +258,7 @@

const clearTapNav = () => {
let tabsContainer = document.getElementsByClassName(
'luigi__internaltabscontainer'
'luigi-tabsContainer'
)[0];
let moreLink = document.getElementsByClassName('luigi__more')[0];
let tabs = [...tabsContainer.children];
Expand All @@ -267,8 +269,8 @@

onMount(() => {
hideNavComponent = LuigiConfig.getConfigBooleanValue(
'settings.hideNavigation'
);
'settings.hideNavigation'
);
});

// [svelte-upgrade warning]
Expand All @@ -279,8 +281,8 @@
setTabNavData();
}
if (
previousResizeTabNavToggle === undefined
|| previousResizeTabNavToggle !== resizeTabNavToggle
previousResizeTabNavToggle === undefined ||
previousResizeTabNavToggle !== resizeTabNavToggle
) {
previousResizeTabNavToggle = resizeTabNavToggle;
setTabNavData();
Expand Down Expand Up @@ -340,45 +342,18 @@
@import 'styles/mixins';

$leftNavWidth: 320px;
.fd-tabs__link.has-child .label {
padding-right: 17px;
}

.tabsContainer {
width: 100%;
}

:global(.hide_element) {
display: none;
}

.hide_element {
display: none !important;
}

.fd-tabs__link.has-child .sap-icon--l {
position: absolute;
top: 0.7em;
right: 0;
}

.fd-side-nav__link.has-child {
padding-right: 40px;
background-position: right 15px center;
}

.fd-tabs__item {
white-space: nowrap;
display: inline-block;
}

.tabsContainerWrapper {
flex-grow: 1;
flex-basis: auto;
flex-shrink: 1;
}

.luigi__internaltabmorebtn {
.luigi-tabsMoreButton {
.fd-menu {
max-height: calc(100vh - 110px);
overflow-y: scroll !important;
Expand All @@ -396,11 +371,37 @@
position: absolute;
right: 0;
left: $leftNavWidth;
}

@media (max-width: 599px) {
.fd-tabs {
@media (max-width: 599px) {
left: 0;
}

&__item {
white-space: nowrap;
display: inline-block;

:global(&.hide_element) {
display: none;
}
}

&__link {
&.has-child {
.label {
padding-right: 17px;
}

.sap-icon--l {
position: absolute;
top: 0.7em;
right: 0;
}
}
}
}

.fd-side-nav__link.has-child {
padding-right: 40px;
background-position: right 15px center;
}
</style>