@flux-ui/components 3.0.0-next.7 → 3.0.0-next.70

package/src/css/component/Form.module.scss

@@ -1,4 +1,4 @@
-@use '$flux/css/mixin';
+@use '~flux/components/css/mixin';
 
 %-form-input-group-inner-styles {
     height: 100%;
@@ -50,10 +50,18 @@
     }
 }
 
+.formGrid {
+    --columns: 2;
+
+    display: grid;
+    gap: 18px;
+    grid-template-columns: repeat(var(--columns), 1fr);
+}
+
 .formRow {
     display: flex;
     flex-grow: 1;
-    gap: 12px;
+    gap: 18px;
 }
 
 .formSectionTitle {
@@ -63,6 +71,10 @@
 }
 
 @include mixin.breakpoint-down(sm) {
+    .formGrid {
+        grid-template-columns: 1fr;
+    }
+
     .formRow {
         flex-flow: column;
         gap: 18px;
@@ -126,7 +138,7 @@
 .formFieldAdditionError {
     composes: formFieldAddition;
 
-    color: rgb(var(--danger-7));
+    color: var(--danger-600);
 }
 
 .formFieldAdditionHint {
@@ -145,14 +157,14 @@
     height: 42px;
     width: 100%;
     padding: 0 12px;
-    align-self: start;
-    background: rgb(var(--gray-0));
+    background: var(--surface);
     background-clip: padding-box;
-    border: 1px solid rgb(var(--gray-3));
+    border: 1px solid var(--surface-stroke);
     border-radius: var(--radius);
     box-shadow: var(--shadow-px);
     color: var(--foreground);
-    transition: 180ms var(--swift-out);
+    outline: 0 solid transparent;
+    transition: var(--transition-default);
     transition-property: background, border-color, mixin.focus-ring-transition-properties();
 
     &::placeholder {
@@ -160,16 +172,29 @@
     }
 
     &.isSecondary {
-        background: rgb(var(--gray-2));
+        background: var(--gray-100);
         border-color: transparent;
         box-shadow: none;
     }
+
+    &.isCondensed {
+        height: 34px;
+    }
+
+    &.isInvalid {
+        border-color: var(--danger-500);
+    }
+}
+
+.form .formInput {
+    align-self: start;
 }
 
 .formInputDisabled {
     composes: formInput;
 
-    background: rgb(var(--gray-2));
+    background: var(--surface-disabled);
+    color: var(--foreground-secondary);
     cursor: not-allowed;
 
     input {
@@ -183,7 +208,7 @@
     @include mixin.focus-ring(-1px, true);
 
     @include mixin.hover {
-        border-color: rgb(var(--gray-4));
+        border-color: var(--surface-stroke-hover);
     }
 }
 
@@ -245,7 +270,7 @@
 
     &::-webkit-color-swatch {
         border: 0;
-        border-radius: calc(var(--radius) / 2);
+        border-radius: var(--radius-half);
     }
 
     &::-webkit-color-swatch-wrapper {
@@ -271,20 +296,20 @@
     align-items: center;
     flex-grow: 0;
     justify-content: center;
-    background: rgb(var(--gray-1));
+    background: var(--surface-disabled);
     color: var(--foreground-secondary);
     pointer-events: none;
 
     &:has(+ .formInput .formInputNative) {
-        border-right: 1px solid rgb(var(--gray-3));
+        border-right: 1px solid var(--surface-stroke);
     }
 
     + .formInputAddition {
-        border-left: 1px solid rgb(var(--gray-3));
+        border-left: 1px solid var(--surface-stroke);
     }
 
     @at-root .formInput:has(.formInputNative) + & {
-        border-left: 1px solid rgb(var(--gray-3));
+        border-left: 1px solid var(--surface-stroke);
     }
 }
 
@@ -301,7 +326,7 @@
 
         + :is(.button, .buttonGroup) {
             margin: 0;
-            border-left: 1px solid rgb(var(--gray-3));
+            border-left: 1px solid var(--surface-stroke);
         }
     }
 
@@ -310,7 +335,7 @@
 
         + .button {
             margin: 0;
-            border-left: 1px solid rgb(var(--gray-3));
+            border-left: 1px solid var(--surface-stroke);
         }
     }
 
@@ -319,6 +344,15 @@
         border-bottom-left-radius: 0;
     }
 
