@pareto-engineering/design-system 4.0.0-alpha.4 → 4.0.0-alpha.42

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

@@ -1,7 +1,7 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 import * as React from 'react'
 
-import { useState, useLayoutEffect, memo } from 'react'
+import { useState, useInsertionEffect, memo } from 'react'
 
 import PropTypes from 'prop-types'
 
@@ -10,7 +10,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 // Local Definitions
 
 import { Rating } from './common'
-import { FormLabel } from '../../common'
+import { FormLabel, InputWrapper } from '../../common'
 
 const baseClassName = styleNames.base
 
@@ -26,46 +26,52 @@ const RatingsInput = ({
   name,
   ratingCount,
   showRatingValue,
-  oneInputLabel,
+  color,
   label,
   labelColor,
   labelMax,
   labelMin,
   displayRatingsLabel,
   optional,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
-  useLayoutEffect(() => {
+  useInsertionEffect(() => {
     import('./styles.scss')
   }, [])
 
   const [hover, setHover] = useState(null)
 
   return (
-    <div
-      id={id}
-      className={[
-        baseClassName,
-        componentClassName,
-        userClassName,
-      ]
-        .filter((e) => e)
-        .join(' ')}
-      style={style}
-    >
+    <>
       <FormLabel
-        className={[
-          'input-label', 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="stars">
-        {displayRatingsLabel && <p className="label-text md-s-1 s-2 x-metadata c-x">{labelMin}</p>}
+      <InputWrapper
+        id={id}
+        className={[
+          baseClassName,
+          componentClassName,
+          userClassName,
+          'stars',
+        ]
+          .filter((e) => e)
+          .join(' ')}
+        style={style}
+        columnSpan={inputSpan}
+        desktopColumnSpan={desktopInputSpan}
+      >
+        {displayRatingsLabel && <p className="label-text s-2 x-metadata c-x">{labelMin}</p>}
         {[...Array(ratingCount)].map((_, index) => {
           const ratingValue = index + 1
           return (
@@ -77,12 +83,13 @@ const RatingsInput = ({
               hover={hover}
               setHover={setHover}
               showRatingValue={showRatingValue}
+              activeBackgroundColor={color}
             />
           )
         })}
-        {displayRatingsLabel && <p className="label-text md-s-1 s-2 x-metadata c-x">{labelMax}</p>}
-      </div>
-    </div>
+        {displayRatingsLabel && <p className="label-text s-2 x-metadata c-x">{labelMax}</p>}
+      </InputWrapper>
+    </>
   )
 }
 
@@ -134,21 +141,41 @@ RatingsInput.propTypes = {
    * Whether the input is optional or not
    */
   optional           :PropTypes.bool,
+
   /**
- * If the slide will only have one input
+ * The color of the stars
  */
-  oneInputLabel      :PropTypes.bool,
+  color:PropTypes.string,
 
   /**
  * String that will represent color for the label
  */
   labelColor: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,
 }
 
 RatingsInput.defaultProps = {
-  labelMin  :'not satisfied.',
-  labelMax  :'very satisfied.',
-  labelColor:'main2',
+  labelMin:'not satisfied.',
+  labelMax:'very satisfied.',
 }
 
 export default memo(RatingsInput)

package/src/ui/f/fields/RatingsInput/common/Rating/Rating.jsx

@@ -53,13 +53,13 @@ const Rating = ({
         onMouseLeave={() => setHover(null)}
       >
         {showRatingValue && (
-        <span className="v25 mb-v md-s-1 s-2 x-metadata c-x">
+        <span className="s-2 x-metadata c-x">
           {value}
         </span>
         )}
         <span
           className={[
-            'f-icons',
+            'icon',
             value <= (hover || Number(field.value)) ? 'c-x' : 'c-hard-y',
           ]
             .filter((e) => e)
@@ -134,8 +134,8 @@ Rating.propTypes = {
 }
 
 Rating.defaultProps = {
-  activeBackgroundColor  :'main1',
-  inactiveBackgroundColor:'background2',
+  activeBackgroundColor  :'interactive',
+  inactiveBackgroundColor:'background-inputs',
   showRatingValue        :false,
 }
 

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

@@ -1,37 +1,32 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 
 @use "@pareto-engineering/bem";
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
 $default-rating-icon-margin: .5em;
 $default-padding: .2em;
 $default-transition: all .2s;
 
 .#{bem.$base}.ratings-input {
-  display: flex;
-  flex-direction: column;
-
-  p {
-    padding: $default-padding;
-  }
-
-  .stars {
+  &.stars {
     display: flex;
 
     >:not(:last-child) {
       margin-right: $default-rating-icon-margin;
     }
 
-    .#{bem.$base}.rating {
+    > .#{bem.$base}.rating {
       display: flex;
 
-      input {
+      > input {
         opacity: 0;
         position: absolute;
         visibility: none;
         z-index: -1;
       }
 
-      label {
+      > label {
         align-items: center;
         cursor: pointer;
         display: flex;
@@ -47,5 +42,3 @@ $default-transition: all .2s;
     }
   }
 }
-
-

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

@@ -1,7 +1,7 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 import * as React from 'react'
 
-import { useLayoutEffect, memo } from 'react'
+import { useInsertionEffect, memo } from 'react'
 
 import { useField } from 'formik'
 
@@ -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,63 +37,76 @@ const SelectInput = ({
   disabled,
   isLoading,
   autoComplete,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
   // ...otherProps
 }) => {
-  useLayoutEffect(() => {
+  useInsertionEffect(() => {
     import('./styles.scss')
   }, [])
 
   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">
-        <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   :'background2',
+  color   :'paragraph',
 }
 
 export default memo(SelectInput)

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

@@ -2,48 +2,82 @@
 
 
 @use "@pareto-engineering/bem";
-@use "../../../form.scss";
+@use "@pareto-engineering/styles/src/mixins";
+@use "@pareto-engineering/styles/src/globals" as *;
 
-
-$default-padding: .75em;
-$default-margin: 1em;
+$default-spacing-size: 1em;
+$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 {
-    margin-bottom: $default-margin;
+  &.#{bem.$base}.label {
+    margin-bottom: $default-spacing-size;
   }
 
   .select-wrapper {
+    background-color: $default-background;
+    border: $default-border;
+    border-radius: $default-input-border-radius;
+    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;
+    }
+
     >.#{bem.$base}.loading-circle {
       position: absolute;
-      right: 0;
+      right: $default-spacing-size;
       top: 50%;
       transform: translateY(-50%);
     }
 
-    >.input {
-      background: var(--soft-y);
-      border: var(--theme-border-style) var(--hard-y);
-      color: var(--on-y);
-      padding: $default-padding;
-      width: 100%;
+    select {
+      appearance: none;
+      background-color: $default-background;
+      background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAyMCAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE5IDEuNUwxMCAxMC41TDEgMS41IiBzdHJva2U9IiM0QzRENTMiIHN0cm9rZS13aWR0aD0iMiIvPgo8L3N2Zz4=");
+      background-position: calc(100% - $default-spacing-size);
+      background-repeat: no-repeat;
+      background-size: $default-spacing-size;
+      padding-right: $default-spacing-size;
 
-      &:not(:disabled):hover {
-        border: var(--theme-border-style) var(--soft-background4);
-      }
-
-      &:disabled {
-        appearance: none;
-        background-color: var(--hard-y);
-      }
+      &.input {
+        border: none;
+        color: var(--y);
+        outline: none;
+        width: 100%;
 
-      &:focus {
-        background: var(--y);
+        &:disabled {
+          opacity: 0%;
+        }
       }
     }
   }

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

@@ -1,7 +1,7 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 import * as React from 'react'
 
-import { useLayoutEffect, memo } from 'react'
+import { useInsertionEffect, memo } from 'react'
 
 import PropTypes from 'prop-types'
 
@@ -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,57 +30,68 @@ const TextInput = ({
   color,
   labelColor,
   validate,
-  oneInputLabel,
   description,
   disabled,
   placeholder,
   optional,
   autoComplete,
+  labelSpan,
+  desktopLabelSpan,
+  inputSpan,
+  desktopInputSpan,
+  symbol,
   // ...otherProps
 }) => {
-  useLayoutEffect(() => {
+  useInsertionEffect(() => {
     import('./styles.scss')
   }, [])
 
   const [field] = useField({ name, validate })
+  const symbolStyle = symbol
+    ? { '--symbol': symbol }
+    : {}
 
   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>
-      <input
-        id={name}
-        className="input"
-        type={type}
-        disabled={disabled}
-        placeholder={placeholder}
-        autoComplete={autoComplete}
-        {...field}
-      />
-
-      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
-
-    </div>
+      <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}
+          className="input"
+          type={type}
+          disabled={disabled}
+          placeholder={placeholder}
+          autoComplete={autoComplete}
+          {...field}
+        />
+        <FormDescription className="s-1" description={description} name={name} />
+      </InputWrapper>
+    </>
   )
 }
 
@@ -169,11 +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,
 }
 
 TextInput.defaultProps = {
   type    :'text',
-  color   :'background2',
+  color   :'paragraph',
   disabled:false,
 }