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

package/src/ui/f/fields/LinkInput/LinkInput.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 PropTypes from 'prop-types'
 
@@ -9,8 +9,7 @@ import styleNames from '@pareto-engineering/bem/exports'
 
 import { useField } from 'formik'
 
-import { FormLabel, FormDescription, InputWrapper } from '../../common'
-import './styles.scss'
+import { FormLabel, FormDescription } from '../../common'
 
 // Local Definitions
 
@@ -35,61 +34,55 @@ const LinkInput = ({
   placeholder,
   optional,
   autoComplete,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   // ...otherProps
 }) => {
+  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}
       >
         {label}
       </FormLabel>
-      <InputWrapper
-        id={id}
-        className={[
-          baseClassName,
-          componentClassName,
-          userClassName,
-          `y-${color}`,
-        ]
-          .filter((e) => e)
-          .join(' ')}
-        style={style}
-        columnSpan={inputSpan}
-        desktopColumnSpan={desktopInputSpan}
-      >
-        <div className="input-link-wrapper">
-          <input
-            id={name}
-            className="input"
-            type="text"
-            disabled={disabled}
-            placeholder={placeholder}
-            autoComplete={autoComplete}
-            {...field}
-          />
-          <a
-            href={field.value}
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            &#8594;
-          </a>
-        </div>
-        <FormDescription className="s-1" description={description} name={name} />
-      </InputWrapper>
-    </>
+      <div className="input-link-wrapper">
+        <input
+          id={name}
+          className="input"
+          type="text"
+          disabled={disabled}
+          placeholder={placeholder}
+          autoComplete={autoComplete}
+          {...field}
+        />
+        <a
+          href={field.value}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          &#8594;
+        </a>
+      </div>
+      <FormDescription className="s-1" description={description} name={name} />
+    </div>
   )
 }
 

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

@@ -1,5 +1,4 @@
 /* @pareto-engineering/generator-front 1.0.12 */
-/* stylelint-disable max-nesting-depth -- required here */
 
 @use "@pareto-engineering/bem";
 @use "@pareto-engineering/styles/src/mixins";
@@ -20,68 +19,70 @@ $default-background: var(--background-inputs);
 $disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.link-input {
-  &.#{bem.$base}.input-wrapper {
-    display: flex;
-    flex-direction: column;
-    position: relative;
+  display: flex;
+  flex-direction: column;
+  position: relative;
 
-    &.has-symbol {
-      &::before {
-        color: var(--y);
-        content: var(--symbol);
-        left: $default-symbol-left;
-        position: absolute;
-        top: 50%;
-        transform: translate(-50%, -50%);
-      }
+  > .#{bem.$base}.form-label {
+    margin-bottom: var(--gap);
+  }
 
-      input {
-        padding: $default-padding-with-symbol;
-      }
+  &.has-symbol {
+    &::before {
+      color: var(--y);
+      content: var(--symbol);
+      left: $default-symbol-left;
+      position: absolute;
+      top: 50%;
+      transform: translate(-50%, -50%);
     }
 
-    > .input-link-wrapper {
-      display: flex;
-      gap: calc(var(--gap) / 2);
+    input {
+      padding: $default-padding-with-symbol;
+    }
+  }
 
-      > a {
-        align-self: center;
-        border: 1px solid var(--interactive);
-        border-radius: var(--theme-default-input-border-radius);
-        padding: .5em;
+  > .input-link-wrapper {
+    display: flex;
+    gap: calc(var(--gap) / 2);
 
-        &:hover {
-          background-color: var(--interactive);
-          color: var(--on-interactive);
-        }
+    > a {
+      align-self: center;
+      border: 1px solid var(--interactive);
+      border-radius: var(--theme-default-input-border-radius);
+      padding: .5em;
+
+      &:hover {
+        background-color: var(--interactive);
+        color: var(--on-interactive);
       }
+    }
 
-      > input {
-        background-color: $default-background;
-        border: $default-border;
-        border-radius: $default-input-border-radius;
-        color: var(--y);
-        outline: none;
-        padding: $default-padding;
-        width: 100%;
+    > input {
+      background-color: $default-background;
+      border: $default-border;
+      border-radius: $default-input-border-radius;
+      color: var(--y);
+      outline: none;
+      padding: $default-padding;
+      width: 100%;
 
-        &::placeholder {
-          color: var(--metadata);
-        }
+      &::placeholder {
+        color: var(--metadata);
+      }
 
-        &:disabled {
-          background-color: $disabled-background;
-        }
+      &:disabled {
+        background-color: $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/QueryChoices/QueryChoices.jsx

@@ -22,10 +22,6 @@ const QueryChoices = ({
   validate,
   loadingOption,
   extraVariables,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   ...otherProps
 }) => {
   const [, , helpers] = useField({ name, validate })
@@ -88,10 +84,6 @@ const QueryChoices = ({
       name={name}
       validate={validate}
       options={options}
-      labelSpan={labelSpan}
-      desktopLabelSpan={desktopLabelSpan}
-      inputSpan={inputSpan}
-      desktopInputSpan={desktopInputSpan}
       {...otherProps}
     />
   )
@@ -148,26 +140,6 @@ QueryChoices.propTypes = {
    *  select options.
    */
   extraVariables:PropTypes.objectOf(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,
 }
 
 QueryChoices.defaultProps = {

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

@@ -1,7 +1,7 @@
 /* @pareto-engineering/generator-front 1.0.12 */
 import * as React from 'react'
 
-import { useState } from 'react'
+import { useState, useInsertionEffect } from 'react'
 
 import { useField } from 'formik'
 
@@ -9,8 +9,6 @@ import { useRelayEnvironment, fetchQuery } from 'react-relay'
 
 import PropTypes from 'prop-types'
 
-import './styles.scss'
-
 // Local Definitions
 
 import { Combobox, MultipleCombobox } from './common'
@@ -38,14 +36,14 @@ const QueryCombobox = ({
   minLength,
   transformSearch,
   validate,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   placeholder,
   promptCreateNewOption,
   // ...otherProps
 }) => {
+  useInsertionEffect(() => {
+    import('./styles.scss')
+  }, [])
+
   const [, meta, helpers] = useField({ name, validate })
 
   const { setValue, setError } = helpers
@@ -117,10 +115,6 @@ const QueryCombobox = ({
     className,
     minLength,
     transformSearch,
-    labelSpan,
-    desktopLabelSpan,
-    inputSpan,
-    desktopInputSpan,
     placeholder,
     promptCreateNewOption,
   }
@@ -236,26 +230,6 @@ QueryCombobox.propTypes = {
   */
   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,
-
   /**
    * Whether to prompt the user to create a new option if the search input
    * does not match any of the options

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>
   )
 }