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

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

@@ -18,59 +18,62 @@ $default-background: var(--background-inputs);
 $disabled-background: var(--background-inputs-30);
 
 .#{bem.$base}.choices-input {
-  &.#{bem.$base}.input-wrapper {
+  display: flex;
+  flex-direction: column;
+
+  > .#{bem.$base}.form-label {
+    margin-bottom: var(--gap);
+  }
+
+  > .choices {
     display: flex;
-    flex-direction: column;
+    flex-wrap: wrap;
+    gap: $default-flex-separator;
 
-    > .choices {
+    &.space-between {
+      justify-content: space-between;
+    }
+
+    >.choice {
       display: flex;
-      flex-wrap: wrap;
-      gap: $default-flex-separator;
 
-      &.space-between {
-        justify-content: space-between;
+      input {
+        opacity: 0;
+        position: fixed;
+        visibility: none;
+        z-index: -1;
       }
 
-      >.choice {
-        display: flex;
-
-        input {
-          opacity: 0;
-          position: fixed;
-          visibility: none;
-          z-index: -1;
-        }
-
-        input:disabled + label {
-          background-color: $disabled-background;
-        }
+      input:disabled + label {
+        background-color: $disabled-background;
+      }
 
-        > label {
-          background-color: $default-background;
-          border: $default-border;
-          border-radius: $default-input-border-radius;
-          color: var(--paragraph);
-          cursor: pointer;
-          display: block;
-          height: $default-label-height;
-          max-width: 100%;
-          padding: $default-label-padding;
-          position: relative;
-          transition: $default-transition;
-          white-space: nowrap;
+      > label {
+        background-color: $default-background;
+        border: $default-border;
+        border-radius: $default-input-border-radius;
+        color: var(--paragraph);
+        cursor: pointer;
+        display: block;
+        height: $default-label-height;
+        max-width: 100%;
+        padding: $default-label-padding;
+        position: relative;
+        transition: $default-transition;
+        white-space: nowrap;
 
-          &:not(.disabled) {
-            &:hover {
-              border: $hover-border;
-            }
+        &:not(.disabled) {
+          &:hover {
+            border: $hover-border;
           }
         }
+      }
 
-        input:checked + label {
-          background: var(--x);
-          color: var(--on-x);
-        }
+      input:checked + label {
+        background: var(--x);
+        color: var(--on-x);
       }
     }
   }
 }
+

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

@@ -16,13 +16,14 @@ import { ListItemNode, ListNode } from '@lexical/list'
 
 import PropTypes from 'prop-types'
 import styleNames from '@pareto-engineering/bem/exports'
-import './styles.scss'
 
 // Local Definitions
 
-import { FormLabel, FormDescription, InputWrapper } from '../../common'
+import { FormLabel, FormDescription } from '../../common'
 import { Toolbar, TreeViewPlugin } from './common'
 
+import './styles.scss'
+
 const baseClassName = styleNames.base
 const componentClassName = 'editor-input'
 
@@ -43,10 +44,6 @@ const EditorInput = ({
   labelColor,
   description,
   disabled,
-  labelSpan,
-  desktopLabelSpan,
-  inputSpan,
-  desktopInputSpan,
   showDebugger,
   // ...otherProps
 }) => {
@@ -122,17 +119,7 @@ const EditorInput = ({
     <LexicalComposer
       initialConfig={initialConfig}
     >
-      <FormLabel
-        name={name}
-        color={labelColor}
-        optional={optional}
-        columnSpan={labelSpan}
-        desktopColumnSpan={desktopLabelSpan}
-      // {...otherProps}
-      >
-        {label}
-      </FormLabel>
-      <InputWrapper
+      <div
         id={id}
         className={[
           baseClassName,
@@ -148,9 +135,15 @@ const EditorInput = ({
           '--resize':resize,
           '--rows'  :`${rows}em`,
         }}
-        columnSpan={inputSpan}
-        desktopColumnSpan={desktopInputSpan}
       >
+        <FormLabel
+          name={name}
+          color={labelColor}
+          optional={optional}
+        >
+          {label}
+        </FormLabel>
+
         { !disabled && <Toolbar /> }
         <RichTextPlugin
           contentEditable={(
@@ -167,7 +160,7 @@ const EditorInput = ({
         <HistoryPlugin />
         <FormDescription className="s-1" description={description} name={name} />
         { showDebugger && <TreeViewPlugin />}
-      </InputWrapper>
+      </div>
     </LexicalComposer>
   )
 }
@@ -233,26 +226,6 @@ EditorInput.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,
-
   /**
    * The resize property of the text area
    */

package/src/ui/f/fields/EditorInput/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";
@@ -18,124 +17,127 @@ $disabled-background: var(--background-inputs-30);
 $default-color-menu-padding: .5em .25em;
 
 .#{bem.$base}.editor-input {
-  &.#{bem.$base}.input-wrapper {
+  display: flex;
+  flex-direction: column;
+
+  > .#{bem.$base}.form-label {
+    margin-bottom: var(--gap);
+  }
+
+  > .#{bem.$base}.toolbar {
     display: flex;
-    flex-direction: column;
-
-    > .#{bem.$base}.toolbar {
-      display: flex;
-      gap: $default-gap;
-      margin-bottom: .25em;
-
-      > .group {
-        > button {
-          background: $default-background;
-          border: $default-border;
-          color: $default-icon-color;
-          padding: $default-padding;
-
-          &.active {
-            background-color: $active-background;
-          }
+    gap: $default-gap;
+    margin-bottom: .25em;
+
+    > .group {
+      > button {
+        background: $default-background;
+        border: $default-border;
+        color: $default-icon-color;
+        padding: $default-padding;
+
+        &.active {
+          background-color: $active-background;
         }
       }
-
-      .flip {
-        transform: scaleX(-1);
-      }
     }
 
-    &:not(.disabled) {
-      &:hover,
-      &:focus,
-      &:active {
-        > .textarea {
-          border: $focus-border;
-        }
-      }
+    .flip {
+      transform: scaleX(-1);
     }
+  }
 
-    &.disabled {
+  &:not(.disabled) {
+    &:hover,
+    &:focus,
+    &:active {
       > .textarea {
-        background: $disabled-background;
-        color: var(--metadata);
-        cursor: not-allowed;
+        border: $focus-border;
       }
     }
+  }
 
-    .color-menu-button {
-      &:hover {
-        > .#{bem.$base}.popover {
-          display: block;
-        }
-      }
+  &.disabled {
+    > .textarea {
+      background: $disabled-background;
+      color: var(--metadata);
+      cursor: not-allowed;
+    }
+  }
 
+  .color-menu-button {
+    &:hover {
       > .#{bem.$base}.popover {
-        padding: $default-color-menu-padding;
-
-        .color-menu {
-          display: flex;
-          flex-wrap: wrap;
-          gap: calc($default-gap / 2);
-          justify-content: center;
-          max-width: 10em;
-          min-width: 5em;
-        }
-
-        .color-option:hover {
-          opacity: .5;
-        }
+        display: block;
       }
     }
 
-    > .content-editable {
-      background: $default-background;
-      border: $default-border;
-      border-radius: $default-input-border-radius;
-      color: var(--y);
-      height: var(--rows);
-      outline: none;
-      overflow: auto;
-      padding: $default-padding;
-      resize: var(--resize);
-      width: 100%;
-
-      li:has(ol, ul) {
-        list-style-type: none;
+    > .#{bem.$base}.popover {
+      padding: $default-color-menu-padding;
+
+      .color-menu {
+        display: flex;
+        flex-wrap: wrap;
+        gap: calc($default-gap / 2);
+        justify-content: center;
+        max-width: 10em;
+        min-width: 5em;
       }
 
-      p,
-      span,
-      strong,
-      em,
-      li {
-        &.underlined {
-          text-decoration: underline;
-
-          &.strikethrough {
-            text-decoration: underline line-through;
-          }
-        }
+      .color-option:hover {
+        opacity: .5;
+      }
+    }
+  }
 
-        &.strikethrough {
-          text-decoration: line-through;
-        }
+  > .content-editable {
+    background: $default-background;
+    border: $default-border;
+    border-radius: $default-input-border-radius;
+    color: var(--y);
+    height: var(--rows);
+    outline: none;
+    overflow: auto;
+    padding: $default-padding;
+    resize: var(--resize);
+    width: 100%;
 
-        &.italic {
-          font-style: italic;
+    li:has(ol, ul) {
+      list-style-type: none;
+    }
+
+    p,
+    span,
+    strong,
+    em,
+    li {
+      &.underlined {
+        text-decoration: underline;
+
+        &.strikethrough {
+          text-decoration: underline line-through;
         }
       }
 
-      :first-child {
-        margin-top: 0;
+      &.strikethrough {
+        text-decoration: line-through;
       }
 
-      &::placeholder {
-        color: var(--metadata);
+      &.italic {
+        font-style: italic;
       }
     }
+
+    :first-child {
+      margin-top: 0;
+    }
+
+    &::placeholder {
+      color: var(--metadata);
+    }
   }
 
+
   > .tree-view-output {
     background: $default-background;
     border: $default-border;

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

@@ -9,11 +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 = 'link-input'
@@ -35,61 +36,51 @@ const LinkInput = ({
   placeholder,
   optional,
   autoComplete,
-  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}
-      >
-        <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;
         }
       }
     }