@digigov/ui 1.0.0-6b93ebf2 → 1.0.0-77ee23d9

package/navigation/Drawer/__stories__/Default.js

@@ -9,20 +9,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.Default = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
 
 var _Drawer = require("@digigov/ui/navigation/Drawer");
 
-var _Link = require("@digigov/ui/navigation/Link");
-
 var _NavList = require("@digigov/ui/navigation/NavList");
 
-var _useNavList2 = require("@digigov/ui/navigation/NavList/hooks/useNavList");
-
 var _Title = require("@digigov/ui/typography/Title");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -49,27 +43,29 @@ var links = [{
 }, {
   name: 'educational',
   label: 'Εκπαιδευτικό υλικό',
-  subMenu: [{
-    name: 'elearning',
-    href: '#elearning',
-    label: 'Εκπαιδευτική πλατφόρμα'
-  }, {
-    name: 'videos',
-    href: '#videos',
-    label: 'Βίντεο'
-  }, {
-    name: 'presentations',
-    href: '#presentations',
-    label: 'Παρουσιάσεις'
-  }, {
-    name: 'promoting',
-    href: '#promoting',
-    label: 'Προωθώντας την αθλητική ακεραιότητα στην νέα γενιά'
-  }, {
-    name: 'other-texts',
-    href: '#other-texts',
-    label: 'Άλλα κείμενα'
-  }]
+  menu: {
+    links: [{
+      name: 'elearning',
+      href: '#elearning',
+      label: 'Εκπαιδευτική πλατφόρμα'
+    }, {
+      name: 'videos',
+      href: '#videos',
+      label: 'Βίντεο'
+    }, {
+      name: 'presentations',
+      href: '#presentations',
+      label: 'Παρουσιάσεις'
+    }, {
+      name: 'promoting',
+      href: '#promoting',
+      label: 'Προωθώντας την αθλητική ακεραιότητα στην νέα γενιά'
+    }, {
+      name: 'other-texts',
+      href: '#other-texts',
+      label: 'Άλλα κείμενα'
+    }]
+  }
 }, {
   name: 'news',
   href: '#news',
@@ -86,19 +82,6 @@ var Default = function Default() {
       open = _useDrawer2[0],
       toggleDrawer = _useDrawer2[1];
 
-  var _useNavList = (0, _useNavList2.useNavList)(),
-      container = _useNavList.container,
-      registerButton = _useNavList.registerButton,
-      registerLink = _useNavList.registerLink;
-
-  var setRegisterButton = function setRegisterButton(name) {
-    return (0, _extends2["default"])({}, registerButton(name));
-  };
-
-  var setRegisterLink = function setRegisterLink(name) {
-    return (0, _extends2["default"])({}, registerLink(name));
-  };
-
   var layout = 'vertical';
   var border = false;
   var fixed = false;
@@ -116,34 +99,7 @@ var Default = function Default() {
     border: border,
     fixed: fixed,
     "aria-label": "Nav list"
-  }, links.map(function (item, key) {
-    var _item$subMenu;
-
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
-      key: key
-    }, /*#__PURE__*/_react["default"].createElement(_NavList.NavListItem, {
-      link: item,
-      setRegisterButton: setRegisterButton,
-      setRegisterLink: setRegisterLink
-    }), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenu, (0, _extends2["default"])({
-      layout: layout
-    }, container(item.name)), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainer, {
-      layout: layout,
-      paddingLeft: 5,
-      paddingRight: 5
-    }, /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerTitle, null, item.label), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerContent, null, /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerContentList, {
-      role: "menu"
-    }, (_item$subMenu = item.subMenu) === null || _item$subMenu === void 0 ? void 0 : _item$subMenu.map(function (subMenu, menuIndex) {
-      return (0, _NavList.isNavListItemLinkInterface)(subMenu) && /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerContentListItem, {
-        key: menuIndex,
-        role: "presentation"
-      }, /*#__PURE__*/_react["default"].createElement(_Link.Link, {
-        role: "menuitem",
-        id: subMenu.name,
-        href: subMenu.href
-      }, subMenu.label));
-    }))))));
-  })));
+  }));
 };
 
 exports.Default = Default;

package/navigation/Drawer/index.mdx

@@ -9,11 +9,7 @@ import Drawer from '@digigov/ui/app/Drawer';
 
 ## How to use
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Drawer"
-  story="Default.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Drawer" story="Default.tsx" />
 
 ## API
 

package/navigation/Dropdown/__stories__/AlignRight.js

@@ -21,9 +21,7 @@ var _SectionBreak = require("@digigov/ui/layouts/SectionBreak");
 
 var _Dropdown = require("@digigov/ui/navigation/Dropdown");
 
