@conduction/components 2.2.22 → 2.2.24

package/README.md

@@ -4,8 +4,12 @@
 
 - **Version 2.2 (breaking changes from 2.1.x)**
 
+  - 2.2.24:
+    - Added DisplaySwitch component.
+    - Removed align hover state on card-header.
+  - 2.2.23: Added Logo component.
   - 2.2.22: Updated Jumbotron component to be more customizable.
-  - 2.2.21: 
+  - 2.2.21:
     - Removed warning from HorizontalOverflowWrapper.
     - Added Jumbotron component.
     - Updated card-header to align hover states.

package/lib/components/card/cardHeader/CardHeader.module.css

@@ -24,16 +24,6 @@
   border-bottom-color: var(--conduction-card-header-hover-border-bottom-color);
 }
 
-.container:before {
-  z-index: 1;
-  content: "";
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
 .title > * {
   color: var(--conduction-card-header-title-color) !important;
 }

package/lib/components/displaySwitch/DisplaySwitch.d.ts

@@ -0,0 +1,18 @@
+import * as React from "react";
+import { IconPrefix, IconName } from "@fortawesome/fontawesome-svg-core";
+interface DisplaySwitchProps {
+    buttons: DisplaySwitchButtonProps[];
+    layoutClassName?: string;
+}
+interface DisplaySwitchButtonProps {
+    label: string;
+    pressed: boolean;
+    handleClick: () => any;
+    icon?: {
+        name: IconName;
+        prefix: IconPrefix;
+    };
+}
+export declare type IDisplaySwitchButton = DisplaySwitchButtonProps;
+declare const DisplaySwitch: React.FC<DisplaySwitchProps>;
+export default DisplaySwitch;

package/lib/components/displaySwitch/DisplaySwitch.js

@@ -0,0 +1,13 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as styles from "./DisplaySwitch.module.css";
+import clsx from "clsx";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { Button, ButtonGroup } from "@utrecht/component-library-react/dist/css-module";
+const DisplaySwitch = ({ layoutClassName, buttons }) => {
+    return (_jsx(ButtonGroup, { className: clsx(styles.displaySwitchButtons, [layoutClassName] && layoutClassName), children: buttons.map((button, idx) => {
+            // TODO: Once the Rotterdam design system supports the "pressed" state,
+            // remove the `appereance` switch, and use the same appearance for each button.
+            return (_jsxs(Button, { pressed: button.pressed, appearance: button.pressed ? "secondary-action-button" : "subtle-button", onClick: button.handleClick, children: [button.icon && _jsx(FontAwesomeIcon, { icon: [button.icon.prefix, button.icon.name] }), _jsx("span", { children: button.label })] }, idx));
+        }) }));
+};
+export default DisplaySwitch;

package/lib/components/displaySwitch/DisplaySwitch.module.css

@@ -0,0 +1,3 @@
+.displaySwitchButtons {
+  align-items: center;
+}

package/lib/components/logo/Logo.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import * as React from "react";
 interface LogoProps {
-    layoutClassName: string;
-    href?: string;
+    variant?: "header" | "footer";
+    onClick?: () => any;
+    layoutClassName?: string;
 }
-export declare const AuthenticatedLogo: ({ layoutClassName, href }: LogoProps) => JSX.Element;
-export declare const UnauthenticatedLogo: ({ layoutClassName, href }: LogoProps) => JSX.Element;
+export declare const Logo: React.FC<LogoProps>;
 export {};

package/lib/components/logo/Logo.js

@@ -1,10 +1,9 @@
 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 clsx from "clsx";
+export const Logo = ({ onClick, layoutClassName, variant = "header" }) => {
+    return (_jsx("div", { className: clsx(styles.container, styles[variant], [
+            onClick && styles.clickable,
+            layoutClassName && layoutClassName,
+        ]), ...{ onClick } }));
 };

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

@@ -1,15 +1,31 @@
-.logoContainer {
-  height: 100%;
-}
-
-.logo {
-  background-size: 100% 100%;
-}
-
-.authenticatedLogo {
-  background-image: var(--conduction-authenticated-logo-background);
-}
-
-.unauthenticatedLogo {
-  background-image: var(--conduction-unauthenticated-logo-background);
-}
+:root {
+  --conduction-logo-header-inline-size: 220px;
+  --conduction-logo-header-block-size: 40px;
+  --conduction-logo-header-background-image: url("https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png");
+
+  --conduction-logo-footer-inline-size: 330px;
+  --conduction-logo-footer-block-size: 60px;
+  --conduction-logo-footer-background-image: url("https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png");
+}
+
+.container {
+  background-size: contain;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+.container.header {
+  inline-size: var(--conduction-logo-header-inline-size);
+  block-size: var(--conduction-logo-header-block-size);
+  background-image: var(--conduction-logo-header-background-image);
+}
+
+.container.footer {
+  inline-size: var(--conduction-logo-footer-inline-size);
+  block-size: var(--conduction-logo-footer-block-size);
+  background-image: var(--conduction-logo-footer-background-image);
+}
+
+.container.clickable:hover {
+  cursor: pointer;
+}

package/lib/index.d.ts

@@ -4,7 +4,7 @@ import { Container } from "./components/container/Container";
 import { Breadcrumbs } from "./components/denhaag-wrappers/breadcrumbs/Breadcrumbs";
 import { InputText, InputPassword, InputEmail, InputDate, InputNumber, Textarea, InputCheckbox, InputFile, SelectMultiple, SelectSingle } from "./components/formFields";
 import { ImageDivider } from "./components/imageDivider/ImageDivider";
-import { AuthenticatedLogo, UnauthenticatedLogo } from "./components/logo/Logo";
+import { Logo } from "./components/logo/Logo";
 import { MetaIcon } from "./components/metaIcon/MetaIcon";
 import { PrivateRoute } from "./components/privateRoute/PrivateRoute";
 import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav";
@@ -25,4 +25,5 @@ import { Pagination } from "./components/Pagination/Pagination";
 import { Tabs, TabList, Tab, TabPanel } from "./components/tabs/Tabs";
 import { HorizontalOverflowWrapper } from "./components/horizontalOverflowWrapper/HorizontalOverflowWrapper";
 import { Jumbotron } from "./components/jumbotron/Jumbotron";
-export { DownloadCard, HorizontalImageCard, ImageAndDetailsCard, DetailsCard, InfoCard, Container, Breadcrumbs, InputText, InputPassword, InputEmail, InputDate, InputNumber, InputFile, Textarea, InputCheckbox, SelectMultiple, SelectSingle, ImageDivider, AuthenticatedLogo, UnauthenticatedLogo, MetaIcon, PrivateRoute, PrimaryTopNav, SecondaryTopNav, Tag, NotificationPopUp, QuoteWrapper, Pagination, BadgeCounter, CodeBlock, ToolTip, CardWrapper, CardHeader, CardHeaderTitle, CardHeaderDate, Tabs, TabList, Tab, TabPanel, HorizontalOverflowWrapper, Jumbotron, };
+import DisplaySwitch from "./components/displaySwitch/DisplaySwitch";
+export { DownloadCard, HorizontalImageCard, ImageAndDetailsCard, DetailsCard, InfoCard, Container, Breadcrumbs, InputText, InputPassword, InputEmail, InputDate, InputNumber, InputFile, Textarea, InputCheckbox, SelectMultiple, SelectSingle, ImageDivider, Logo, MetaIcon, PrivateRoute, PrimaryTopNav, SecondaryTopNav, Tag, NotificationPopUp, QuoteWrapper, Pagination, BadgeCounter, CodeBlock, ToolTip, CardWrapper, CardHeader, CardHeaderTitle, CardHeaderDate, Tabs, TabList, Tab, TabPanel, HorizontalOverflowWrapper, Jumbotron, DisplaySwitch };

package/lib/index.js

@@ -3,7 +3,7 @@ import { Container } from "./components/container/Container";
 import { Breadcrumbs } from "./components/denhaag-wrappers/breadcrumbs/Breadcrumbs";
 import { InputText, InputPassword, InputEmail, InputDate, InputNumber, Textarea, InputCheckbox, InputFile, SelectMultiple, SelectSingle, } from "./components/formFields";
 import { ImageDivider } from "./components/imageDivider/ImageDivider";
-import { AuthenticatedLogo, UnauthenticatedLogo } from "./components/logo/Logo";
+import { Logo } from "./components/logo/Logo";
 import { MetaIcon } from "./components/metaIcon/MetaIcon";
 import { PrivateRoute } from "./components/privateRoute/PrivateRoute";
 import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav";
@@ -18,4 +18,5 @@ import { Pagination } from "./components/Pagination/Pagination";
 import { Tabs, TabList, Tab, TabPanel } from "./components/tabs/Tabs";
 import { HorizontalOverflowWrapper } from "./components/horizontalOverflowWrapper/HorizontalOverflowWrapper";
 import { Jumbotron } from "./components/jumbotron/Jumbotron";
-export { DownloadCard, HorizontalImageCard, ImageAndDetailsCard, DetailsCard, InfoCard, Container, Breadcrumbs, InputText, InputPassword, InputEmail, InputDate, InputNumber, InputFile, Textarea, InputCheckbox, SelectMultiple, SelectSingle, ImageDivider, AuthenticatedLogo, UnauthenticatedLogo, MetaIcon, PrivateRoute, PrimaryTopNav, SecondaryTopNav, Tag, NotificationPopUp, QuoteWrapper, Pagination, BadgeCounter, CodeBlock, ToolTip, CardWrapper, CardHeader, CardHeaderTitle, CardHeaderDate, Tabs, TabList, Tab, TabPanel, HorizontalOverflowWrapper, Jumbotron, };
+import DisplaySwitch from "./components/displaySwitch/DisplaySwitch";
+export { DownloadCard, HorizontalImageCard, ImageAndDetailsCard, DetailsCard, InfoCard, Container, Breadcrumbs, InputText, InputPassword, InputEmail, InputDate, InputNumber, InputFile, Textarea, InputCheckbox, SelectMultiple, SelectSingle, ImageDivider, Logo, MetaIcon, PrivateRoute, PrimaryTopNav, SecondaryTopNav, Tag, NotificationPopUp, QuoteWrapper, Pagination, BadgeCounter, CodeBlock, ToolTip, CardWrapper, CardHeader, CardHeaderTitle, CardHeaderDate, Tabs, TabList, Tab, TabPanel, HorizontalOverflowWrapper, Jumbotron, DisplaySwitch };

package/package.json

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

package/src/components/card/cardHeader/CardHeader.module.css

@@ -24,16 +24,6 @@
   border-bottom-color: var(--conduction-card-header-hover-border-bottom-color);
 }
 
-.container:before {
-  z-index: 1;
-  content: "";
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
 .title > * {
   color: var(--conduction-card-header-title-color) !important;
 }

package/src/components/displaySwitch/DisplaySwitch.module.css

@@ -0,0 +1,3 @@
+.displaySwitchButtons {
+  align-items: center;
+}

package/src/components/displaySwitch/DisplaySwitch.tsx

@@ -0,0 +1,48 @@
+import * as React from "react";
+import * as styles from "./DisplaySwitch.module.css";
+import _ from "lodash";
+import clsx from "clsx";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { IconPrefix, IconName } from "@fortawesome/fontawesome-svg-core";
+import { Button, ButtonGroup } from "@utrecht/component-library-react/dist/css-module";
+
+interface DisplaySwitchProps {
+  buttons: DisplaySwitchButtonProps[];
+  layoutClassName?: string;
+}
+
+interface DisplaySwitchButtonProps {
+  label: string;
+  pressed: boolean;
+  handleClick: () => any;
+  icon?: {
+    name: IconName;
+    prefix: IconPrefix;
+  };
+}
+
+export declare type IDisplaySwitchButton = DisplaySwitchButtonProps;
+
+const DisplaySwitch: React.FC<DisplaySwitchProps> = ({ layoutClassName, buttons }) => {
+  return (
+    <ButtonGroup className={clsx(styles.displaySwitchButtons, [layoutClassName] && layoutClassName)}>
+      {buttons.map((button, idx: number) => {
+        // TODO: Once the Rotterdam design system supports the "pressed" state,
+        // remove the `appereance` switch, and use the same appearance for each button.
+        return (
+          <Button
+            key={idx}
+            pressed={button.pressed}
+            appearance={button.pressed ? "secondary-action-button" : "subtle-button"}
+            onClick={button.handleClick}
+          >
+            {button.icon && <FontAwesomeIcon icon={[button.icon.prefix, button.icon.name]} />}
+            <span>{button.label}</span>
+          </Button>
+        );
+      })}
+    </ButtonGroup>
+  );
+};
+
+export default DisplaySwitch;

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

@@ -1,15 +1,31 @@
-.logoContainer {
-  height: 100%;
-}
-
-.logo {
-  background-size: 100% 100%;
-}
-
-.authenticatedLogo {
-  background-image: var(--conduction-authenticated-logo-background);
-}
-
-.unauthenticatedLogo {
-  background-image: var(--conduction-unauthenticated-logo-background);
-}
+:root {
+  --conduction-logo-header-inline-size: 220px;
+  --conduction-logo-header-block-size: 40px;
+  --conduction-logo-header-background-image: url("https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png");
+
+  --conduction-logo-footer-inline-size: 330px;
+  --conduction-logo-footer-block-size: 60px;
+  --conduction-logo-footer-background-image: url("https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png");
+}
+
+.container {
+  background-size: contain;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+.container.header {
+  inline-size: var(--conduction-logo-header-inline-size);
+  block-size: var(--conduction-logo-header-block-size);
+  background-image: var(--conduction-logo-header-background-image);
+}
+
+.container.footer {
+  inline-size: var(--conduction-logo-footer-inline-size);
+  block-size: var(--conduction-logo-footer-block-size);
+  background-image: var(--conduction-logo-footer-background-image);
+}
+
+.container.clickable:hover {
+  cursor: pointer;
+}

package/src/components/logo/Logo.tsx

@@ -1,25 +1,21 @@
-import clsx from "clsx";
-import { Link } from "gatsby";
 import * as React from "react";
 import * as styles from "./Logo.module.css";
+import clsx from "clsx";
 
 interface LogoProps {
-  layoutClassName: string;
-  href?: string;
+  variant?: "header" | "footer";
+  onClick?: () => any;
+  layoutClassName?: string;
 }
 
-export const AuthenticatedLogo = ({ layoutClassName, href }: LogoProps): JSX.Element => {
-  return (
-    <Link className={styles.logoContainer} to={href ?? "#"}>
-      <div className={clsx(styles.authenticatedLogo, styles.logo, layoutClassName)} />
-    </Link>
-  );
-};
-
-export const UnauthenticatedLogo = ({ layoutClassName, href }: LogoProps): JSX.Element => {
+export const Logo: React.FC<LogoProps> = ({ onClick, layoutClassName, variant = "header" }) => {
   return (
-    <Link className={styles.logoContainer} to={href ?? "#"}>
-      <div className={clsx(styles.unauthenticatedLogo, styles.logo, layoutClassName)} />
-    </Link>
+    <div
+      className={clsx(styles.container, styles[variant], [
+        onClick && styles.clickable,
+        layoutClassName && layoutClassName,
+      ])}
+      {...{ onClick }}
+    />
   );
 };

package/src/index.ts

@@ -24,7 +24,7 @@ import {
   SelectSingle,
 } from "./components/formFields";
 import { ImageDivider } from "./components/imageDivider/ImageDivider";
-import { AuthenticatedLogo, UnauthenticatedLogo } from "./components/logo/Logo";
+import { Logo } from "./components/logo/Logo";
 import { MetaIcon } from "./components/metaIcon/MetaIcon";
 import { PrivateRoute } from "./components/privateRoute/PrivateRoute";
 import { PrimaryTopNav, SecondaryTopNav } from "./components/topNav";
@@ -42,6 +42,7 @@ import { Pagination } from "./components/Pagination/Pagination";
 import { Tabs, TabList, Tab, TabPanel } from "./components/tabs/Tabs";
 import { HorizontalOverflowWrapper } from "./components/horizontalOverflowWrapper/HorizontalOverflowWrapper";
 import { Jumbotron } from "./components/jumbotron/Jumbotron";
+import DisplaySwitch from "./components/displaySwitch/DisplaySwitch";
 
 export {
   DownloadCard,
@@ -62,8 +63,7 @@ export {
   SelectMultiple,
   SelectSingle,
   ImageDivider,
-  AuthenticatedLogo,
-  UnauthenticatedLogo,
+  Logo,
   MetaIcon,
   PrivateRoute,
   PrimaryTopNav,
@@ -85,4 +85,5 @@ export {
   TabPanel,
   HorizontalOverflowWrapper,
   Jumbotron,
+  DisplaySwitch
 };