+    &.isCondensed,
+    &.isSecondary {
+        .formInputAddition:not(:last-child) {
+            padding-right: 0;
+            background: unset;
+            border-color: transparent;
+        }
+    }
+
     &.isSecondary {
         .formInput {
             background: transparent;
@@ -326,20 +360,35 @@
             box-shadow: none;
         }
 
-        .formInputAddition:not(:last-child) {
-            padding-right: 0;
-        }
-
         .secondaryButton {
             background: transparent;
-            border-color: rgb(var(--gray-3));
+            border-color: var(--surface-stroke);
             box-shadow: none;
 
             @include mixin.hover {
-                background: rgb(var(--gray-3));
+                background: var(--surface-stroke-hover);
             }
         }
     }
+
+    &:has(*:disabled) {
+        cursor: not-allowed;
+
+        > * {
+            pointer-events: none;
+        }
+    }
+
+    :is(.button[disabled]),
+    :is(.button[aria-disabled="true"]) {
+        background: var(--surface-disabled);
+        opacity: 1;
+
+        &,
+        .buttonIcon {
+            color: var(--foreground-secondary);
+        }
+    }
 }
 
 .formDateInput {
@@ -398,7 +447,7 @@
         @include mixin.focus-ring(-1px, true);
 
         @include mixin.hover {
-            border-color: rgb(var(--gray-4));
+            border-color: var(--surface-stroke-hover);
         }
     }
 
@@ -430,7 +479,7 @@
     top: 0;
     height: 48px;
     margin-bottom: 9px;
-    background: rgb(var(--gray-0));
+    background: var(--surface);
     border-top: 0;
     border-left: 0;
     border-right: 0;
@@ -441,13 +490,14 @@
     @include mixin.focus-ring-remove;
 
     .formInputIcon {
+        right: 0;
         margin: 15px;
         font-size: 18px;
     }
 
     .formInputNative {
-        padding-left: 21px;
-        padding-right: 21px;
+        padding-left: 18px;
+        padding-right: 18px;
     }
 }
 
@@ -459,7 +509,7 @@
 }
 
 .formSelectPopup {
-    composes: basePaneStructure from './base/Pane.module.scss';
+    composes: basePane from './base/Pane.module.scss';
 
     position: fixed;
     display: block;
@@ -474,7 +524,7 @@
     z-index: 10000;
 
     .menuItem {
-        contain-intrinsic-size: #{'auto 42px'};
+        contain-intrinsic-size: auto 42px;
         content-visibility: auto;
     }
 
@@ -507,8 +557,8 @@
 }
 
 .isDisabled .formSelectSelected {
-    background: rgb(var(--gray-2));
-    border: 1px solid rgb(var(--gray-3));
+    background: var(--surface-disabled);
+    border: 1px solid var(--surface-stroke);
     color: var(--foreground-secondary);
     opacity: 1;
 }
@@ -538,32 +588,59 @@
     display: inline-flex;
     flex-shrink: 0;
     gap: 12px;
+    line-height: 20px;
     outline: 0;
+
+    &.isDisabled {
+        cursor: not-allowed;
+
+        .checkboxElement {
+            background: var(--surface-disabled);
+            border-color: var(--surface-stroke);
+            color: var(--foreground-secondary);
+        }
+
+        .checkboxLabel {
+            color: var(--foreground-secondary);
+        }
+    }
+
+    &.isReadonly {
+        cursor: default;
+
+        .checkboxNative {
+            pointer-events: none;
+        }
+    }
+
+    &.isInvalid .checkboxElement {
+        border-color: var(--danger-500);
+    }
 }
 
 .checkboxElement,
 .checkboxNative {
-    margin: 1px 0;
-    height: 22px;
-    width: 22px;
+    margin: 1px 0 0;
+    height: 20px;
+    width: 20px;
 }
 
 .checkboxElement {
     position: relative;
     display: inline-flex;
-    height: 22px;
-    width: 22px;
+    height: 20px;
+    width: 20px;
     padding: 0;
     align-items: center;
     justify-content: center;
-    background: rgb(var(--gray-3));
-    border: 0;
-    border-radius: calc(var(--radius) / 2);
-    color: rgb(var(--primary-0));
+    background: var(--gray-50);
+    border: 1px solid var(--gray-200);
+    border-radius: var(--radius-half);
+    color: var(--primary-25);
     cursor: pointer;
     pointer-events: none;
     transition: 210ms var(--swift-out);
-    transition-property: background, color, mixin.focus-ring-transition-properties();
+    transition-property: background, border-color, color, mixin.focus-ring-transition-properties();
 
     @include mixin.focus-outline;
 
@@ -574,7 +651,7 @@
         transition-property: opacity;
 
         :is(path) {
-            stroke: white;
+            stroke: currentColor;
             stroke-width: 54px;
         }
     }
