@pareto-engineering/design-system 4.0.0-alpha.63 → 4.0.0-alpha.64

package/src/ui/f/fields/QueryCombobox/common/Combobox/Combobox.jsx

@@ -15,7 +15,7 @@ import { Popover, LoadingCircle } from 'ui/a'
 
 import { Button } from 'ui/b'
 
-import { InputWrapper, lookUpInputValueFromFetchedOptions } from '../../../../common'
+import { lookUpInputValueFromFetchedOptions } from '../../../../common'
 
 // Local Definitions
 
@@ -47,10 +47,6 @@ const Combobox = ({
   transformSearch,
   disabled,
   optional,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   placeholder,
   promptCreateNewOption,
   // ...otherProps
@@ -107,61 +103,54 @@ const Combobox = ({
   const resetInputValue = () => setInputValue('')
 
   return (
-    <>
+    <div
+      id={id}
+      className={[
+        baseClassName,
+        componentClassName,
+        userClassName,
+        `y-${color}`,
+      ]
+        .filter((e) => e)
+        .join(' ')}
+      style={style}
+      ref={parentRef}
+      {...getComboboxProps()}
+    >
       <FormLabel
         {...getLabelProps()}
         name={name}
         optional={optional}
         color={labelColor}
-        columnSpan={labelSpan}
-        desktopColumnSpan={desktopLabelSpan}
       >
         {label}
       </FormLabel>
-
-      <InputWrapper
-        id={id}
-        className={[
-          baseClassName,
-          componentClassName,
-          userClassName,
-          `y-${color}`,
-        ]
-          .filter((e) => e)
-          .join(' ')}
-        style={style}
-        ref={parentRef}
-        {...getComboboxProps()}
-        columnSpan={inputSpan}
-        desktopColumnSpan={desktopInputSpan}
-      >
-        <input {...getInputProps()} className="input" disabled={disabled} placeholder={placeholder} />
-        {isFetching && (
-          <LoadingCircle className="x-main" />
-        )}
-        {inputValue.length > minLength && !isFetching && (
+      <input {...getInputProps()} className="input" disabled={disabled} placeholder={placeholder} />
+      {isFetching && (
+      <LoadingCircle className="x-main" />
+      )}
+      {inputValue.length > minLength && !isFetching && (
         <Button isSimple isCompact color="heading" onClick={resetInputValue}>
           <span className="icon">
             Y
           </span>
         </Button>
-        )}
-        <FormDescription className="s-1" description={description} name={name} />
-        <Popover
+      )}
+      <FormDescription className="s-1" description={description} name={name} />
+      <Popover
+        isOpen={isOpen}
+        parentRef={parentRef}
+      >
+        <Menu
+          className={`y-${color}`}
           isOpen={isOpen}
-          parentRef={parentRef}
-        >
-          <Menu
-            className={`y-${color}`}
-            isOpen={isOpen}
-            getItemProps={getItemProps}
-            highlightedIndex={highlightedIndex}
-            items={items}
-            {...getMenuProps()}
-          />
-        </Popover>
-      </InputWrapper>
-    </>
+          getItemProps={getItemProps}
+          highlightedIndex={highlightedIndex}
+          items={items}
+          {...getMenuProps()}
+        />
+      </Popover>
+    </div>
   )
 }
 

package/src/ui/f/fields/QueryCombobox/common/MultipleCombobox/MultipleCombobox.jsx

@@ -15,7 +15,7 @@ import { Popover, LoadingCircle } from 'ui/a'
 
 import { FormDescription, FormLabel } from 'ui/f'
 
-import { InputWrapper, lookUpInputValueFromFetchedOptions } from '../../../../common'
+import { lookUpInputValueFromFetchedOptions } from '../../../../common'
 
 // Local Definitions
 
@@ -57,11 +57,7 @@ const MultipleCombobox = ({
   minLength,
   transformSearch,
   disabled,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
   placeholder,
-  desktopInputSpan,
   setOptions,
   promptCreateNewOption,
   // ...otherProps
@@ -168,7 +164,19 @@ const MultipleCombobox = ({
   const resetInputValue = () => setInputValue('')
 
   return (
-    <>
+    <div
+      id={id}
+      className={[
+        baseClassName,
+        componentClassName,
+        userClassName,
+      ]
+        .filter((e) => e)
+        .join(' ')}
+      style={style}
+      ref={parentRef}
+      {...getComboboxProps()}
+    >
       <FormLabel
         className={[
           baseClassName,
@@ -180,63 +188,45 @@ const MultipleCombobox = ({
         name={name}
         optional={optional}
         color={labelColor}
-        columnSpan={labelSpan}
-        desktopColumnSpan={desktopLabelSpan}
       >
         {label}
       </FormLabel>
 
-      <InputWrapper
-        id={id}
-        className={[
-          baseClassName,
-          componentClassName,
-          userClassName,
-        ]
-          .filter((e) => e)
-          .join(' ')}
-        style={style}
-        ref={parentRef}
-        columnSpan={inputSpan}
-        desktopColumnSpan={desktopInputSpan}
-        {...getComboboxProps()}
-      >
-        {selectedItems?.length > 0 && (
-          <div className="selected-items">
-            {selectedItems.map((selectedItem, index) => (
-              <div
-                key={selectedItem.label}
-                {...getSelectedItemProps({ selectedItem, index })}
-                className="item"
+      {selectedItems?.length > 0 && (
+        <div className="selected-items">
+          {selectedItems.map((selectedItem, index) => (
+            <div
+              key={selectedItem.label}
+              {...getSelectedItemProps({ selectedItem, index })}
+              className="item"
+            >
+              <Button
+                onClick={(e) => {
+                  e.stopPropagation()
+                  removeSelectedItem(selectedItem)
+                }}
+                isCompact
+                color={color}
               >
-                <Button
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    removeSelectedItem(selectedItem)
-                  }}
-                  isCompact
-                  color={color}
-                >
-                  <span>{selectedItem.label}</span>
-                  <span className="icon close">Y</span>
-                </Button>
-              </div>
-            ))}
-          </div>
+                <span>{selectedItem.label}</span>
+                <span className="icon close">Y</span>
+              </Button>
+            </div>
+          ))}
+        </div>
+      )}
+      <input
+        {...getInputProps(
+          getDropdownProps({ preventKeyAction: isOpen }),
         )}
-
-        <input
-          {...getInputProps(
-            getDropdownProps({ preventKeyAction: isOpen }),
-          )}
-          className="input"
-          disabled={disabled}
-          placeholder={placeholder}
-        />
-        {isFetching && (
-          <LoadingCircle className="x-main" />
-        )}
-        {inputValue.length > minLength && !isFetching && (
+        className="input"
+        disabled={disabled}
+        placeholder={placeholder}
+      />
+      {isFetching && (
+      <LoadingCircle className="x-main" />
+      )}
+      {inputValue.length > minLength && !isFetching && (
         <Button
           isSimple
           isCompact
@@ -247,24 +237,24 @@ const MultipleCombobox = ({
             Y
           </span>
         </Button>
-        )}
+      )}
 
-        <FormDescription className="s-1" description={description} name={name} />
-        <Popover
+      <FormDescription className="s-1" description={description} name={name} />
+      <Popover
+        isOpen={isOpen}
+        parentRef={parentRef}
+      >
+        <Menu
+          className={`y-${color}`}
           isOpen={isOpen}
-          parentRef={parentRef}
-        >
-          <Menu
-            className={`y-${color}`}
-            isOpen={isOpen}
-            getItemProps={getItemProps}
-            highlightedIndex={highlightedIndex}
-            items={getFilteredItems()}
-            {...getMenuProps()}
-          />
-        </Popover>
-      </InputWrapper>
-    </>
+          getItemProps={getItemProps}
+          highlightedIndex={highlightedIndex}
+          items={getFilteredItems()}
+          {...getMenuProps()}
+        />
+      </Popover>
+
+    </div>
   )
 }
 

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

@@ -20,9 +20,16 @@ $on-disabled-background: var(--on-background-inputs-30);
 
 .#{bem.$base}.combobox,
 .#{bem.$base}.multiple-combobox {
+  display: flex;
+  flex-direction: column;
   outline: none;
   position: relative;
 
+  > .#{bem.$base}.form-label {
+    margin-bottom: var(--gap);
+  }
+
+
   .#{bem.$base}.popover {
     border: $default-border;
     border-radius: $default-input-border-radius;
@@ -53,51 +60,45 @@ $on-disabled-background: var(--on-background-inputs-30);
     }
   }
 
-  &.#{bem.$base}.input-wrapper {
-    display: flex;
-    flex-direction: column;
-    position: relative;
+  >.#{bem.$base}.loading-circle,
+  >.#{bem.$base}.button {
+    position: absolute;
+    right: $default-loading-circle-displacement;
+  }
 
-    >.#{bem.$base}.loading-circle,
-    >.#{bem.$base}.button {
-      position: absolute;
-      right: $default-loading-circle-displacement;
-    }
+  >.#{bem.$base}.loading-circle {
+    top: calc($default-loading-circle-displacement * 1.5);
+  }
 
-    >.#{bem.$base}.loading-circle {
-      top: calc($default-loading-circle-displacement * 1.5);
-    }
+  >.#{bem.$base}.button {
+    top: $default-loading-circle-displacement;
+  }
 
-    >.#{bem.$base}.button {
-      top: $default-loading-circle-displacement;
-    }
+  > .input {
+    background: $default-background;
+    border: $default-border;
+    border-radius: calc(var(--theme-default-border-radius) / 2);
+    color: $on-default-background;
+    outline: none;
+    padding: $default-input-padding;
 
-    > .input {
-      background: $default-background;
-      border: $default-border;
-      border-radius: calc(var(--theme-default-border-radius) / 2);
-      color: $on-default-background;
-      outline: none;
-      padding: $default-input-padding;
+    &::placeholder {
+      color: var(--metadata);
+    }
 
-      &::placeholder {
-        color: var(--metadata);
-      }
+    &:disabled {
+      background-color: $disabled-background;
+      color: $on-disabled-background;
+    }
 
-      &:disabled {
-        background-color: $disabled-background;
-        color: $on-disabled-background;
+    &:not(:disabled) {
+      &:hover,
+      &:active {
+        border: $hover-border;
       }
 
-      &:not(:disabled) {
-        &:hover,
-        &:active {
-          border: $hover-border;
-        }
-
-        &:focus {
-          border: $focus-border;
-        }
+      &:focus {
+        border: $focus-border;
       }
     }
   }

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

@@ -33,10 +33,6 @@ const QuerySelect = ({
   loadingOption,
   defaultOption,
   validate,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   // ...otherProps
 }) => {
   const [, , helpers] = useField({ name, validate })
@@ -101,10 +97,6 @@ const QuerySelect = ({
       disabled={isFetching || disabled}
       options={options}
       isLoading={isFetching}
-      labelSpan={labelSpan}
-      desktopLabelSpan={desktopLabelSpan}
-      inputSpan={inputSpan}
-      desktopInputSpan={desktopInputSpan}
     />
   )
 }

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, memo } from 'react'
+import { useState, useInsertionEffect, memo } from 'react'
 
 import PropTypes from 'prop-types'
 
@@ -10,9 +10,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 // Local Definitions
 
 import { Rating } from './common'
-import { FormLabel, InputWrapper } from '../../common'
-
-import './styles.scss'
+import { FormLabel } from '../../common'
 
 const baseClassName = styleNames.base
 
@@ -35,40 +33,35 @@ const RatingsInput = ({
   labelMin,
   displayRatingsLabel,
   optional,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   // ...otherProps
 }) => {
+  useInsertionEffect(() => {
+    import('./styles.scss')
+  }, [])
+
   const [hover, setHover] = useState(null)
 
   return (
-    <>
+    <div
+      id={id}
+      className={[
+        baseClassName,
+        componentClassName,
+        userClassName,
+      ]
+        .filter((e) => e)
+        .join(' ')}
+      style={style}
+    >
       <FormLabel
         name={name}
         color={labelColor}
         optional={optional}
-        columnSpan={labelSpan}
-        desktopColumnSpan={desktopLabelSpan}
         // {...otherProps}
       >
         {label}
       </FormLabel>
-      <InputWrapper
-        id={id}
-        className={[
-          baseClassName,
-          componentClassName,
-          userClassName,
-          'stars',
-        ]
-          .filter((e) => e)
-          .join(' ')}
-        style={style}
-        columnSpan={inputSpan}
-        desktopColumnSpan={desktopInputSpan}
-      >
+      <div className="stars">
         {displayRatingsLabel && <p className="label-text s-2 x-metadata c-x">{labelMin}</p>}
         {[...Array(ratingCount)].map((_, index) => {
           const ratingValue = index + 1
@@ -86,8 +79,8 @@ const RatingsInput = ({
           )
         })}
         {displayRatingsLabel && <p className="label-text s-2 x-metadata c-x">{labelMax}</p>}
-      </InputWrapper>
-    </>
+      </div>
+    </div>
   )
 }
 
@@ -149,26 +142,6 @@ RatingsInput.propTypes = {
  * 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 = {

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

@@ -9,7 +9,11 @@ $default-padding: .2em;
 $default-transition: all .2s;
 
 .#{bem.$base}.ratings-input {
-  &.stars {
+  display: flex;
+  flex-direction: column;
+  gap: var(--gap);
+
+  >.stars {
     display: flex;
 
     >:not(:last-child) {

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 { memo } from 'react'
+import { useInsertionEffect, memo } from 'react'
 
 import { useField } from 'formik'
 
@@ -11,9 +11,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 
 import { LoadingCircle } from 'ui/a'
 
-import { FormLabel, FormDescription, InputWrapper } from '../../common'
-
-import './styles.scss'
+import { FormLabel, FormDescription } from '../../common'
 
 // Local Definitions
 
@@ -39,49 +37,44 @@ const SelectInput = ({
   disabled,
   isLoading,
   autoComplete,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   // ...otherProps
 }) => {
+  useInsertionEffect(() => {
+    import('./styles.scss')
+  }, [])
+
   const [field] = useField({ name, validate })
 
   return (
-    <>
+    <div
+      id={id}
+      className={[
+        baseClassName,
+        componentClassName,
+        userClassName,
+      ]
+        .filter((e) => e)
+        .join(' ')}
+      style={style}
+    >
       <FormLabel
         name={name}
         color={labelColor}
         optional={optional}
-        columnSpan={labelSpan}
-        desktopColumnSpan={desktopLabelSpan}
       // {...otherProps}
       >
         {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}
-          >
-            {
+      <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
@@ -97,14 +90,13 @@ const SelectInput = ({
             )
           })
         }
-          </select>
-          {isLoading && (
+        </select>
+        {isLoading && (
           <LoadingCircle className="x-main" />
-          )}
-        </div>
-        <FormDescription className="s-1" description={description} name={name} />
-      </InputWrapper>
-    </>
+        )}
+      </div>
+      <FormDescription className="s-1" description={description} name={name} />
+    </div>
   )
 }
 
@@ -181,26 +173,6 @@ 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
   */