@aarhus-university/au-lib-react-components 10.5.0 → 10.8.0

package/src/components/AUButtonComponent.tsx

@@ -1,16 +1,6 @@
-import React, { FC, MouseEvent } from 'react';
-
-interface AUButtonComponentProps {
-  label: string,
-  disabled?: boolean,
-  size?: 'small' | 'default' | 'large',
-  type?: 'default' | 'text' | 'dimmed';
-  icon?: string, // Maybe a list of available font awesome glyphs?
-  iconPosition?: 'left' | 'right',
-  hideLabel?: boolean,
-  mode?: 'none' | 'ireversable-action' | 'confirmable-action' | 'processing', // (sic)
-  onClick?: (event: MouseEvent<HTMLButtonElement>) => void,
-}
+import React, {
+  FC, MouseEvent, RefObject,
+} from 'react';
 
 const AUButtonComponent: FC<AUButtonComponentProps> = ({
   label,
@@ -21,6 +11,9 @@ const AUButtonComponent: FC<AUButtonComponentProps> = ({
   iconPosition,
   hideLabel,
   mode,
+  btnRef,
+  classNames,
+  ariaExpanded,
   onClick,
 }: AUButtonComponentProps) => {
   const sizeClass = size === 'default' ? '' : `button--${size}`;
@@ -37,11 +30,13 @@ const AUButtonComponent: FC<AUButtonComponentProps> = ({
     }
   }
   let modeClass = '';
-  if (mode) {
+  if (mode !== 'none') {
     modeClass = `button--${mode}`;
   }
+
   return (
     <button
+      ref={btnRef}
       type="button"
       disabled={disabled}
       className={[
@@ -51,10 +46,15 @@ const AUButtonComponent: FC<AUButtonComponentProps> = ({
         iconClass,
         modeClass,
         disabled && mode !== 'processing' ? 'visually-disabled' : '',
-      ].join(' ').replace(/\s+/g, ' ').trim()}
+      ].concat(classNames || []).join(' ').replace(/\s+/g, ' ').trim()}
       data-icon={icon === '' ? null : icon}
       title={icon && hideLabel ? label : undefined}
-      onClick={onClick}
+      aria-expanded={ariaExpanded}
+      onClick={(event: MouseEvent<HTMLButtonElement>) => {
+        if (typeof onClick !== 'undefined') {
+          onClick(event, btnRef);
+        }
+      }}
     >
       {label}
     </button>
@@ -69,8 +69,14 @@ AUButtonComponent.defaultProps = {
   iconPosition: 'left',
   hideLabel: false,
   mode: 'none',
+  classNames: [],
+  ariaExpanded: false,
   // eslint-disable-next-line no-console
-  onClick: (event: MouseEvent<HTMLButtonElement>) => console.log(event),
+  onClick: (
+    event: MouseEvent<HTMLButtonElement>,
+    ref: RefObject<HTMLButtonElement> | undefined,
+    // eslint-disable-next-line no-console
+  ) => console.log(event, ref),
 };
 
 AUButtonComponent.displayName = 'AUButtonComponent';

package/src/components/AUModalComponent.tsx

@@ -2,63 +2,46 @@
 /* eslint jsx-a11y/click-events-have-key-events: 0 */
 /* eslint jsx-a11y/no-noninteractive-element-interactions: 0 */
 /* eslint jsx-a11y/no-static-element-interactions: 0 */
-import React, { FC, useLayoutEffect } from 'react';
+import React, { FC } from 'react';
 import ReactDOM from 'react-dom';
-import { hideModal } from '@aarhus-university/au-designsystem-delphinus/source/js/components/modal-view';
-
-export {
-  hideModal,
-};
+import AUButtonComponent from './AUButtonComponent';
+import { useModal } from '../lib/hooks';
 
 const AUModalComponent: FC<AUModalComponentProps> = ({
+  lang,
   domId,
+  className,
   children,
-  onClose,
   closeButton,
   closeButtonDisabled,
-  lang,
   sender,
-  className,
+  show,
+  onClose,
 }: AUModalComponentProps) => {
-  useLayoutEffect(() => {
-    const modalView = document.getElementById(domId);
-    if (modalView) {
-      const header = modalView.querySelector('.modal-view__header');
-      if (header && !header.getAttribute('id')) {
-        header.setAttribute('id', `${domId}-header`);
-        modalView.setAttribute('aria-labelledby', `${domId}-header`);
-      }
-    }
-  });
+  useModal(domId, sender, show, !closeButtonDisabled, onClose);
 
   return (
     ReactDOM.createPortal(
       <div
-        key={0}
         id={domId}
         className={className}
       >
         <div className="modal-view__wrapper theme--normal">
           {
             closeButton && (
-              <button
-                type="button"
+              <AUButtonComponent
+                label={lang === 'da' ? 'Luk' : 'Close'}
                 disabled={closeButtonDisabled}
-                className="modal-view__close button button--icon button--icon--hide-label"
-                data-icon=""
-                data-gtm="au-btn-modal-close"
-                title={lang === 'da' ? 'Luk' : 'Close'}
+                icon=""
+                hideLabel
+                classNames={['modal-view__close']}
+                dataGtm="au-btn-modal-close"
                 onClick={() => {
                   if (typeof onClose === 'function') {
                     onClose();
                   }
-                  if (sender) {
-                    hideModal(domId, sender);
-                  }
                 }}
-              >
-                {lang === 'da' ? 'Luk' : 'Close'}
-              </button>
+              />
             )
           }
           {children}
@@ -71,6 +54,7 @@ const AUModalComponent: FC<AUModalComponentProps> = ({
 };
 
 AUModalComponent.defaultProps = {
+  domId: 'modal-view1',
   closeButton: true,
   lang: 'da',
   className: 'modal-view',

package/src/components/AUNotificationComponent.tsx

@@ -0,0 +1,42 @@
+import React, { FC } from 'react';
+
+const AUNotificationsComponent: FC<AUNotificationsComponentProps> = ({
+  header,
+  content,
+  actions,
+  type,
+  classNames,
+}: AUNotificationsComponentProps) => {
+  const typeClass = type === 'default' ? '' : `notification--${type}`;
+  return (
+    <div className={[
+      'notification',
+      typeClass,
+    ].concat(classNames || []).join(' ').replace(/\s+/g, ' ').trim()}
+    >
+      <div className="notification__content">
+        {
+          header && <h2 className="notification__header">{header}</h2>
+        }
+        {content.map((c) => c)}
+      </div>
+      {
+        (actions || []).length > 0 && (
+          <div className="notification__actions">
+            {(actions || []).map((a) => a)}
+          </div>
+        )
+      }
+    </div>
+  );
+};
+
+AUNotificationsComponent.defaultProps = {
+  header: null,
+  actions: [],
+  type: 'default',
+  classNames: [],
+};
+
+AUNotificationsComponent.displayName = 'AUNotificationsComponent';
+export default AUNotificationsComponent;

package/src/components/AUSpinnerComponent.tsx

@@ -1,91 +1,33 @@
 /* eslint-disable react/static-property-placement */
 /* eslint-env browser */
-import React from 'react';
-import { isElementInViewport } from '../lib/helpers';
-
-type AUSpinnerComponentState = {
-  loading: boolean,
-}
-
-class AUSpinnerComponent extends React.Component<AUSpinnerComponentProps, AUSpinnerComponentState> {
-  static displayName = 'AUSpinnerComponent';
-
-  static defaultProps = {
-    domID: 'au-spinner-component',
-    visible: false,
-    className: '',
-    height: 'auto',
-    init: '',
-  };
-
-  constructor(props: AUSpinnerComponentProps) {
-    super(props);
-
-    this.state = {
-      loading: true,
-    };
-
-    this.lazyLoad = this.lazyLoad.bind(this);
-  }
-
-  componentDidMount() {
-    this.lazyLoad();
-    window.addEventListener('scroll', () => {
-      this.lazyLoad();
-    });
-  }
-
-  componentDidUpdate() {
-    this.lazyLoad();
-  }
-
-  lazyLoad() {
-    const {
-      loadingCondition,
-      loaded,
-      visible,
-      domID,
-      onLoad,
-    } = this.props;
-    const { loading } = this.state;
-
-    const element = document.getElementById(domID || '');
-    if (element
-      && !loaded
-      && loading
-      && loadingCondition
-      && (visible || isElementInViewport(element))) {
-      this.setState({
-        loading: false,
-      }, () => {
-        onLoad();
-      });
-    }
-  }
-
-  render() {
-    const {
-      loaded, domID, children, init, className, height,
-    } = this.props;
-
-    if (!loaded) {
-      if (init === 'table') {
-        return (
-          <div id={domID} className={`processing-state processing-state--init-table ${className}`} style={{ minHeight: height }} />
-        );
-      }
-      if (init === 'box') {
-        return (
-          <div id={domID} className={`processing-state processing-state--init-box ${className}`} style={{ minHeight: height }} />
-        );
-      }
+import React, { FC } from 'react';
+
+const AUSpinnerComponent: FC<AUSpinnerComponentProps> = ({
+  loaded,
+  init,
+  height,
+  className,
+  children,
+}: AUSpinnerComponentProps) => {
+  if (!loaded) {
+    if (init === 'table' || init === 'box') {
       return (
-        <div id={domID} className={`processing-state ${className}`} style={{ minHeight: height }} />
+        <div
+          className={`processing-state processing-state--init-${init} ${className}`}
+          style={{ minHeight: height }}
+        />
       );
     }
-
-    return children;
+    return (
+      <div
+        className={`processing-state ${className}`}
+        style={{ minHeight: height }}
+      />
+    );
   }
-}
 
+  return children;
+};
+
+AUSpinnerComponent.displayName = 'AUSpinnerComponent';
 export default AUSpinnerComponent;

package/src/components/AUToolbarComponent.tsx

@@ -11,7 +11,7 @@ const AUToolbarComponent: FC<AUToolbarComponentProps> = ({
 }: AUToolbarComponentProps) => {
   useEffect(() => {
     setToolbars();
-    setToolbarToggle();
+    const cleanUp: CleanUpPair[] = setToolbarToggle();
     windowInnerWidth = window.innerWidth;
     window.addEventListener('resize', () => {
       if (windowInnerWidth > 0 && window.innerWidth !== windowInnerWidth) {
@@ -19,6 +19,13 @@ const AUToolbarComponent: FC<AUToolbarComponentProps> = ({
         setToolbars();
       }
     });
+
+    // Runs on unmounting
+    return () => {
+      cleanUp.forEach((pair: CleanUpPair) => {
+        pair.element.removeEventListener('click', pair.clickEvent);
+      });
+    };
   }, []);
 
   const renderElements = elements.map((e, i) => <React.Fragment key={i}>{e}</React.Fragment>);

package/src/lib/hooks.ts

@@ -1,31 +1,35 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
 /* eslint-disable import/prefer-default-export */
-import { useState, useEffect } from 'react';
+import { useEffect } from 'react';
 import { showModal, hideModal } from '@aarhus-university/au-designsystem-delphinus/source/js/components/modal-view';
 
 const useModal = (
   domId: string,
-  initialState: boolean,
-  showCondition = true,
-  hideCondition = false,
+  sender: HTMLButtonElement | null,
+  show = true,
   closeable = true,
-): [IModal, (modal: IModal) => void] => {
-  const [modal, setModal] = useState<IModal>({ modal: initialState, sender: null });
-
+  onClose: () => void = () => { },
+): void => {
   useEffect(() => {
-    if (modal.modal && modal.sender && showCondition) {
-      showModal(domId, modal.sender, () => {
-        setModal({ modal: false, sender: null });
+    const modalView = document.getElementById(domId);
+    if (modalView) {
+      const header = modalView.querySelector('.modal-view__header');
+      if (header && !header.getAttribute('id')) {
+        header.setAttribute('id', `${domId}-header`);
+        modalView.setAttribute('aria-labelledby', `${domId}-header`);
+      }
+    }
+
+    if (sender && show) {
+      showModal(domId, sender, () => {
+        onClose();
       }, closeable);
     }
 
-    if (modal.modal && modal.sender && hideCondition) {
-      hideModal(domId, modal.sender, () => {
-        setModal({ modal: false, sender: null });
-      });
+    if (sender && !show) {
+      hideModal(domId, sender);
     }
   });
-
-  return [modal, setModal];
 };
 
 export {

package/src/lib/tracking.ts

@@ -32,8 +32,8 @@ class AUTracking {
   }
 
   init() {
-    let gaNewElem: any = {};
-    let gaElems: any = {};
+    const gaNewElem: any = {};
+    const gaElems: any = {};
     const currdate: any = new Date();
 
     ((i, s, o, g, r, a, m): void => {
@@ -42,7 +42,7 @@ class AUTracking {
         (i[r].q = i[r].q || []).push(arguments);
       }, i[r].l = 1 * currdate;
       a = s.createElement(o),
-        m = s.getElementsByTagName(o)[0];
+      m = s.getElementsByTagName(o)[0];
       a.async = 1;
       a.src = g;
       m.parentNode.insertBefore(a, m);

package/stories/AUButtonComponent.stories.tsx

@@ -8,9 +8,6 @@ export default {
   title: 'Delphinus/Button',
   component: AUButtonComponent,
   // More on argTypes: https://storybook.js.org/docs/react/api/argtypes
-  argTypes: {
-    backgroundColor: { control: 'color' },
-  },
   decorators: [
     (Story) => { // , context) => {
       /*
@@ -20,7 +17,7 @@ export default {
       */
       return (
         <div>
-          <Story />
+          {Story()}
         </div>
       );
     }

package/stories/AUModalComponent.stories.tsx

@@ -0,0 +1,92 @@
+import React from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { useArgs } from '@storybook/client-api';
+
+import AUModalComponent from '../src/components/AUModalComponent';
+import AUButtonComponent from '../src/components/AUButtonComponent';
+
+// More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+export default {
+  title: 'Delphinus/Modal',
+  component: AUModalComponent,
+  // More on argTypes: https://storybook.js.org/docs/react/api/argtypes
+  decorators: [
+    (Story) => {
+      // , context) => {
+      /*
+      const { args: { themeColor, themeMode } } = context;
+      const themeColorClass = themeColor === 'none' ? '' : `theme--${themeColor}`;
+      const themeModeClass = themeMode === 'light' ? '' : `theme--${themeMode}`;
+      */
+      return (
+        <div className="page">
+          {Story()}
+        </div>
+      );
+    },
+  ],
+} as ComponentMeta<typeof AUModalComponent>;
+
+const fakeBtn = document.createElement('button');
+
+// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
+const Template: ComponentStory<typeof AUModalComponent> = (args) => {
+  const [_, updateArgs] = useArgs();
+  return (
+    <div className="page__content__block">
+      <AUButtonComponent
+        label="Open modal"
+        onClick={() => updateArgs({ ...args, show: true })}
+      />
+      <AUModalComponent {...args} onClose={() => updateArgs({ ...args, show: false })}>
+        <div className="modal-view__body">
+          <h2 className="modal-view__header">
+            The quick brown fox jumps over the lazy dog
+          </h2>
+          <div className="modal-view__content">
+            <p>"The quick brown fox jumps over the lazy dog" is an English-language pangram—a sentence that contains all of the letters of the alphabet. It is commonly used for touch-typing practice, testing typewriters and computer keyboards, displaying examples of fonts, and other applications involving text where the use of all letters in the alphabet is desired. Owing to its brevity and coherence, it has become widely known.</p><h3>History</h3><p>The earliest known appearance of the phrase is from The Boston Journal. In an article titled "Current Notes" in the February 10, 1885, morning edition, the phrase is mentioned as a good practice sentence for writing students: "A favorite copy set by writing teachers for their pupils is the following, because it contains every letter of the alphabet: 'A quick brown fox jumps over the lazy dog.'"[1] Dozens of other newspapers published the phrase over the next few months, all using the version of the sentence starting with "A" rather than "The".[2] The earliest known use of the phrase in its modern form (starting with "The") is from the 1888 book Illustrative Shorthand by Linda Bronson.[3] The modern form (starting with "The") became more common despite the fact that it is slightly longer than the original (starting with "A").</p>
+          </div>
+        </div>
+      </AUModalComponent>
+    </div>
+  )
+};
+
+export const Default = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+Default.args = {
+  show: true,
+  sender: fakeBtn,
+};
+
+export const Hidden = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+Hidden.args = {
+  show: false,
+  sender: fakeBtn,
+};
+
+export const Wide = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+Wide.args = {
+  className: 'modal-view modal-view--wide',
+  show: true,
+  sender: fakeBtn,
+};
+
+export const High = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+High.args = {
+  className: 'modal-view modal-view--high',
+  show: true,
+  sender: fakeBtn,
+};
+
+export const Non_Closable = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+Non_Closable.args = {
+  show: true,
+  sender: fakeBtn,
+  closeButtonDisabled: true,
+};
+

package/stories/AUNotificationComponent.stories.tsx

@@ -0,0 +1,116 @@
+import React from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+
+import AUNotificationComponent from '../src/components/AUNotificationComponent';
+import AUButtonComponent from '../src/components/AUButtonComponent';
+
+// More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+export default {
+  title: 'Delphinus/Notification',
+  component: AUNotificationComponent,
+  // More on argTypes: https://storybook.js.org/docs/react/api/argtypes
+  decorators: [
+    (Story) => { // , context) => {
+      /*
+      const { args: { themeColor, themeMode } } = context;
+      const themeColorClass = themeColor === 'none' ? '' : `theme--${themeColor}`;
+      const themeModeClass = themeMode === 'light' ? '' : `theme--${themeMode}`;
+      */
+      return (
+        <div>
+          {Story()}
+        </div>
+      );
+    }
+  ]
+} as ComponentMeta<typeof AUNotificationComponent>;
+
+// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
+const Template: ComponentStory<typeof AUNotificationComponent> = (args) => <AUNotificationComponent {...args} />;
+
+export const Default = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+Default.args = {
+  header: 'This is a notification',
+  content: [
+    <p>This might be of importance...</p>
+  ],
+};
+
+export const Warning = Template.bind({});
+Warning.args = {
+  header: 'Oops! An error has occurred',
+  type: 'warning',
+  content: [
+    <p>Shit's fucked, yo!</p>
+  ],
+};
+
+export const Attention = Template.bind({});
+Attention.args = {
+  header: 'Please read this',
+  type: 'attention',
+  content: [
+    <p>We really want you to read this.</p>
+  ],
+};
+
+export const Confirm = Template.bind({});
+Confirm.args = {
+  header: 'Great success',
+  type: 'confirm',
+  content: [
+    <p>You the man now, dawg!</p>
+  ],
+};
+
+export const Single_Action = Template.bind({});
+Single_Action.args = {
+  header: 'Do you want to do this?',
+  type: 'attention',
+  content: [
+    <p>Please confirm.</p>
+  ],
+  actions: [
+    <AUButtonComponent
+      label="Ok"
+    />
+  ],
+};
+
+export const Multiple_Actions = Template.bind({});
+Multiple_Actions.args = {
+  header: 'Do you want to do this?',
+  type: 'attention',
+  content: [
+    <p>Please confirm.</p>
+  ],
+  actions: [
+    <div className="button-container">
+      <AUButtonComponent
+        label="Ok"
+      />
+      <AUButtonComponent
+        label="Cancel"
+        type="text"
+      />
+    </div>,
+  ],
+};
+
+export const No_Header = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+No_Header.args = {
+  content: [
+    <p>This might be of importance...</p>
+  ],
+};
+
+export const Constrained_Width = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
+Constrained_Width.args = {
+  content: [
+    <p>This might be of importance...</p>
+  ],
+  classNames: ['notification--constrain-width'],
+};