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

package/src/component/FluxTabBar.vue

@@ -1,61 +1,104 @@
 <template>
     <nav
-        :class="$style.tabBar"
+        :class="isPills ? $style.tabBarPills : $style.tabBarDefault"
         role="tablist"
         aria-orientation="horizontal">
-        <button
-            v-if="isStartArrowVisible"
-            :class="$style.tabBarArrowStart"
-            tabindex="-1"
-            type="button"
-            @click="scrollToStart">
-            <FluxIcon name="angle-left"/>
-        </button>
+        <FluxFadeTransition>
+            <button
+                v-if="isStartArrowVisible"
+                :class="$style.tabBarArrowStart"
+                tabindex="-1"
+                type="button"
+                @click="scrollToStart">
+                <FluxIcon name="angle-left"/>
+            </button>
+        </FluxFadeTransition>
 
         <div
             ref="tabBar"
             :class="clsx(
-                $style.tabBarTabs,
+                isPills ? $style.tabBarTabsPills : $style.tabBarTabsDefault,
                 isEndArrowVisible && $style.isEndMasked,
                 isStartArrowVisible && $style.isStartMasked
             )">
+            <div
+                v-if="activeItemWidth > 0"
+                :class="isPills ? $style.tabBarHighlightPills : $style.tabBarHighlightDefault"
+                :style="{
+                    left: `${activeItemX}px`,
+                    width: `${activeItemWidth}px`
+                }"/>
             <slot/>
         </div>
 
-        <button
-            v-if="isEndArrowVisible"
-            :class="$style.tabBarArrowEnd"
-            tabindex="-1"
-            type="button"
-            @click="scrollToEnd">
-            <FluxIcon name="angle-right"/>
-        </button>
+        <FluxFadeTransition>
+            <button
+                v-if="isEndArrowVisible"
+                :class="$style.tabBarArrowEnd"
+                tabindex="-1"
+                type="button"
+                @click="scrollToEnd">
+                <FluxIcon name="angle-right"/>
+            </button>
+        </FluxFadeTransition>
     </nav>
 </template>
 
 <script
     lang="ts"
     setup>
-    import { unrefTemplateElement, useEventListener, useMutationObserver } from '@flux-ui/internals';
+    import { useMutationObserver, useResizeObserver } from '@basmilius/common';
+    import { unrefTemplateElement, useEventListener } from '@flux-ui/internals';
     import { clsx } from 'clsx';
-    import { onMounted, ref, useTemplateRef } from 'vue';
+    import { onMounted, provide, ref, toRef, useTemplateRef, watch, type Ref, type VNode } from 'vue';
+    import { FluxTabBarInjectionKey } from '~flux/components/data';
+    import { FluxFadeTransition } from '~flux/components/transition';
     import FluxIcon from './FluxIcon.vue';
-    import $style from '$flux/css/component/Tab.module.scss';
+    import $style from '~flux/components/css/component/Tab.module.scss';
+
+    const { isPills } = defineProps<{
+        readonly isPills?: boolean;
+    }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 
-    const tabBarRef = useTemplateRef('tabBar');
+    const tabBarRef = useTemplateRef<HTMLElement>('tabBar');
 
     useEventListener(tabBarRef, 'scroll', () => checkScroll());
-    useMutationObserver(tabBarRef, () => checkScroll(), {childList: true});
+    useMutationObserver(tabBarRef, () => {
+        checkScroll();
+        updateHighlight();
+    }, {childList: true});
+    useResizeObserver(tabBarRef, () => updateHighlight());
 
     const isEndArrowVisible = ref(false);
     const isStartArrowVisible = ref(false);
+    const activeItemX = ref(0);
+    const activeItemWidth = ref(0);
+
+    const items = new Map<Element, Ref<boolean>>();
+    const itemUnwatchers = new Map<Element, () => void>();
 
     onMounted(() => checkScroll());
 
