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

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/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

@@ -26,7 +26,10 @@ const SelectInput = ({
   style,
   name,
   label,
+  color,
   options,
+  validate,
+  description,
   disabled,
   // ...otherProps
 }) => {
@@ -34,7 +37,7 @@ const SelectInput = ({
     import('./styles.scss')
   }, [])
 
-  const [field, meta] = useField(name)
+  const [field, meta] = useField({ name, validate })
 
   return (
     <div
@@ -45,6 +48,7 @@ const SelectInput = ({
 
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -52,18 +56,30 @@ const SelectInput = ({
       // {...otherProps}
     >
       <FormLabel className="input-label" name={name}>{label}</FormLabel>
-      <select className="input v25 pv-v" {...field} id={name} disabled={disabled}>
+      <select className="input" {...field} value={field.value || ''} id={name} disabled={disabled}>
         {
         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>}
+      {(description || (meta.touched && meta.error))
+      && (
+      <FormDescription isError={!!meta.error} className="v50 mt-v s-1">
+        { meta.error || description }
+      </FormDescription>
+      )}
     </div>
   )
 }
@@ -93,22 +109,44 @@ 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,
 }
 
 SelectInput.defaultProps = {
   disabled:false,
+  color   :'background2',
 }
 
 export default memo(SelectInput)

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

@@ -5,7 +5,7 @@
 @use "../../../form.scss";
 
 
-$default-padding: 0.75em 0.75em 0.55em;
+$default-padding: 0.75em;
 
 
 .#{bem.$base}.select-input {
@@ -13,17 +13,22 @@ $default-padding: 0.75em 0.75em 0.55em;
   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;
 
+     &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
+
+     &:disabled {
+      background-color: var(--dark-y);
+    }
+
     &:focus {
-      background: var(--dark-background1);
+      background: var(--y);
     }
   }
 }

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

@@ -27,10 +27,14 @@ const TextInput = ({
   type,
   name,
   label,
+  color,
+  labelColor,
   validate,
   oneInputLabel,
   description,
   disabled,
+  placeholder,
+  optional,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -46,6 +50,7 @@ const TextInput = ({
         baseClassName,
         componentClassName,
         userClassName,
+        `y-${color}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -53,19 +58,21 @@ 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}
         {...field}
       />
       {(description || (meta.touched && meta.error))
@@ -104,6 +111,11 @@ TextInput.propTypes = {
    */
   label:PropTypes.string.isRequired,
 
+  /**
+   * The input label color
+   */
+  labelColor:PropTypes.string,
+
   /**
    * The type of the input (html)
    */
@@ -136,10 +148,26 @@ 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,
 }
 
 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);
     }
   }
 }

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

@@ -34,6 +34,7 @@ const TextareaInput = ({
   labelColor,
   description,
   disabled,
+  placeholder,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
@@ -51,8 +52,7 @@ const TextareaInput = ({
 
         componentClassName,
         userClassName,
-        `x-${textAreaColor}`,
-        `y-${labelColor}`,
+        `y-${textAreaColor}`,
       ]
         .filter((e) => e)
         .join(' ')}
@@ -60,18 +60,19 @@ const TextareaInput = ({
       // {...otherProps}
     >
       <FormLabel
-        className={[
-          'c-y', labelAsDescription ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
+        className={[labelAsDescription ? 'md-s2 s0 v1 mb-v' : 'v50 mb-v']
           .filter((e) => e)
           .join(' ')}
         name={name}
+        color={labelColor}
       >
         { label }
       </FormLabel>
       <textarea
         id={textAreaId}
-        className={`textarea v50 pv-v ${meta.touched && meta.error ? 'input-border-error' : 'input-border'}`}
+        className="textarea"
         {...field}
+        placeholder={placeholder}
         rows={rows}
         disabled={disabled}
       >
@@ -123,36 +124,46 @@ TextareaInput.propTypes = {
    * If the text area depends on it's label's text as the default description
    */
   labelAsDescription:PropTypes.bool,
+
   /**
    * The textarea id
   */
-  textAreaId        :PropTypes.string,
+  textAreaId:PropTypes.string,
+
   /**
    * The number of rows int the text area
    */
-  rows              :PropTypes.number,
+  rows:PropTypes.number,
+
   /**
    * Text area base color
    */
-  textAreaColor     :PropTypes.string,
+  textAreaColor:PropTypes.string,
+
   /**
    * Label base color
    */
-  labelColor        :PropTypes.string,
+  labelColor:PropTypes.string,
+
   /**
    * Text area description
    */
-  description       :PropTypes.string,
+  description:PropTypes.string,
+
   /**
    * Whether the text area should be disabled
    */
-  disabled          :PropTypes.bool,
+  disabled:PropTypes.bool,
+
+  /**
+   * The textarea placeholder text
+   */
+  placeholder:PropTypes.string,
 }
 
 TextareaInput.defaultProps = {
   rows         :3,
-  textAreaColor:'background1',
-  labelColor   :'main1',
+  textAreaColor:'background2',
   disabled     :false,
 }
 

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

@@ -1,19 +1,32 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 @use "@pareto-engineering/bem";
 
+$default-padding: .5em;
+
 .#{bem.$base}.text-area-input{
   display: flex;
   flex-direction: column;
 
   .textarea {
-    background: var(--light-x);
-    color: var(--on-x);
+    border: var(--theme-border-style) var(--dark-y);
+    background: var(--light-y);
+    color: var(--on-y);
+    padding: $default-padding;
 
-    &:focus {
-      background: var(--dark-x);
+    &::placeholder{
+      color: var(--metadata);
     }
-  }
-}
 
+    &:not(:disabled):hover{
+      border: var(--theme-border-style) var(--light-background4);
+    }
 
+     &:disabled {
+      background-color: var(--dark-y);
+    }
 
+    &:focus {
+      background: var(--light-background4);
+    }
+  }
+}

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

@@ -1,8 +1,5 @@
 export { TextInput } from './TextInput'
 export { SelectInput } from './SelectInput'
-export { RadioInput } from './RadioInput'
-export { CheckboxInput } from './CheckboxInput'
-export { TaskRecommendationInput } from './TaskRecommendationInput'
 export { ChoicesInput } from './ChoicesInput'
 export { TextareaInput } from './TextareaInput'
 export { RatingsInput } from './RatingsInput'

package/src/ui/form-reset.scss

@@ -19,7 +19,7 @@ button,
 textarea,
 label,
 select {
-  background-color: inherit;
+  // background-color: inherit;
   border: 0;
   display: inline-block;
   font: inherit;

package/src/ui/index.js

@@ -4,3 +4,4 @@ export * from './b'
 export * from './c'
 export * from './d'
 export * from './f'
+export * from './utils'

package/src/ui/utils/hooks/index.js

@@ -0,0 +1,2 @@
+export { default as useWindowSize } from './useWindowSize'
+export { default as useDynamicPosition } from './useDynamicPosition'