@@ -586,16 +663,18 @@
 
 .checkboxNative {
     position: absolute;
+    cursor: pointer;
     opacity: 0;
 
     @include mixin.hover {
         + .checkboxElement {
-            background: rgb(var(--gray-4));
+            background: var(--gray-100);
         }
     }
 
     &:is(:checked, :indeterminate) + .checkboxElement {
-        background: rgb(var(--primary-7));
+        background: var(--primary-600);
+        border-color: var(--primary-600);
 
         .icon {
             opacity: 1;
@@ -605,21 +684,33 @@
     &:focus-visible + .checkboxElement {
         @include mixin.focus-outline-visible(2px);
     }
+
+    &:disabled {
+        cursor: not-allowed;
+    }
+
+    &:disabled + .checkboxElement {
+        background: var(--gray-100);
+        border-color: var(--gray-200);
+        color: var(--foreground-secondary);
+    }
 }
 
 .quantitySelector {
     min-width: max-content;
     align-self: center;
     justify-self: center;
-    border: 1px solid rgb(var(--gray-3));
+    border: 1px solid var(--surface-stroke);
     border-radius: var(--radius);
     box-shadow: var(--shadow-px);
     overflow: hidden;
+    transition: var(--transition-default);
+    transition-property: border-color, mixin.focus-ring-transition-properties();
 
-    @include mixin.focus-ring-transition(2px, true);
+    @include mixin.focus-ring(2px, true);
 
     @include mixin.hover {
-        border-color: rgb(var(--gray-4));
+        border-color: var(--surface-stroke-hover);
     }
 }
 
@@ -654,7 +745,7 @@
     text-align: center;
 
     &:hover {
-        border-color: rgb(var(--gray-3));
+        border-color: var(--surface-stroke-hover);
     }
 
     &,
@@ -689,15 +780,14 @@
 .pinInputField {
     padding: 0;
     width: 2.7ch;
-    background-clip: padding-box;
-    border: 1px solid rgb(var(--gray-3));
+    border: 1px solid var(--surface-stroke);
     border-radius: var(--radius);
     box-shadow: var(--shadow-px);
     font: inherit;
     line-height: 3.3ch;
     outline: 0;
     text-align: center;
-    transition: 180ms var(--swift-out);
+    transition: var(--transition-default);
     transition-property: border-color, mixin.focus-ring-transition-properties();
 }
 
@@ -705,7 +795,7 @@
     composes: pinInput;
 
     .pinInputField {
-        background-color: rgb(var(--gray-0));
+        background-color: var(--surface);
         color: var(--foreground-prominent);
 
         @include mixin.focus-ring(-1px, true);
@@ -716,7 +806,7 @@
     composes: pinInput;
 
     .pinInputField {
-        background-color: rgb(var(--gray-2));
+        background-color: var(--surface-disabled);
         color: var(--foreground-secondary);
         cursor: not-allowed;
     }
@@ -728,20 +818,29 @@
     width: 54px;
     height: 30px;
     flex: 0 0 auto;
-    background: rgb(var(--gray-2));
-    border-radius: 99px;
+    background: var(--gray-50);
+    border: 1px solid var(--gray-200);
+    border-radius: var(--radius-full);
     contain: paint;
 
+    @include mixin.focus-outline;
+
+    &:has(.toggleInput:focus-visible) {
+        @include mixin.focus-outline-visible(2px);
+    }
+
     &.isChecked {
+        border-color: transparent;
+
         .toggleInput::after {
             translate: 24px 0;
         }
 
         &:not(.isSwitch) {
-            background: rgb(var(--primary-7));
+            background: var(--primary-600);
 
             .toggleIcon {
-                color: rgb(var(--primary-0));
+                color: var(--primary-25);
             }
 
             .toggleInput::after {
@@ -762,6 +861,14 @@
         cursor: not-allowed;
         opacity: .6;
     }
+
+    &.isReadonly .toggleInput {
+        pointer-events: none;
+    }
+
+    &.isInvalid {
+        border-color: var(--danger-500);
+    }
 }
 
 .toggleIcon {
@@ -799,20 +906,17 @@
     cursor: pointer;
     outline: 0;
 
-    @include mixin.focus-ring(2px);
-
     &::after {
         position: absolute;
         display: block;
-        top: 3px;
-        left: 3px;
+        top: 2px;
+        left: 2px;
         height: 24px;
         width: 24px;
         content: '';
-        background: rgb(var(--gray-0));
-        background-clip: padding-box;
-        border: 1px solid rgb(var(--gray-3));
-        border-radius: 99px;
+        background: var(--surface);
+        border: 1px solid var(--surface-stroke);
+        border-radius: var(--radius-full);
         box-shadow: var(--shadow-sm);
     }
 }

package/src/css/component/Gallery.module.scss

@@ -1,6 +1,15 @@
-@use '$flux/css/mixin';
+@use '~flux/components/css/mixin';
 
 .gallery {
+    --dz-fill: transparent;
+    --dz-stroke: transparent;
+    --dz-inset: -3px;
+    --dz-radius: calc(var(--radius) + 3px);
+    --dz-height: calc(100% + 6px);
+    --dz-width: calc(100% + 6px);
+}
+
+.galleryGrid {
     display: grid;
     gap: 9px;
     grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));
@@ -9,12 +18,13 @@
 .galleryAdd {
     composes: placeholder from './Placeholder.module.scss';
 
+    position: relative;
     aspect-ratio: 1 / 1;
-    color: rgb(var(--gray-7));
+    color: var(--foreground-secondary);
 
     @include mixin.hover {
-        background: rgb(var(--gray-1));
-        border-color: rgb(var(--gray-3));
+        background: var(--gray-100);
+        border-color: var(--gray-200);
     }
 }
 
@@ -50,7 +60,7 @@
     inset: 1px;
     align-items: center;
     justify-content: center;
-    backdrop-filter: blur(2px) saturate(180%);
+    backdrop-filter: blur(3px) saturate(180%);
     background: rgb(0 0 0 / .25);
     border-radius: calc(var(--radius) - 1px);
     z-index: 0;

package/src/css/component/Grid.module.scss

@@ -1,4 +1,4 @@
-@use '$flux/css/mixin';
+@use '~flux/components/css/mixin';
 
 .grid {
     display: grid;

package/src/css/component/Icon.module.scss

@@ -1,47 +1,37 @@
-.icon {
-    height: 1em;
-    width: 1em;
-    flex-shrink: 0;
-    font-size: 20px;
-    line-height: 1;
-}
+@layer flux-base {
+    .icon {
+        height: 1em;
+        width: 1em;
+        flex-shrink: 0;
+        font-size: 20px;
+        line-height: 1;
+        overflow: visible;
+    }
 
-.fontAwesomeIcon {
-    composes: icon;
+    .fontAwesomeIcon {
+        composes: icon;
 
-    display: inline-block;
-}
+        display: inline-block;
 
-.materialSymbolIcon {
-    composes: icon;
-
-    display: inline-flex;
-    color: currentColor;
-    font-family: 'Material Symbols Outlined', sans-serif;
-    font-weight: 400;
-    font-style: normal;
-    user-select: none;
-    -webkit-font-feature-settings: 'liga';
-    -webkit-font-smoothing: antialiased;
-}
-
-.iconBoxed {
-    composes: basePane from './base/Pane.module.scss';
+        &:has(> path:nth-child(2)) path:first-child {
+            opacity: .2;
+        }
+    }
 
-    display: flex;
-    height: 1em;
-    width: 1em;
-    align-items: center;
-    flex-shrink: 0;
-    justify-content: center;
-    font-size: 42px;
+    .iconBoxed {
+        composes: basePane from './base/Pane.module.scss';
 
-    .icon {
-        font-size: .33em;
-    }
+        display: flex;
+        height: 1em;
+        width: 1em;
+        align-items: center;
+        flex-shrink: 0;
+        justify-content: center;
+        font-size: 42px;
 
-    .materialSymbolIcon {
-        font-size: .5em;
+        .icon {
+            font-size: .45em;
+        }
     }
 }
 
@@ -60,41 +50,41 @@
 .iconBoxedGray {
     composes: iconBoxedColored;
 
-    background: rgb(var(--gray-2));
+    background: var(--gray-100);
     color: var(--foreground);
 }
 
 .iconBoxedPrimary {
     composes: iconBoxedColored;
 
-    background: rgb(var(--primary-2));
-    color: rgb(var(--primary-10));
+    background: var(--primary-100);
+    color: var(--primary-900);
 }
 
 .iconBoxedDanger {
     composes: iconBoxedColored;
 
-    background: rgb(var(--danger-2));
-    color: rgb(var(--danger-10));
+    background: var(--danger-100);
+    color: var(--danger-900);
 }
 
 .iconBoxedInfo {
     composes: iconBoxedColored;
 
-    background: rgb(var(--info-2));
-    color: rgb(var(--info-10));
+    background: var(--info-100);
+    color: var(--info-900);
 }
 
 .iconBoxedSuccess {
     composes: iconBoxedColored;
 
-    background: rgb(var(--success-2));
-    color: rgb(var(--success-10));
+    background: var(--success-100);
+    color: var(--success-900);
 }
 
 .iconBoxedWarning {
     composes: iconBoxedColored;
 
-    background: rgb(var(--warning-2));
-    color: rgb(var(--warning-10));
+    background: var(--warning-100);
+    color: var(--warning-900);
 }