@flux-ui/components 3.0.0-next.6 → 3.0.0-next.60

package/src/component/FluxFormDateInput.vue

@@ -5,7 +5,7 @@
         <template #opener="{open}">
             <FluxFormInputGroup>
                 <FluxFormInput
-                    :="{autoComplete, autoFocus, disabled, isReadonly, modelValue, placeholder}"
+                    :="{autoComplete, autoFocus, error, isCondensed, isLoading, isReadonly, isSecondary, name, placeholder}"
                     v-model="localValue"
                     :class="$style.formDateInput"
                     :disabled="disabled"
@@ -17,7 +17,7 @@
                     @show-picker="open"/>
 
                 <FluxSecondaryButton
-                    :disabled="disabled"
+                    :disabled="disabled || isReadonly"
                     icon-leading="calendar"
                     @click.prevent="open"/>
             </FluxFormInputGroup>
@@ -33,16 +33,17 @@
 <script
     lang="ts"
     setup>
-    import type { FluxAutoCompleteType } from '@flux-ui/types';
+    import type { FluxAutoCompleteType, FluxFormInputBaseProps } from '@flux-ui/types';
     import type { DateTime } from 'luxon';
-    import { ref, toRef, unref, useTemplateRef, watch } from 'vue';
-    import { useDisabled } from '$flux/composable';
+    import { toRef, useTemplateRef } from 'vue';
+    import { useDisabled } from '~flux/components/composable';
+    import { useDateFlyout } from '~flux/components/composable/private';
     import FluxDatePicker from './FluxDatePicker.vue';
     import FluxFlyout from './FluxFlyout.vue';
     import FluxFormInput from './FluxFormInput.vue';
     import FluxFormInputGroup from './FluxFormInputGroup.vue';
     import FluxSecondaryButton from './FluxSecondaryButton.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     const emit = defineEmits<{
         blur: [];
@@ -55,20 +56,18 @@
 
     const {
         disabled: componentDisabled
-    } = defineProps<{
+    } = defineProps<FluxFormInputBaseProps & {
         readonly autoComplete?: FluxAutoCompleteType;
-        readonly autoFocus?: boolean;
-        readonly disabled?: boolean;
-        readonly isReadonly?: boolean;
         readonly max?: DateTime;
         readonly min?: DateTime;
-        readonly placeholder?: string;
     }>();
 
     const disabled = useDisabled(toRef(() => componentDisabled));
     const flyoutRef = useTemplateRef('flyout');
 
-    const localValue = ref<DateTime | null>(null);
+    const localValue = useDateFlyout(modelValue, flyoutRef, {
+        compareKey: value => value?.toISODate()
+    });
 
     function onBlur(): void {
         emit('blur');
@@ -77,16 +76,4 @@
     function onFocus(): void {
         emit('focus');
     }
-
-    watch(modelValue, modelValue => localValue.value = modelValue, {immediate: true});
-
-    watch(localValue, localValue => {
-        unref(flyoutRef)?.close();
-
-        if (modelValue.value?.toISODate() === localValue?.toISODate()) {
-            return;
-        }
-
-        modelValue.value = localValue;
-    });
 </script>

package/src/component/FluxFormDateRangeInput.vue

@@ -3,18 +3,29 @@
         ref="flyout"
         :width="300">
         <template #opener="{open}">
-            <FluxFormInputGroup :aria-disabled="disabled ? true : undefined">
+            <FluxFormInputGroup
+                :aria-disabled="disabled ? true : undefined"
+                :aria-readonly="isReadonly ? true : undefined"
+                :aria-invalid="error ? true : undefined">
                 <div
                     :class="clsx(
                         $style.formDateRangeInput,
-                        disabled && $style.isDisabled
+                        disabled && $style.isDisabled,
+                        isCondensed && $style.isCondensed,
+                        isSecondary && $style.isSecondary,
+                        error && $style.isInvalid
                     )"
                     role="presentation">
