@pareto-engineering/design-system 4.0.0-alpha.35 → 4.0.0-alpha.37

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

@@ -29,10 +29,18 @@ export default {
     ),
   ],
   argTypes:{
-    // backgroundColor:{ control: 'color' },
-    multiple:{ control: 'boolean' },
-    disabled:{ control: 'boolean' },
-    optional:{ control: 'boolean' },
+    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' },
   },
 }
 
@@ -121,7 +129,7 @@ const ResolvedTemplate = ({ defaultFormikState, ...otherProps }) => {
     }
 
     return (
-      <>
+      <div className="grid">
         <QueryCombobox
           label="Search for a team"
           optionsKeyMap={{
@@ -136,13 +144,7 @@ const ResolvedTemplate = ({ defaultFormikState, ...otherProps }) => {
           searchVariable="name_Icontains"
           {...otherProps}
         />
-        <div
-          style={{
-            display      :'flex',
-            alignItems   :'flex-end',
-            flexDirection:'column',
-          }}
-        >
+        <div className="container">
           <FormDebugger />
           <Button
             onClick={updateFormikState}
@@ -150,7 +152,7 @@ const ResolvedTemplate = ({ defaultFormikState, ...otherProps }) => {
             {multiple ? 'Add formik values' : 'Replace formik value'}
           </Button>
         </div>
-      </>
+      </div>
     )
   }
 
@@ -217,6 +219,16 @@ 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,9 +28,15 @@ export default {
     ),
   ],
   argTypes:{
-    // backgroundColor:{ control: 'color' },
-    isLoading:{ control: 'boolean' },
-    optional :{ control: 'boolean' },
+    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' },
   },
 }
 const statuses = [
@@ -93,7 +99,7 @@ const Template = ({ isLoading, defaultFormikState, ...args }) => {
   }
 
   const Content = () => (
-    <>
+    <div className="grid">
       <QuerySelect
         name="status"
         label="Select Task Status"
@@ -108,7 +114,7 @@ const Template = ({ isLoading, defaultFormikState, ...args }) => {
         {...args}
       />
       <FormDebugger />
-    </>
+    </div>
   )
 
   const initialValues = defaultFormikState ?? { status: '' }
@@ -140,3 +146,12 @@ 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

@@ -27,19 +27,24 @@ export default {
     ratingCount        :{ control: 'number' },
     name               :{ control: 'text' },
     label              :{ control: 'text' },
+    labelColor         :{ control: 'text' },
     showRatingValue    :{ control: 'boolean' },
     displayRatingsLabel:{ control: 'boolean' },
     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">
     <RatingsInput {...args} />
     <FormDebugger />
-  </>
+  </div>
 )
 
 export const Base = Template.bind({})
@@ -68,3 +73,12 @@ 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,17 +22,23 @@ export default {
     ),
   ],
   argTypes:{
-    // backgroundColor:{ control: 'color' },
-    disabled:{ control: 'boolean' },
-    optional:{ control: 'boolean' },
+    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' },
   },
 }
 
 const Template = (args) => (
-  <>
+  <div className="grid">
     <SelectInput {...args} />
     <FormDebugger />
-  </>
+  </div>
 )
 
 export const Base = Template.bind({})
@@ -85,3 +91,12 @@ 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,20 +27,25 @@ 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' },
-    optional    :{ control: 'boolean' },
-    symbol      :{ control: 'text' },
+    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' },
   },
 }
 
 // eslint-disable-next-line react/prop-types
 const Template = (args) => (
-  <div className=" u2 pb-u">
+  <div className="grid">
     <TextInput {...args} />
     <FormDebugger />
   </div>
@@ -111,3 +116,12 @@ 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

@@ -27,18 +27,23 @@ export default {
     // backgroundColor:{ control: 'color' },
     name              :{ control: 'text' },
     label             :{ control: 'text' },
+    labelColor        :{ control: 'text' },
     placeholder       :{ control: 'text' },
     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">
     <TextareaInput {...args} />
     <FormDebugger />
-  </>
+  </div>
 )
 
 export const Base = Template.bind({})
@@ -98,3 +103,12 @@ 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/common/InputWrapper/InputWrapper.jsx

@@ -0,0 +1,89 @@
+/* @pareto-engineering/generator-front 1.0.12 */
+import * as React from 'react'
+
+import { useInsertionEffect } from 'react'
+
+import PropTypes from 'prop-types'
+
+import styleNames from '@pareto-engineering/bem/exports'
+
+// Local Definitions
+
+const baseClassName = styleNames.base
+
+const componentClassName = 'input-wrapper'
+
+/**
+ * This is the component description.
+ */
+const InputWrapper = ({
+  id,
+  className:userClassName,
+  style,
+  children,
+  columnSpan,
+  desktopColumnSpan,
+  // ...otherProps
+}) => {
+  useInsertionEffect(() => {
+    import('./styles.scss')
+  }, [])
+
+  return (
+    <div
+      id={id}
+      className={[
+        baseClassName,
+        componentClassName,
+        userClassName,
+      ]
+        .filter((e) => e)
+        .join(' ')}
+      style={{
+        ...style,
+        '--column-span'   :columnSpan || 'var(--columns)',
+        '--column-span-md':desktopColumnSpan || 'var(--columns)',
+      }}
+    >
+      {children}
+    </div>
+  )
+}
+
+InputWrapper.propTypes = {
+  /**
+   * The HTML id for this element
+   */
+  id:PropTypes.string,
+
+  /**
+   * The HTML class names for this element
+   */
+  className:PropTypes.string,
+
+  /**
+   * The React-written, css properties for this element.
+   */
+  style:PropTypes.objectOf(PropTypes.string),
+
+  /**
+   *  The children JSX
+   */
+  children:PropTypes.node,
+
+  /**
+   * How many columns the input should span
+   */
+  columnSpan:PropTypes.number,
+
+  /**
+   * How many columns the input should span on desktop
+   */
+  desktopColumnSpan:PropTypes.number,
+}
+
+InputWrapper.defaultProps = {
+  // as      :'label',
+}
+
+export default InputWrapper

package/src/ui/f/common/InputWrapper/index.js

@@ -0,0 +1,2 @@
+/* @pareto-engineering/generator-front 1.0.12 */
+export { default as InputWrapper } from './InputWrapper'

package/src/ui/f/common/InputWrapper/styles.scss

@@ -0,0 +1,13 @@
+/* @pareto-engineering/generator-front 1.0.12 */
+
+@use "@pareto-engineering/bem";
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
+
+.#{bem.$base}.input-wrapper {
+  grid-column: span var(--column-span);
+
+  @include mixins.media($from: $sm-md) {
+    grid-column: span var(--column-span-md);
+  }
+}

