@pareto-engineering/design-system 4.0.0-alpha.63 → 4.0.0-alpha.64

package/dist/es/f/fields/index.js

@@ -8,5 +8,4 @@ export { QuerySelect } from "./QuerySelect";
 export { Checkbox } from "./Checkbox";
 export { QueryChoices } from "./QueryChoices";
 export { LinkInput } from "./LinkInput";
-export { EditorInput } from "./EditorInput";
-export * from "./V2";
+export { EditorInput } from "./EditorInput";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pareto-engineering/design-system",
-  "version": "4.0.0-alpha.63",
+  "version": "4.0.0-alpha.64",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
@@ -71,5 +71,5 @@
     "relay-test-utils": "^15.0.0"
   },
   "browserslist": "> 2%",
-  "gitHead": "d150baeb18c0f279e529ba46a7248fdb16180853"
+  "gitHead": "2664d428449c22570d89c6c4f9e6d65e3c1d51c1"
 }

package/src/stories/f/Checkbox.stories.jsx

@@ -27,16 +27,12 @@ export default {
     ),
   ],
   argTypes:{
-    label           :{ control: 'text' },
-    labelColor      :{ control: 'text' },
-    description     :{ control: 'text' },
-    defaultValue    :{ control: 'boolean' },
-    disabled        :{ control: 'boolean' },
-    optional        :{ control: 'boolean' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    label       :{ control: 'text' },
+    labelColor  :{ control: 'text' },
+    description :{ control: 'text' },
+    defaultValue:{ control: 'boolean' },
+    disabled    :{ control: 'boolean' },
+    optional    :{ control: 'boolean' },
   },
 }
 
