trepur_components 2.3.8 → 2.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trepur_components",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "component lib",
   "author": "trepur_ttenneb",
   "private": false,
@@ -40,13 +40,14 @@
   "dependencies": {
     "@fortawesome/fontawesome": "^1.2.0-6",
     "@fortawesome/fontawesome-common-types": "^6.5.1",
+    "@fortawesome/fontawesome-free": "^6.5.2",
     "@fortawesome/fontawesome-free-regular": "^5.1.0-3",
     "@fortawesome/fontawesome-free-solid": "^5.1.0-3",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "class-variance-authority": "^0.7.0",
     "classnames": "^2.5.1",
-    "clsx": "^2.0.0",
+    "clsx": "^2.1.1",
     "cmdk": "^0.2.0",
     "d3-array": "^3.2.4",
     "embla-carousel-react": "^8.0.0-rc17",

package/src/components/Accordion/Accordion.stories.tsx

@@ -1,112 +1,35 @@
-import { type Meta, type StoryObj } from '@storybook/react';
+import { Collapsible } from '@components/Collapsible';
+import { Meta, StoryObj } from '@storybook/react';
 import { idAndClassName } from '@utils/controls';
 
-import { Accordion } from './';
-
-const propItems = [
-  {
-    preText: 'This is some text',
-    title: 'This is a title',
-    subtitle: 'This is a subtitle',
-    imageProps: {
-      src: 'https://picsum.photos/100/100',
-    },
-    children: (
-      <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper
-        in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla
-        lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec
-        ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh,
-        posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu
-        dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam
-        lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis
-        luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo
-        sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida
-        risus, et bibendum nunc condimentum eu.
-      </p>
-    ),
-  },
-  {
-    preText:
-      'Lorem, ipsum dolor sit amet consectetur adipisicing elit. Repellendus nihil, molestias amet sed, corrupti debitis odit doloribus perspiciatis est, quasi illum culpa iusto. Molestias, ducimus. Provident, quibusdam fuga. Voluptatem, saepe.',
-    title: 'This is a title',
-    imageProps: {
-      src: 'https://picsum.photos/101/100',
-    },
-    children: (
-      <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper
-        in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla
-        lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec
-        ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh,
-        posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu
-        dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam
-        lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis
-        luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo
-        sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida
-        risus, et bibendum nunc condimentum eu.
-      </p>
-    ),
-  },
-  {
-    subtitle: 'This is a subtitle',
-    imageProps: {
-      src: 'https://picsum.photos/100/101',
-    },
-    children: (
-      <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper
-        in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla
-        lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec
-        ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh,
-        posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu
-        dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam
-        lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis
-        luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo
-        sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida
-        risus, et bibendum nunc condimentum eu.
-      </p>
-    ),
-  },
-  {
-    imageProps: {
-      src: 'https://picsum.photos/102/100',
-    },
-    children: (
-      <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper
-        in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla
-        lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec
-        ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh,
-        posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu
-        dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam
-        lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis
-        luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo
-        sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida
-        risus, et bibendum nunc condimentum eu.
-      </p>
-    ),
-  }
-]
+import { Accordion } from '.';
+import { items } from './const';
 
 const meta = {
-  title: 'Components/Accordion',
+  title: 'V2Components/Accordion',
   component: Accordion,
   argTypes: {
     ...idAndClassName,
-    items: {
-      description: 'An array of collapsible props',
-      control: { type: 'array', default: undefined },
-      table: {
-        category: 'Accordion',
-        type: { summary: 'array' },
-        defaultValue: { summary: 'undefined' },
-      }
-    }
   },
   args: {
-    items: propItems,
-  }
+    children: items.map((item) => {
+      return (
+        <Collapsible>
+          <Collapsible.Header>
+            {item.image && <Collapsible.Image src={item.image} />}
+            <Collapsible.HeaderContent>
+              <Collapsible.Label>{item.label}</Collapsible.Label>
+              <Collapsible.Title>{item.title}</Collapsible.Title>
+              <Collapsible.Subtitle>{item.subtitle}</Collapsible.Subtitle>
+            </Collapsible.HeaderContent>
+          </Collapsible.Header>
+          <Collapsible.Content>
+            <Collapsible.Text>{item.content}</Collapsible.Text>
+          </Collapsible.Content>
+        </Collapsible>
+      );
+    }),
+  },
 } satisfies Meta<typeof Accordion>;
 
 export default meta;

package/src/components/Accordion/const.tsx