package/src/ui/f/common/Label/Label.jsx

@@ -25,6 +25,8 @@ const Label = ({
   color,
   optional,
   as:Wrapper,
+  columnSpan,
+  desktopColumnSpan,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -43,7 +45,11 @@ const Label = ({
       ]
         .filter((e) => e)
         .join(' ')}
-      style={style}
+      style={{
+        ...style,
+        '--column-span'   :columnSpan || 'var(--columns)',
+        '--column-span-md':desktopColumnSpan || 'var(--columns)',
+      }}
       // {...otherProps}
     >
       {children}
@@ -91,11 +97,21 @@ Label.propTypes = {
    * Whether the input should have an optional tag
    */
   optional:PropTypes.bool,
+
+  /**
+ * How many columns the input should span
+ */
+  columnSpan:PropTypes.number,
+
+  /**
+   * How many columns the input should span on desktop
+   */
+  desktopColumnSpan:PropTypes.number,
 }
 
 Label.defaultProps = {
   as      :'label',
-  color   :'main2',
+  color   :'paragraph',
   optional:false,
 }
 

package/src/ui/f/common/Label/styles.scss

@@ -1,8 +1,14 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
 @use "@pareto-engineering/bem";
-@use "../../../form.scss";
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 .#{bem.$base}.form-label {
-  color: var(--paragraph);
+  color: var(--x);
+  grid-column: span var(--column-span);
+
+  @include mixins.media($from: $sm-md) {
+    grid-column: span var(--column-span-md);
+  }
 }

package/src/ui/f/common/index.js

@@ -1,3 +1,4 @@
 export { Label as FormLabel } from './Label'
 export { Description as FormDescription } from './Description'
 export { Debugger as FormDebugger } from './Debugger'
+export { InputWrapper } from './InputWrapper'

package/src/ui/f/fields/Checkbox/Checkbox.jsx

@@ -9,7 +9,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 
 import { useField } from 'formik'
 
-import { FormLabel, FormDescription } from '../../common'
+import { FormLabel, FormDescription, InputWrapper } from '../../common'
 
 // Local Definitions
 
@@ -29,6 +29,11 @@ const Checkbox = ({
   description,
   disabled,
   optional,
+  labelColor,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -38,34 +43,42 @@ const Checkbox = ({
   const [field] = useField({ name, type: 'checkbox' })
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-      // {...otherProps}
-    >
+    <>
       {label && (
-      <FormLabel name={name} optional={optional}>
-        {label}
-      </FormLabel>
+        <FormLabel
+          name={name}
+          color={labelColor}
+          optional={optional}
+          columnSpan={labelSpan}
+          desktopColumnSpan={desktopLabelSpan}
+        // {...otherProps}
+        >
+          {label}
+        </FormLabel>
       )}
-      <input
-        id={name}
-        className="input"
-        type="checkbox"
-        disabled={disabled}
-        {...field}
-      />
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-    </div>
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
+      >
+        <input
+          id={name}
+          className="input"
+          type="checkbox"
+          disabled={disabled}
+          {...field}
+        />
+        <FormDescription className="s-1" description={description} name={name} />
+      </InputWrapper>
+    </>
   )
 }
 
@@ -100,11 +113,36 @@ Checkbox.propTypes = {
    */
   disabled:PropTypes.bool,
 
+  /**
+   * The color of the label
+   */
+  labelColor:PropTypes.string,
+
   /**
    * The input label
    */
   label:PropTypes.string,
 
+  /**
+ * The number of columns the label should span
+ */
+  labelSpan:PropTypes.number,
+
+  /**
+   * The number of columns the input should span
+   */
+  inputSpan:PropTypes.number,
+
+  /**
+   * The number of columns the label should span on desktop
+   */
+  desktopLabelSpan:PropTypes.number,
+
+  /**
+   * The number of columns the input should span on desktop
+   */
+  desktopInputSpan:PropTypes.number,
+
   /**
    * Whether the input should have an optional tag
    */

package/src/ui/f/fields/Checkbox/styles.scss

@@ -1,15 +1,13 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
 @use "@pareto-engineering/bem";
-
-$default-margin: 1em;
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 .#{bem.$base}.checkbox {
-  align-items: flex-start;
-  display: flex;
-  flex-direction: column;
-
-  .#{bem.$base}.label {
-    margin-bottom: $default-margin;
+  &.#{bem.$base}.input-wrapper {
+    align-items: flex-start;
+    display: flex;
+    flex-direction: column;
   }
 }