-                    <span>{{ label }}</span>
+                    <span v-if="label">{{ label }}</span>
+                    <span
+                        v-else-if="placeholder"
+                        :class="$style.formSelectPlaceholder">
+                        {{ placeholder }}
+                    </span>
                 </div>
 
                 <FluxSecondaryButton
-                    :disabled="disabled"
+                    :disabled="disabled || isReadonly"
                     icon-leading="calendar"
                     @click.prevent="open"/>
             </FluxFormInputGroup>
@@ -31,17 +42,18 @@
 <script
     lang="ts"
     setup>
-    import type { FluxAutoCompleteType } from '@flux-ui/types';
+    import type { FluxFormInputBaseProps } from '@flux-ui/types';
     import { clsx } from 'clsx';
     import type { DateTime } from 'luxon';
-    import { computed, ref, toRef, unref, useTemplateRef, watch } from 'vue';
-    import { useDisabled } from '$flux/composable';
-    import { createLabelForDateRange } from '$flux/util';
+    import { computed, toRef, unref, useTemplateRef } from 'vue';
+    import { useDisabled } from '~flux/components/composable';
+    import { useDateFlyout } from '~flux/components/composable/private';
+    import { createLabelForDateRange } from '~flux/components/util';
     import FluxDatePicker from './FluxDatePicker.vue';
     import FluxFlyout from './FluxFlyout.vue';
     import FluxFormInputGroup from './FluxFormInputGroup.vue';
     import FluxSecondaryButton from './FluxSecondaryButton.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     const modelValue = defineModel<[DateTime, DateTime] | null>({
         required: true
@@ -50,21 +62,16 @@
     const {
         disabled: componentDisabled,
         rangeMode = 'range'
-    } = defineProps<{
-        readonly autoComplete?: FluxAutoCompleteType;
-        readonly autoFocus?: boolean;
-        readonly disabled?: boolean;
-        readonly isReadonly?: boolean;
+    } = defineProps<FluxFormInputBaseProps & {
         readonly max?: DateTime;
         readonly min?: DateTime;
-        readonly placeholder?: string;
         readonly rangeMode?: 'range' | 'week' | 'month';
     }>();
 
     const disabled = useDisabled(toRef(() => componentDisabled));
     const flyoutRef = useTemplateRef('flyout');
 
-    const localValue = ref<[DateTime, DateTime] | null>(null);
+    const localValue = useDateFlyout(modelValue, flyoutRef);
 
     const label = computed(() => {
         const value = unref(localValue);
@@ -77,11 +84,4 @@
 
         return createLabelForDateRange(start, end, true);
     });
-
-    watch(localValue, localValue => {
-        unref(flyoutRef)?.close();
-        modelValue.value = localValue;
-    });
-
-    watch(modelValue, modelValue => localValue.value = modelValue, {immediate: true});
 </script>

package/src/component/FluxFormDateTimeInput.vue

@@ -10,7 +10,7 @@
             <template #opener="{open}">
                 <FluxFormInputGroup>
                     <FluxFormInput
-                        :="{autoFocus, disabled, isReadonly, modelValue, placeholder}"
+                        :="{autoFocus, error, isCondensed, isLoading, isReadonly, isSecondary, name, placeholder}"
                         :class="$style.formDateInput"
                         :disabled="disabled"
                         :model-value="localValue"
@@ -19,7 +19,7 @@
                         @show-picker="open"/>
 
                     <FluxSecondaryButton
-                        :disabled="disabled"
+                        :disabled="disabled || isReadonly"
                         icon-leading="calendar"
                         @click.prevent="open"/>
                 </FluxFormInputGroup>
@@ -33,8 +33,10 @@
         </FluxFlyout>
 
         <FluxFormInput
-            :="{disabled, isReadonly, modelValue, placeholder}"
+            :="{error, isCondensed, isLoading, isReadonly, isSecondary, placeholder}"
             :class="$style.formTimeInput"
+            :disabled="disabled"
+            :name="name ? `${name}-time` : undefined"
             type="time"
             :model-value="localValue"
             @update:model-value="setTime"/>
