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

package/src/component/FluxFilterRange.vue

@@ -38,31 +38,45 @@
     lang="ts"
     setup>
     import { formatNumber } from '@basmilius/utils';
-    import type { FluxIconName } from '@flux-ui/types';
+    import type { FluxFilterRangeSpec } from '@flux-ui/types';
     import { computed, unref } from 'vue';
-    import { useFilterInjection } from '$flux/composable';
-    import { useTranslate } from '$flux/composable/private';
+    import { useFilterInjection } from '~flux/components/composable';
+    import { useTranslate } from '~flux/components/composable/private';
+    import { defineFilter, pickFilterCommon } from '~flux/components/util';
     import FluxFormColumn from './FluxFormColumn.vue';
     import FluxFormField from './FluxFormField.vue';
     import FluxFormSlider from './FluxFormSlider.vue';
     import FluxPaneBody from './FluxPaneBody.vue';
 
+    type Props = FluxFilterRangeSpec & {
+        readonly isTicksVisible?: boolean;
+        readonly max: number;
+        readonly min: number;
+        readonly step?: number;
+    };
+
+    defineFilter<Props>(p => ({
+        ...pickFilterCommon(p),
+        type: 'range',
+        async getValueLabel(value) {
+            if (!value || !Array.isArray(value) || value.length !== 2) {
+                return null;
+            }
+
+            const [lower, upper] = value as number[];
+            const format = p.formatter ?? formatNumber;
+
+            return `${format(lower!)} – ${format(upper!)}`;
+        }
+    }));
+
     const {
         formatter = formatNumber,
         max,
         min,
         name,
         step = 1
-    } = defineProps<{
-        readonly icon?: FluxIconName;
-        readonly isTicksVisible?: boolean;
-        readonly label: string;
-        readonly name: string;
-        readonly max: number;
-        readonly min: number;
-        readonly step?: number;
-        readonly formatter?: (value: number) => string;
-    }>();
+    } = defineProps<Props>();
 
     const {state, setValue} = useFilterInjection();
     const translate = useTranslate();

package/src/component/FluxFilterWindow.vue

@@ -0,0 +1,97 @@
+<template>
+    <div
+        v-height-transition
+        :class="$style.filter">
+        <FluxWindow ref="window">
+            <template #default="{navigate}">
+                <FluxMenu>
+                    <FilterMenuRenderer
+                        :menu-items="menuItems"
+                        :navigate="navigate"/>
+                </FluxMenu>
+            </template>
+
+            <template
+                v-for="(filter, name) of filters"
+                #[name]>
+                <FluxMenu>
+                    <FluxMenuGroup
+                        :class="$style.filterHeader"
+                        is-horizontal>
+                        <FluxMenuItem
+                            :class="$style.filterBack"
+                            :label="translate('flux.back')"
+                            icon-leading="angle-left"
+                            @click="back()"/>
+
+                        <FluxMenuItem
+                            v-if="canReset(name)"
+                            :class="$style.filterAction"
+                            icon-leading="rotate-left"
+                            @click="reset(name)"
+                            style="flex-grow: 0"/>
+
+                        <FluxMenuItem
+                            :class="$style.filterAction"
+                            icon-leading="trash"
+                            is-destructive
+                            @click="clear(name)"
+                            style="flex-grow: 0"/>
+                    </FluxMenuGroup>
+
+                    <VNodeRenderer :vnode="filter"/>
+                </FluxMenu>
+            </template>
+        </FluxWindow>
+    </div>
+</template>
+
+<script
+    lang="ts"
+    setup>
+    import { vHeightTransition } from '@flux-ui/internals';
+    import type { FluxFilterDefinition } from '@flux-ui/types';
+    import { unref, useTemplateRef, type VNode } from 'vue';
+    import { useFilterInjection } from '~flux/components/composable';
+    import { useTranslate } from '~flux/components/composable/private';
+    import { isResettable } from '~flux/components/util';
+    import FluxMenu from './FluxMenu.vue';
+    import FluxMenuGroup from './FluxMenuGroup.vue';
+    import FluxMenuItem from './FluxMenuItem.vue';
+    import FluxWindow from './FluxWindow.vue';
+    import { FilterMenuRenderer, VNodeRenderer } from './primitive';
+    import $style from '~flux/components/css/component/Filter.module.scss';
+
+    defineProps<{
+        readonly filters: Record<string, VNode>;
+        readonly menuItems: (FluxFilterDefinition | VNode)[][];
+    }>();
+
+    defineSlots<{
+        default(): VNode[];
+    }>();
+
+    const {clear: clearFilter, getDefinition, getValue, reset: resetFilter} = useFilterInjection();
+
+    const translate = useTranslate();
+
+    const windowRef = useTemplateRef<{ back(to: string): void; }>('window');
+
+    function back(): void {
+        unref(windowRef)?.back('default');
+    }
+
+    function clear(name: string): void {
+        back();
+        clearFilter(name);
+    }
+
+    function reset(name: string): void {
+        back();
+        resetFilter(name);
+    }
+
+    function canReset(name: string): boolean {
+        return isResettable(getDefinition(name), getValue(name));
+    }
+</script>

