@conduction/components 1.0.24 → 1.0.28

package/lib/components/card/imageAndDetailsCard/ImageAndDetailsCard.module.css

@@ -26,7 +26,6 @@
     100% - var(--conduction-image-and-details-card-image-height) -
       var(--nlportal-space-block-lg) - var(--nlportal-space-block-lg) - 2px
   ); /* height = 100% - imageHeight - padding - border */
-  margin-block-start: auto;
 }
 
 .content > *:not(:last-child) {
@@ -56,4 +55,5 @@
 .link {
   display: flex;
   justify-content: flex-end;
+  margin-block-start: auto;
 }

package/lib/components/topNav/TopNav.module.css

@@ -69,3 +69,7 @@
 .secondary .li:hover {
   background-color: var(--conduction-top-nav-background-color-secondary-hover);
 }
+
+.secondary .link a {
+  text-decoration: none;
+}

package/lib/components/topNav/index.d.ts

@@ -0,0 +1,3 @@
+import { PrimaryTopNav } from "./primaryTopNav/PrimaryTopNav";
+import { SecondaryTopNav } from "./secondaryTopNav/SecondaryTopNav";
+export { PrimaryTopNav, SecondaryTopNav };

package/lib/components/topNav/index.js

@@ -0,0 +1,3 @@
+import { PrimaryTopNav } from "./primaryTopNav/PrimaryTopNav";
+import { SecondaryTopNav } from "./secondaryTopNav/SecondaryTopNav";
+export { PrimaryTopNav, SecondaryTopNav };

package/lib/components/topNav/primaryTopNav/PrimaryTopNav.d.ts

@@ -0,0 +1,17 @@
+import * as React from "react";
+interface ITopNavItem {
+    label: string;
+    icon?: JSX.Element;
+    handleClick?: () => any;
+    subItems?: {
+        label: string;
+        icon?: JSX.Element;
+        handleClick?: () => any;
+    }[];
+}
+export interface TopNavProps {
+    items: ITopNavItem[];
+    layoutClassName?: string;
+}
+export declare const PrimaryTopNav: React.FC<TopNavProps>;
+export {};

package/lib/components/topNav/primaryTopNav/PrimaryTopNav.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Link } from "@gemeente-denhaag/components-react";
+import * as styles from "./PrimaryTopNav.module.css";
+import clsx from "clsx";
+export const PrimaryTopNav = ({ items, layoutClassName }) => {
+    return (_jsx("div", { className: clsx(styles.primary, layoutClassName && layoutClassName), children: _jsx("nav", { className: styles.primary, children: _jsx("ul", { className: styles.ul, children: items.map(({ label, icon, handleClick, subItems }, idx) => (_jsxs("li", { className: styles.li, children: [_jsx("div", { onClick: handleClick, children: _jsx(Link, { className: styles.link, icon: icon, iconAlign: "start", children: label }) }), subItems && (_jsx("ul", { className: styles.dropdown, children: subItems.map(({ label, icon, handleClick }, idx) => (_jsx("li", { className: styles.li, onClick: handleClick, children: _jsx(Link, { className: styles.link, icon: icon, iconAlign: "start", children: label }) }, idx))) }))] }, idx))) }) }) }));
+};

package/lib/components/topNav/primaryTopNav/PrimaryTopNav.module.css

@@ -0,0 +1,60 @@
+:root {
+  --conduction-top-nav-space-inline-lg: 1.25rem;
+
+  --conduction-top-nav-color-primary: #ffffff;
+  --conduction-top-nav-background-color-primary: #0b71a1;
+  --conduction-top-nav-background-color-primary-hover: rgba(255, 255, 255, 0.2);
+}
+
+.primary:hover {
+  cursor: pointer;
+}
+
+.ul {
+  margin: unset;
+  display: flex;
+  padding-inline-start: unset;
+  align-items: center;
+}
+
+.li {
+  list-style-type: none;
+  display: block;
+  position: relative;
+}
+
+.primary {
+  font-weight: 500;
+  width: fit-content;
+  background-color: var(--conduction-top-nav-background-color-primary);
+}
+
+.primary .link {
+  display: block;
+  color: var(--conduction-top-nav-color-primary);
+  padding-inline-start: var(--conduction-top-nav-space-inline-lg);
+  padding-inline-end: var(--conduction-top-nav-space-inline-lg);
+  padding-block-start: var(--conduction-top-nav-space-inline-lg);
+  padding-block-end: var(--conduction-top-nav-space-inline-lg);
+}
+
+.primary .li:hover {
+  background-color: var(--conduction-top-nav-background-color-primary-hover);
+}
+
+.primary .li:hover .dropdown {
+  display: block;
+  z-index: 1;
+}
+
+.dropdown {
+  left: 0;
+  padding: 0;
+  width: 100%;
+  display: none;
+  position: absolute;
+  list-style-type: none;
+  background-color: var(--conduction-top-nav-background-color-primary);
+  border-bottom-right-radius: var(--nlportal-border-radius);
+  border-bottom-left-radius: var(--nlportal-border-radius);
+}