@@ -44,17 +46,18 @@
 <script
     lang="ts"
     setup>
-    import type { FluxAutoCompleteType } from '@flux-ui/types';
+    import type { FluxAutoCompleteType, FluxFormInputBaseProps } from '@flux-ui/types';
     import { DateTime } from 'luxon';
-    import { ref, toRef, unref, useTemplateRef, watch } from 'vue';
-    import { useDisabled } from '$flux/composable';
+    import { toRef, unref, useTemplateRef, watch } from 'vue';
+    import { useDisabled } from '~flux/components/composable';
+    import { useDateFlyout } from '~flux/components/composable/private';
     import FluxDatePicker from './FluxDatePicker.vue';
     import FluxFlyout from './FluxFlyout.vue';
     import FluxFormInput from './FluxFormInput.vue';
     import FluxFormInputGroup from './FluxFormInputGroup.vue';
     import FluxSecondaryButton from './FluxSecondaryButton.vue';
     import FluxStack from './FluxStack.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     const modelValue = defineModel<DateTime | null>({
         required: true
@@ -63,21 +66,20 @@
     const {
         disabled: componentDisabled,
         isHourOnly
-    } = defineProps<{
+    } = defineProps<FluxFormInputBaseProps & {
         readonly autoComplete?: FluxAutoCompleteType;
-        readonly autoFocus?: boolean;
-        readonly disabled?: boolean;
         readonly isHourOnly?: boolean;
-        readonly isReadonly?: boolean;
         readonly max?: DateTime;
         readonly min?: DateTime;
-        readonly placeholder?: string;
     }>();
 
     const disabled = useDisabled(toRef(() => componentDisabled));
     const flyoutRef = useTemplateRef<{ close(): void; }>('flyout');
 
-    const localValue = ref<DateTime | null>(null);
+    const localValue = useDateFlyout(modelValue, flyoutRef, {
+        compareKey: value => value?.toISO(),
+        transformIn: value => isHourOnly ? value?.startOf('hour') ?? null : value
+    });
 
     function setDate(dateTime: DateTime | object | string | number | null): void {
         if (!DateTime.isDateTime(dateTime)) {
@@ -100,21 +102,16 @@
         const value: DateTime = (localValue.value ?? DateTime.now());
         localValue.value = value.set({
             hour: dateTime.hour,
-            minute: unref(isHourOnly) ? 0 : dateTime.minute,
-            second: unref(isHourOnly) ? 0 : dateTime.second
+            minute: isHourOnly ? 0 : dateTime.minute,
+            second: isHourOnly ? 0 : dateTime.second
         });
     }
 
-    watch(() => isHourOnly, () => isHourOnly && (localValue.value = unref(localValue)?.startOf('hour') ?? null), {immediate: true});
-    watch(modelValue, modelValue => localValue.value = isHourOnly ? modelValue?.startOf('hour') ?? null : modelValue, {immediate: true});
-
-    watch(localValue, localValue => {
-        unref(flyoutRef)?.close();
-
-        if (modelValue.value?.toISO() === localValue?.toISO()) {
+    watch(() => isHourOnly, () => {
+        if (!isHourOnly) {
             return;
         }
 
-        modelValue.value = localValue;
-    });
+        localValue.value = unref(localValue)?.startOf('hour') ?? null;
+    }, {immediate: true});
 </script>

package/src/component/FluxFormField.vue

@@ -50,11 +50,11 @@
 <script
     lang="ts"
     setup>
-    import { provide, useId } from 'vue';
-    import { useTranslate } from '$flux/composable/private';
-    import { FluxFormFieldInjectionKey } from '$flux/data';
+    import { provide, useId, type VNode } from 'vue';
+    import { useTranslate } from '~flux/components/composable/private';
+    import { FluxFormFieldInjectionKey } from '~flux/components/data';
     import FluxFormFieldAddition from './FluxFormFieldAddition.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     defineProps<{
         readonly currentLength?: number;
@@ -68,7 +68,7 @@
     const slots = defineSlots<{
         default(props: {
             readonly id?: string;
-        }): any;
+        }): VNode[];
 
         addition(props: {
             readonly currentLength?: number;
@@ -77,7 +77,7 @@
             readonly isOptional?: boolean;
             readonly label: string;
             readonly maxLength?: number;
-        }): any;
+        }): VNode[];
 
         value(props: {
             readonly currentLength?: number;
@@ -86,7 +86,7 @@
             readonly isOptional?: boolean;
             readonly label: string;
             readonly maxLength?: number;
-        }): any;
+        }): VNode[];
     }>();
 
     const id = useId();

