@pareto-engineering/design-system 4.0.0-alpha.16 → 4.0.0-alpha.17

package/src/stories/a/Conversation.stories.jsx

@@ -21,22 +21,22 @@ export const Base = () => {
   const conversations = [
     {
       message:'Hi Camille, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
-      sender :'HUMBL',
+      sender :'Humbl',
       from   :'theirs',
     },
     {
       message:'Hi Morgan! Here is the database we prepared for you.',
-      sender :'CAMILLE',
+      sender :'Camille',
       from   :'ours',
     },
     {
       message:'Hi Camille, please compile an assesment of top 6 firms/brand providers for the listed fields in the US.',
-      sender :'HUMBL',
+      sender :'Humbl',
       from   :'theirs',
     },
     {
       message:'Hi Morgan! Here is the spreadsheet we prepared for you.',
-      sender :'CAMILLE',
+      sender :'Camille',
       from   :'ours',
     },
   ]
@@ -50,63 +50,28 @@ export const Base = () => {
   )
 }
 
-export const WithTriangle = () => {
-  const conversations = [
-    {
-      message:'Hi Camille, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
-      sender :'HUMBL',
-      from   :'theirs',
-    },
-    {
-      message:'Hi Morgan! Here is the database we prepared for you.',
-      sender :'CAMILLE',
-      from   :'ours',
-    },
-    {
-      message:'Hi Camille, please compile an assesment of top 6 firms/brand providers for the listed fields in the US.',
-      sender :'HUMBL',
-      from   :'theirs',
-    },
-    {
-      message:'Hi Morgan! Here is the spreadsheet we prepared for you.',
-      sender :'CAMILLE',
-      from   :'ours',
-    },
-  ]
-
-  return (
-    <Conversation
-      hasTriangle
-    >
-      {conversations.map((conversation) => (
-        <Conversation.Message key={conversation.message} {...conversation} />
-      ))}
-    </Conversation>
-  )
-}
-
 export const WithAttachment = () => {
   const conversations = [
     {
       message:'Hi Camille, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
-      sender :'HUMBL',
+      sender :'Humbl',
       from   :'theirs',
     },
     {
       message        :'Hi Morgan! Here is the database we prepared for you.',
-      sender         :'CAMILLE',
+      sender         :'Camille',
       from           :'ours',
       attachment     :'spreadsheet.xlsx',
       attachmentColor:'main4',
     },
     {
       message:'Hi Camille, please compile an assesment of top 6 firms/brand providers for the listed fields in the US.',
-      sender :'HUMBL',
+      sender :'Humbl',
       from   :'theirs',
     },
     {
       message        :'Hi Morgan! Here is the spreadsheet we prepared for you.',
-      sender         :'CAMILLE',
+      sender         :'Camille',
       from           :'ours',
       attachment     :'spreadsheet.xlsx',
       attachmentColor:'main4',

package/src/stories/b/Button/Button.stories.jsx

@@ -112,11 +112,14 @@ ArrowRightSimple.args = {
   isSimple      :true,
 }
 
-const GroupTemplate = (args) => (
-  <Button.Group {...args}>
-    <MultipleTemplate />
-  </Button.Group>
-)
-
-export const ButtonGroup = GroupTemplate.bind({})
-ButtonGroup.args = {}
+export const DisabledArrowLeft = MultipleTemplate.bind({})
+DisabledArrowLeft.args = {
+  arrowDirection:'left',
+  disabled      :true,
+}
+
+export const DisabledArrowRight = MultipleTemplate.bind({})
+DisabledArrowRight.args = {
+  arrowDirection:'right',
+  disabled      :true,
+}

package/src/stories/colors.js

@@ -1,10 +1,11 @@
 const THEME = [
   'main',
-  'interactive',
-  'main1',
+  'main-80',
+  'main-50',
   'main2',
-  'main3',
-  'main4',
+  'interactive',
+  'interactive-icons',
+  'shadow',
 ]
 
 /*
@@ -26,19 +27,30 @@ const MODALS = [
   'success',
   'warning',
   'error',
+  'blocked',
+  'backlog',
+  'in-progress',
+  'in-review',
+  'requested',
+  'completed',
 ]
 
 const UI = [
   'background-far',
   'background-near',
   'background-cards',
+  'background-cards-80',
+  'background-cards-50',
+  'background-inputs',
   'background-mesh',
   'heading',
   'paragraph',
   'subtitle',
   'metadata',
   'link',
-  'navlink',
+  'transparent',
+  'highlighted',
+  'disabled',
 ]
 
 const SM = [

package/src/ui/a/Conversation/Conversation.jsx

@@ -7,6 +7,8 @@ import PropTypes from 'prop-types'
 
 import styleNames from '@pareto-engineering/bem/exports'
 
+import { Card } from 'ui'
+
 // Local Definitions
 
 import { Message } from './common'
@@ -24,11 +26,10 @@ const Conversation = ({
   id,
   className:userClassName,
   style,
-  backgroundColor,
   ourColor,
   theirColor,
   children,
-  hasTriangle,
+  backgroundColor,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -42,22 +43,20 @@ const Conversation = ({
         theirColor,
       }}
     >
-      <div
+      <Card
         id={id}
         className={[
           baseClassName,
           componentClassName,
           userClassName,
-          hasTriangle && 'has-triangle',
           `y-${backgroundColor}`,
-          'u1',
         ]
           .filter((e) => e)
           .join(' ')}
         style={style}
       >
         {children}
-      </div>
+      </Card>
     </ConversationContext.Provider>
   )
 }
@@ -88,26 +87,21 @@ Conversation.propTypes = {
    */
   theirColor:PropTypes.string,
 
-  /**
-   * The component background color
-   */
-  backgroundColor:PropTypes.string,
   /**
    *  The children JSX
    */
-  children       :PropTypes.node,
+  children:PropTypes.node,
 
   /**
-   * whether to add triangle to bubble chats
+   * The background color
    */
-  hasTriangle:PropTypes.bool,
+  backgroundColor:PropTypes.string,
 }
 
 Conversation.defaultProps = {
-  backgroundColor:'background2',
-  ourColor       :'background1',
-  theirColor     :'background1',
-  hasTriangle    :false,
+  ourColor       :'main',
+  theirColor     :'main2',
+  backgroundColor:'background-near',
 }
 
 Conversation.Message = Message

package/src/ui/a/Conversation/common/Message/Message.jsx

@@ -5,6 +5,8 @@ import PropTypes from 'prop-types'
 
 import styleNames from '@pareto-engineering/bem/exports'
 
+import { Card } from 'ui'
+
 // Local Definitions
 
 import useConversation from '../../useConversation'
@@ -31,7 +33,7 @@ const Message = ({
   const { ourColor, theirColor } = useConversation()
 
   return (
-    <div
+    <Card.Section
       id={id}
       className={[
         baseClassName,
@@ -39,31 +41,32 @@ const Message = ({
         userClassName,
         `x-${from === 'ours' ? ourColor : theirColor}`,
         from === 'ours' && 'ours',
-        'v1',
       ]
         .filter((e) => e)
         .join(' ')}
       style={style}
     >
-      <div className={styleNames.elementContent}>
-        <p className="sender v25 mb-v s-1">
+      {sender && (
+        <p className="sender">
           {sender}
           :
         </p>
+      )}
+      <div className="message-content">
         <p>
           {message}
         </p>
         {attachment
       && (
       <div className={`attachment y-${attachmentColor}`}>
-        <span className="f-icons">{attachmentIcon}</span>
-        <p className="ml-v">
+        <span className="icon">{attachmentIcon}</span>
+        <p>
           {attachment}
         </p>
       </div>
       )}
       </div>
-    </div>
+    </Card.Section>
   )
 }
 Message.propTypes = {
@@ -116,7 +119,7 @@ Message.propTypes = {
 Message.defaultProps = {
   from           :'theirs',
   attachmentIcon :'A',
-  attachmentColor:'main4',
+  attachmentColor:'interactive',
 }
 
 export default Message

package/src/ui/a/Conversation/styles.scss

@@ -1,154 +1,50 @@
 /* @pareto-engineering/generator-front 1.0.12 */
-/* stylelint-disable selector-max-compound-selectors -- exception */
 
 @use "@pareto-engineering/bem";
 @use "@pareto-engineering/styles/src/mixins";
 @use "@pareto-engineering/styles/src/globals" as *;
 
-$default-padding: var(--u);
-$default-conversation-background: var(--y);
+$default-border-radius: var(--theme-default-border-radius);
+$default-padding: var(--gap);
 $default-message-max-width: calc(100% - 4 * #{$default-padding});
 $default-message-min-width: 12em;
-$default-message-border: var(--theme-border);
-$triangle-border-size: 15px;
-$triangle-border-style: $triangle-border-size solid;
-$triangle-border-style-subtracted: ($triangle-border-size - 1px) solid;
-$triangle-border1: $triangle-border-style var(--paragraph);
-$triangle-border2: $triangle-border-style transparent;
-$triangle-border3: $triangle-border-style-subtracted var(--x);
-$triangle-border4: $triangle-border-style-subtracted transparent;
-$triangle-before-side:24px;
-$triangle-before-bottom:-30px;
-$triangle-after-bottom:-27px;
-$triangle-after-side:25px;
+$default-message-border: 1px solid var(--hard-background-cards);
 
 .#{bem.$base}.conversation {
-  background-color: $default-conversation-background;
-  border-radius: var(--theme-border-radius);
+  background: var(--y);
   display: flex;
   flex-direction: column;
   padding: $default-padding;
 
-  >:not(:last-child) {
-    margin-bottom: $default-padding;
-  }
-
-  // >:nth-child(1) {
-  // animation-delay: 1s;
-  // }
-  // >:nth-child(2) {
-  // animation-delay: 3s;
-  // }
-
-  &.has-triangle {
-    padding-bottom: calc(#{$default-padding} * 2);
-    .#{bem.$base}.message {
-      ::before {
-        border-bottom: $triangle-border2;
-        border-left: $triangle-border2;
-        border-right: $triangle-border1;
-        border-top: $triangle-border1;
-        bottom: $triangle-before-bottom;
-        content: "";
-        height: 0;
-        position: absolute;
-        right: $triangle-before-side;
-        width: 0;
-      }
-
-      ::after {
-        border-bottom: $triangle-border4;
-        border-left: $triangle-border4;
-        border-right: $triangle-border3;
-        border-top: $triangle-border3;
-        bottom: $triangle-after-bottom;
-        content: "";
-        height: 0;
-        position: absolute;
-        right: $triangle-after-side;
-        width: 0;
-      }
-
-      &:not(.ours) {
-        ::before {
-          border-bottom: $triangle-border2;
-          border-left: $triangle-border1;
-          border-right: $triangle-border2;
-          border-top: $triangle-border1;
-          bottom: $triangle-before-bottom;
-          content: "";
-          height: 0;
-          left: $triangle-before-side;
-          position: absolute;
-          width: 0;
-        }
-
-        ::after {
-          border-bottom: $triangle-border4;
-          border-left: $triangle-border3;
-          border-right: $triangle-border4;
-          border-top: $triangle-border3;
-          bottom: $triangle-after-bottom;
-          content: "";
-          height: 0;
-          left: $triangle-after-side;
-          position: absolute;
-          width: 0;
-        }
-      }
-    }
-  }
-
-  .#{bem.$base}.message {
+  > .#{bem.$base}.message {
     align-self: flex-start;
-    background-color: var(--x);
-    //  animation: fadeIn 1s ease-in both;
-    border: $default-message-border;
-    border-radius: var(--theme-border-radius);
     max-width: $default-message-max-width;
     min-width: $default-message-min-width;
-    padding: $default-padding;
     position: relative;
 
-    .#{bem.$element-content} {
+    > .message-content {
+      background-color: var(--x);
+      border: $default-message-border;
+      border-radius: $default-border-radius;
       display: flex;
       flex-direction: column;
+      padding: 0 $default-padding;
 
-      >p {
+      > p {
         color: var(--on-x);
       }
 
-      .sender {
-        font-weight: 800;
-        margin-bottom: .5em;
-      }
-
-      .attachment {
-        align-self: baseline;
-        background-color: var(--y);
+      > .attachment {
+        align-items: center;
+        align-self: flex-end;
         display: flex;
         flex-direction: row;
-        padding: .5em 1em;
-
-        > p {
-          margin-bottom: 0;
-        }
-
-        > img {
-          width: 40px;
-        }
+        gap: calc($default-padding / 2);
       }
     }
+
     &.#{bem.$base}.ours {
       align-self: flex-end;
     }
-
-
-    // mobile style
-    @include mixins.media($to:$sm-md) {
-      .message {
-        margin-top: 2em;
-      }
-    }
   }
 }

package/src/ui/a/SnapScroller/styles.scss

@@ -27,6 +27,10 @@ $default-spacing: var(--gap, 1em);
     &:first-child {
       margin-left: $default-spacing;
     }
+
+    &:last-child {
+      margin-right: $default-spacing;
+    }
   }
 
   @include mixins.media($from: $sm-md) {
@@ -42,6 +46,10 @@ $default-spacing: var(--gap, 1em);
         &:first-child {
           margin-left: unset;
         }
+
+        &:last-child {
+          margin-right: unset;
+        }
       }
     }
   }

package/src/ui/b/Button/styles.scss

@@ -30,7 +30,7 @@ $default-animation-time: .31s;
       vertical-align: middle;
     }
 
-    &:hover {
+    &:hover:not(:disabled) {
       &::after {
         --final-position: 50%;
         animation: animateArrow $default-animation-time forwards;
@@ -46,7 +46,7 @@ $default-animation-time: .31s;
       vertical-align: middle;
     }
 
-    &:hover {
+    &:hover:not(:disabled) {
       &::before {
         --final-position: -50%;
         animation: animateArrow $default-animation-time forwards;