-var _NavVertical = require("@digigov/ui/navigation/NavList/NavVertical");
-
-var _NavVerticalItem = require("@digigov/ui/navigation/NavList/NavVerticalItem");
+var _NavList = require("@digigov/ui/navigation/NavList");
 
 var _ref = /*#__PURE__*/_react["default"].createElement(_Dropdown.Dropdown, {
   align: "right"
@@ -40,16 +38,18 @@ var _ref = /*#__PURE__*/_react["default"].createElement(_Dropdown.Dropdown, {
 }, /*#__PURE__*/_react["default"].createElement(_LabelContainer.LabelContainer, null, /*#__PURE__*/_react["default"].createElement(_LabelContainer.LabelTitle, null, "\u038C\u03BD\u03BF\u03BC\u03B1 \u03C0\u03B5\u03B4\u03AF\u03BF\u03C5"), /*#__PURE__*/_react["default"].createElement(_TextInput.TextInput, {
   name: "input-name"
 }))), /*#__PURE__*/_react["default"].createElement(_SectionBreak.SectionBreak, {
-  role: "separator"
-}), /*#__PURE__*/_react["default"].createElement(_NavVertical.NavVertical, {
-  role: "menu"
-}, /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+  role: "separator",
+  paddingBottom: 0,
+  paddingTop: 0
+}), /*#__PURE__*/_react["default"].createElement(_NavList.NavList, {
+  layout: "vertical"
+}, /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
-}, "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"), /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+}, "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"), /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
-}, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7"), /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+}, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7"), /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
 }, "\u039F\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE")), /*#__PURE__*/_react["default"].createElement(_SectionBreak.SectionBreak, {

package/navigation/Dropdown/__stories__/Default.js

@@ -21,9 +21,7 @@ var _SectionBreak = require("@digigov/ui/layouts/SectionBreak");
 
 var _Dropdown = require("@digigov/ui/navigation/Dropdown");
 
-var _NavVertical = require("@digigov/ui/navigation/NavList/NavVertical");
-
-var _NavVerticalItem = require("@digigov/ui/navigation/NavList/NavVerticalItem");
+var _NavList = require("@digigov/ui/navigation/NavList");
 
 var _ref = /*#__PURE__*/_react["default"].createElement(_Dropdown.Dropdown, null, /*#__PURE__*/_react["default"].createElement(_Dropdown.DropdownButton, {
   role: "button",
@@ -38,16 +36,18 @@ var _ref = /*#__PURE__*/_react["default"].createElement(_Dropdown.Dropdown, null
 }, /*#__PURE__*/_react["default"].createElement(_LabelContainer.LabelContainer, null, /*#__PURE__*/_react["default"].createElement(_LabelContainer.LabelTitle, null, "\u038C\u03BD\u03BF\u03BC\u03B1 \u03C0\u03B5\u03B4\u03AF\u03BF\u03C5"), /*#__PURE__*/_react["default"].createElement(_TextInput.TextInput, {
   name: "input-name"
 }))), /*#__PURE__*/_react["default"].createElement(_SectionBreak.SectionBreak, {
-  role: "separator"
-}), /*#__PURE__*/_react["default"].createElement(_NavVertical.NavVertical, {
-  role: "menu"
-}, /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+  role: "separator",
+  paddingBottom: 0,
+  paddingTop: 0
+}), /*#__PURE__*/_react["default"].createElement(_NavList.NavList, {
+  layout: "vertical"
+}, /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
-}, "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"), /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+}, "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"), /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
-}, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7"), /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+}, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7"), /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
 }, "\u039F\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE")), /*#__PURE__*/_react["default"].createElement(_SectionBreak.SectionBreak, {

package/navigation/Dropdown/__stories__/PlacementTop.js

@@ -21,9 +21,7 @@ var _SectionBreak = require("@digigov/ui/layouts/SectionBreak");
 
 var _Dropdown = require("@digigov/ui/navigation/Dropdown");
 
-var _NavVertical = require("@digigov/ui/navigation/NavList/NavVertical");
-
-var _NavVerticalItem = require("@digigov/ui/navigation/NavList/NavVerticalItem");
+var _NavList = require("@digigov/ui/navigation/NavList");
 
 var _ref = /*#__PURE__*/_react["default"].createElement(_Dropdown.DropdownButton, {
   role: "button",
@@ -40,16 +38,18 @@ var _ref2 = /*#__PURE__*/_react["default"].createElement(_Dropdown.DropdownConte
 }, /*#__PURE__*/_react["default"].createElement(_LabelContainer.LabelContainer, null, /*#__PURE__*/_react["default"].createElement(_LabelContainer.LabelTitle, null, "\u038C\u03BD\u03BF\u03BC\u03B1 \u03C0\u03B5\u03B4\u03AF\u03BF\u03C5"), /*#__PURE__*/_react["default"].createElement(_TextInput.TextInput, {
   name: "input-name"
 }))), /*#__PURE__*/_react["default"].createElement(_SectionBreak.SectionBreak, {
-  role: "separator"
-}), /*#__PURE__*/_react["default"].createElement(_NavVertical.NavVertical, {
-  role: "menu"
-}, /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+  role: "separator",
+  paddingBottom: 0,
+  paddingTop: 0
+}), /*#__PURE__*/_react["default"].createElement(_NavList.NavList, {
+  layout: "vertical"
+}, /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
-}, "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"), /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+}, "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"), /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
-}, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7"), /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+}, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7"), /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, {
   role: "menuitem",
   href: "#"
 }, "\u039F\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE")), /*#__PURE__*/_react["default"].createElement(_SectionBreak.SectionBreak, {

package/navigation/Dropdown/index.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import DropdownBase, { DropdownBaseProps } from '@digigov/react-core/DropdownBase';
 export * from '@digigov/react-core/DropdownButton';
 export * from '@digigov/react-core/DropdownContent';
-export * from '@digigov/react-core/DropdownArrowDown';
 export interface DropdownProps extends DropdownBaseProps {
     /**
      * Use closeBehaviour to set the way that the Dropdown will close.

package/navigation/Dropdown/index.js

@@ -55,20 +55,6 @@ Object.keys(_DropdownContent).forEach(function (key) {
     }
   });
 });
-
-var _DropdownArrowDown = require("@digigov/react-core/DropdownArrowDown");
-
-Object.keys(_DropdownArrowDown).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _DropdownArrowDown[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _DropdownArrowDown[key];
-    }
-  });
-});
 var _excluded = ["closeBehaviour", "float"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }

package/navigation/Dropdown/index.mdx

@@ -11,34 +11,20 @@ import Dropdown from '@digigov/ui/navigation/Dropdown';
 
 ## How to use
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Dropdown"
-  story="Default.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Dropdown" story="Default.tsx" />
 
 ### Dropdown with align right
 
 You can display the dropdown menu to the right side of the `Dropdown` button.
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Dropdown"
-  story="AlignRight.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Dropdown" story="AlignRight.tsx" />
 
 ### Dropdown with placement top
 
 You can display the dropdown menu to the top of the `Dropdown` button.
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Dropdown"
-  story="PlacementTop.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Dropdown" story="PlacementTop.tsx" />
 
-You can read more about the accessibility patterns used in our Dropdown
-implementation in the ARIA Authoring Practices Guide (APG) at
 
 ## API
 

package/navigation/Link/index.mdx

@@ -11,43 +11,25 @@ import Link from '@digigov/ui/navigation/Link';
 
 ### Default
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Link"
-  story="Default.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Link" story="Default.tsx" />
 
 ### No Underline
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Link"
-  story="NoUnderline.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Link"story="NoUnderline.tsx" />
 
 ### Opens in a new tab
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Link"
-  story="OpensInNewTab.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Link" story="OpensInNewTab.tsx" />
 
 ### At dark background
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Link"
-  story="DarkBackground.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Link" story="DarkBackground.tsx" />
 
 ### At dark background and no underline
 
-<Story
-  packageName="@digigov/ui"
-  component="navigation/Link"
-  story="DarkBackgroundNoUnderline.tsx"
-/>
+<Story packageName="@digigov/ui" component="navigation/Link" story="DarkBackgroundNoUnderline.tsx" />
+
+### Accessibility
 
 You can read more about the accessibility patterns used in our Link
 implementation in the ARIA Authoring Practices Guide (APG) at

package/navigation/NavList/NavList.stories.playwright.json

@@ -8,7 +8,7 @@
             {
               "name": "hover",
               "args": {
-                "selector": "html>body>div:nth-child(5)>nav>ul>li:nth-child(3)>button"
+                "selector": "html>body>div:nth-child(5)>nav>ul>li:nth-child(2)>button"
               }
             }
           ],
@@ -20,7 +20,7 @@
             {
               "name": "click",
               "args": {
-                "selector": "html>body>div:nth-child(5)>nav>ul>li:nth-child(3)>button"
+                "selector": "html>body>div:nth-child(5)>nav>ul>li:nth-child(2)>button"
               }
             }
           ],

package/navigation/NavList/NavListAuto/index.js

@@ -0,0 +1,80 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.NavListAuto = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _useNavList2 = require("../hooks/useNavList");
+
+var _NavListItemAction = _interopRequireDefault(require("@digigov/react-core/NavListItemAction"));
+
+var _Link = require("@digigov/ui/navigation/Link");
+
+var _Nav = _interopRequireDefault(require("../Nav"));
+
+var _NavList = _interopRequireDefault(require("@digigov/react-core/NavList"));
+
+var _NavMenuContainer = _interopRequireDefault(require("@digigov/react-core/NavMenuContainer"));
+
+var _NavMenuContent = _interopRequireDefault(require("@digigov/react-core/NavMenuContent"));
+
+var _NavMenuContentList = _interopRequireDefault(require("@digigov/ui/navigation/NavList/NavMenuContentList"));
+
+var _NavMenuContentListItem = _interopRequireDefault(require("@digigov/react-core/NavMenuContentListItem"));
+
+var _NavMenuTitle = _interopRequireDefault(require("@digigov/react-core/NavMenuTitle"));
+
+var _excluded = ["layout", "border", "fixed", "links"];
+
+var NavListAuto = function NavListAuto(_ref) {
+  var layout = _ref.layout,
+      border = _ref.border,
+      fixed = _ref.fixed,
+      _ref$links = _ref.links,
+      links = _ref$links === void 0 ? [] : _ref$links,
+      props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+
+  var _useNavList = (0, _useNavList2.useNavList)(),
+      registerNavItemMenu = _useNavList.registerNavItemMenu,
+      registerNavItem = _useNavList.registerNavItem;
+
+  return /*#__PURE__*/_react["default"].createElement(_Nav["default"], (0, _extends2["default"])({
+    open: true,
+    border: border,
+    fixed: fixed
+  }, props), /*#__PURE__*/_react["default"].createElement(_NavList["default"], {
+    layout: layout
+  }, links.map(function (item, key) {
+    var _item$menu, _item$menu2, _item$menu$links;
+
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
+      key: key
+    }, /*#__PURE__*/_react["default"].createElement(_NavListItemAction["default"], registerNavItem(item), item.label), item.menu && /*#__PURE__*/_react["default"].createElement(_NavMenuContainer["default"], (0, _extends2["default"])({
+      layout: layout
+    }, registerNavItemMenu(item.name)), ((_item$menu = item.menu) === null || _item$menu === void 0 ? void 0 : _item$menu.title) && /*#__PURE__*/_react["default"].createElement(_NavMenuTitle["default"], null, (_item$menu2 = item.menu) === null || _item$menu2 === void 0 ? void 0 : _item$menu2.title), /*#__PURE__*/_react["default"].createElement(_NavMenuContent["default"], null, /*#__PURE__*/_react["default"].createElement(_NavMenuContentList["default"], {
+      role: "menu"
+    }, (_item$menu$links = item.menu.links) === null || _item$menu$links === void 0 ? void 0 : _item$menu$links.map(function (subMenu, menuIndex) {
+      return (subMenu === null || subMenu === void 0 ? void 0 : subMenu.href) && /*#__PURE__*/_react["default"].createElement(_NavMenuContentListItem["default"], {
+        key: menuIndex,
+        role: "presentation"
+      }, /*#__PURE__*/_react["default"].createElement(_Link.Link, {
+        role: "menuitem",
+        id: subMenu.name,
+        href: subMenu.href
+      }, subMenu.label));
+    })))));
+  })));
+};
+
+exports.NavListAuto = NavListAuto;
+var _default = NavListAuto;
+exports["default"] = _default;