package/src/component/FluxFormFieldAddition.vue

@@ -25,7 +25,7 @@
     import type { FluxIconName } from '@flux-ui/types';
     import { clsx } from 'clsx';
     import FluxIcon from './FluxIcon.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     const {
         mode = 'hint'

package/src/component/FluxFormGrid.vue

@@ -0,0 +1,24 @@
+<template>
+    <div
+        :class="$style.formGrid"
+        :style="{
+            '--columns': columns
+        }">
+        <slot/>
+    </div>
+</template>
+
+<script
+    lang="ts"
+    setup>
+    import type { VNode } from 'vue';
+    import $style from '~flux/components/css/component/Form.module.scss';
+
+    defineProps<{
+        readonly columns?: number;
+    }>();
+
+    defineSlots<{
+        default(): VNode[];
+    }>();
+</script>

package/src/component/FluxFormInput.vue

@@ -2,7 +2,9 @@
     <div
         :class="clsx(
             disabled ? $style.formInputDisabled : $style.formInputEnabled,
-            isSecondary && $style.isSecondary
+            isCondensed && $style.isCondensed,
+            isSecondary && $style.isSecondary,
+            error && $style.isInvalid
         )"
         :aria-disabled="disabled ? true : undefined">
         <input
@@ -13,9 +15,11 @@
                 !!iconLeading && $style.formInputNativeHasIconLeading
             )"
             :id="id"
+            :name="name"
             :autocomplete="autoComplete"
             :autofocus="autoFocus"
             :aria-disabled="disabled ? true : undefined"
+            :aria-invalid="error ? true : undefined"
             :disabled="disabled"
             :max="max"
             :maxlength="maxLength"
@@ -48,6 +52,11 @@
             :class="$style.formInputIconTrailing"
             :name="iconTrailing"
             :size="18"/>
+
+        <FluxSpinner
+            v-if="isLoading"
+            :class="$style.formInputIconTrailing"
+            :size="18"/>
     </div>
 </template>
 
@@ -55,14 +64,15 @@
     lang="ts"
     setup>
     import { unrefTemplateElement } from '@flux-ui/internals';
-    import type { FluxAutoCompleteType, FluxIconName, FluxInputMask, FluxInputType } from '@flux-ui/types';
+    import type { FluxAutoCompleteType, FluxFormInputBaseProps, FluxIconName, FluxInputMask, FluxInputType } from '@flux-ui/types';
     import { clsx } from 'clsx';
     import { DateTime } from 'luxon';
     import { ref, toRef, unref, useTemplateRef, watch } from 'vue';
-    import { useDisabled, useFormFieldInjection } from '$flux/composable';
-    import { inputMask } from '$flux/data';
+    import { useDisabled, useFormFieldInjection } from '~flux/components/composable';
+    import { inputMask } from '~flux/components/data';
     import FluxIcon from './FluxIcon.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import FluxSpinner from './FluxSpinner.vue';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     const emit = defineEmits<{
         blur: [];
