Merge remote-tracking branch 'upstream/dev' into dev

Author: JosefBredereck

packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js

@@ -223,7 +223,11 @@ class Nav extends BaseComponent {
     target.classList.toggle('pl-is-active');
 
     // when the Nav renders as a dropdown menu, only allow one top-level menu item to be open at a time to prevent overlap issues
-    if (this.layoutMode !== 'vertical' && window.innerWidth > 670) {
+    if (
+      this.layoutMode !== 'vertical' &&
+      window.innerWidth > 670 &&
+      target.classList.contains('pl-c-nav__link--title')
+    ) {
       this.topLevelTriggers = document.querySelectorAll(
         '.pl-c-nav__link--title.pl-is-active'
       );

packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js

@@ -2,6 +2,7 @@ import { h } from 'preact';
 import { NavToggle } from './NavToggle';
 import { NavLink } from './NavLink';
 import { NavItem } from './NavItem';
+import { NavButton } from './NavButton';
 
 export const NavList = props => {
   const { children, category, categoryName, elem } = props;
@@ -41,9 +42,9 @@ export const NavList = props => {
           </div>
         ))
       ) : (
-        <Button aria-controls={category} onClick={elem.toggleNavPanel}>
+        <NavButton aria-controls={category} onClick={elem.toggleNavPanel}>
           {categoryName}
-        </Button>
+        </NavButton>
       )}
 
       {((viewAllItems.length && nonViewAllItems.length) ||