package/navigation/NavList/NavMenuContentList.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { NavMenuContentListProps } from '@digigov/react-core/NavMenuContentListBase';
+export * from '@digigov/react-core/NavMenuContentListBase';
+export declare const NavMenuContentList: React.FC<NavMenuContentListProps>;
+export default NavMenuContentList;

package/navigation/NavList/{NavMenuContainerContentList.js → NavMenuContentList.js}

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  NavMenuContainerContentList: true
+  NavMenuContentList: true
 };
-exports["default"] = exports.NavMenuContainerContentList = void 0;
+exports["default"] = exports.NavMenuContentList = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -18,16 +18,16 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireDefault(require("react"));
 
-var _NavMenuContainerContentList = _interopRequireWildcard(require("@digigov/react-core/NavMenuContainerContentList"));
+var _NavMenuContentListBase = _interopRequireWildcard(require("@digigov/react-core/NavMenuContentListBase"));
 
-Object.keys(_NavMenuContainerContentList).forEach(function (key) {
+Object.keys(_NavMenuContentListBase).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _NavMenuContainerContentList[key]) return;
+  if (key in exports && exports[key] === _NavMenuContentListBase[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _NavMenuContainerContentList[key];
+      return _NavMenuContentListBase[key];
     }
   });
 });