@@ -54,7 +50,13 @@ const Template = ({ defaultValue, ...args }) => {
     }, [defaultValue])
 
     return (
-      <div className="grid">
+      <div
+        style={{
+          display      :'flex',
+          flexDirection:'column',
+          gap          :'1rem',
+        }}
+      >
         <Checkbox {...args} />
         <FormDebugger />
       </div>
@@ -98,13 +100,3 @@ Optional.args = {
   ...WithLabel.args,
   optional:true,
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  label           :'Urgent',
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/ChoicesInput.stories.jsx

@@ -22,15 +22,11 @@ export default {
     ),
   ],
   argTypes:{
-    color           :{ control: 'color' },
-    labelColor      :{ control: 'color' },
-    multiple        :{ control: 'boolean' },
-    disabled        :{ control: 'boolean' },
-    optional        :{ control: 'boolean' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    color     :{ control: 'color' },
+    labelColor:{ control: 'color' },
+    multiple  :{ control: 'boolean' },
+    disabled  :{ control: 'boolean' },
+    optional  :{ control: 'boolean' },
   },
 }
 
@@ -82,7 +78,13 @@ const Template = ({ defaultValue, ...args }) => {
     }, [defaultValue])
 
     return (
-      <div className="grid">
+      <div
+        style={{
+          display      :'flex',
+          flexDirection:'column',
+          gap          :'1rem',
+        }}
+      >
         <ChoicesInput {...args} />
         <FormDebugger />
       </div>
@@ -117,13 +119,6 @@ MultipleWithDefaultFormikValue.args = {
   defaultValue:['brown', 'violet'],
 }
 
-export const MultipleWithGrid = Template.bind({})
-MultipleWithGrid.args = {
-  ...Base.args,
-  multiple          :true,
-  gridColumnsDesktop:2,
-}
-
 export const ChoicesWithLabel = Template.bind({})
 ChoicesWithLabel.args = {
   ...Base.args,
@@ -142,13 +137,3 @@ DisabledChoicesInput.args = {
   ...ChoicesWithLabel.args,
   disabled:true,
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  label           :'Select color',
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/EditorInput.stories.jsx

@@ -29,16 +29,18 @@ export default {
     disabled          :{ control: 'boolean' },
     labelAsDescription:{ control: 'boolean' },
     optional          :{ control: 'boolean' },
-    labelSpan         :{ control: 'number' },
-    inputSpan         :{ control: 'number' },
-    desktopLabelSpan  :{ control: 'number' },
-    desktopInputSpan  :{ control: 'number' },
     showDebugger      :{ control: 'boolean' },
   },
 }
 
 const Template = (args) => (
-  <div className="grid">
+  <div
+    style={{
+      display      :'flex',
+      flexDirection:'column',
+      gap          :'1rem',
+    }}
+  >
     <EditorInput {...args} />
     <FormDebugger />
   </div>
@@ -77,12 +79,3 @@ Disabled.args = {
   ...Base.args,
   disabled:true,
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/LinkInput.stories.jsx

@@ -27,24 +27,26 @@ export default {
   ],
   argTypes:{
     // backgroundColor:{ control: 'color' },
-    placeholder     :{ control: 'text' },
-    autoComplete    :{ control: 'select', options: ['off', 'on'] },
-    disabled        :{ control: 'boolean' },
-    name            :{ control: 'text' },
-    label           :{ control: 'text' },
-    labelColor      :{ control: 'text' },
-    optional        :{ control: 'boolean' },
-    symbol          :{ control: 'text' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    placeholder :{ control: 'text' },
+    autoComplete:{ control: 'select', options: ['off', 'on'] },
+    disabled    :{ control: 'boolean' },
+    name        :{ control: 'text' },
+    label       :{ control: 'text' },
+    labelColor  :{ control: 'text' },
+    optional    :{ control: 'boolean' },
+    symbol      :{ control: 'text' },
   },
 }
 
 // eslint-disable-next-line react/prop-types
 const Template = (args) => (
-  <div className="grid">
+  <div
+    style={{
+      display      :'flex',
+      flexDirection:'column',
+      gap          :'1rem',
+    }}
+  >
     <LinkInput {...args} />
     <FormDebugger />
   </div>
@@ -89,12 +91,3 @@ WithDisabled.args = {
   ...Base.args,
   disabled:true,
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/QueryChoices.stories.jsx

@@ -28,15 +28,11 @@ export default {
     ),
   ],
   argTypes:{
-    color           :{ control: 'color' },
-    labelColor      :{ control: 'color' },
-    multiple        :{ control: 'boolean' },
-    isLoading       :{ control: 'boolean' },
-    optional        :{ control: 'boolean' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    color     :{ control: 'color' },
+    labelColor:{ control: 'color' },
+    multiple  :{ control: 'boolean' },
+    isLoading :{ control: 'boolean' },
+    optional  :{ control: 'boolean' },
   },
 }
 
@@ -103,7 +99,13 @@ const Template = ({ isLoading, defaultFormikState, ...args }) => {
   }
 
   const Content = () => (
-    <div className="grid">
+    <div
+      style={{
+        display      :'flex',
+        flexDirection:'column',
+        gap          :'1rem',
+      }}
+    >
       <QueryChoices
         name="status"
         label="Select Status"
@@ -140,12 +142,3 @@ export const Optional = Template.bind({})
 Optional.args = {
   optional:true,
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/QueryCombobox.stories.jsx

@@ -29,18 +29,14 @@ export default {
     ),
   ],
   argTypes:{
-    disabled        :{ control: 'boolean' },
-    type            :{ control: 'text' },
-    name            :{ control: 'text' },
-    color           :{ control: 'text' },
-    label           :{ control: 'text' },
-    labelColor      :{ control: 'text' },
-    multiple        :{ control: 'boolean' },
-    optional        :{ control: 'boolean' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    disabled  :{ control: 'boolean' },
+    type      :{ control: 'text' },
+    name      :{ control: 'text' },
+    color     :{ control: 'text' },
+    label     :{ control: 'text' },
+    labelColor:{ control: 'text' },
+    multiple  :{ control: 'boolean' },
+    optional  :{ control: 'boolean' },
   },
 }
 
@@ -129,7 +125,13 @@ const ResolvedTemplate = ({ defaultFormikState, ...otherProps }) => {
     }
 
     return (
-      <div className="grid">
+      <div
+        style={{
+          display      :'flex',
+          flexDirection:'column',
+          gap          :'1rem',
+        }}
+      >
         <QueryCombobox
           label="Search for a team"
           optionsKeyMap={{
@@ -144,7 +146,7 @@ const ResolvedTemplate = ({ defaultFormikState, ...otherProps }) => {
           searchVariable="name_Icontains"
           {...otherProps}
         />
-        <div className="container">
+        <div>
           <FormDebugger />
           <Button
             onClick={updateFormikState}
@@ -237,16 +239,6 @@ MultipleSelectWithDefaultFormikState.args = {
   },
 }
 
-export const OnSingleRow = ResolvedTemplate.bind({})
-OnSingleRow.args = {
-  multiple          :true,
-  defaultFormikState:{ teams: [] },
-  labelSpan         :4,
-  inputSpan         :4,
-  desktopLabelSpan  :4,
-  desktopInputSpan  :10,
-}
-
 // eslint-disable-next-line react/prop-types
 // const RejectedTemplate = ({ multiple }) => {
 //   const Content = () => {

package/src/stories/f/QuerySelect.stories.jsx

@@ -28,15 +28,11 @@ export default {
     ),
   ],
   argTypes:{
-    color           :{ control: 'text' },
-    label           :{ control: 'text' },
-    labelColor      :{ control: 'text' },
-    isLoading       :{ control: 'boolean' },
-    optional        :{ control: 'boolean' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    color     :{ control: 'text' },
+    label     :{ control: 'text' },
+    labelColor:{ control: 'text' },
+    isLoading :{ control: 'boolean' },
+    optional  :{ control: 'boolean' },
   },
 }
 const statuses = [
@@ -99,7 +95,13 @@ const Template = ({ isLoading, defaultFormikState, ...args }) => {
   }
 
   const Content = () => (
-    <div className="grid">
+    <div
+      style={{
+        display      :'flex',
+        flexDirection:'column',
+        gap          :'1rem',
+      }}
+    >
       <QuerySelect
         name="status"
         label="Select Task Status"
@@ -146,12 +148,3 @@ export const Optional = Template.bind({})
 Optional.args = {
   optional:true,
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/RatingsInput.stories.jsx

@@ -33,15 +33,17 @@ export default {
     labelMax           :{ control: 'text' },
     labelMin           :{ control: 'text' },
     optional           :{ control: 'boolean' },
-    labelSpan          :{ control: 'number' },
-    inputSpan          :{ control: 'number' },
-    desktopLabelSpan   :{ control: 'number' },
-    desktopInputSpan   :{ control: 'number' },
   },
 }
 
 const Template = (args) => (
-  <div className="grid">
+  <div
+    style={{
+      display      :'flex',
+      flexDirection:'column',
+      gap          :'1rem',
+    }}
+  >
     <RatingsInput {...args} />
     <FormDebugger />
   </div>
@@ -73,12 +75,3 @@ Labels.args = {
   labelMin           :'not satisfied.',
   displayRatingsLabel:true,
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/SelectInput.stories.jsx

@@ -22,20 +22,22 @@ export default {
     ),
   ],
   argTypes:{
-    color           :{ control: 'text' },
-    label           :{ control: 'text' },
-    labelColor      :{ control: 'text' },
-    disabled        :{ control: 'boolean' },
-    optional        :{ control: 'boolean' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    color     :{ control: 'text' },
+    label     :{ control: 'text' },
+    labelColor:{ control: 'text' },
+    disabled  :{ control: 'boolean' },
+    optional  :{ control: 'boolean' },
   },
 }
 
 const Template = (args) => (
-  <div className="grid">
+  <div
+    style={{
+      display      :'flex',
+      flexDirection:'column',
+      gap          :'1rem',
+    }}
+  >
     <SelectInput {...args} />
     <FormDebugger />
   </div>
@@ -91,12 +93,3 @@ DisabledWithDescriptionSelectInput.args = {
   disabled   :true,
   description:'This is a description',
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/TextInput.stories.jsx

@@ -27,25 +27,27 @@ export default {
   ],
   argTypes:{
     // backgroundColor:{ control: 'color' },
-    placeholder     :{ control: 'text' },
-    autoComplete    :{ control: 'select', options: ['off', 'on'] },
-    disabled        :{ control: 'boolean' },
-    type            :{ control: 'text' },
-    name            :{ control: 'text' },
-    label           :{ control: 'text' },
-    labelColor      :{ control: 'text' },
-    optional        :{ control: 'boolean' },
-    symbol          :{ control: 'text' },
-    labelSpan       :{ control: 'number' },
-    inputSpan       :{ control: 'number' },
-    desktopLabelSpan:{ control: 'number' },
-    desktopInputSpan:{ control: 'number' },
+    placeholder :{ control: 'text' },
+    autoComplete:{ control: 'select', options: ['off', 'on'] },
+    disabled    :{ control: 'boolean' },
+    type        :{ control: 'text' },
+    name        :{ control: 'text' },
+    label       :{ control: 'text' },
+    labelColor  :{ control: 'text' },
+    optional    :{ control: 'boolean' },
+    symbol      :{ control: 'text' },
   },
 }
 
 // eslint-disable-next-line react/prop-types
 const Template = (args) => (
-  <div className="grid">
+  <div
+    style={{
+      display      :'flex',
+      flexDirection:'column',
+      gap          :'1rem',
+    }}
+  >
     <TextInput {...args} />
     <FormDebugger />
   </div>
@@ -116,12 +118,3 @@ HasSymbol.args = {
   ...Base.args,
   symbol:"'$'",
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/stories/f/TextareaInput.stories.jsx

@@ -32,15 +32,17 @@ export default {
     disabled          :{ control: 'boolean' },
     labelAsDescription:{ control: 'boolean' },
     optional          :{ control: 'boolean' },
-    labelSpan         :{ control: 'number' },
-    inputSpan         :{ control: 'number' },
-    desktopLabelSpan  :{ control: 'number' },
-    desktopInputSpan  :{ control: 'number' },
   },
 }
 
 const Template = (args) => (
-  <div className="grid">
+  <div
+    style={{
+      display      :'flex',
+      flexDirection:'column',
+      gap          :'1rem',
+    }}
+  >
     <TextareaInput {...args} />
     <FormDebugger />
   </div>
@@ -103,12 +105,3 @@ DisableResize.args = {
   ...Base.args,
   resize:'none',
 }
-
-export const OnSingleRow = Template.bind({})
-OnSingleRow.args = {
-  ...Base.args,
-  labelSpan       :4,
-  inputSpan       :4,
-  desktopLabelSpan:4,
-  desktopInputSpan:10,
-}

package/src/ui/f/FormInput/FormInput.jsx

@@ -6,28 +6,17 @@ import { memo } from 'react'
 import PropTypes from 'prop-types'
 
 import {
-  TextInput as TextInputV1,
-  TextareaInput as TextareaInputV1,
-  ChoicesInput as ChoicesInputV1,
-  SelectInput as SelectInputV1,
-  QueryCombobox as QueryComboboxV1,
-  QuerySelect as QuerySelectV1,
-  RatingsInput as RatingsInputV1,
-  Checkbox as CheckboxV1,
-  QueryChoices as QueryChoicesV1,
-  LinkInput as LinkInputV1,
-  EditorInput as EditorInputV1,
-  TextInputV2,
-  TextareaInputV2,
-  ChoicesInputV2,
-  SelectInputV2,
-  QueryComboboxV2,
-  QuerySelectV2,
-  RatingsInputV2,
-  CheckboxV2,
-  QueryChoicesV2,
-  LinkInputV2,
-  EditorInputV2,
+  TextInput,
+  TextareaInput,
+  ChoicesInput,
+  SelectInput,
+  QueryCombobox,
+  QuerySelect,
+  RatingsInput,
+  Checkbox,
+  QueryChoices,
+  LinkInput,
+  EditorInput,
 } from '../fields'
 
 import './styles.scss'
@@ -46,7 +35,6 @@ const FormInput = ({
   type,
   extraTypes,
   disabled,
-  isVersionTwo,
   ...otherProps
 }) => {
   const newClassName = [
@@ -54,32 +42,6 @@ const FormInput = ({
     componentClassName,
   ].filter(Boolean).join(' ')
 
-  let TextInput = TextInputV1
-  let TextareaInput = TextareaInputV1
-  let ChoicesInput = ChoicesInputV1
-  let SelectInput = SelectInputV1
-  let QueryCombobox = QueryComboboxV1
-  let QuerySelect = QuerySelectV1
-  let RatingsInput = RatingsInputV1
-  let Checkbox = CheckboxV1
-  let QueryChoices = QueryChoicesV1
-  let LinkInput = LinkInputV1
-  let EditorInput = EditorInputV1
-
-  if (isVersionTwo) {
-    TextInput = TextInputV2
-    TextareaInput = TextareaInputV2
-    ChoicesInput = ChoicesInputV2
-    SelectInput = SelectInputV2
-    QueryCombobox = QueryComboboxV2
-    QuerySelect = QuerySelectV2
-    RatingsInput = RatingsInputV2
-    Checkbox = CheckboxV2
-    QueryChoices = QueryChoicesV2
-    LinkInput = LinkInputV2
-    EditorInput = EditorInputV2
-  }
-
   if (type === 'textarea') {
     return (
       <TextareaInput
@@ -234,17 +196,10 @@ FormInput.propTypes = {
    * Whether the Form input input should be disabled
    */
   disabled  :PropTypes.bool,
-
-  /**
-   * Whethe the Form input is version 2
-   */
-  isVersionTwo:PropTypes.bool,
-
 }
 
 FormInput.defaultProps = {
-  disabled    :false,
-  isVersionTwo:false,
+  disabled:false,
 }
 
 export default memo(FormInput)