package/lib/components/topNav/secondaryTopNav/SecondaryTopNav.d.ts

@@ -0,0 +1,11 @@
+import * as React from "react";
+interface TopNavProps {
+    items: {
+        label: string;
+        icon?: JSX.Element;
+        handleClick: () => any;
+    }[];
+    layoutClassName?: string;
+}
+export declare const SecondaryTopNav: React.FC<TopNavProps>;
+export {};

package/lib/components/topNav/secondaryTopNav/SecondaryTopNav.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as styles from "./SecondaryTopnav.module.css";
+import { Link } from "@gemeente-denhaag/components-react";
+import clsx from "clsx";
+export const SecondaryTopNav = ({ items, layoutClassName }) => {
+    return (_jsx("div", { className: clsx(styles.secondary, layoutClassName && layoutClassName), children: _jsx("nav", { children: _jsx("ul", { className: styles.ul, children: items.map(({ label, icon, handleClick }, idx) => (_jsx("li", { className: styles.li, onClick: handleClick, children: _jsx(Link, { className: styles.link, icon: icon, iconAlign: "start", children: label }) }, idx))) }) }) }));
+};

package/{src/components/topNav/TopNav.module.css → lib/components/topNav/secondaryTopNav/SecondaryTopNav.module.css}

@@ -1,20 +1,12 @@
 :root {
   --conduction-top-nav-space-inline-lg: 1.25rem;
 
-  --conduction-top-nav-color-primary: #ffffff;
-  --conduction-top-nav-background-color-primary: #0b71a1;
-  --conduction-top-nav-background-color-primary-hover: rgba(255, 255, 255, 0.2);
-
   --conduction-top-nav-font-size-secondary: 16px;
   --conduction-top-nav-color-secondary: #ffffff;
   --conduction-top-nav-background-color-secondary: #084f70;
   --conduction-top-nav-background-color-secondary-hover: rgba(0, 0, 0, 0.2);
 }
 
-/*
- * Global
-*/
-.primary:hover,
 .secondary:hover {
   cursor: pointer;
 }
@@ -35,26 +27,6 @@
   padding-block-end: var(--conduction-top-nav-space-inline-lg);
 }
 