+    provide(FluxTabBarInjectionKey, {
+        isPills: toRef(() => isPills ?? false),
+        registerItem(element, isActive) {
+            items.set(element, isActive);
+            const unwatch = watch(isActive, () => updateHighlight(), {flush: 'post', immediate: true});
+            itemUnwatchers.set(element, unwatch);
+        },
+        unregisterItem(element) {
+            const unwatch = itemUnwatchers.get(element);
+            unwatch?.();
+            itemUnwatchers.delete(element);
+            items.delete(element);
+            updateHighlight();
+        }
+    });
+
     function checkScroll(): void {
         const tabBar = unrefTemplateElement(tabBarRef)!;
 
@@ -69,6 +112,37 @@
         isStartArrowVisible.value = tabBar.scrollLeft > 0;
     }
 
+    function updateHighlight(): void {
+        const tabBar = unrefTemplateElement(tabBarRef);
+
+        if (!tabBar) {
+            return;
+        }
+
+        let activeElement: HTMLElement | null = null;
+
+        for (const [element, isActive] of items) {
+            if (isActive.value) {
+                activeElement = element as HTMLElement;
+                break;
+            }
+        }
+
+        if (!activeElement) {
+            activeItemWidth.value = 0;
+            return;
+        }
+
+        const width = activeElement.offsetWidth;
+
+        if (width === 0) {
+            return;
+        }
+
+        activeItemX.value = activeElement.offsetLeft;
+        activeItemWidth.value = width;
+    }
+
     function scrollToEnd(): void {
         const tabBar = unrefTemplateElement(tabBarRef)!;
         tabBar.scrollBy({

package/src/component/FluxTabBarItem.vue

@@ -2,7 +2,7 @@
     <FluxPressable
         ref="tab"
         :component-type="type"
-        :class="isActive ? $style.tabBarItemActive : $style.tabBarItem"
+        :class="itemClass"
         type="button"
         role="tab"
         :aria-disabled="disabled ? true : undefined"
@@ -29,11 +29,11 @@
     lang="ts"
     setup>
     import type { FluxIconName, FluxPressableType, FluxTo } from '@flux-ui/types';
-    import { ComponentPublicInstance, toRef, unref, useTemplateRef, watch } from 'vue';
-    import { useDisabled } from '$flux/composable';
+    import { type ComponentPublicInstance, computed, onBeforeUnmount, onMounted, toRef, unref, useTemplateRef, watch } from 'vue';
+    import { useDisabled, useTabBarInjection } from '~flux/components/composable';
     import FluxIcon from './FluxIcon.vue';
     import FluxPressable from './FluxPressable.vue';
-    import $style from '$flux/css/component/Tab.module.scss';
+    import $style from '~flux/components/css/component/Tab.module.scss';
 
     const emit = defineEmits<{
         click: [MouseEvent];
@@ -58,8 +58,39 @@
     }>();
 
     const disabled = useDisabled(toRef(() => componentDisabled));
+    const tabBar = useTabBarInjection();
     const tabRef = useTemplateRef<ComponentPublicInstance>('tab');
 
+    const itemClass = computed(() => {
+        if (tabBar.isPills.value) {
+            return isActive ? $style.tabBarItemPillsActive : $style.tabBarItemPills;
+        }
+
+        return isActive ? $style.tabBarItemDefaultActive : $style.tabBarItemDefault;
+    });
+
+    let registeredElement: Element | null = null;
+
+    onMounted(() => {
+        const tab = unref(tabRef);
+
+        if (!tab) {
+            return;
+        }
+
+        registeredElement = tab.$el;
+        tabBar.registerItem(registeredElement!, toRef(() => !!isActive));
+    });
+
+    onBeforeUnmount(() => {
+        if (!registeredElement) {
+            return;
+        }
+
+        tabBar.unregisterItem(registeredElement);
+        registeredElement = null;
+    });
+
     function onClick(evt: MouseEvent): void {
         if (unref(disabled)) {
             evt.preventDefault();

package/src/component/FluxTable.vue

@@ -1,5 +1,10 @@
 <template>
-    <div :class="$style.table">
+    <div
+        ref="base"
+        :class="[
+            $style.table,
+            isBordered && $style.isBordered
+        ]">
         <table :class="$style.tableBase">
             <slot name="colgroups"/>
 
@@ -30,7 +35,8 @@
 
         <div
             v-if="isLoading"
-            :class="$style.tableLoader">
+            :class="$style.tableLoader"
+            :style="{transform: `translate(${x}px, ${y}px)`}">
             <FluxSpinner/>
         </div>
 
@@ -45,14 +51,14 @@
 <script
     lang="ts"
     setup>
-    import type { VNode } from 'vue';
-    import { provide } from 'vue';
-    import { FluxTableInjectionKey } from '$flux/data';
+    import { useScrollPosition } from '@flux-ui/internals';
+    import { provide, useTemplateRef, type VNode } from 'vue';
+    import { FluxTableInjectionKey } from '~flux/components/data';
     import FluxPaneBody from './FluxPaneBody.vue';
     import FluxSpinner from './FluxSpinner.vue';
     import FluxTableCell from './FluxTableCell.vue';
     import FluxTableRow from './FluxTableRow.vue';
-    import $style from '$flux/css/component/Table.module.scss';
+    import $style from '~flux/components/css/component/Table.module.scss';
 
     const {
         captionSide = 'bottom',
@@ -80,6 +86,9 @@
         pagination?(): VNode;
     }>();
 
+    const base = useTemplateRef('base');
+    const {x, y} = useScrollPosition(base);
+
     provide(FluxTableInjectionKey, {
         isBordered,
         isHoverable,

package/src/component/FluxTableActions.vue

@@ -1,16 +1,17 @@
 <template>
-    <FluxActions :class="$style.tableActions">
+    <FluxActionStack :class="$style.tableActions">
         <slot/>
-    </FluxActions>
+    </FluxActionStack>
 </template>
 
 <script
     lang="ts"
     setup>
-    import FluxActions from './FluxActions.vue';
-    import $style from '$flux/css/component/Table.module.scss';
+    import type { VNode } from 'vue';
+    import FluxActionStack from './FluxActionStack.vue';
+    import $style from '~flux/components/css/component/Table.module.scss';
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>

package/src/component/FluxTableBar.vue

@@ -0,0 +1,38 @@
+<template>
+    <tr :class="$style.tableRow">
+        <td
+            :class="clsx(
+                $style.tableBar,
+                isBordered && $style.isBordered,
+                isHoverable && $style.isHoverable,
+                isSeparated && $style.isSeparated,
+                isStriped && $style.isStriped
+            )"
+            colspan="100%"
+            role="cell">
+            <div :class="$style.tableBarContent">
+                <slot/>
+            </div>
+        </td>
+    </tr>
+</template>
+
+<script
+    lang="ts"
+    setup>
+    import { clsx } from 'clsx';
+    import type { VNode } from 'vue';
+    import { useTableInjection } from '~flux/components/composable';
+    import $style from '~flux/components/css/component/Table.module.scss';
+
+    defineSlots<{
+        default(): VNode[];
+    }>();
+
+    const {
+        isBordered,
+        isHoverable,
+        isSeparated,
+        isStriped
+    } = useTableInjection();
+</script>

package/src/component/FluxTableCell.vue

@@ -12,7 +12,8 @@
             <div
                 :class="$style.tableCellContent"
                 :style="{
-                    flexFlow: contentDirection
+                    flexFlow: contentDirection,
+                    gap: contentGap != null ? `${contentGap}px` : undefined
                 }">
                 <slot/>
             </div>
@@ -24,18 +25,20 @@
     lang="ts"
     setup>
     import { clsx } from 'clsx';
-    import { useTableInjection } from '$flux/composable';
-    import $style from '$flux/css/component/Table.module.scss';
+    import type { VNode } from 'vue';
+    import { useTableInjection } from '~flux/components/composable';
+    import $style from '~flux/components/css/component/Table.module.scss';
 
     const {
         contentDirection = 'row'
     } = defineProps<{
         readonly contentDirection?: 'column' | 'row';
+        readonly contentGap?: number;
     }>();
 
     defineSlots<{
-        default(): any;
-        content(): any;
+        default(): VNode[];
+        content(): VNode[];
     }>();
 
     const {

package/src/component/FluxTableHeader.vue

@@ -6,6 +6,8 @@
             isShrinking && $style.isShrinking,
             isSticky && $style.isSticky
         )"
+        scope="col"
+        :aria-sort="isSortable ? (sort ?? 'none') : undefined"
         :style="{
             minWidth: `${minWidth}px`
         }">
@@ -63,16 +65,16 @@
     setup>
     import type { FluxIconName } from '@flux-ui/types';
     import { clsx } from 'clsx';
-    import { computed } from 'vue';
-    import { useTableInjection } from '$flux/composable';
-    import { useTranslate } from '$flux/composable/private';
+    import { computed, type VNode } from 'vue';
+    import { useTableInjection } from '~flux/components/composable';
+    import { useTranslate } from '~flux/components/composable/private';
     import FluxFlyout from './FluxFlyout.vue';
     import FluxIcon from './FluxIcon.vue';
     import FluxMenu from './FluxMenu.vue';
     import FluxMenuGroup from './FluxMenuGroup.vue';
     import FluxMenuItem from './FluxMenuItem.vue';
     import FluxSeparator from './FluxSeparator.vue';
-    import $style from '$flux/css/component/Table.module.scss';
+    import $style from '~flux/components/css/component/Table.module.scss';
 
     defineEmits<{
         sort: ['ascending' | 'descending' | null];
@@ -90,7 +92,7 @@
     }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 
     const {isBordered} = useTableInjection();

package/src/component/FluxTableRow.vue

@@ -1,5 +1,5 @@
 <template>
-    <tr :class="$style.tableRow">
+    <tr :class="clsx($style.tableRow, isSelected && $style.isSelected)">
         <slot/>
     </tr>
 </template>
@@ -7,9 +7,15 @@
 <script
     lang="ts"
     setup>
-    import $style from '$flux/css/component/Table.module.scss';
+    import { clsx } from 'clsx';
+    import type { VNode } from 'vue';
+    import $style from '~flux/components/css/component/Table.module.scss';
+
+    defineProps<{
+        readonly isSelected?: boolean;
+    }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>

package/src/component/FluxTabs.vue

@@ -3,11 +3,15 @@
         <slot
             v-bind="{children, modelValue, tabs, activate}"
             name="tabs">
-            <FluxTabBar :class="$style.tabsBar">
+            <FluxTabBar
+                :class="$style.tabsBar"
+                :is-pills="isPills">
                 <template
                     v-for="(tab, index) of tabs"
                     :key="index">
                     <FluxTabBarItem
+                        :id="`${baseId}-tab-${index}`"
+                        :aria-controls="`${baseId}-panel-${index}`"
                         :icon="tab.icon"
                         :is-active="modelValue === index"
                         :label="tab.label"
@@ -33,19 +37,23 @@
     setup>
     import { flattenVNodeTree, getComponentProps } from '@flux-ui/internals';
     import type { FluxIconName } from '@flux-ui/types';
-    import { computed, ref, unref, VNode, watch } from 'vue';
-    import { FluxWindowTransition } from '$flux/transition';
-    import { VNodeRenderer } from './primitive';
+    import { cloneVNode, computed, ref, unref, useId, type VNode, watch } from 'vue';
+    import { FluxWindowTransition } from '~flux/components/transition';
     import FluxTabBar from './FluxTabBar.vue';
     import FluxTabBarItem from './FluxTabBarItem.vue';
-    import $style from '$flux/css/component/Tab.module.scss';
+    import { VNodeRenderer } from './primitive';
+    import $style from '~flux/components/css/component/Tab.module.scss';
 
     const modelValue = defineModel<number>({
         default: 0
     });
 
+    defineProps<{
+        readonly isPills?: boolean;
+    }>();
+
     const slots = defineSlots<{
-        default(): any;
+        default(): VNode[];
 
         content(props: {
             activate(index: number): void;
@@ -56,7 +64,7 @@
                 readonly icon?: FluxIconName;
                 readonly label?: string;
             }[];
-        }): any;
+        }): VNode[];
 
         tabs(props: {
             activate(index: number): void;
@@ -67,13 +75,20 @@
                 readonly icon?: FluxIconName;
                 readonly label?: string;
             }[];
-        }): any;
+        }): VNode[];
     }>();
 