@@ -77,21 +87,17 @@
     const {
         autoFocus = false,
         disabled: componentDisabled,
+        isReadonly,
         pattern,
         type = 'text'
-    } = defineProps<{
+    } = defineProps<FluxFormInputBaseProps & {
         readonly autoComplete?: FluxAutoCompleteType;
-        readonly autoFocus?: boolean;
         readonly iconLeading?: FluxIconName;
         readonly iconTrailing?: FluxIconName;
-        readonly disabled?: boolean;
-        readonly isReadonly?: boolean;
-        readonly isSecondary?: boolean;
         readonly max?: string | number;
         readonly maxLength?: number;
         readonly min?: string | number;
         readonly pattern?: FluxInputMask;
-        readonly placeholder?: string;
         readonly step?: number;
         readonly type?: FluxInputType;
     }>();
@@ -156,6 +162,10 @@
     }
 
     function onKeyDown(evt: KeyboardEvent): void {
+        if (isReadonly) {
+            return;
+        }
+
         if (!['date', 'datetime-local', 'month', 'week'].includes(type)) {
             return;
         }
@@ -208,7 +218,7 @@
 
         if (value) {
             mask.value = value;
-            localValue.value = mask.value;
+            modelValue.value = mask.value;
         }
 
         onCleanup(() => mask.destroy());

package/src/component/FluxFormInputAddition.vue

@@ -17,8 +17,9 @@
     lang="ts"
     setup>
     import type { FluxIconName } from '@flux-ui/types';
+    import type { VNode } from 'vue';
     import FluxIcon from './FluxIcon.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     defineProps<{
         readonly icon?: FluxIconName;
@@ -26,6 +27,6 @@
     }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>

package/src/component/FluxFormInputGroup.vue

@@ -2,9 +2,10 @@
     <div
         :class="clsx(
             $style.formInputGroup,
+            isCondensed && $style.isCondensed,
             isSecondary && $style.isSecondary
         )"
-        role="textbox">
+        role="group">
         <slot/>
     </div>
 </template>
@@ -13,13 +14,15 @@
     lang="ts"
     setup>
     import { clsx } from 'clsx';
-    import $style from '$flux/css/component/Form.module.scss';
+    import type { VNode } from 'vue';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     defineProps<{
         readonly isSecondary?: boolean;
+        readonly isCondensed?: boolean;
     }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>

package/src/component/FluxFormPinInput.vue

@@ -1,21 +1,28 @@
 <template>
     <fieldset
-        :class="disabled ? $style.pinInputDisabled : $style.pinInputEnabled"
+        :class="clsx(
+            disabled ? $style.pinInputDisabled : $style.pinInputEnabled,
+            error && $style.isInvalid
+        )"
         :id="id"
+        :name="name"
         :style="{
             '--max-length': maxLength
         }"
         :autofocus="autoFocus"
-        :aria-disabled="disabled ? true : undefined">
+        :aria-disabled="disabled ? true : undefined"
+        :aria-invalid="error ? true : undefined">
         <input
             v-for="field of maxLength"
             :key="field"
             ref="fields"
             :class="$style.pinInputField"
             maxlength="1"
+            :aria-label="translate('flux.pinDigit', {index: field, total: maxLength})"
             :autocomplete="field === 1 ? autoComplete : undefined"
             :autofocus="field === 1 && autoFocus"
             :disabled="disabled"
+            :readonly="isReadonly"
             :tabindex="(field - 1) === modelValue?.length ? 0 : -1"
             :type="isPrivate ? 'password' : 'text'"
             :value="modelValue[field - 1]"
@@ -29,10 +36,12 @@
 <script
     lang="ts"
     setup>
-    import type { FluxAutoCompleteType } from '@flux-ui/types';
+    import type { FluxAutoCompleteType, FluxFormInputBaseProps } from '@flux-ui/types';
+    import { clsx } from 'clsx';
     import { toRef, unref, useTemplateRef } from 'vue';