@@ -0,0 +1,34 @@
+export const items = [
+  {
+    label: 'This is some text',
+    title: 'This is a title',
+    subtitle: 'This is a subtitle',
+    image: 'https://picsum.photos/100/100',
+    content:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh, posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida risus, et bibendum nunc condimentum eu.',
+  },
+  {
+    title: 'This is a title',
+    content:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh, posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida risus, et bibendum nunc condimentum eu.',
+  },
+  {
+    label:
+      'Lorem, ipsum dolor sit amet consectetur adipisicing elit. Repellendus nihil, molestias amet sed, corrupti debitis odit doloribus perspiciatis est, quasi illum culpa iusto. Molestias, ducimus. Provident, quibusdam fuga. Voluptatem, saepe.',
+    title: 'This is a title',
+    image: 'https://picsum.photos/101/100',
+    content:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh, posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida risus, et bibendum nunc condimentum eu.',
+  },
+  {
+    subtitle: 'This is a subtitle',
+    image: 'https://picsum.photos/100/101',
+    content:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh, posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida risus, et bibendum nunc condimentum eu.',
+  },
+  {
+    image: 'https://picsum.photos/102/100',
+    content:
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam semper in neque in venenatis. Mauris scelerisque orci magna, et ultricies nulla lobortis ac. Aliquam vitae faucibus nisl. Nunc in tellus libero. Donec ut augue consequat, convallis risus in, pulvinar nibh. Duis mi nibh, posuere molestie pharetra cursus, viverra ut dolor. Vivamus eget arcu dui. Donec ullamcorper ornare justo sed feugiat. Curabitur aliquam lectus sed quam pharetra scelerisque. Integer vitae eleifend dolor. Duis luctus metus ipsum, et commodo magna bibendum quis. Quisque gravida leo sodales quam feugiat, id vulputate arcu pulvinar. Duis dictum gravida risus, et bibendum nunc condimentum eu.',
+  },
+];

package/src/components/Accordion/index.tsx

@@ -1,21 +1,22 @@
-import { Collapsible } from "@components/index";
+import { forwardRef, HTMLAttributes } from 'react';
+
+import clsx from 'clsx';
 
 export interface AccordionProps {
-  id?: string;
-  className?: string;
-  items: any;
+  loading?: boolean;
 }
 
-export const Accordion = ({ id, className, items }: AccordionProps) => {
-  return (
-    <div id={id} className={className}>
-      {items?.map((item: any, i: number) => {
-        return (
-          <Collapsible key={`collapsible_item_${i}`} {...item}>
-            {item.children}
-          </Collapsible>
-        );
-      })}
-    </div>
-  );
-}
+const AccordionComponent = forwardRef<
+  HTMLDivElement,
+  HTMLAttributes<HTMLDivElement> & AccordionProps
+>(({ id, className, children, loading = false, ...props }, ref) => (
+  <div id={id} className={clsx('', className)} ref={ref} {...props}>
+    {children}
+  </div>
+));
+
+AccordionComponent.displayName = 'Accordion';
+
+const Accordion = Object.assign(AccordionComponent);
+
+export { Accordion };

package/src/components/AlertBar/AlertBar.stories.tsx

@@ -1,95 +1,89 @@
-import { Meta, type StoryObj } from '@storybook/react';
-import { idAndClassName } from '@utils/controls';
-
-import { AlertBar } from '.';
+import { AlertBar } from './';
+import {
+  faCheckCircle,
+  faExclamationCircle,
+  faHeart,
+  faQuestionCircle,
+  faStopCircle,
+} from '@fortawesome/fontawesome-free-solid';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+import { action } from '@storybook/addon-actions';
+import { Meta, StoryObj } from '@storybook/react';
 
 const meta = {
-  title: 'Components/Alert Bar',
+  title: 'V2Components/Alert Bar',
   component: AlertBar,
-  argTypes: {
-    ...idAndClassName,
-    type: {
-      type: { name: 'string', required: false },
-      options: ['success', 'warning', 'error', 'info'],
-      description: 'The type of alert to render',
-      table: {
-        type: { summary: 'warning' },
-        defaultValue: { summary: 'warning' },
-      },
-      defaultValue: 'warning',
-      control: { type: 'radio' },
-    },
-    text: {
-      type: { name: 'string', required: false },
-      description: 'The text to display in the component',
-      table: {
-        type: { summary: 'string' },
-        defaultValue: { summary: 'undefined' },
-      }
-    },
 
-    leftIconProps: {
-      description: 'The icon props for the icon to display aligned to the left',
-      table: {
-        category: '',
-        type: { summary: 'string' },
-        defaultValue: { summary: 'undefined' },
-      }
-    },
-    rightIconProps: {
-      description:
-        'The icon props for the icon to display aligned to the right',
-      table: {
-        category: '',
-        type: { summary: 'string' },
-        defaultValue: { summary: 'undefined' },
-      }
-    },
-    textCenter: {
-      type: { name: 'boolean', required: false },
-      description: 'Aligns the text in the center of the component',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: 'false' },
-      },
-      defaultValue: 'false',
-    },
-    isDismissable: {
-      type: { name: 'boolean', required: false },
-      description: 'Enables the component to be closed when set to true',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: 'false' },
-      },
-      defaultValue: 'false',
-    },
-    onDismissClick: {
-      type: { name: 'function', required: false },
-      description: 'The action to perform when the component is closed',
-      action: 'onClick',
-      table: {
-        type: {
-          summary: 'function',
-        },
-        defaultValue: { summary: 'undefined' },
-      }
-    }
-  },
   args: {
-    text: 'This is an alert bar message',
-    leftIconProps: {
-      type: 'heart',
-      colour: 'white',
-      hollow: true,
-    },
-    rightIconProps: {
-      type: 'heart',
-      colour: 'white',
-    }
-  }
-};
+    children: [
+      <AlertBar.Icon icon={faHeart} />,
+      <AlertBar.Label>This is an alert bar</AlertBar.Label>,
+    ],
+  },
+} satisfies Meta<typeof AlertBar>;
 export default meta;
 
 type Story = StoryObj<typeof AlertBar>;
 
 export const Default: Story = {};