@@ -72,10 +72,10 @@ var focusNavListItem = function focusNavListItem(e, nextItemIndex) {
   }
 };
 
-var NavMenuContainerContentList = function NavMenuContainerContentList(_ref) {
+var NavMenuContentList = function NavMenuContentList(_ref) {
   var children = _ref.children,
       props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  return /*#__PURE__*/_react["default"].createElement(_NavMenuContainerContentList["default"], (0, _extends2["default"])({}, props, {
+  return /*#__PURE__*/_react["default"].createElement(_NavMenuContentListBase["default"], (0, _extends2["default"])({}, props, {
     onKeyDown: function onKeyDown(event) {
       switch (event.key) {
         case 'ArrowDown':
@@ -95,6 +95,6 @@ var NavMenuContainerContentList = function NavMenuContainerContentList(_ref) {
   }), children);
 };
 
-exports.NavMenuContainerContentList = NavMenuContainerContentList;
-var _default = NavMenuContainerContentList;
+exports.NavMenuContentList = NavMenuContentList;
+var _default = NavMenuContentList;
 exports["default"] = _default;

package/navigation/NavList/__stories__/Default.js

@@ -11,9 +11,9 @@ exports["default"] = exports.Default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _NavList = _interopRequireWildcard(require("@digigov/ui/navigation/NavList"));
+var _NavList = require("@digigov/ui/navigation/NavList");
 
 var _Link = require("@digigov/ui/navigation/Link");
 
@@ -60,42 +60,26 @@ var Default = function Default() {
   var border = false;
 
   var _useNavList = (0, _NavList.useNavList)(),
-      container = _useNavList.container,
-      registerButton = _useNavList.registerButton,
-      registerLink = _useNavList.registerLink;
-
-  var setRegisterButton = function setRegisterButton(name) {
-    return (0, _extends2["default"])({}, registerButton(name));
-  };
-
-  var setRegisterLink = function setRegisterLink(name) {
-    return (0, _extends2["default"])({}, registerLink(name));
-  };
+      registerNavItemMenu = _useNavList.registerNavItemMenu,
+      registerNavItem = _useNavList.registerNavItem;
 
   return /*#__PURE__*/_react["default"].createElement(_NavList.Nav, {
     open: true,
-    layout: layout,
     border: border,
     "aria-orientation": layout
-  }, /*#__PURE__*/_react["default"].createElement(_NavList["default"], null, links.map(function (item, key) {
+  }, /*#__PURE__*/_react["default"].createElement(_NavList.NavList, {
+    layout: layout
+  }, links.map(function (item, key) {
     var _item$subMenu;
 
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
+    return /*#__PURE__*/_react["default"].createElement(_react.Fragment, {
       key: key
-    }, /*#__PURE__*/_react["default"].createElement(_NavList.NavListItem, {
-      link: item,
-      setRegisterButton: setRegisterButton,
-      setRegisterLink: setRegisterLink
-    }), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenu, (0, _extends2["default"])({
+    }, /*#__PURE__*/_react["default"].createElement(_NavList.NavListItemAction, registerNavItem(item), item.label), item.subMenu && /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainer, (0, _extends2["default"])({
       layout: layout
-    }, container(item.name)), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainer, {
-      layout: layout,
-      paddingLeft: 5,
-      paddingRight: 5
-    }, /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerTitle, null, item.label), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerContent, null, /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerContentList, {
+    }, registerNavItemMenu(item.name)), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuTitle, null, item.label), /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContent, null, /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContentList, {
       role: "menu"
     }, (_item$subMenu = item.subMenu) === null || _item$subMenu === void 0 ? void 0 : _item$subMenu.map(function (subMenu, menuIndex) {
-      return (0, _NavList.isNavListItemLinkInterface)(subMenu) && /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContainerContentListItem, {
+      return (subMenu === null || subMenu === void 0 ? void 0 : subMenu.href) && /*#__PURE__*/_react["default"].createElement(_NavList.NavMenuContentListItem, {
         key: menuIndex,
         role: "presentation"
       }, /*#__PURE__*/_react["default"].createElement(_Link.Link, {
@@ -103,7 +87,7 @@ var Default = function Default() {
         id: subMenu.name,
         href: subMenu.href
       }, subMenu.label));
-    }))))));
+    })))));
   })));
 };