chore(masthead): reverts fix on release branch, avoid rendering L0 if…

… L1 is there (carbon-design-system#4685) Reverts carbon-design-system#4679
asudoh · Dec 9, 2020 · d96f8c1 · d96f8c1
1 parent 9bfe360
commit d96f8c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/packages/web-components/src/components/masthead/masthead-composite.ts b/packages/web-components/src/components/masthead/masthead-composite.ts
@@ -558,8 +558,8 @@ class DDSMastheadComposite extends LitElement {
           : html`
               <dds-left-nav-name>${brandName}</dds-left-nav-name>
             `}
-        ${l1Data ? undefined : this._renderNavItems({ target: NAV_ITEMS_RENDER_TARGET.LEFT_NAV })}
-        ${l1Data ? this._renderL1Items({ target: NAV_ITEMS_RENDER_TARGET.LEFT_NAV }) : undefined}
+        ${this.l1Data ? undefined : this._renderNavItems({ target: NAV_ITEMS_RENDER_TARGET.LEFT_NAV })}
+        ${this.l1Data ? this._renderL1Items({ target: NAV_ITEMS_RENDER_TARGET.LEFT_NAV }) : undefined}
       </dds-left-nav>
       <dds-masthead aria-label="${ifNonNull(mastheadAssistiveText)}">
         <dds-masthead-menu-button
@@ -574,13 +574,9 @@ class DDSMastheadComposite extends LitElement {
           : html`
               <dds-top-nav-name>${brandName}</dds-top-nav-name>
             `}
-        ${l1Data
-          ? undefined
-          : html`
-              <dds-top-nav menu-bar-label="${ifNonNull(menuBarAssistiveText)}">
-                ${this._renderNavItems({ target: NAV_ITEMS_RENDER_TARGET.TOP_NAV })}
-              </dds-top-nav>
-            `}
+        <dds-top-nav ?hide-divider="${this.l1Data}" menu-bar-label="${ifNonNull(menuBarAssistiveText)}">
+          ${this.l1Data ? undefined : this._renderNavItems({ target: NAV_ITEMS_RENDER_TARGET.TOP_NAV })}
+        </dds-top-nav>
         <dds-masthead-search-composite
           ?active="${activateSearch}"
           input-timeout="${inputTimeout}"

diff --git a/packages/web-components/src/components/masthead/top-nav.ts b/packages/web-components/src/components/masthead/top-nav.ts
@@ -11,7 +11,6 @@ import { property, customElement, html, internalProperty } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
 import BXHeaderNav from 'carbon-web-components/es/components/ui-shell/header-nav.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
 import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
 import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
@@ -54,7 +53,7 @@ class DDSTopNav extends StableSelectorMixin(HostListenerMixin(BXHeaderNav)) {
       ? html``
       : html`
           <nav class="${prefix}--header__nav">
-            <ul role="menubar" class="${prefix}--header__menu-bar" aria-label="${ifNonNull(this.menuBarLabel)}">
+            <ul role="menubar" class="${prefix}--header__menu-bar" aria-label="${this.menuBarLabel}">
               <slot></slot>
             </ul>
           </nav>