@conduction/components 2.1.40 → 2.2.1

package/src/components/formFields/createKeyValue/CreateKeyValue.tsx

@@ -3,7 +3,14 @@ import * as styles from "./CreateKeyValue.module.css";
 import { Control, Controller, FieldValues } from "react-hook-form";
 import { IReactHookFormProps } from "../types";
 import { Button } from "@gemeente-denhaag/button";
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@gemeente-denhaag/table";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHeaderCell,
+  TableHeader,
+  TableRow,
+} from "@utrecht/component-library-react/dist/css-module";
 import { ToolTip } from "../../toolTip/ToolTip";
 import clsx from "clsx";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -110,13 +117,13 @@ const KeyValueComponent = ({
     <div className={styles.keyValue}>
       {keyValues && (
         <Table className={styles.table}>
-          <TableHead>
+          <TableHeader className={styles.tableHeader}>
             <TableRow>
-              <TableHeader>Key</TableHeader>
-              <TableHeader>Value</TableHeader>
-              <TableHeader />
+              <TableHeaderCell>Key</TableHeaderCell>
+              <TableHeaderCell>Value</TableHeaderCell>
+              <TableHeaderCell />
             </TableRow>
-          </TableHead>
+          </TableHeader>
           <TableBody>
             {keyValues.map((keyValue, idx) => (
               <TableRow key={`${keyValue.key}${keyValue.value}${idx}`}>

package/src/components/formFields/date/Date.module.css

@@ -1,12 +1,12 @@
-.container {
-  display: flex;
-}
-
-.calendar {
-  display: flex;
-}
-
-.calendar > div::before,
-.calendar > div::after {
-  display: none;
-}
+.container {
+  display: flex;
+}
+
+.calendar {
+  display: flex;
+}
+
+.calendar > div::before,
+.calendar > div::after {
+  display: none;
+}

package/src/components/formFields/index.js

@@ -1,4 +1,4 @@
-import { InputText, InputPassword, InputEmail, InputDate, InputNumber } from "./input";
-import { Textarea } from "./textarea";
-import { InputCheckbox } from "./checkbox";
-export { InputText, InputPassword, InputEmail, InputDate, InputNumber, InputCheckbox, Textarea };
+import { InputText, InputPassword, InputEmail, InputDate, InputNumber } from "./input";
+import { Textarea } from "./textarea";
+import { InputCheckbox } from "./checkbox";
+export { InputText, InputPassword, InputEmail, InputDate, InputNumber, InputCheckbox, Textarea };

package/src/components/formFields/index.tsx

@@ -1,13 +1,11 @@
 import { InputText, InputPassword, InputEmail, InputURL, InputNumber, InputFile } from "./input";
 import { Textarea } from "./textarea";
 import { InputCheckbox } from "./checkbox/checkbox";
-import { InputRadio } from "./radio";
 import { SelectSingle, SelectMultiple, SelectCreate } from "./select/select";
 import { CreateKeyValue, IKeyValue } from "./createKeyValue/CreateKeyValue";
 import { InputDate } from "./date/Date";
 
 export {
-  InputRadio,
   InputText,
   InputPassword,
   InputEmail,

package/src/components/formFields/textarea.js

@@ -1,3 +1,3 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { TextArea } from "@gemeente-denhaag/textarea";
-export const Textarea = ({ name, validation, register, errors }) => (_jsx(TextArea, { ...register(name, { ...validation }), invalid: errors[name] }));
+import { jsx as _jsx } from "react/jsx-runtime";
+import { TextArea } from "@gemeente-denhaag/textarea";
+export const Textarea = ({ name, validation, register, errors }) => (_jsx(TextArea, { ...register(name, { ...validation }), invalid: errors[name] }));

package/src/components/formFields/types.js

@@ -1 +1 @@
-export {};
+export {};

package/src/components/imageDivider/ImageDivider.js

@@ -1,6 +1,6 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import clsx from "clsx";
-import * as styles from "./imageDivider.module.css";
-export const ImageDivider = ({ image, layoutClassName }) => {
-    return _jsx("img", { src: image, className: clsx(styles.divider, layoutClassName) });
-};
+import { jsx as _jsx } from "react/jsx-runtime";
+import clsx from "clsx";
+import * as styles from "./imageDivider.module.css";
+export const ImageDivider = ({ image, layoutClassName }) => {
+    return _jsx("img", { src: image, className: clsx(styles.divider, layoutClassName) });
+};

package/src/components/imageDivider/imageDivider.module.css

@@ -1,5 +1,5 @@
-.divider {
-  display: block;
-  object-fit: cover;
-  width: 100%;
-}
+.divider {
+  display: block;
+  object-fit: cover;
+  width: 100%;
+}

package/src/components/logo/Logo.js

@@ -1,10 +1,10 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import clsx from "clsx";
-import { Link } from "gatsby";
-import * as styles from "./Logo.module.css";
-export const AuthenticatedLogo = ({ layoutClassName, href }) => {
-    return (_jsx(Link, { className: styles.logoContainer, to: href ?? "#", children: _jsx("div", { className: clsx(styles.authenticatedLogo, styles.logo, layoutClassName) }) }));
-};
-export const UnauthenticatedLogo = ({ layoutClassName, href }) => {
-    return (_jsx(Link, { className: styles.logoContainer, to: href ?? "#", children: _jsx("div", { className: clsx(styles.unauthenticatedLogo, styles.logo, layoutClassName) }) }));
-};
+import { jsx as _jsx } from "react/jsx-runtime";
+import clsx from "clsx";
+import { Link } from "gatsby";
+import * as styles from "./Logo.module.css";
+export const AuthenticatedLogo = ({ layoutClassName, href }) => {
+    return (_jsx(Link, { className: styles.logoContainer, to: href ?? "#", children: _jsx("div", { className: clsx(styles.authenticatedLogo, styles.logo, layoutClassName) }) }));
+};
+export const UnauthenticatedLogo = ({ layoutClassName, href }) => {
+    return (_jsx(Link, { className: styles.logoContainer, to: href ?? "#", children: _jsx("div", { className: clsx(styles.unauthenticatedLogo, styles.logo, layoutClassName) }) }));
+};

package/src/components/logo/Logo.module.css

@@ -1,15 +1,15 @@
-.logoContainer {
-  height: 100%;
-}
-
-.logo {
-  background-size: 100% 100%;
-}
-
-.authenticatedLogo {
-  background-image: var(--conduction-authenticated-logo-background);
-}
-
-.unauthenticatedLogo {
-  background-image: var(--conduction-unauthenticated-logo-background);
-}
+.logoContainer {
+  height: 100%;
+}
+
+.logo {
+  background-size: 100% 100%;
+}
+
+.authenticatedLogo {
+  background-image: var(--conduction-authenticated-logo-background);
+}
+
+.unauthenticatedLogo {
+  background-image: var(--conduction-unauthenticated-logo-background);
+}

package/src/components/metaIcon/MetaIcon.js

@@ -1,3 +1,3 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import * as styles from "./MetaIcon.module.css";
-export const MetaIcon = ({ icon, label, value }) => (_jsxs("div", { className: styles.container, children: [_jsx("span", { className: styles.icon, children: icon }), _jsx("span", { children: label }), _jsx("span", { className: styles.value, children: value })] }));
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as styles from "./MetaIcon.module.css";
+export const MetaIcon = ({ icon, label, value }) => (_jsxs("div", { className: styles.container, children: [_jsx("span", { className: styles.icon, children: icon }), _jsx("span", { children: label }), _jsx("span", { className: styles.value, children: value })] }));

package/src/components/metaIcon/MetaIcon.module.css

@@ -1,29 +1,29 @@
-:root {
-  --conduction-meta-icon-icon-size: var(--skeleton-size-lg);
-  --conduction-meta-icon-icon-color: var(--skeleton-color-secondary-4);
-}
-
-.container {
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-}
-
-.container > *:not(:last-child) {
-  margin-block-end: var(--skeleton-size-xs);
-}
-
-.icon {
-  color: var(--conduction-meta-icon-icon-color);
-  height: var(--conduction-meta-icon-icon-size);
-  width: var(--conduction-meta-icon-icon-size);
-}
-
-.icon > svg {
-  height: 100%;
-  width: 100%;
-}
-
-.value {
-  font-weight: var(--skeleton-font-weight-bold);
-}
+:root {
+  --conduction-meta-icon-icon-size: var(--skeleton-size-lg);
+  --conduction-meta-icon-icon-color: var(--skeleton-color-secondary-4);
+}
+
+.container {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+
+.container > *:not(:last-child) {
+  margin-block-end: var(--skeleton-size-xs);
+}
+
+.icon {
+  color: var(--conduction-meta-icon-icon-color);
+  height: var(--conduction-meta-icon-icon-size);
+  width: var(--conduction-meta-icon-icon-size);
+}
+
+.icon > svg {
+  height: 100%;
+  width: 100%;
+}
+
+.value {
+  font-weight: var(--skeleton-font-weight-bold);
+}

package/src/components/notificationPopUp/NotificationPopUp.module.css

@@ -36,6 +36,10 @@
   animation-name: fadeInBottom;
 }
 
+.link > * {
+  margin-inline-end: 8px;
+}
+
 @keyframes fadeInBottom {
   from {
     opacity: 0;

package/src/components/notificationPopUp/NotificationPopUp.tsx

@@ -2,11 +2,10 @@ import * as React from "react";
 import * as styles from "./NotificationPopUp.module.css";
 import ReactDOM from "react-dom";
 import { Button } from "@gemeente-denhaag/button";
-import { Heading3, Paragraph } from "@gemeente-denhaag/typography";
-import { Link } from "@gemeente-denhaag/link";
-import { StylesProvider } from "@gemeente-denhaag/stylesprovider";
 import clsx from "clsx";
-import { CloseIcon, ArrowRightIcon } from "@gemeente-denhaag/icons";
+import { Heading3, Link, Paragraph } from "@utrecht/component-library-react";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faArrowRight, faClose } from "@fortawesome/free-solid-svg-icons";
 
 export interface NotificationPopUpProps {
   title: string;
@@ -51,34 +50,33 @@ export const NotificationPopUp = ({
   };
 
   const modal = (
-    <StylesProvider>
-      <div
-        style={{ animationDuration: `${animationDuration}ms` }}
-        className={clsx(styles.modal, animationVisible && styles.visible, layoutClassName)}
-      >
-        <Heading3>{title}</Heading3>
+    <div
+      style={{ animationDuration: `${animationDuration}ms` }}
+      className={clsx(styles.modal, animationVisible && styles.visible, layoutClassName)}
+    >
+      <Heading3>{title}</Heading3>
 
-        <Paragraph>{description}</Paragraph>
+      <Paragraph>{description}</Paragraph>
 
-        <div className={styles.buttons}>
-          {secondaryButton && (
-            <div onClick={() => handleClick(secondaryButton.handleClick)} className={secondaryButton.layoutClassName}>
-              <Link icon={secondaryButton.icon ?? <CloseIcon />} iconAlign="start">
-                {secondaryButton.label}
-              </Link>
-            </div>
-          )}
+      <div className={styles.buttons}>
+        {secondaryButton && (
+          <div onClick={() => handleClick(secondaryButton.handleClick)} className={secondaryButton.layoutClassName}>
+            <Link className={styles.link}>
+              {secondaryButton.icon ?? <FontAwesomeIcon icon={faClose} />}
+              {secondaryButton.label}
+            </Link>
+          </div>
+        )}
 
-          <Button
-            icon={primaryButton.icon ?? <ArrowRightIcon />}
-            onClick={() => handleClick(primaryButton.handleClick)}
-            className={primaryButton.layoutClassName}
-          >
-            {primaryButton.label}
-          </Button>
-        </div>
+        <Button
+          icon={primaryButton.icon ?? <FontAwesomeIcon icon={faArrowRight} />}
+          onClick={() => handleClick(primaryButton.handleClick)}
+          className={primaryButton.layoutClassName}
+        >
+          {primaryButton.label}
+        </Button>
       </div>
-    </StylesProvider>
+    </div>
   );
 
   return isVisible ? ReactDOM.createPortal(modal, document.body) : null;

package/src/components/privateRoute/PrivateRoute.js

@@ -1,15 +1,15 @@
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-import React from "react";
-import { navigate } from "gatsby";
-export const PrivateRoute = ({ children, isLoggedIn }) => {
-    const [authenticated, setAuthenticated] = React.useState(false);
-    React.useEffect(() => {
-        if (!isLoggedIn && window.location.pathname !== "/login") {
-            navigate("/login");
-        }
-        isLoggedIn && setAuthenticated(true);
-    }, [isLoggedIn]);
-    if (!authenticated)
-        return _jsx(_Fragment, {});
-    return _jsx(_Fragment, { children: children });
-};
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import React from "react";
+import { navigate } from "gatsby";
+export const PrivateRoute = ({ children, isLoggedIn }) => {
+    const [authenticated, setAuthenticated] = React.useState(false);
+    React.useEffect(() => {
+        if (!isLoggedIn && window.location.pathname !== "/login") {
+            navigate("/login");
+        }
+        isLoggedIn && setAuthenticated(true);
+    }, [isLoggedIn]);
+    if (!authenticated)
+        return _jsx(_Fragment, {});
+    return _jsx(_Fragment, { children: children });
+};

package/src/components/quoteWrapper/QuoteWrapper.module.css

@@ -1,12 +1,12 @@
-:root {
-  --conduction-quote-wrapper-border-width: var(--skeleton-size-sm);
-  --conduction-quote-wrapper-border-color: var(--skeleton-color-grey-1);
-  --conduction-quote-wrapper-padding-inline: var(--skeleton-size-lg);
-}
-
-.container {
-  border-left-width: var(--conduction-quote-wrapper-border-width);
-  border-left-style: solid;
-  border-left-color: var(--conduction-quote-wrapper-border-color);
-  padding-inline-start: var(--conduction-quote-wrapper-padding-inline);
-}
+:root {
+  --conduction-quote-wrapper-border-width: var(--skeleton-size-sm);
+  --conduction-quote-wrapper-border-color: var(--skeleton-color-grey-1);
+  --conduction-quote-wrapper-padding-inline: var(--skeleton-size-lg);
+}
+
+.container {
+  border-left-width: var(--conduction-quote-wrapper-border-width);
+  border-left-style: solid;
+  border-left-color: var(--conduction-quote-wrapper-border-color);
+  padding-inline-start: var(--conduction-quote-wrapper-padding-inline);
+}

package/src/components/tag/Tag.module.css

@@ -1,44 +1,44 @@
-:root {
-  --conduction-tag-font-size: var(--skeleton-font-size-sm);
-  --conduction-tag-color: var(--skeleton-black);
-  --conduction-tag-background-color: var(--skeleton-color-grey-1);
-  --conduction-tag-border-radius: var(--skeleton-border-radius-md);
-  --conduction-tag-padding: var(--skeleton-size-xs);
-  --conduction-tag-icon-margin-inline-end: var(--skeleton-size-2xs);
-  --conduction-tag-remove-background-color: #ffbdad;
-  --conduction-tag-remove-text-color: #e44f2a;
-}
-
-.tag {
-  display: inline-block;
-  width: fit-content;
-  font-size: var(--conduction-tag-font-size);
-  color: var(--conduction-tag-color);
-  background-color: var(--conduction-tag-background-color);
-  padding-inline-start: var(--conduction-tag-padding);
-  padding-inline-end: var(--conduction-tag-padding);
-  padding-block-start: var(--conduction-tag-padding);
-  padding-block-end: var(--conduction-tag-padding);
-}
-
-.tag > *:not(:last-child) {
-  margin-inline-end: var(--conduction-tag-icon-margin-inline-end);
-}
-
-.clickable :hover {
-  cursor: pointer;
-}
-
-.remove {
-  padding-inline-end: 4px;
-}
-
-.tagContainer {
-  display: flex;
-}
-
-.removeTag:hover {
-  cursor: pointer;
-  background-color: var(--conduction-tag-remove-background-color);
-  color: var(--conduction-tag-remove-text-color);
-}
+:root {
+  --conduction-tag-font-size: var(--skeleton-font-size-sm);
+  --conduction-tag-color: var(--skeleton-black);
+  --conduction-tag-background-color: var(--skeleton-color-grey-1);
+  --conduction-tag-border-radius: var(--skeleton-border-radius-md);
+  --conduction-tag-padding: var(--skeleton-size-xs);
+  --conduction-tag-icon-margin-inline-end: var(--skeleton-size-2xs);
+  --conduction-tag-remove-background-color: #ffbdad;
+  --conduction-tag-remove-text-color: #e44f2a;
+}
+
+.tag {
+  display: inline-block;
+  width: fit-content;
+  font-size: var(--conduction-tag-font-size);
+  color: var(--conduction-tag-color);
+  background-color: var(--conduction-tag-background-color);
+  padding-inline-start: var(--conduction-tag-padding);
+  padding-inline-end: var(--conduction-tag-padding);
+  padding-block-start: var(--conduction-tag-padding);
+  padding-block-end: var(--conduction-tag-padding);
+}
+
+.tag > *:not(:last-child) {
+  margin-inline-end: var(--conduction-tag-icon-margin-inline-end);
+}
+
+.clickable :hover {
+  cursor: pointer;
+}
+
+.remove {
+  padding-inline-end: 4px;
+}
+
+.tagContainer {
+  display: flex;
+}
+
+.removeTag:hover {
+  cursor: pointer;
+  background-color: var(--conduction-tag-remove-background-color);
+  color: var(--conduction-tag-remove-text-color);
+}

package/src/components/topNav/index.ts

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

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

@@ -93,6 +93,10 @@
   color: var(--conduction-primary-top-nav-color-hover);
 }
 
+.link > * {
+  margin-inline-end: 8px;
+}
+
 .primary .li:hover .dropdown {
   display: block;
   z-index: 1;

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

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as styles from "./PrimaryTopNav.module.css";
 import clsx from "clsx";
-import { Link } from "@gemeente-denhaag/link";
+import { Link } from "@utrecht/component-library-react/dist/css-module";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faBars } from "@fortawesome/free-solid-svg-icons";
 
@@ -53,7 +53,8 @@ export const PrimaryTopNav = ({ items, mobileLogo, layoutClassName }: TopNavProp
               className={clsx(styles.li, current && styles.current)}
               key={idx}
             >
-              <Link className={clsx(styles.link, styles.label)} icon={icon} iconAlign="start">
+              <Link className={clsx(styles.link, styles.label)}>
+                {icon}
                 {label}
               </Link>
 
@@ -65,7 +66,8 @@ export const PrimaryTopNav = ({ items, mobileLogo, layoutClassName }: TopNavProp
                       className={clsx(styles.li, current && styles.current)}
                       onClick={() => handleItemClick(handleClick)}
                     >
-                      <Link className={clsx(styles.link, styles.label)} icon={icon} iconAlign="start">
+                      <Link className={clsx(styles.link, styles.label)}>
+                        {icon}
                         {label}
                       </Link>
                     </li>

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

@@ -61,3 +61,7 @@
 .label > :not(:last-child) {
   margin-inline-end: var(--conduction-secondary-top-nav-item-icon-margin);
 }
+
+.link > * {
+  margin-inline-end: 8px;
+}

package/src/components/topNav/secondaryTopNav/SecondaryTopNav.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as styles from "./SecondaryTopNav.module.css";
-import { Link } from "@gemeente-denhaag/link";
+import { Link } from "@utrecht/component-library-react/dist/css-module";
 import clsx from "clsx";
 
 interface TopNavProps {
@@ -15,7 +15,8 @@ export const SecondaryTopNav = ({ items, layoutClassName }: TopNavProps): JSX.El
         <ul className={styles.ul}>
           {items.map(({ label, icon, current, handleClick }, idx) => (
             <li className={clsx(styles.li, current && styles.current)} key={idx} onClick={handleClick}>
-              <Link className={clsx(styles.link, styles.label)} icon={icon} iconAlign="start">
+              <Link className={clsx(styles.link, styles.label)}>
+                {icon}
                 {label}
               </Link>
             </li>

package/src/custom.d.ts

@@ -1,4 +1,4 @@
-declare module "*.svg";
-declare module "*.jpg";
-declare module "*.png";
-declare module "*.module.css";
+declare module "*.svg";
+declare module "*.jpg";
+declare module "*.png";
+declare module "*.module.css";

package/src/index.ts

@@ -1,14 +1,6 @@
-import {
-  DownloadCard,
-  HorizontalImageCard,
-  ImageAndDetailsCard,
-  RichContentCard,
-  DetailsCard,
-  InfoCard,
-} from "./components/card";
+import { DownloadCard, HorizontalImageCard, ImageAndDetailsCard, DetailsCard, InfoCard } from "./components/card";
 import { Container } from "./components/container/Container";
 import { Breadcrumbs } from "./components/denhaag-wrappers/breadcrumbs/Breadcrumbs";
-import { EditableTableRow } from "./components/editableTableRow/EditableTableRow";
 import {
   InputText,
   InputPassword,
@@ -17,7 +9,6 @@ import {
   InputNumber,
   Textarea,
   InputCheckbox,
-  InputRadio,
   InputFile,
   SelectMultiple,
   SelectSingle,
@@ -40,16 +31,13 @@ import { ToolTip } from "./components/toolTip/ToolTip";
 import { Pagination } from "./components/Pagination/Pagination";
 
 export {
-  InputRadio,
   DownloadCard,
   HorizontalImageCard,
   ImageAndDetailsCard,
-  RichContentCard,
   DetailsCard,
   InfoCard,
   Container,
   Breadcrumbs,
-  EditableTableRow,
   InputText,
   InputPassword,
   InputEmail,

package/.github/workflows/npm-publish.yml

@@ -1,39 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  push:
-    branches:
-      - development
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          registry-url: https://registry.npmjs.org/
-      - run: |
-          git --version
-          git config user.name "GitHub Version patch"
-          git config user.email "<>"
-          git checkout development
-          git clean -f -n
-      - run: npm install
-      - run: npm version patch
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}