-    import { useDisabled, useFormFieldInjection } from '$flux/composable';
-    import $style from '$flux/css/component/Form.module.scss';
+    import { useDisabled, useFormFieldInjection } from '~flux/components/composable';
+    import { useTranslate } from '~flux/components/composable/private';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     const modelValue = defineModel<string>({
         default: ''
@@ -43,16 +52,15 @@
         autoFocus = false,
         disabled: componentDisabled,
         maxLength = 6
-    } = defineProps<{
+    } = defineProps<Pick<FluxFormInputBaseProps, 'autoFocus' | 'disabled' | 'error' | 'isLoading' | 'isReadonly' | 'name'> & {
         readonly autoComplete?: FluxAutoCompleteType;
-        readonly autoFocus?: boolean;
-        readonly disabled?: boolean;
         readonly isPrivate?: boolean;
         readonly maxLength?: number;
     }>();
 
     const disabled = useDisabled(toRef(() => componentDisabled));
     const {id} = useFormFieldInjection();
+    const translate = useTranslate();
 
     const fieldRefs = useTemplateRef<HTMLInputElement[]>('fields');
 

package/src/component/FluxFormRangeSlider.vue

@@ -13,6 +13,10 @@
             :percentage-upper="percentageUpper">
             <SliderThumb
                 ref="lowerThumb"
+                :aria-label="translate('flux.lowerBound')"
+                :aria-valuemax="max"
+                :aria-valuemin="min"
+                :aria-valuenow="modelValue[0]"
                 :disabled="disabled"
                 :is-dragging="isDraggingLower"
                 :position="percentageLower"
@@ -22,6 +26,10 @@
 
             <SliderThumb
                 ref="upperThumb"
+                :aria-label="translate('flux.upperBound')"
+                :aria-valuemax="max"
+                :aria-valuemin="min"
+                :aria-valuenow="modelValue[1]"
                 :disabled="disabled"
                 :is-dragging="isDraggingUpper"
                 :position="percentageUpper"
@@ -36,9 +44,11 @@
     lang="ts"
     setup>
     import { clampWithStepPrecision, countDecimals, formatNumber } from '@basmilius/utils';
+    import type { FluxFormInputBaseProps } from '@flux-ui/types';
     import { computed, ref, toRef, unref, useTemplateRef, watch } from 'vue';
-    import { useDisabled } from '$flux/composable';
-    import { addTooltip, removeTooltip, updateTooltip } from '$flux/data';
+    import { useDisabled } from '~flux/components/composable';
+    import { useTranslate } from '~flux/components/composable/private';
+    import { addTooltip, removeTooltip, updateTooltip } from '~flux/components/data';
     import { SliderBase, SliderThumb, SliderTrack } from './primitive';
 
     const modelValue = defineModel<[number, number]>({
@@ -52,10 +62,9 @@
         max = 100,
         min = 0,
         step = 1
-    } = defineProps<{
+    } = defineProps<Pick<FluxFormInputBaseProps, 'disabled' | 'error' | 'isLoading' | 'isReadonly' | 'name'> & {
         formatter?(value: number, decimals?: number): string;
 
-        readonly disabled?: boolean;
         readonly isTicksVisible?: boolean;
         readonly isTooltipDisabled?: boolean;
         readonly max?: number;
@@ -66,6 +75,7 @@
     const disabled = useDisabled(toRef(() => componentDisabled));
     const lowerThumbRef = useTemplateRef('lowerThumb');
     const upperThumbRef = useTemplateRef('upperThumb');
+    const translate = useTranslate();
 
     const isDraggingLower = ref(false);
     const isDraggingUpper = ref(false);

package/src/component/FluxFormRow.vue

@@ -7,9 +7,10 @@
 <script
     lang="ts"
     setup>
-    import $style from '$flux/css/component/Form.module.scss';
+    import type { VNode } from 'vue';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>

package/src/component/FluxFormSection.vue

@@ -1,8 +1,8 @@
 <template>
     <div :class="$style.formSection">
-        <div :class="$style.formSectionTitle">
+        <h3 :class="$style.formSectionTitle">
             {{ title }}
-        </div>
+        </h3>
 
         <slot/>
     </div>
@@ -11,13 +11,14 @@
 <script
     lang="ts"
     setup>
-    import $style from '$flux/css/component/Form.module.scss';
+    import type { VNode } from 'vue';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     defineProps<{
         readonly title: string;
     }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>