package/src/component/FluxFlex.vue

@@ -0,0 +1,53 @@
+<template>
+    <Component
+        :is="tag ?? 'div'"
+        :class="clsx(
+            isInline ? $style.flexInline : $style.flex,
+            direction === 'horizontal' && $style.flexDirectionHorizontal,
+            direction === 'vertical' && $style.flexDirectionVertical,
+            align === 'start' && $style.flexAlignStart,
+            align === 'center' && $style.flexAlignCenter,
+            align === 'end' && $style.flexAlignEnd,
+            align === 'stretch' && $style.flexAlignStretch,
+            align === 'baseline' && $style.flexAlignBaseline,
+            justify === 'start' && $style.flexJustifyStart,
+            justify === 'center' && $style.flexJustifyCenter,
+            justify === 'end' && $style.flexJustifyEnd,
+            justify === 'between' && $style.flexJustifyBetween,
+            justify === 'around' && $style.flexJustifyAround,
+            justify === 'evenly' && $style.flexJustifyEvenly,
+            wrap === 'wrap' && $style.flexWrapWrap,
+            wrap === 'nowrap' && $style.flexWrapNowrap,
+            wrap === 'wrap-reverse' && $style.flexWrapWrapReverse
+        )"
+        :style="{
+            '--gap': gap != null ? `${gap}px` : undefined
+        }">
+        <slot/>
+    </Component>
+</template>
+
+<script
+    lang="ts"
+    setup>
+    import type { FluxAlign, FluxDirection, FluxFlexWrap, FluxJustify } from '@flux-ui/types';
+    import { clsx } from 'clsx';
+    import type { VNode } from 'vue';
+    import $style from '~flux/components/css/component/Flex.module.scss';
+
+    const {
+        direction = 'horizontal'
+    } = defineProps<{
+        readonly align?: FluxAlign;
+        readonly direction?: FluxDirection;
+        readonly gap?: number;
+        readonly isInline?: boolean;
+        readonly justify?: FluxJustify;
+        readonly tag?: keyof HTMLElementTagNameMap;
+        readonly wrap?: FluxFlexWrap;
+    }>();
+
+    defineSlots<{
+        default(): VNode[];
+    }>();
+</script>

package/src/component/FluxFlexItem.vue

