@pareto-engineering/design-system 2.0.0-alpha.7 → 2.0.0-alpha.71

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

@@ -10,6 +10,7 @@ import styleNames from '@pareto-engineering/bem'
 // Local Definitions
 
 import { Rating } from './common'
+import { FormLabel } from '../../common'
 
 const baseClassName = styleNames.base
 
@@ -25,9 +26,13 @@ const RatingsInput = ({
   name,
   ratingCount,
   showRatingValue,
+  oneInputLabel,
+  label,
+  labelColor,
   labelMax,
   labelMin,
   displayRatingsLabel,
+  optional,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -47,24 +52,36 @@ const RatingsInput = ({
         .filter((e) => e)
         .join(' ')}
       style={style}
-      // {...otherProps}
     >
-      {displayRatingsLabel && <p className="label-text md-s-1 s-2 x-metadata c-x">{labelMin}</p>}
-      {[...Array(ratingCount)].map((_, index) => {
-        const ratingValue = index + 1
-        return (
-          <Rating
-            key={ratingValue}
-            ratingId={`${name}-${ratingValue}`}
-            value={ratingValue}
-            name={name}
-            hover={hover}
-            setHover={setHover}
-            showRatingValue={showRatingValue}
-          />
-        )
-      })}
-      {displayRatingsLabel && <p className="label-text md-s-1 s-2 x-metadata c-x">{labelMax}</p>}
+      <FormLabel
+        className={[
+          'input-label', oneInputLabel ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
+          .filter((e) => e)
+          .join(' ')}
+        name={name}
+        color={labelColor}
+        optional={optional}
+      >
+        { label }
+      </FormLabel>
+      <div className="stars">
+        {displayRatingsLabel && <p className="label-text md-s-1 s-2 x-metadata c-x">{labelMin}</p>}
+        {[...Array(ratingCount)].map((_, index) => {
+          const ratingValue = index + 1
+          return (
+            <Rating
+              key={ratingValue}
+              ratingId={`${name}-${ratingValue}`}
+              value={ratingValue}
+              name={name}
+              hover={hover}
+              setHover={setHover}
+              showRatingValue={showRatingValue}
+            />
+          )
+        })}
+        {displayRatingsLabel && <p className="label-text md-s-1 s-2 x-metadata c-x">{labelMax}</p>}
+      </div>
     </div>
   )
 }
@@ -97,6 +114,10 @@ RatingsInput.propTypes = {
    * Determines if the rating start value should be shown
    */
   showRatingValue    :PropTypes.bool,
+  /**
+   * The label of the ratings input
+   */
+  label              :PropTypes.string.isRequired,
   /**
    * description for the highest rating value
    */
@@ -109,11 +130,25 @@ RatingsInput.propTypes = {
    * If the rating lables should be shown
    */
   displayRatingsLabel:PropTypes.bool,
+  /**
+   * Whether the input is optional or not
+   */
+  optional           :PropTypes.bool,
+  /**
+ * If the slide will only have one input
+ */
+  oneInputLabel      :PropTypes.bool,
+
+  /**
+ * String that will represent color for the label
+ */
+  labelColor:PropTypes.string,
 }
 
 RatingsInput.defaultProps = {
-  labelMin:'not satisfied.',
-  labelMax:'very satisfied.',
+  labelMin  :'not satisfied.',
+  labelMax  :'very satisfied.',
+  labelColor:'main2',
 }
 
 export default memo(RatingsInput)

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

@@ -25,12 +25,13 @@ const Rating = ({
   ratingId,
   hover,
   setHover,
+  validate,
   activeBackgroundColor,
   inactiveBackgroundColor,
   showRatingValue,
   // ...otherProps
 }) => {
-  const [field] = useField(name)
+  const [field] = useField({ name, validate })
 
   return (
     <div
@@ -125,6 +126,11 @@ Rating.propTypes = {
    * Determines if the rating start value should be shown
    */
   showRatingValue        :PropTypes.bool,
+
+  /**
+   * The rating field validator function
+   */
+  validate:PropTypes.func,
 }
 
 Rating.defaultProps = {

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

@@ -7,34 +7,43 @@ $default-transition: all .2s;
 
 .#{bem.$base}.ratings-input {
   display: flex;
+  flex-direction: column;
 
-  >:not(:last-child) {
-    margin-right: $default-rating-icon-margin;
+  p {
+    padding: $default-padding;
   }
 
-  .#{bem.$base}.rating {
+  .stars {
     display: flex;
 
-    input {
-      opacity: 0;
-      position: absolute;
-      visibility: none;
-      z-index: -1;
+    >:not(:last-child) {
+      margin-right: $default-rating-icon-margin;
     }
-
-    label {
+  
+    .#{bem.$base}.rating {
       display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: $default-padding;
-      transition: $default-transition;
-      cursor: pointer;
+  
+      input {
+        opacity: 0;
+        position: absolute;
+        visibility: none;
+        z-index: -1;
+      }
+  
+      label {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding: $default-padding;
+        transition: $default-transition;
+        cursor: pointer;
+      }
+    }
+  
+    .label-text {
+      margin-bottom: 0;
+      align-self: flex-end;
     }
-  }
-
-  .label-text {
-    margin-bottom: 0;
-    align-self: flex-end;
   }
 }
 

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

@@ -9,6 +9,8 @@ import PropTypes from 'prop-types'
 
 import styleNames from '@pareto-engineering/bem'
 
+import { LoadingCircle } from 'ui/a'
+
 import { FormLabel, FormDescription } from '../../common'
 
 // Local Definitions
@@ -26,15 +28,21 @@ const SelectInput = ({
   style,
   name,
   label,
+  color,
   options,
+  validate,
+  optional,
+  description,
   disabled,
+  isLoading,
+  autoComplete,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
     import('./styles.scss')
   }, [])
 
-  const [field, meta] = useField(name)
+  const [field] = useField({ name, validate })
 
   return (
     <div
@@ -45,25 +53,45 @@ const SelectInput = ({
 
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
       style={style}
       // {...otherProps}
     >
-      <FormLabel className="input-label" name={name}>{label}</FormLabel>
-      <select className="input v25 pv-v" {...field} id={name} disabled={disabled}>
-        {
+      <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}>{newOption.label}</option>
+            <option
+              key={newOption.value}
+              value={newOption.value}
+              disabled={newOption?.disabled || false}
+            >
+              {newOption.label}
+            </option>
           )
         })
       }
-      </select>
-      {meta.error && meta.touched && <FormDescription error>{meta.error}</FormDescription>}
+        </select>
+        {isLoading && (
+        <LoadingCircle className="x-main2" />
+        )}
+      </div>
+      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
     </div>
   )
 }
@@ -93,22 +121,58 @@ SelectInput.propTypes = {
    */
   label:PropTypes.string,
 
+  /**
+   * The input field validator function
+   */
+  validate:PropTypes.func,
+
+  /**
+   * The select input description
+   */
+  description:PropTypes.string,
+
   /**
    * The options of the select input
    */
   options:PropTypes.arrayOf(
     PropTypes.oneOfType(
-      [PropTypes.string, PropTypes.shape({ value: PropTypes.string, label: PropTypes.string })],
+      [
+        PropTypes.string,
+        PropTypes.shape({
+          value   :PropTypes.string,
+          label   :PropTypes.string,
+          disabled:PropTypes.bool,
+        })],
     ),
   ),
   /**
    * Whether the select input should be disabled
    */
   disabled:PropTypes.bool,
+
+  /**
+   * The color of the select input
+   */
+  color:PropTypes.string,
+
+  /*
+  * Whether the query that is fetching the select options is still in flight
+  */
+  isLoading   :PropTypes.bool,
+  /**
+   * The autoComplete value that the browser should watch for the input
+   */
+  autoComplete:PropTypes.string,
+
+  /**
+  * Whether the input is optional or not
+  */
+  optional:PropTypes.bool,
 }
 
 SelectInput.defaultProps = {
   disabled:false,
+  color   :'background2',
 }
 
 export default memo(SelectInput)

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

@@ -5,26 +5,46 @@
 @use "../../../form.scss";
 
 
-$default-padding: 0.75em 0.75em 0.55em;
-
+$default-padding: 0.75em;
+$default-margin: 1em;
 
 .#{bem.$base}.select-input {
   display: flex;
   flex-direction: column;
 
-
-  .input-label {
-    color: var(--main1);
+  .#{bem.$base}.label {
+    margin-bottom: $default-margin
   }
 
-  .input {
-    background: var(--light-background1);
-    color: var(--on-background1);
-    padding: $default-padding;
+  .select-wrapper {
+    position: relative;
 
-    &:focus {
-      background: var(--dark-background1);
+    >.#{bem.$base}.loading-circle {
+      position: absolute;
+      right: 0;
+      top: 50%;
+      transform: translateY(-50%);
     }
-  }
-}
 
+    >.input {
+      width: 100%;
+      border: var(--theme-border-style) var(--dark-y);
+      background: var(--light-y);
+      color: var(--on-y);
+      padding: $default-padding;
+
+      &:not(:disabled):hover {
+        border: var(--theme-border-style) var(--light-background4);
+      }
+
+      &:disabled {
+        background-color: var(--dark-y);
+        appearance: none;
+      }
+
+      &:focus {
+        background: var(--y);
+      }
+    }
+  }
+}

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

@@ -27,17 +27,22 @@ const TextInput = ({
   type,
   name,
   label,
+  color,
+  labelColor,
   validate,
   oneInputLabel,
   description,
   disabled,
+  placeholder,
+  optional,
+  autoComplete,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
     import('./styles.scss')
   }, [])
 
-  const [field, meta] = useField({ name, validate })
+  const [field] = useField({ name, validate })
 
   return (
     <div
@@ -46,6 +51,7 @@ const TextInput = ({
         baseClassName,
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -53,27 +59,27 @@ const TextInput = ({
       // {...otherProps}
     >
       <FormLabel
-        className={[
-          'input-label', oneInputLabel ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
+        className={[oneInputLabel ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
           .filter((e) => e)
           .join(' ')}
         name={name}
+        color={labelColor}
+        optional={optional}
       >
         { label }
       </FormLabel>
       <input
         id={name}
-        className={`input ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
+        className="input"
         type={type}
         disabled={disabled}
+        placeholder={placeholder}
+        autoComplete={autoComplete}
         {...field}
       />
-      {(description || (meta.touched && meta.error))
-      && (
-      <FormDescription isError={!!meta.error} className="v50 mt-v s-1">
-        { meta.error || description }
-      </FormDescription>
-      )}
+
+      <FormDescription className="v50 mt-v s-1" description={description} name={name} />
+
     </div>
   )
 }
@@ -104,6 +110,11 @@ TextInput.propTypes = {
    */
   label:PropTypes.string.isRequired,
 
+  /**
+   * The input label color
+   */
+  labelColor:PropTypes.string,
+
   /**
    * The type of the input (html)
    */
@@ -118,6 +129,7 @@ TextInput.propTypes = {
     'month',
     'tel',
     'hidden',
+    'url',
   ]),
 
   /**
@@ -136,10 +148,32 @@ TextInput.propTypes = {
    * Whether the text input should be disabled
    */
   disabled     :PropTypes.bool,
+
+  /**
+   * The placeholder text for the input
+   */
+  placeholder:PropTypes.string,
+
+  /**
+   * The text input color
+   */
+  color:PropTypes.string,
+
+  /**
+ * Whether the input is optional or not
+ */
+  optional:PropTypes.bool,
+
+  /**
+   * The autoComplete value that the browser should watch for the input
+   * `https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete`
+   */
+  autoComplete:PropTypes.string,
 }
 
 TextInput.defaultProps = {
   type    :'text',
+  color   :'background2',
   disabled:false,
 }
 

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

@@ -9,17 +9,26 @@ $default-padding: 0.75em 0.75em 0.55em;
   display: flex;
   flex-direction: column;
 
-  .input-label {
-    color: var(--main1);
-  }
-
   .input {
-    background: var(--light-background1);
-    color: var(--on-background1);
+    border: var(--theme-border-style) var(--dark-y);
+    background: var(--light-y);
+    color: var(--on-y);
     padding: $default-padding;
 
+    &::placeholder{
+      color: var(--metadata);
+    }
+
+    &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
+
+    &:disabled {
+      background-color: var(--dark-y);
+    }
+
     &:focus {
-      background: var(--dark-background1);
+      background: var(--light-background4);
     }
   }
 }