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

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

@@ -16,8 +16,11 @@ $default-background: var(--background-inputs);
 $disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.select-input {
-  &.#{bem.$base}.label {
-    margin-bottom: $default-spacing-size;
+  display: flex;
+  flex-direction: column;
+
+  > .#{bem.$base}.form-label {
+    margin-bottom: var(--gap);
   }
 
   .select-wrapper {

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

@@ -9,12 +9,12 @@ 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
 
+import './styles.scss'
+
 const baseClassName = styleNames.base
 
 const componentClassName = 'text-input'
@@ -37,10 +37,6 @@ const TextInput = ({
   placeholder,
   optional,
   autoComplete,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   symbol,
   ...otherProps
 }) => {
@@ -49,35 +45,34 @@ const TextInput = ({
     ? { '--symbol': symbol }
     : {}
 
+  const InputWrapper = symbol ? 'div' : React.Fragment
+  const inputWrapperProps = symbol ? { className: 'input-wrapper' } : {}
+
   return (
-    <>
+    <div
+      id={id}
+      className={[
+        baseClassName,
+        componentClassName,
+        userClassName,
+        `y-${color} ${symbol ? 'has-symbol' : ''}`,
+      ]
+        .filter((e) => e)
+        .join(' ')}
+      style={{
+        ...symbolStyle,
+        ...style,
+      }}
+    >
       <FormLabel
         name={name}
         color={labelColor}
         optional={optional}
-        columnSpan={labelSpan}
-        desktopColumnSpan={desktopLabelSpan}
         // {...otherProps}
       >
         {label}
       </FormLabel>
-      <InputWrapper
-        id={id}
-        className={[
-          baseClassName,
-          componentClassName,
-          userClassName,
-          `y-${color} ${symbol ? 'has-symbol' : ''}`,
-        ]
-          .filter((e) => e)
-          .join(' ')}
-        style={{
-          ...symbolStyle,
-          ...style,
-        }}
-        columnSpan={inputSpan}
-        desktopColumnSpan={desktopInputSpan}
-      >
+      <InputWrapper {...inputWrapperProps}>
         <input
           id={name}
           className="input"
@@ -88,9 +83,9 @@ const TextInput = ({
           {...field}
           {...otherProps}
         />
-        <FormDescription className="s-1" description={description} name={name} />
       </InputWrapper>
-    </>
+      <FormDescription className="s-1" description={description} name={name} />
+    </div>
   )
 }
 
@@ -180,26 +175,6 @@ TextInput.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,
-
   /**
    * A symbol to be set inside the input field
    */

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

@@ -19,12 +19,18 @@ $default-background: var(--background-inputs);
 $disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.text-input {
-  &.#{bem.$base}.input-wrapper {
-    display: flex;
-    flex-direction: column;
-    position: relative;
+  display: flex;
+  flex-direction: column;
+
+  > .#{bem.$base}.form-label {
+    margin-bottom: var(--gap);
+  }
+
+
+  &.has-symbol {
+    > .input-wrapper {
+      position: relative;
 
-    &.has-symbol {
       &::before {
         color: var(--y);
         content: var(--symbol);
@@ -33,39 +39,40 @@ $disabled-background: var(--background-inputs-30);
         top: 50%;
         transform: translate(-50%, -50%);
       }
+    }
 
-      input {
-        padding: $default-padding-with-symbol;
-      }
+    input {
+      padding: $default-padding-with-symbol;
     }
+  }
 
-    > 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/TextareaInput/TextareaInput.jsx

@@ -11,10 +11,10 @@ import { useField } from 'formik'
 
 // Local Definitions
 
-import { FormLabel, FormDescription, InputWrapper } from '../../common'
-
 import './styles.scss'
 
+import { FormLabel, FormDescription } from '../../common'
+
 const baseClassName = styleNames.base
 
 const componentClassName = 'text-area-input'
@@ -38,55 +38,46 @@ const TextareaInput = ({
   placeholder,
   autoComplete,
   resize,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   // ...otherProps
 }) => {
   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}
+
+      <textarea
+        id={name}
+        className="textarea"
+        {...field}
+        style={{ resize }}
+        placeholder={placeholder}
+        rows={rows}
+        disabled={disabled}
+        autoComplete={autoComplete}
       >
-        <textarea
-          id={name}
-          className="textarea"
-          {...field}
-          style={{ resize }}
-          placeholder={placeholder}
-          rows={rows}
-          disabled={disabled}
-          autoComplete={autoComplete}
-        >
-          {/* It was a dark and stormy night... */}
-        </textarea>
-        <FormDescription className="s-1" description={description} name={name} />
-      </InputWrapper>
-    </>
+        {/* It was a dark and stormy night... */}
+      </textarea>
+      <FormDescription className="s-1" description={description} name={name} />
+    </div>
   )
 }
 
@@ -175,26 +166,6 @@ TextareaInput.propTypes = {
   * Whether the input is optional or not
   */
   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,
 }
 
 TextareaInput.defaultProps = {

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

@@ -14,36 +14,39 @@ $default-background: var(--background-inputs);
 $disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.text-area-input {
-  &.#{bem.$base}.input-wrapper {
-    display: flex;
-    flex-direction: column;
-
-    > .textarea {
-      background: $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);
-      }
+  display: flex;
+  flex-direction: column;
 
-      &:disabled {
-        background-color: $disabled-background;
-      }
+  > .#{bem.$base}.form-label {
+    margin-bottom: var(--gap);
+  }
+
+
+  > .textarea {
+    background: $default-background;
+    border: $default-border;
+    border-radius: $default-input-border-radius;
+    color: var(--y);
+    outline: none;
+    padding: $default-padding;
+    width: 100%;
 
-      &:not(:disabled) {
-        &:hover,
-        &:active {
-          border: $hover-border;
-        }
+    &::placeholder {
+      color: var(--metadata);
+    }
+
+    &:disabled {
+      background-color: $disabled-background;
+    }
+
+    &:not(:disabled) {
+      &:hover,
+      &:active {
+        border: $hover-border;
+      }
 
-        &:focus {
-          border: $focus-border;
-        }
+      &:focus {
+        border: $focus-border;
       }
     }
   }

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

@@ -9,4 +9,3 @@ export { Checkbox } from './Checkbox'
 export { QueryChoices } from './QueryChoices'
 export { LinkInput } from './LinkInput'
 export { EditorInput } from './EditorInput'
-export * from './V2'