@@ -0,0 +1,40 @@
+<template>
+    <component :is="rendered"/>
+</template>
+
+<script
+    lang="ts"
+    setup>
+    import { flattenVNodeTree } from '@flux-ui/internals';
+    import { cloneVNode, computed, h, useSlots, type VNode } from 'vue';
+    import $style from '~flux/components/css/component/Flex.module.scss';
+
+    const props = defineProps<{
+        readonly basis?: number | string;
+        readonly grow?: number;
+        readonly shrink?: number;
+    }>();
+
+    defineSlots<{
+        default(): VNode[];
+    }>();
+
+    const slots = useSlots();
+
+    const flexStyle = computed(() => ({
+        flexBasis: typeof props.basis === 'number' ? `${props.basis}px` : props.basis,
+        flexGrow: props.grow,
+        flexShrink: props.shrink
+    }));
+
+    const rendered = computed(() => {
+        const children = flattenVNodeTree(slots.default?.() ?? []);
+        const extra = {class: $style.flexItem, style: flexStyle.value};
+
+        if (children.length === 1) {
+            return cloneVNode(children[0], extra);
+        }
+
+        return h('div', extra, children);
+    });
+</script>

package/src/component/FluxFlickeringGrid.vue

@@ -10,7 +10,7 @@
     import { mulberry32 } from '@basmilius/utils';
     import { useInView } from '@flux-ui/internals';
     import { computed, unref, useTemplateRef, watch } from 'vue';
-    import $style from '$flux/css/component/Visual.module.scss';
+    import $style from '~flux/components/css/component/Visual.module.scss';
 
     const {
         color = '#1d4ed8',

package/src/component/FluxFlyout.vue

@@ -6,12 +6,12 @@
             '--opener-width': `${openerWidth}px`,
             '--pane-mx': `${paneMarginX}px`,
             '--pane-my': `${paneMarginY}px`,
-            '--pane-x': `${paneX - 12}px`,
-            '--pane-y': `${paneY - 12}px`
+            '--pane-x': `${paneX - 30}px`,
+            '--pane-y': `${paneY - 30}px`
         }">
         <slot
             name="opener"
-            v-bind="{close, open, toggle}"/>
+            v-bind="{close, open, toggle, isOpen: isOpen || isOpening || isClosing}"/>
 
         <dialog
             ref="dialog"
@@ -39,13 +39,13 @@
 <script
     lang="ts"
     setup>
-    import { unrefTemplateElement, useFocusTrap } from '@flux-ui/internals';
+    import { isSSR, unrefTemplateElement, useEventListener, useFocusTrap } from '@flux-ui/internals';
     import type { FluxDirection } from '@flux-ui/types';
     import { clsx } from 'clsx';
-    import { provide, ref, unref, useTemplateRef, watch } from 'vue';
-    import { FluxFlyoutInjectionKey } from '$flux/data';
+    import { provide, ref, unref, useTemplateRef, type VNode, watch } from 'vue';
+    import { FluxFlyoutInjectionKey } from '~flux/components/data';
     import FluxPane from './FluxPane.vue';
-    import $style from '$flux/css/component/Flyout.module.scss';
+    import $style from '~flux/components/css/component/Flyout.module.scss';
 
     const {
         direction = 'vertical',
@@ -65,13 +65,15 @@
             readonly paneY: number;
             readonly openerWidth: number;
             readonly openerHeight: number;
-        }): any;
+        }): VNode[];
 
         opener(props: {
             close(): void;
             open(): void;
             toggle(): void;
-        }): any;
+
+            readonly isOpen: boolean;
+        }): VNode[];
     }>();
 
     const dialogRef = useTemplateRef('dialog');
@@ -88,6 +90,7 @@
     const paneMarginX = ref(0);
     const paneMarginY = ref(0);
 
