@digigov/ui 1.0.0-6b93ebf2 → 1.0.0-871b6be5

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

@@ -1,31 +1,31 @@
 {
   "version": "4",
   "stories": {
-    "digigov-ui-navigation-navlist--default": {
+    "digigov-ui-navigation-navlist--with-sub-menu": {
       "actionSets": [
         {
           "actions": [
             {
               "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"
               }
             }
           ],
-          "id": "dHQxEQCIJ4bJ",
-          "title": "Hover item"
+          "id": "FO0jt9D4koTE",
+          "title": "Hover Item"
         },
         {
           "actions": [
             {
               "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"
               }
             }
           ],
-          "id": "WMfgyO3E_9S_",
-          "title": "Open sub menu"
+          "id": "pSAeXNWiklxX",
+          "title": "Open submenu"
         }
       ]
     }

package/src/navigation/NavList/NavListAuto/index.tsx

@@ -0,0 +1,68 @@
+import React from 'react';
+import { NavListAutoProps } from '@digigov/ui/navigation/NavList/types';
+import { useNavList } from '../hooks/useNavList';
+import NavListItemAction from '@digigov/react-core/NavListItemAction';
+import { Link } from '@digigov/ui/navigation/Link';
+import Nav from '../Nav';
+import NavList from '@digigov/react-core/NavList';
+import NavMenuContainer from '@digigov/react-core/NavMenuContainer';
+import NavMenuContent from '@digigov/react-core/NavMenuContent';
+import NavMenuContentList from '@digigov/ui/navigation/NavList/NavMenuContentList';
+import NavMenuContentListItem from '@digigov/react-core/NavMenuContentListItem';
+import NavMenuTitle from '@digigov/react-core/NavMenuTitle';
+
+export const NavListAuto: React.FC<NavListAutoProps> = ({
+  layout,
+  border,
+  fixed,
+  links = [],
+  ...props
+}) => {
+  const { registerNavItemMenu, registerNavItem } = useNavList();
+  return (
+    <Nav open={true} border={border} fixed={fixed} {...props}>
+      <NavList layout={layout}>
+        {links.map((item, key) => (
+          <React.Fragment key={key}>
+            <NavListItemAction {...registerNavItem(item)}>
+              {item.label}
+            </NavListItemAction>
+            {item.menu && (
+              <NavMenuContainer
+                layout={layout}
+                {...registerNavItemMenu(item.name)}
+              >
+                    {item.menu?.title && <NavMenuTitle>{item.menu?.title}</NavMenuTitle>}
+                    <NavMenuContent>
+                      <NavMenuContentList role="menu">
+                        {item.menu.links?.map((subMenu, menuIndex) => {
+                          return (
+                            subMenu?.href && (
+                              <NavMenuContentListItem
+                                key={menuIndex}
+                                role="presentation"
+                              >
+                                <Link
+                                  role="menuitem"
+                                  id={subMenu.name}
+                                  href={subMenu.href}
+                                >
+                                  {subMenu.label}
+                                </Link>
+                              </NavMenuContentListItem>
+                            )
+                          );
+                        })}
+                      </NavMenuContentList>
+                    </NavMenuContent>
+                
+              </NavMenuContainer>
+            )}
+          </React.Fragment>
+        ))}
+      </NavList>
+    </Nav>
+  );
+};
+
+export default NavListAuto;

package/src/navigation/NavList/{NavMenuContainerContentList.tsx → NavMenuContentList.tsx}

@@ -1,8 +1,8 @@
 import React from 'react';
-import NavMenuContainerContentListWrapper, {
-  NavMenuContainerContentListProps,
-} from '@digigov/react-core/NavMenuContainerContentList';
-export * from '@digigov/react-core/NavMenuContainerContentList';
+import NavMenuContentListBase, {
+  NavMenuContentListProps,
+} from '@digigov/react-core/NavMenuContentListBase';
+export * from '@digigov/react-core/NavMenuContentListBase';
 
 const focusNavListItem = (e, nextItemIndex) => {
   e.preventDefault();
@@ -33,12 +33,12 @@ const focusNavListItem = (e, nextItemIndex) => {
   }
 };
 
-export const NavMenuContainerContentList: React.FC<NavMenuContainerContentListProps> = ({
+export const NavMenuContentList: React.FC<NavMenuContentListProps> = ({
   children,
   ...props
 }) => {
   return (
-    <NavMenuContainerContentListWrapper
+    <NavMenuContentListBase
       {...props}
       onKeyDown={(event) => {
         switch (event.key) {
@@ -56,8 +56,8 @@ export const NavMenuContainerContentList: React.FC<NavMenuContainerContentListPr
       }}
     >
       {children}
-    </NavMenuContainerContentListWrapper>
+    </NavMenuContentListBase>
   );
 };
 
-export default NavMenuContainerContentList;
+export default NavMenuContentList;

package/src/navigation/NavList/__stories__/Default.tsx

@@ -1,109 +1,33 @@
 import React from 'react';
-import NavList, {
-  isNavListItemLinkInterface,
+import {
   Nav,
-  NavListItem,
-  NavMenu,
-  NavMenuContainer,
-  NavMenuContainerContent,
-  NavMenuContainerContentList,
-  NavMenuContainerContentListItem,
-  NavMenuContainerTitle,
+  NavList,
+  NavListItemAction,
   useNavList
 } from '@digigov/ui/navigation/NavList';
-import { Link } from '@digigov/ui/navigation/Link';
 
 const links = [
-  { name: 'home', href: '#home', label: 'Αρχική' },
-  {
-    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: 'Άλλα κείμενα',
-      },
-    ],
-  },
+  { name: 'home', href: '#home', label: 'Αρχική', active: true },
+  { name: 'new_form', href: '#new_form', label: 'Καταχώριση φόρμας' },
   { name: 'news', href: '#news', label: 'Νέα' },
+  { name: 'contact', href: '#contact', label: 'Επικοινωνία' },
 ];
 
 export const Default = () => {
-  const layout = 'horizontal';
-  const border = false;
-  const { container, registerButton, registerLink } = useNavList();
-
-  const setRegisterButton = (name: string) => {
-    return { ...registerButton(name) };
-  };
-
-  const setRegisterLink = (name: string) => {
-    return { ...registerLink(name) };
-  };
+  const { registerNavItem } = useNavList();
 
   return (
-    <Nav open={true} layout={layout} border={border} aria-orientation={layout}>
+    <Nav
+      role="menubar"
+      aria-orientation="horizontal"
+      aria-label="Nav list"
+      fixed={false}
+    >
       <NavList>
         {links.map((item, key) => (
-          <React.Fragment key={key}>
-            <NavListItem
-              link={item}
-              setRegisterButton={setRegisterButton}
-              setRegisterLink={setRegisterLink}
-            />
-            <NavMenu layout={layout} {...container(item.name)}>
-              <NavMenuContainer
-                layout={layout}
-                paddingLeft={5}
-                paddingRight={5}
-              >
-                <NavMenuContainerTitle>{item.label}</NavMenuContainerTitle>
-                <NavMenuContainerContent>
-                  <NavMenuContainerContentList role="menu">
-                    {item.subMenu?.map((subMenu, menuIndex) => {
-                      return (
-                        isNavListItemLinkInterface(subMenu) && (
-                          <NavMenuContainerContentListItem
-                            key={menuIndex}
-                            role="presentation"
-                          >
-                            <Link
-                              role="menuitem"
-                              id={subMenu.name}
-                              href={subMenu.href}
-                            >
-                              {subMenu.label}
-                            </Link>
-                          </NavMenuContainerContentListItem>
-                        )
-                      );
-                    })}
-                  </NavMenuContainerContentList>
-                </NavMenuContainerContent>
-              </NavMenuContainer>
-            </NavMenu>
-          </React.Fragment>
+          <NavListItemAction key={key} {...registerNavItem(item)} active={item?.active}>
+            {item.label}
+          </NavListItemAction>
         ))}
       </NavList>
     </Nav>

package/src/navigation/NavList/__stories__/NavVertical.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import {
+  Nav,
+  NavList,
+  NavListItemAction,
+  useNavList
+} from '@digigov/ui/navigation/NavList';
+
+const links = [
+  { name: 'link_1', href: '#link_1', label: 'Σύνδεσμος 1', active: true },
+  { name: 'link_2', href: '#link_2', label: 'Σύνδεσμος 2' },
+  { name: 'link_3', href: '#link_3', label: 'Σύνδεσμος 3' },
+];
+
+export const NavVertical = () => {
+  const { registerNavItem } = useNavList();
+
+  return (
+    <Nav
+      aria-orientation="vertical"
+      aria-label="Nav list"
+      fixed={false}
+      border={false}
+    >
+      <NavList layout="vertical">
+        {links.map((item, key) => (
+          <NavListItemAction key={key} {...registerNavItem(item)} active={item?.active} >
+            {item.label}
+          </NavListItemAction>
+        ))}
+      </NavList>
+    </Nav>
+  );
+};
+
+export default NavVertical;

package/src/navigation/NavList/__stories__/NavVerticalLayout.tsx

@@ -1,15 +1,14 @@
 import React from 'react';
 import Link from '@digigov/ui/navigation/Link';
-import NavList, {
-  isNavListItemLinkInterface,
+import {
   Nav,
-  NavListItem,
-  NavMenu,
+  NavList,
+  NavListItemAction,
   NavMenuContainer,
-  NavMenuContainerContent,
-  NavMenuContainerContentList,
-  NavMenuContainerContentListItem,
-  NavMenuContainerTitle,
+  NavMenuContent,
+  NavMenuContentList,
+  NavMenuContentListItem,
+  NavMenuTitle,
 } from '@digigov/ui/navigation/NavList';
 import { useNavList } from '@digigov/ui/navigation/NavList/hooks/useNavList';
 
@@ -53,41 +52,34 @@ const links = [
 export const NavVerticalLayout = () => {
   const layout = 'vertical';
   const border = false;
-  const { container, registerButton, registerLink } = useNavList();
+  const { registerNavItemMenu, registerNavItem } = useNavList();
 
-  const setRegisterButton = (name: string) => {
-    return { ...registerButton(name) };
-  };
 
-  const setRegisterLink = (name: string) => {
-    return { ...registerLink(name) };
-  };
 
   return (
-    <Nav open={true} layout={layout} border={border}>
-      <NavList>
+    <Nav open={true}  border={border}>
+      <NavList layout={layout}>
         {links.map((item, key) => (
           <React.Fragment key={key}>
-            <NavListItem
-              link={item}
-              setRegisterButton={setRegisterButton}
-              setRegisterLink={setRegisterLink}
-            />
-            <NavMenu layout={layout} {...container(item.name)}>
+            <NavListItemAction {...registerNavItem(item)} >
+              {item.label}
+            </NavListItemAction>
+            {item.subMenu &&
               <NavMenuContainer
                 layout={layout}
                 paddingLeft={5}
                 paddingRight={5}
+                {...registerNavItemMenu(item.name)}
               >
-                <NavMenuContainerTitle>{item.label}</NavMenuContainerTitle>
-                <NavMenuContainerContent>
-                  <NavMenuContainerContentList role="menu">
+                <NavMenuTitle>{item.label}</NavMenuTitle>
+                <NavMenuContent>
+                  <NavMenuContentList role="menu">
                     {item.subMenu?.map((subMenu, menuIndex) => {
                       return (
-                        isNavListItemLinkInterface(subMenu) && (
-                          <NavMenuContainerContentListItem
-                            role="presentation"
+                        subMenu?.href && (
+                          <NavMenuContentListItem
                             key={menuIndex}
+                            role="presentation"
                           >
                             <Link
                               role="menuitem"
@@ -96,14 +88,14 @@ export const NavVerticalLayout = () => {
                             >
                               {subMenu.label}
                             </Link>
-                          </NavMenuContainerContentListItem>
+                          </NavMenuContentListItem>
                         )
                       );
                     })}
-                  </NavMenuContainerContentList>
-                </NavMenuContainerContent>
+                  </NavMenuContentList>
+                </NavMenuContent>
               </NavMenuContainer>
-            </NavMenu>
+            }
           </React.Fragment>
         ))}
       </NavList>

package/src/navigation/NavList/__stories__/NavVerticalWithTitle.tsx

@@ -0,0 +1,40 @@
+import React from 'react';
+import {
+  Nav,
+  NavList,
+  NavListItemAction,
+  useNavList
+} from '@digigov/ui/navigation/NavList';
+import { Heading } from '@digigov/ui/typography/Heading';
+
+const links = [
+  { name: 'link_1', href: '#link_1', label: 'Σύνδεσμος 1', active: true },
+  { name: 'link_2', href: '#link_2', label: 'Σύνδεσμος 2' },
+  { name: 'link_3', href: '#link_3', label: 'Σύνδεσμος 3' },
+];
+
+export const NavVerticalWithTitle = () => {
+  const { registerNavItem } = useNavList();
+
+  return (
+    <div>
+      <Heading size='sm'>Σχετικοί Σύνδεσμοι</Heading>
+      <Nav
+        aria-orientation="vertical"
+        aria-label="Nav list"
+        fixed={false}
+        border={false}
+      >
+        <NavList layout="vertical">
+          {links.map((item, key) => (
+            <NavListItemAction key={key} {...registerNavItem(item)} active={item?.active} >
+              {item.label}
+            </NavListItemAction>
+          ))}
+        </NavList>
+      </Nav>
+    </div>
+  );
+};
+
+export default NavVerticalWithTitle;

package/src/navigation/NavList/__stories__/WithBurgerIcon.tsx

@@ -0,0 +1,49 @@
+import React, { useState } from 'react';
+import NavList from '@digigov/ui/navigation/NavList/NavList';
+import { BurgerIcon } from '@digigov/ui/icons';
+import {
+  Nav, NavListItemAction,
+} from '@digigov/ui/navigation/NavList';
+import { useNavList } from '@digigov/ui/navigation/NavList/hooks/useNavList';
+
+const links = [
+  { name: 'home', href: '#home', label: 'Αρχική', active: true },
+  { name: 'new_form', href: '#new_form', label: 'Καταχώριση φόρμας' },
+  { name: 'news', href: '#news', label: 'Νέα' },
+  { name: 'contact', href: '#contact', label: 'Επικοινωνία' },
+];
+
+export const WithBurgerIcon = () => {
+  const { registerNavItem } = useNavList();
+  const [open, setOpen] = useState<boolean>(true);
+
+  return (
+    <div>
+      <BurgerIcon
+        mdUpHidden
+        size="lg"
+        onClick={() => {
+          setOpen(!open)
+        }}
+      />
+      <Nav
+        role="menubar"
+        aria-orientation="horizontal"
+        aria-label="Nav list"
+        fixed={false}
+        border={false}
+        open={open}
+      >
+        <NavList>
+          {links.map((item, key) => (
+            <NavListItemAction key={key} {...registerNavItem(item)} active={item?.active} >
+              {item.label}
+            </NavListItemAction>
+          ))}
+        </NavList>
+      </Nav>
+    </div>
+  );
+};
+
+export default WithBurgerIcon;

package/src/navigation/NavList/__stories__/WithSubMenu.tsx

@@ -0,0 +1,101 @@
+import React, { Fragment } from 'react';
+import {
+  Nav,
+  NavList,
+  NavListItemAction,
+  NavMenuContainer,
+  NavMenuContent,
+  NavMenuContentList,
+  NavMenuContentListItem,
+  NavMenuTitle,
+  useNavList
+} from '@digigov/ui/navigation/NavList';
+import { Link } from '@digigov/ui/navigation/Link';
+
+const links = [
+  { name: 'home', href: '#home', label: 'Αρχική' },
+  {
+    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: 'Άλλα κείμενα',
+      },
+    ],
+  },
+  { name: 'news', href: '#news', label: 'Νέα' },
+];
+
+
+export const WithSubMenu = () => {
+  const layout = 'horizontal';
+  const border = false;
+  const { registerNavItemMenu, registerNavItem } = useNavList();
+  return (
+    <Nav open={true} border={border} aria-orientation={layout}>
+      <NavList layout={layout}>
+        {links.map((item, key) => (
+          <Fragment key={key}>
+            <NavListItemAction {...registerNavItem(item)} >
+              {item.label}
+            </NavListItemAction>
+            {item.subMenu &&
+              <NavMenuContainer
+                layout={layout}
+                {...registerNavItemMenu(item.name)}
+              >
+                <NavMenuTitle>{item.label}</NavMenuTitle>
+                <NavMenuContent>
+                  <NavMenuContentList role="menu">
+                    {item.subMenu?.map((subMenu, menuIndex) => {
+                      return (
+                        subMenu?.href && (
+                          <NavMenuContentListItem
+                            key={menuIndex}
+                            role="presentation"
+                          >
+                            <Link
+                              role="menuitem"
+                              id={subMenu.name}
+                              href={subMenu.href}
+                            >
+                              {subMenu.label}
+                            </Link>
+                          </NavMenuContentListItem>
+                        )
+                      );
+                    })}
+                  </NavMenuContentList>
+                </NavMenuContent>
+              </NavMenuContainer>
+            }
+          </Fragment>
+        ))}
+      </NavList>
+    </Nav>
+  );
+};
+
+export default WithSubMenu;

package/src/navigation/NavList/hooks/useNavList.ts

@@ -5,7 +5,7 @@ import {
 } from '@digigov/ui/navigation/NavList/hooks/useTogglableNav';
 
 export interface UseNavListReturn extends UseTogglableNavReturn {
-  container: (key: string) => { active: boolean; id: string };
+  registerNavItemMenu: (key: string) => { active: boolean; id: string };
 }
 export const useNavList = (): UseNavListReturn => {
   const registeredContainers = useRef({});
@@ -18,7 +18,7 @@ export const useNavList = (): UseNavListReturn => {
     onToggleProperty: 'onClick',
     ariaNavigation: true,
   });
-  const container = useCallback(
+  const registerNavItemMenu = useCallback(
     (key: string) => {
       return {
         ref: (el) => {
@@ -32,5 +32,5 @@ export const useNavList = (): UseNavListReturn => {
     },
     [opened]
   );
-  return { registerButton, registerLink, opened, container, ...rest };
+  return { registerButton, registerLink, opened, registerNavItemMenu, ...rest };
 };