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

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

@@ -11,7 +11,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 
 import { LoadingCircle } from 'ui/a'
 
-import { FormLabel, FormDescription } from '../../common'
+import { FormLabel, FormDescription, InputWrapper } from '../../common'
 
 // Local Definitions
 
@@ -28,6 +28,7 @@ const SelectInput = ({
   style,
   name,
   label,
+  labelColor,
   color,
   options,
   validate,
@@ -36,6 +37,10 @@ const SelectInput = ({
   disabled,
   isLoading,
   autoComplete,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -45,54 +50,63 @@ const SelectInput = ({
   const [field] = useField({ name, validate })
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-        `y-${color}`,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
+    <>
+      <FormLabel
+        name={name}
+        color={labelColor}
+        optional={optional}
+        columnSpan={labelSpan}
+        desktopColumnSpan={desktopLabelSpan}
       // {...otherProps}
-    >
-      <FormLabel name={name} optional={optional}>{label}</FormLabel>
-      <div className="select-wrapper with-faded-border">
-        <select
-          className="input"
-          {...field}
-          value={field.value || ''}
-          id={name}
-          disabled={disabled}
-          autoComplete={autoComplete}
-        >
-          {
-        options.map((option) => {
-          // i.e if option is a string like "blah", return { value: "blah", label: "blah" }
-          const newOption = typeof option === 'string' ? { value: option, label: option } : option
-
-          return (
-            <option
-              key={newOption.value}
-              value={newOption.value}
-              disabled={newOption?.disabled || false}
-            >
-              {newOption.label}
-            </option>
-          )
-        })
-      }
-        </select>
-        {isLoading && (
-        <LoadingCircle className="x-main2" />
-        )}
-      </div>
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-    </div>
+      >
+        {label}
+      </FormLabel>
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
+      >
+        <div className={`select-wrapper${disabled ? ' disabled' : ''}`}>
+          <select
+            className={`input y-${color}`}
+            {...field}
+            value={field.value || ''}
+            id={name}
+            disabled={disabled}
+            autoComplete={autoComplete}
+          >
+            {
+          options.map((option) => {
+            // i.e if option is a string like "blah", return { value: "blah", label: "blah" }
+            const newOption = typeof option === 'string' ? { value: option, label: option } : option
+
+            return (
+              <option
+                key={newOption.value}
+                value={newOption.value}
+                disabled={newOption?.disabled || false}
+              >
+                {newOption.label}
+              </option>
+            )
+          })
+        }
+          </select>
+          {isLoading && (
+          <LoadingCircle className="x-main" />
+          )}
+        </div>
+        <FormDescription className="s-1" description={description} name={name} />
+      </InputWrapper>
+    </>
   )
 }
 
@@ -155,6 +169,11 @@ SelectInput.propTypes = {
    */
   color:PropTypes.string,
 
+  /**
+   * The color of the select input label
+   */
+  labelColor:PropTypes.string,
+
   /*
   * Whether the query that is fetching the select options is still in flight
   */
@@ -164,6 +183,26 @@ SelectInput.propTypes = {
    */
   autoComplete: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 is optional or not
   */
@@ -172,7 +211,7 @@ SelectInput.propTypes = {
 
 SelectInput.defaultProps = {
   disabled:false,
-  color   :'interactive',
+  color   :'paragraph',
 }
 
 export default memo(SelectInput)

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

@@ -2,45 +2,67 @@
 
 
 @use "@pareto-engineering/bem";
-@use "../../../form.scss";
-
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 $default-spacing-size: 1em;
-$default-padding: .5em;
+$default-padding: .55em .75em;
 $default-bg-gradient: var(--background-far);
 $default-input-border-radius: var(--theme-default-input-border-radius);
+$default-border: var(--theme-default-input-border);
+$hover-border: var(--theme-hover-input-border);
+$focus-border: var(--theme-focus-input-border);
+$default-background: var(--background-inputs);
+$disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.select-input {
-  display: flex;
-  flex-direction: column;
-
-  .#{bem.$base}.label {
+  &.#{bem.$base}.label {
     margin-bottom: $default-spacing-size;
   }
 
-  >.select-wrapper {
-    background-color: var(--background-inputs);
+  .select-wrapper {
+    background-color: $default-background;
+    border: $default-border;
     border-radius: $default-input-border-radius;
-    padding: $default-padding 0 $default-padding calc($default-padding * 1.5);
+    display: flex;
+    flex-direction: column;
+    padding: $default-padding;
+    padding-right: 0;
     position: relative;
 
+    &:not(.disabled) {
+      &:hover,
+      &:active {
+        border: $hover-border;
+      }
+
+      &:focus {
+        border: $focus-border;
+      }
+    }
+
+    &.disabled {
+      background: $disabled-background;
+    }
+
+    &::placeholder {
+      color: var(--metadata);
+    }
+
     &::after {
       border-radius: $default-input-border-radius;
     }
 
-    &:not(:disabled):hover {
-      box-shadow: var(--default-input-box-shadow);
-    }
     >.#{bem.$base}.loading-circle {
       position: absolute;
-      right: 0;
+      right: $default-spacing-size;
       top: 50%;
       transform: translateY(-50%);
     }
 
     select {
       appearance: none;
-      background-color: transparent;
+      background-color: $default-background;
       background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAyMCAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE5IDEuNUwxMCAxMC41TDEgMS41IiBzdHJva2U9IiM0QzRENTMiIHN0cm9rZS13aWR0aD0iMiIvPgo8L3N2Zz4=");
       background-position: calc(100% - $default-spacing-size);
       background-repeat: no-repeat;
@@ -48,12 +70,13 @@ $default-input-border-radius: var(--theme-default-input-border-radius);
       padding-right: $default-spacing-size;
 
       &.input {
-        color: var(--paragraph);
+        border: none;
+        color: var(--y);
+        outline: none;
         width: 100%;
 
         &:disabled {
-          appearance: none;
-          opacity: 35%;
+          opacity: 0%;
         }
       }
     }

package/src/ui/f/fields/TextInput/TextInput.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
 
@@ -30,12 +30,15 @@ const TextInput = ({
   color,
   labelColor,
   validate,
-  oneInputLabel,
   description,
   disabled,
   placeholder,
   optional,
   autoComplete,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   symbol,
   // ...otherProps
 }) => {
@@ -49,32 +52,33 @@ const TextInput = ({
     : {}
 
   return (
-    <div
-      id={id}
-      className={[
-        baseClassName,
-        componentClassName,
-        userClassName,
-        `y-${color}`,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-      // {...otherProps}
-    >
+    <>
       <FormLabel
-        className={[oneInputLabel ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
-          .filter((e) => e)
-          .join(' ')}
         name={name}
         color={labelColor}
         optional={optional}
+        columnSpan={labelSpan}
+        desktopColumnSpan={desktopLabelSpan}
+        // {...otherProps}
       >
-        { label }
+        {label}
       </FormLabel>
-      <div
-        className={`input-wrapper with-faded-border ${symbol ? 'has-symbol' : ''}`}
-        style={symbolStyle}
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+          `y-${color} ${symbol ? 'has-symbol' : ''}`,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={{
+          ...symbolStyle,
+          ...style,
+        }}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
       >
         <input
           id={name}
@@ -85,11 +89,9 @@ const TextInput = ({
           autoComplete={autoComplete}
           {...field}
         />
-      </div>
-
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-
-    </div>
+        <FormDescription className="s-1" description={description} name={name} />
+      </InputWrapper>
+    </>
   )
 }
 
@@ -178,15 +180,36 @@ TextInput.propTypes = {
    * `https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete`
    */
   autoComplete: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,
+
   /**
    * A symbol to be set inside the input field
    */
-  symbol      :PropTypes.string,
+  symbol:PropTypes.string,
 }
 
 TextInput.defaultProps = {
   type    :'text',
-  color   :'main',
+  color   :'paragraph',
   disabled:false,
 }
 

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

@@ -1,32 +1,32 @@
 /* @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 *;
 
-$default-padding: .75em .75em .55em;
+$default-padding: .55em .75em;
 $default-symbol-left: 1em;
 $default-padding-with-symbol:
-  .75em
+  .55em
   calc($default-symbol-left - 1em)
-  .75em
+  .55em
   calc($default-symbol-left + 1em);
 $default-input-border-radius: var(--theme-default-input-border-radius);
-
+$default-border: var(--theme-default-input-border);
+$hover-border: var(--theme-hover-input-border);
+$focus-border: var(--theme-focus-input-border);
+$default-background: var(--background-inputs);
+$disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.text-input {
-  display: flex;
-  flex-direction: column;
-
-  >.input-wrapper {
+  &.#{bem.$base}.input-wrapper {
+    display: flex;
+    flex-direction: column;
     position: relative;
 
-    &::after {
-      border-radius: $default-input-border-radius;
-    }
-
     &.has-symbol {
       &::before {
-        color: var(--interactive);
+        color: var(--y);
         content: var(--symbol);
         left: $default-symbol-left;
         position: absolute;
@@ -40,10 +40,11 @@ $default-input-border-radius: var(--theme-default-input-border-radius);
     }
 
     > input {
-      background-color: var(--background-inputs);
+      background-color: $default-background;
+      border: $default-border;
       border-radius: $default-input-border-radius;
-      color: var(--paragraph);
-      height: 100%;
+      color: var(--y);
+      outline: none;
       padding: $default-padding;
       width: 100%;
 
@@ -52,14 +53,19 @@ $default-input-border-radius: var(--theme-default-input-border-radius);
       }
 
       &:disabled {
-        background-color: var(--hard-x);
+        background-color: $disabled-background;
       }
 
-      &:not(:disabled):hover {
-        border-radius: $default-input-border-radius;
-        box-shadow: var(--theme-default-input-box-shadow);
+      &:not(:disabled) {
+        &:hover,
+        &:active {
+          border: $hover-border;
+        }
+
+        &:focus {
+          border: $focus-border;
+        }
       }
     }
   }
 }
-

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

@@ -11,7 +11,7 @@ import { useField } from 'formik'
 
 // Local Definitions
 
-import { FormLabel, FormDescription } from '../../common'
+import { FormLabel, FormDescription, InputWrapper } from '../../common'
 
 const baseClassName = styleNames.base
 
@@ -27,17 +27,19 @@ const TextareaInput = ({
   name,
   label,
   validate,
-  labelAsDescription,
-  textAreaId,
+  color,
   rows,
   optional,
-  backgroundColor,
   labelColor,
   description,
   disabled,
   placeholder,
   autoComplete,
   resize,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
   useInsertionEffect(() => {
@@ -47,46 +49,46 @@ const TextareaInput = ({
   const [field] = useField({ name, validate })
 
   return (
-    <div
-      id={id}
-      className={[
-
-        baseClassName,
-
-        componentClassName,
-        userClassName,
-        `y-${backgroundColor}`,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-      // {...otherProps}
-    >
+    <>
       <FormLabel
-        className={[labelAsDescription ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
-          .filter((e) => e)
-          .join(' ')}
         name={name}
         color={labelColor}
         optional={optional}
+        columnSpan={labelSpan}
+        desktopColumnSpan={desktopLabelSpan}
+      // {...otherProps}
       >
-        { label }
+        {label}
       </FormLabel>
-      <textarea
-        id={textAreaId}
-        className="textarea"
-        {...field}
-        style={{ resize }}
-        placeholder={placeholder}
-        rows={rows}
-        disabled={disabled}
-        autoComplete={autoComplete}
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+          `y-${color}`,
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
       >
-        {/* It was a dark and stormy night... */}
-      </textarea>
-
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-    </div>
+        <textarea
+          id={name}
+          className="textarea"
+          {...field}
+          style={{ resize }}
+          placeholder={placeholder}
+          rows={rows}
+          disabled={disabled}
+          autoComplete={autoComplete}
+        >
+          {/* It was a dark and stormy night... */}
+        </textarea>
+        <FormDescription className="s-1" description={description} name={name} />
+      </InputWrapper>
+    </>
   )
 }
 
@@ -136,9 +138,9 @@ TextareaInput.propTypes = {
   rows:PropTypes.number,
 
   /**
-   * Text area background color
+   * Color of the text
    */
-  backgroundColor:PropTypes.string,
+  color:PropTypes.string,
 
   /**
    * Label base color
@@ -175,13 +177,33 @@ TextareaInput.propTypes = {
   * Whether the input is optional or not
   */
   optional:PropTypes.bool,
+
+  /**
+ * 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,
 }
 
 TextareaInput.defaultProps = {
-  rows           :10,
-  backgroundColor:'background-inputs',
-  disabled       :false,
-  resize         :'vertical',
+  rows    :10,
+  disabled:false,
+  resize  :'vertical',
+  color   :'paragraph',
 }
 
 export default memo(TextareaInput)