+
+export const Error: Story = {
+  ...Default,
+  args: {
+    ...Default.args,
+    children: [
+      <AlertBar.Icon icon={faStopCircle} />,
+      <AlertBar.Label>This is an alert bar</AlertBar.Label>,
+    ],
+    variant: 'error',
+  },
+};
+
+export const Success: Story = {
+  ...Default,
+  args: {
+    ...Default.args,
+    children: [
+      <AlertBar.Icon icon={faCheckCircle} />,
+      <AlertBar.Label>This is an alert bar</AlertBar.Label>,
+    ],
+    variant: 'success',
+  },
+};
+
+export const Warning: Story = {
+  ...Default,
+  args: {
+    ...Default.args,
+    children: [
+      <AlertBar.Icon icon={faExclamationCircle} />,
+      <AlertBar.Label>This is an alert bar</AlertBar.Label>,
+    ],
+    variant: 'warning',
+  },
+};
+
+export const Info: Story = {
+  ...Default,
+  args: {
+    ...Default.args,
+    children: [
+      <AlertBar.Icon icon={faQuestionCircle} />,
+      <AlertBar.Label>This is an alert bar</AlertBar.Label>,
+    ],
+    variant: 'info',
+  },
+};
+
+export const Dismiss: Story = {
+  ...Default,
+  args: {
+    ...Default.args,
+    children: [
+      <AlertBar.Icon icon={faQuestionCircle} />,
+      <AlertBar.Label>This is an alert bar</AlertBar.Label>,
+      <AlertBar.Dismiss onClick={action('clicked')} />,
+    ],
+    variant: 'info',
+  },
+};

package/src/components/AlertBar/index.tsx

@@ -1,113 +1,82 @@
-import { type MouseEventHandler, useState } from 'react';
+import { ComponentPropsWithoutRef, forwardRef, HTMLAttributes } from 'react';
 
-// import Icon, { type Props as iconProps } from '@components/Icon';
-import classNames from 'classnames';
+import { PickU } from '@components/Pill';
+import { faExclamation } from '@fortawesome/fontawesome-free-solid';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+import clsx from 'clsx';
 