-/* 
- * Primary Top Navigation
-*/
-.primary {
-  font-weight: 500;
-  width: fit-content;
-  background-color: var(--conduction-top-nav-background-color-primary);
-}
-
-.primary .link {
-  color: var(--conduction-top-nav-color-primary);
-}
-
-.primary .li:hover {
-  background-color: var(--conduction-top-nav-background-color-primary-hover);
-}
-
-/* 
- * Secondary Top Navigation
-*/
 .secondary {
   font-weight: 100;
   width: fit-content;

package/lib/index.d.ts

@@ -9,7 +9,7 @@ import { AuthenticatedLogo, UnauthenticatedLogo } from "./components/logo/Logo";
 import { MetaIcon } from "./components/metaIcon/MetaIcon";
 import { PrivateRoute } from "./components/privateRoute/PrivateRoute";
 import { StatusSteps } from "./components/statusSteps/StatusSteps";
-import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav/TopNav";
+import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav";
 import { Tag } from "./components/tag/Tag";
 declare const NotificationPopUp: {
     controller: () => {

package/lib/index.js

@@ -8,7 +8,7 @@ import { AuthenticatedLogo, UnauthenticatedLogo } from "./components/logo/Logo";
 import { MetaIcon } from "./components/metaIcon/MetaIcon";
 import { PrivateRoute } from "./components/privateRoute/PrivateRoute";
 import { StatusSteps } from "./components/statusSteps/StatusSteps";
-import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav/TopNav";
+import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav";
 import { Tag } from "./components/tag/Tag";
 import { NotificationPopUpController, NotificationPopUp as _NotificationPopUp, } from "./components/notificationPopUp/NotificationPopUp";
 const NotificationPopUp = { controller: NotificationPopUpController, NotificationPopUp: _NotificationPopUp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conduction/components",
-  "version": "1.0.24",
+  "version": "1.0.28",
   "description": "React (Gatsby) components used within the Conduction Skeleton Application (and its implementations)",
   "main": "lib/index.js",
   "scripts": {

package/src/components/card/imageAndDetailsCard/ImageAndDetailsCard.module.css

@@ -26,7 +26,6 @@
     100% - var(--conduction-image-and-details-card-image-height) -
       var(--nlportal-space-block-lg) - var(--nlportal-space-block-lg) - 2px
   ); /* height = 100% - imageHeight - padding - border */
-  margin-block-start: auto;
 }
 
 .content > *:not(:last-child) {
@@ -56,4 +55,5 @@
 .link {
   display: flex;
   justify-content: flex-end;
+  margin-block-start: auto;
 }

package/src/components/topNav/index.ts

@@ -0,0 +1,4 @@
+import { PrimaryTopNav } from "./primaryTopNav/PrimaryTopNav";
+import { SecondaryTopNav } from "./secondaryTopNav/SecondaryTopNav";
+
+export { PrimaryTopNav, SecondaryTopNav };

package/src/components/topNav/primaryTopNav/PrimaryTopNav.module.css

@@ -0,0 +1,60 @@
+:root {
+  --conduction-top-nav-space-inline-lg: 1.25rem;
+
+  --conduction-top-nav-color-primary: #ffffff;
+  --conduction-top-nav-background-color-primary: #0b71a1;
+  --conduction-top-nav-background-color-primary-hover: rgba(255, 255, 255, 0.2);
+}
+
+.primary:hover {
+  cursor: pointer;
+}
+
+.ul {
+  margin: unset;
+  display: flex;
+  padding-inline-start: unset;
+  align-items: center;
+}
+
+.li {
+  list-style-type: none;
+  display: block;
+  position: relative;
+}
+
+.primary {
+  font-weight: 500;
+  width: fit-content;
+  background-color: var(--conduction-top-nav-background-color-primary);
+}
+
+.primary .link {
+  display: block;
+  color: var(--conduction-top-nav-color-primary);
+  padding-inline-start: var(--conduction-top-nav-space-inline-lg);
+  padding-inline-end: var(--conduction-top-nav-space-inline-lg);
+  padding-block-start: var(--conduction-top-nav-space-inline-lg);
+  padding-block-end: var(--conduction-top-nav-space-inline-lg);
+}
+
+.primary .li:hover {
+  background-color: var(--conduction-top-nav-background-color-primary-hover);
+}
+
+.primary .li:hover .dropdown {
+  display: block;
+  z-index: 1;
+}
+
+.dropdown {
+  left: 0;
+  padding: 0;
+  width: 100%;
+  display: none;
+  position: absolute;
+  list-style-type: none;
+  background-color: var(--conduction-top-nav-background-color-primary);
+  border-bottom-right-radius: var(--nlportal-border-radius);
+  border-bottom-left-radius: var(--nlportal-border-radius);
+}

package/src/components/topNav/primaryTopNav/PrimaryTopNav.tsx

@@ -0,0 +1,52 @@
+import * as React from "react";
+import { Link } from "@gemeente-denhaag/components-react";
+import * as styles from "./PrimaryTopNav.module.css";
+import clsx from "clsx";
+
+interface ITopNavItem {
+  label: string;
+  icon?: JSX.Element;
+  handleClick?: () => any;
+  subItems?: {
+    label: string;
+    icon?: JSX.Element;
+    handleClick?: () => any;
+  }[];
+}
+
+export interface TopNavProps {
+  items: ITopNavItem[];
+  layoutClassName?: string;
+}
+
+export const PrimaryTopNav: React.FC<TopNavProps> = ({ items, layoutClassName }) => {
+  return (
+    <div className={clsx(styles.primary, layoutClassName && layoutClassName)}>
+      <nav className={styles.primary}>
+        <ul className={styles.ul}>
+          {items.map(({ label, icon, handleClick, subItems }, idx) => (
+            <li className={styles.li} key={idx}>
+              <div onClick={handleClick}>
+                <Link className={styles.link} icon={icon} iconAlign="start">
+                  {label}
+                </Link>
+              </div>
+
+              {subItems && (
+                <ul className={styles.dropdown}>
+                  {subItems.map(({ label, icon, handleClick }, idx) => (
+                    <li key={idx} className={styles.li} onClick={handleClick}>
+                      <Link className={styles.link} icon={icon} iconAlign="start">
+                        {label}
+                      </Link>
+                    </li>
+                  ))}
+                </ul>
+              )}
+            </li>
+          ))}
+        </ul>
+      </nav>
+    </div>
+  );
+};

package/src/components/topNav/secondaryTopNav/SecondaryTopNav.module.css

@@ -0,0 +1,43 @@
+:root {
+  --conduction-top-nav-space-inline-lg: 1.25rem;
+
+  --conduction-top-nav-font-size-secondary: 16px;
+  --conduction-top-nav-color-secondary: #ffffff;
+  --conduction-top-nav-background-color-secondary: #084f70;
+  --conduction-top-nav-background-color-secondary-hover: rgba(0, 0, 0, 0.2);
+}
+
+.secondary:hover {
+  cursor: pointer;
+}
+
+.ul {
+  margin: unset;
+  display: flex;
+  padding-inline-start: unset;
+  align-items: center;
+}
+
+.li {
+  list-style-type: none;
+  display: block;
+  padding-inline-start: var(--conduction-top-nav-space-inline-lg);
+  padding-inline-end: var(--conduction-top-nav-space-inline-lg);
+  padding-block-start: var(--conduction-top-nav-space-inline-lg);
+  padding-block-end: var(--conduction-top-nav-space-inline-lg);
+}
+
+.secondary {
+  font-weight: 100;
+  width: fit-content;
+  font-size: var(--conduction-top-nav-font-size-secondary);
+  background-color: var(--conduction-top-nav-background-color-secondary);
+}
+
+.secondary .link {
+  color: var(--conduction-top-nav-color-secondary);
+}
+
+.secondary .li:hover {
+  background-color: var(--conduction-top-nav-background-color-secondary-hover);
+}

package/src/components/topNav/{TopNav.tsx → secondaryTopNav/SecondaryTopNav.tsx}

@@ -1,6 +1,6 @@
 import * as React from "react";
+import * as styles from "./SecondaryTopnav.module.css";
 import { Link } from "@gemeente-denhaag/components-react";
-import * as styles from "./TopNav.module.css";
 import clsx from "clsx";
 
 interface TopNavProps {
@@ -8,24 +8,6 @@ interface TopNavProps {
   layoutClassName?: string;
 }
 
-export const PrimaryTopNav: React.FC<TopNavProps> = ({ items, layoutClassName }) => {
-  return (
-    <div className={clsx(styles.primary, layoutClassName && layoutClassName)}>
-      <nav className={styles.primary}>
-        <ul className={styles.ul}>
-          {items.map(({ label, icon, handleClick }, idx) => (
-            <li className={styles.li} key={idx} onClick={handleClick}>
-              <Link className={styles.link} icon={icon} iconAlign="start">
-                {label}
-              </Link>
-            </li>
-          ))}
-        </ul>
-      </nav>
-    </div>
-  );
-};
-
 export const SecondaryTopNav: React.FC<TopNavProps> = ({ items, layoutClassName }) => {
   return (
     <div className={clsx(styles.secondary, layoutClassName && layoutClassName)}>

package/src/index.ts

@@ -27,7 +27,7 @@ import { AuthenticatedLogo, UnauthenticatedLogo } from "./components/logo/Logo";
 import { MetaIcon } from "./components/metaIcon/MetaIcon";
 import { PrivateRoute } from "./components/privateRoute/PrivateRoute";
 import { StatusSteps } from "./components/statusSteps/StatusSteps";
-import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav/TopNav";
+import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav";
 import { Tag } from "./components/tag/Tag";
 import {
   NotificationPopUpController,

package/src/components/topNav/TopNav.js

@@ -1,10 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import * as styles from "./TopNav.module.css";
-import { Link } from "@gemeente-denhaag/components-react";
-import { navigate } from "gatsby";
-export const PrimaryTopNav = ({ items }) => {
-    return (_jsx("nav", { className: styles.primary, children: _jsx("ul", { className: styles.ul, children: items.map(({ label, href, icon }, idx) => (_jsx("li", { className: styles.li, onClick: () => navigate(href), children: _jsx(Link, { icon: icon, iconAlign: "start", children: label }) }, idx))) }) }));
-};
-export const SecondaryTopNav = ({ items }) => {
-    return (_jsx("nav", { className: styles.secondary, children: _jsx("ul", { className: styles.ul, children: items.map(({ label, href, icon }, idx) => (_jsx("li", { className: styles.li, onClick: () => navigate(href), children: _jsx(Link, { icon: icon, iconAlign: "start", children: label }) }, idx))) }) }));
-};