+    const baseId = useId();
     const isTransitioningBack = ref(false);
 
-    const children = computed(() => flattenVNodeTree(slots.default?.() ?? []));
-    const tabs = computed<{ icon?: FluxIconName; label?: string; }[]>(() => unref(children)
+    const rawChildren = computed(() => flattenVNodeTree(slots.default?.() ?? []));
+
+    const children = computed(() => unref(rawChildren).map((child, index) => cloneVNode(child, {
+        id: `${baseId}-panel-${index}`,
+        'aria-labelledby': `${baseId}-tab-${index}`
+    })));
+
+    const tabs = computed<{ icon?: FluxIconName; label?: string; }[]>(() => unref(rawChildren)
         .filter((child: VNode) => getComponentProps<any>(child).icon || getComponentProps<any>(child).label)
         .map((child: VNode) => ({
             icon: getComponentProps<any>(child).icon,

package/src/component/FluxTag.vue

@@ -6,7 +6,8 @@
             color === 'danger' && $style.tagDanger,
             color === 'info' && $style.tagInfo,
             color === 'success' && $style.tagSuccess,
-            color === 'warning' && $style.tagWarning
+            color === 'warning' && $style.tagWarning,
+            isKeyboardShortcut && $style.tagKeyboardShortcut
         )"
         :component-type="type"
         :tabindex="tabindex"
@@ -40,7 +41,8 @@
             v-if="!isClickable && isDeletable"
             :class="$style.tagClose"
             type="button"
-            @click="onDeleteClick()">
+            :aria-label="translate('flux.delete')"
+            @click.stop="onDeleteClick()">
             <FluxIcon name="xmark"/>
         </button>
     </FluxPressable>
@@ -51,10 +53,11 @@
     setup>
     import type { FluxButtonEmits, FluxColor, FluxIconName, FluxPressableType, FluxTo } from '@flux-ui/types';
     import { clsx } from 'clsx';
+    import { useTranslate } from '~flux/components/composable/private';
     import FluxIcon from './FluxIcon.vue';
     import FluxPressable from './FluxPressable.vue';
     import FluxSpinner from './FluxSpinner.vue';
-    import $style from '$flux/css/component/Badge.module.scss';
+    import $style from '~flux/components/css/component/Badge.module.scss';
 
     const emit = defineEmits<FluxButtonEmits & {
         delete: [];
@@ -69,6 +72,7 @@
         readonly icon?: FluxIconName;
         readonly isClickable?: boolean;
         readonly isDeletable?: boolean;
+        readonly isKeyboardShortcut?: boolean;
         readonly isLoading?: boolean;
         readonly label: string;
         readonly type?: FluxPressableType;
@@ -79,6 +83,8 @@
         readonly to?: FluxTo;
     }>();
 
+    const translate = useTranslate();
+
     function onDeleteClick(): void {
         emit('delete');
     }

package/src/component/FluxTagStack.vue

@@ -1,18 +1,19 @@
 <template>
-    <FluxStack
+    <FluxFlex
         direction="horizontal"
         :gap="6"
-        is-wrapping>
+        wrap="wrap">
         <slot/>
-    </FluxStack>
+    </FluxFlex>
 </template>
 
 <script
     lang="ts"
     setup>
-    import FluxStack from './FluxStack.vue';
+    import type { VNode } from 'vue';
+    import FluxFlex from './FluxFlex.vue';
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>

package/src/component/FluxTicks.vue

@@ -29,7 +29,7 @@
     setup>
     import { generateStepTicks } from '@basmilius/utils';
     import { computed } from 'vue';
-    import $style from '$flux/css/component/primitive/Slider.module.scss';
+    import $style from '~flux/components/css/component/primitive/Slider.module.scss';
 
     const {
         lower,

package/src/component/FluxTimeline.vue

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

package/src/component/FluxTimelineItem.vue

@@ -54,8 +54,9 @@
     setup>
     import type { FluxColor, FluxIconName } from '@flux-ui/types';
     import { clsx } from 'clsx';
+    import type { VNode } from 'vue';
     import FluxIcon from './FluxIcon.vue';
-    import $style from '$flux/css/component/Timeline.module.scss';
+    import $style from '~flux/components/css/component/Timeline.module.scss';
 
     const {
         color = 'gray'
@@ -68,6 +69,6 @@
     }>();
 
     defineSlots<{
-        default(): any;
+        default(): VNode[];
     }>();
 </script>