-export interface Props {
+import { Button } from '..';
+import { Icon } from '../Icon';
+
+export interface AlertBarProps {
   id?: string;
   className?: string;
-  type?: 'success' | 'warning' | 'error' | 'info';
-  text?: string;
-  // leftIconProps?: iconProps;
-  // rightIconProps?: iconProps;
-  textCenter?: boolean;
-  isDismissable?: boolean;
-  onDismissClick?: MouseEventHandler;
+  variant?: 'default' | 'success' | 'warning' | 'error' | 'info';
+  loading?: boolean;
 }
 
-export const AlertBar = ({
-  id,
-  className,
-  type = 'warning',
-  text,
-  // leftIconProps,
-  // rightIconProps,
-  textCenter = false,
-  isDismissable = false,
-  onDismissClick,
-}: Props) => {
-  const [alertBarStatus, setAlertBarStatus] = useState({
-    state: 'open',
-    display: true,
-  })
-
-  // const iconLeft = leftIconProps != null && <Icon {...leftIconProps} />;
-
-  // const iconRight = rightIconProps != null && <Icon {...rightIconProps} />;
+const AlertBarComponent = forwardRef<
+  HTMLDivElement,
+  HTMLAttributes<HTMLDivElement> & AlertBarProps
+>(
+  (
+    { id, className, children, variant = 'default', loading, ...props },
+    ref,
+  ) => {
+    return (
+      <div
+        id={id}
+        className={clsx('flex w-full items-center gap-x-4 px-8 py-2', {
+          '': variant === 'default',
+          'border-error-default bg-error-light text-error-default':
+            variant === 'error',
+          'border-info-default bg-info-light text-info-default':
+            variant === 'info',
+          'border-success-default bg-success-light text-success-default':
+            variant === 'success',
+          'border-warning-default bg-warning-light text-warning-default':
+            variant === 'warning',
+        })}
+        ref={ref}
+        {...props}
+      >
+        {children}
+      </div>
+    );
+  },
+);
 
-  const bgColor = classNames({
-    'bg-success': type === 'success',
-    'bg-warning': type === 'warning',
-    'bg-error': type === 'error',
-    'bg-info-light': type === 'info',
-  })
+const AlertBarLabel = forwardRef<
+  HTMLParagraphElement,
+  HTMLAttributes<HTMLParagraphElement>
+>(({ ...props }, ref) => (
+  <p className="text-md text-light-grey flex-1 truncate" ref={ref} {...props} />
+));
 
-  const alertBarState = classNames({
-    'opacity-100': alertBarStatus.state === 'open',
-    'opacity-0': alertBarStatus.state === 'closed',
-    hidden: !alertBarStatus.display,
-  })
+const AlertBarIcon = forwardRef<
+  SVGSVGElement,
+  PickU<ComponentPropsWithoutRef<typeof Icon>, 'icon'>
+>(({ icon }, ref) => <Icon ref={ref} icon={icon} />);
 
-  const classList = classNames(
-    className,
-    bgColor,
-    alertBarState,
-    'flex py-2 text-white duration-700  w-parent transition-opactiy',
-  )
+const AlertBarDismiss = forwardRef<
+  HTMLButtonElement,
+  Omit<HTMLAttributes<HTMLButtonElement>, 'icon'>
+>(({ ...props }) => (
+  <Button variant="ghost" {...props}>
+    <Icon icon={faExclamation} />
+  </Button>
+));
 
-  const textClassList = classNames(
-    {
-      'text-center': textCenter,
-      // 'pl-20': !textCenter && leftIconProps !== null,
-      // 'pl-4': !textCenter && leftIconProps === null,
-    },
-    'w-full py-3',
-  )
+AlertBarComponent.displayName = 'AlertBar';
 
-  const rightIconClasses = classNames(
-    {
-      'hover:cursor-pointer': isDismissable,
-    },
-    'absolute right-0 pr-8 pt-3',
-  )
+AlertBarLabel.displayName = 'AlertBar.Label';
+AlertBarIcon.displayName = 'AlertBar.Icon';
+AlertBarDismiss.displayName = 'AlertBar.Dismiss';
 
-  const closeAlertBar = (e: any): void => {
-    setAlertBarStatus({
-      state: 'closed',
-      display: alertBarStatus.display,
-    })
-    setTimeout(() => {
-      setAlertBarStatus({
-        state: 'closed',
-        display: false,
-      })
-    }, 700);
-    if (onDismissClick != null) {
-      onDismissClick(e);
-    }
-  };
+const AlertBar = Object.assign(AlertBarComponent, {
+  Label: AlertBarLabel,
+  Icon: AlertBarIcon,
+  Dismiss: AlertBarDismiss,
+});
 
-  // const dismissIcon = <Icon type="multiply" colour="white" />;
-
-  return (
-    <div id={id} className={classList}>
-      {/* {leftIconProps != null && (
-        <span className='absolute pl-8 pt-3'>{iconLeft}</span>
-      )} */}
-      <h3 className={textClassList}>{text}</h3>
-      {/* {isDismissable && (
-        <a
-          className={rightIconClasses}
-          onClick={(e) => {
-            closeAlertBar(e);
-          }}
-        >
-          <span>{dismissIcon}</span>
-        </a>
-      )} */}
-      {/* {iconRight != null && !isDismissable && (
-        <span className={rightIconClasses}>{iconRight}</span>
-      )} */}
-    </div>
-  );
-}
+export { AlertBar };

package/src/components/Avatar/Avatar.stories.tsx

@@ -1,16 +1,11 @@
-import { Meta, type StoryObj } from '@storybook/react';
-import { idAndClassName } from '@utils/controls';
-
-import { Avatar } from '.';
+import { Avatar } from './';
+import { Meta, StoryObj } from '@storybook/react';
 
 const meta = {
   title: 'Components/Avatar',
   component: Avatar,
-  argTypes: {
-    ...idAndClassName,
-  },
   args: {},
-}
+} satisfies Meta<typeof Avatar>;
 
 export default meta;