+    !isSSR && useEventListener(ref(window), 'resize', () => unref(isOpen) && reposition());
     useFocusTrap(paneRef);
 
     function close(): void {
@@ -132,14 +135,14 @@
         const {top, left, width, height} = mount.children[0].getBoundingClientRect();
         const {width: paneWidth, height: paneHeight} = pane.getBoundingClientRect();
 
-        let x, y, mx = 0, my = 0;
+        let x: number, y: number, mx = 0, my = 0;
 
         if (direction === 'horizontal') {
             x = left + width;
             y = top + height / 2 - paneHeight / 2;
             mx = margin;
 
-            if (x + paneWidth > innerWidth - 30) {
+            if (x + paneWidth > innerWidth - 12) {
                 x = left - paneWidth;
                 mx = -mx;
             }
@@ -148,14 +151,14 @@
             y = top + height;
             my = margin;
 
-            if (y + paneHeight > innerHeight - 30) {
+            if (y + paneHeight > innerHeight - 12) {
                 y = top - paneHeight;
                 my = -my;
             }
         }
 
-        paneX.value = Math.max(30, Math.min(innerWidth - paneWidth - 30, x));
-        paneY.value = Math.max(30, Math.min(innerHeight - paneHeight - 30, y));
+        paneX.value = Math.max(12, Math.min(innerWidth - paneWidth - 12, x));
+        paneY.value = Math.max(12, Math.min(innerHeight - paneHeight - 12, y));
         paneMarginX.value = mx;
         paneMarginY.value = my;
     }

package/src/component/FluxFocalPointEditor.vue

@@ -56,14 +56,14 @@
     lang="ts"
     setup>
     import { computed, onMounted, onUnmounted, ref, unref, useTemplateRef, watch } from 'vue';
-    import { useTranslate } from '$flux/composable/private';
-    import { FluxFadeTransition } from '$flux/transition';
+    import { useTranslate } from '~flux/components/composable/private';
+    import { FluxFadeTransition } from '~flux/components/transition';
     import FluxPane from './FluxPane.vue';
     import FluxPaneBody from './FluxPaneBody.vue';
     import FluxPaneFooter from './FluxPaneFooter.vue';
     import FluxSecondaryButton from './FluxSecondaryButton.vue';
     import FluxSpacer from './FluxSpacer.vue';
-    import $style from '$flux/css/component/FocalPoint.module.scss';
+    import $style from '~flux/components/css/component/FocalPoint.module.scss';
 
     const modelValue = defineModel<[number, number]>({
         required: true
@@ -112,11 +112,11 @@
         }
 
         const {top, left, width, height} = image.getBoundingClientRect();
-        const {pageX, pageY} = evt;
+        const {clientX, clientY} = evt;
 
         dragging.value = [
-            Math.max(0, Math.min(1, (pageX - left) / width)) * 100,
-            Math.max(0, Math.min(1, (pageY - top) / height)) * 100
+            Math.max(0, Math.min(1, (clientX - left) / width)) * 100,
+            Math.max(0, Math.min(1, (clientY - top) / height)) * 100
         ];
     }
 

package/src/component/FluxFocalPointImage.vue

@@ -13,7 +13,7 @@
     setup>
     import type { FluxFocalPointObject } from '@flux-ui/types';
     import { computed } from 'vue';
-    import $style from '$flux/css/component/FocalPoint.module.scss';
+    import $style from '~flux/components/css/component/FocalPoint.module.scss';
 
     const {
         alt = '',

package/src/component/FluxForm.vue

@@ -1,19 +1,20 @@
 <template>
-    <FluxDisabled :disabled="disabled">
-        <form
-            :class="$style.form"
-            :aria-disabled="disabled ? true : undefined"
-            @submit.prevent="onSubmit()">
+    <form
+        :class="$style.form"
+        :aria-disabled="disabled ? true : undefined"
+        @submit.prevent="onSubmit()">
+        <FluxDisabled :disabled="disabled">
             <slot/>
-        </form>
-    </FluxDisabled>
+        </FluxDisabled>
+    </form>
 </template>
 
 <script
     lang="ts"
     setup>
+    import type { VNode } from 'vue';
     import FluxDisabled from './FluxDisabled.vue';
-    import $style from '$flux/css/component/Form.module.scss';
+    import $style from '~flux/components/css/component/Form.module.scss';
 
     const emit = defineEmits<{
         submit: [];
@@ -26,7 +27,7 @@
     }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 
     function onSubmit(): void {

package/src/component/FluxFormColumn.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/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>