@indielayer/ui 1.3.0 → 1.5.0

package/src/components/tab/TabGroup.vue

@@ -54,7 +54,7 @@ export default {
 <script setup lang="ts">
 import { reactive, computed, provide, type PropType, ref, watch, onMounted, watchEffect, type ExtractPublicPropTypes, type Ref, nextTick } from 'vue'
 import { useMutationObserver, useResizeObserver, useThrottleFn } from '@vueuse/core'
-import { injectTabKey } from '../../composables/keys'
+import { injectTabGroupKey } from '../../composables/keys'
 import { useCommon, type Size } from '../../composables/useCommon'
 import { useColors } from '../../composables/useColors'
 import { useTheme, type ThemeComponent } from '../../composables/useTheme'
@@ -92,7 +92,7 @@ function activateTab(tab: string | number | null) {
   emit('update:modelValue', tab)
 }
 
-provide(injectTabKey, {
+provide(injectTabGroupKey, {
   tabsContentRef,
   activateTab,
   state,

package/src/components/tab/theme/Tab.base.theme.ts

@@ -20,6 +20,8 @@ const theme: TabTheme = {
     label: 'font-medium',
 
     icon: 'mr-1.5',
+
+    tabpanel: 'py-2',
   },
 }
 

package/src/components/tab/theme/Tab.carbon.theme.ts

@@ -3,9 +3,9 @@ import type { TabTheme } from '../Tab.vue'
 const theme: TabTheme = {
   classes: {
     wrapper: ({ props, data }) => {
-      const c = ['py-2 transition-colors duration-150 ease-in-out whitespace-nowrap text-left min-w-[8rem]']
+      const c = ['py-2 transition-colors duration-150 ease-in-out whitespace-nowrap text-left']
 
-      if (data.variant === 'block') c.push('px-8')
+      if (data.variant === 'block') c.push('px-4')
       else c.push('px-4')
 
       if (props.size === 'lg') c.push('text-lg')
@@ -26,6 +26,8 @@ const theme: TabTheme = {
     },
 
     icon: 'mr-1.5',
+
+    tabpanel: 'py-4',
   },
 }
 

package/src/components/tab/theme/TabGroup.base.theme.ts

@@ -9,7 +9,7 @@ const theme: TabGroupTheme = {
 
       if (!props.fullWidth) c.push('!w-fit')
       if (props.variant === 'block') c.push('rounded-md')
-      if (props.variant === 'block' && !props.ghost) c.push('bg-slate-100 dark:bg-gray-800 p-1')
+      if (props.variant === 'block' && !props.ghost) c.push('bg-secondary-100 dark:bg-secondary-800 p-1')
 
       return c
     },
@@ -17,7 +17,7 @@ const theme: TabGroupTheme = {
     list: ({ props }) => {
       const c = ['flex min-w-full w-fit']
 
-      if (props.variant === 'line') c.push('border-b border-gray-200 dark:border-gray-700')
+      if (props.variant === 'line') c.push('border-b border-secondary-200 dark:border-secondary-700')
       if (props.variant === 'line' && !props.grow) c.push('space-x-8')
       if (props.variant === 'block') c.push('z-[1]')
       if (props.align === 'center') c.push('justify-center')
@@ -38,7 +38,7 @@ const theme: TabGroupTheme = {
   },
 
   styles: ({ props, colors, css }) => {
-    const gray = colors.getPalette('gray')
+    const secondary = colors.getPalette('secondary')
     const color = colors.getPalette(props.color)
 
     return css.variables({
@@ -46,7 +46,7 @@ const theme: TabGroupTheme = {
       bg: props.ghost ? color[50] : '#fff',
       dark: {
         text: color[400],
-        bg: props.ghost ? color[900] : gray[700],
+        bg: props.ghost ? color[900] : secondary[700],
       },
     })
   },

package/src/components/tab/theme/TabGroup.carbon.theme.ts

@@ -1,7 +1,55 @@
 import type { TabGroupTheme } from '../TabGroup.vue'
 
-import BaseTheme from './TabGroup.base.theme'
+const theme: TabGroupTheme = {
+  classes: {
+    wrapper: '',
 
-const theme: TabGroupTheme = BaseTheme
+    scroller: ({ props }) => {
+      const c = ['']
+
+      if (!props.fullWidth) c.push('!w-fit')
+      if (props.variant === 'block') c.push('')
+      if (props.variant === 'block' && !props.ghost) c.push('bg-secondary-200 dark:bg-secondary-800')
+
+      return c
+    },
+
+    list: ({ props }) => {
+      const c = ['flex min-w-full w-fit']
+
+      if (props.variant === 'line') c.push('border-b border-secondary-200 dark:border-secondary-700')
+      if (props.variant === 'line' && !props.grow) c.push('')
+      if (props.variant === 'block') c.push('z-[1] py-1.5')
+      if (props.align === 'center') c.push('justify-center')
+      if (props.align === 'right') c.push('justify-end')
+
+      return c
+    },
+
+    tracker: ({ props }) => {
+      const c = ['absolute transition-all duration-150']
+
+      if (props.variant === 'line') c.push('h-[2px] -mt-[2px] bg-[color:var(--x-tab-group-text)] dark:bg-[color:var(--x-tab-group-dark-text)]')
+
+      if (props.variant === 'block') c.push('border-t-2 border-solid border-[color:var(--x-tab-group-text)] dark:border-[color:var(--x-tab-group-dark-text)] h-full top-0 bg-secondary-100 dark:bg-secondary-700')
+
+      return c
+    },
+  },
+
+  styles: ({ props, colors, css }) => {
+    const gray = colors.getPalette('gray')
+    const color = colors.getPalette(props.color)
+
+    return css.variables({
+      text: color[600],
+      bg: props.ghost ? color[50] : '#fff',
+      dark: {
+        text: color[400],
+        bg: props.ghost ? color[900] : gray[700],
+      },
+    })
+  },
+}
 
 export default theme

package/src/components/table/Table.vue

@@ -13,6 +13,12 @@ const tableProps = {
     default: () => [],
   },
   loading: Boolean,
+  loadingSkeleton: Boolean,
+  loadingLines: {
+    type: [Number, String],
+    default: 3,
+  },
+  error: Boolean,
   dense: Boolean,
   fixed: Boolean,
   striped: Boolean,
@@ -25,6 +31,7 @@ const tableProps = {
     type: Boolean,
     default: true,
   },
+  expandable: Boolean,
 }
 
 export type TableHeader = {
@@ -34,26 +41,34 @@ export type TableHeader = {
   value?: string;
   text?: string;
   width?: string | number;
+  truncate?: boolean;
+  skeletonShape?: SkeletonShape;
 }
 
 export type TableProps = ExtractPublicPropTypes<typeof tableProps>
 
-type InternalClasses = 'wrapper' | 'loadingWrapper'
+type InternalClasses = 'wrapper' | 'table' | 'loadingWrapper'
 export interface TableTheme extends ThemeComponent<TableProps, InternalClasses> {}
 
 export default { name: 'XTable' }
 </script>
 
 <script setup lang="ts" generic="T">
-import type { ExtractPublicPropTypes, PropType } from 'vue'
+import { ref, type ExtractPublicPropTypes, type PropType, watch } from 'vue'
 import { useTheme, type ThemeComponent } from '../../composables/useTheme'
 
-import XTableHead from './TableHead'
+import XTableHead from './TableHead.vue'
 import XTableHeader, { type TableHeaderSort, type TableHeaderAlign } from './TableHeader.vue'
 import XTableBody from './TableBody'
 import XTableRow from './TableRow.vue'
 import XTableCell from './TableCell.vue'
 import XSpinner from '../spinner/Spinner.vue'
+import XSkeleton from '../skeleton/Skeleton.vue'
+import type { SkeletonShape } from '../skeleton/Skeleton.vue'
+
+import XIcon from '../icon/Icon.vue'
+
+import { chevronDownIcon } from '../../common/icons'
 
 const props = defineProps({
   ...tableProps,
@@ -63,6 +78,24 @@ const props = defineProps({
   },
 })
 
+type internalT = T & {
+  __expanded?: boolean;
+}
+
+function clone<T>(source: T[]): T[] {
+  try {
+    return JSON.parse(JSON.stringify(source))
+  } catch (e) {
+    return []
+  }
+}
+
+const internalItems = ref<internalT[]>([])
+
+watch(() => props.items, (newValue) => {
+  if (props.expandable) internalItems.value = clone(newValue as any)
+}, { immediate: true })
+
 const emit = defineEmits(['update:sort', 'click-row'])
 
 function getSort(headerValue: string | undefined, sort: string[]): TableHeaderSort {
@@ -120,15 +153,16 @@ const { styles, classes, className } = useTheme('Table', {}, props)
 </script>
 
 <template>
-  <div class="w-full overflow-x-auto">
+  <div :class="[className, classes.wrapper]">
+    <slot name="title"></slot>
+    <slot name="actions"></slot>
+
     <table
       :style="styles"
-      :class="[
-        className,
-        classes.wrapper,
-      ]"
+      :class="classes.table"
     >
       <x-table-head>
+        <x-table-header v-if="expandable" width="48" class="!p-0" :sticky-header="stickyHeader"/>
         <x-table-header
           v-for="(header, index) in headers"
           :key="index"
@@ -139,29 +173,93 @@ const { styles, classes, className } = useTheme('Table', {}, props)
           :width="header.width"
           @click="header.sortable ? sortHeader(header) : null"
         >
-          {{ header.text }}
+          <slot :name="`header-${header.value}`" :header="header">
+            {{ header.text }}
+          </slot>
         </x-table-header>
       </x-table-head>
       <x-table-body>
-        <x-table-row
-          v-for="(item, index) in (items as T[])"
-          :key="index"
-          :pointer="pointer"
-          :striped="striped"
-          @click="$emit('click-row', item)"
-        >
-          <x-table-cell
-            v-for="(header, index2) in headers"
-            :key="index2"
-            :text-align="header.align"
-            :dense="dense"
-            :fixed="fixed"
+        <template v-if="loading">
+          <x-table-row
+            v-for="(item, index) in Number(loadingLines)"
+            :key="index"
+            :striped="striped"
+          >
+            <x-table-cell
+              v-for="(header, index2) in headers"
+              :key="index2"
+              :text-align="header.align"
+              :width="header.width"
+              :dense="dense"
+              :fixed="fixed"
+            >
+              <slot :name="`loading-${header.value}`" :item="item">
+                <x-skeleton
+                  class="max-w-[60%]"
+                  :shape="header.skeletonShape || 'line'"
+                  :class="{
+                    'mx-auto': header.align === 'center',
+                    'ml-auto': header.align === 'right',
+                  }"
+                />
+              </slot>
+            </x-table-cell>
+          </x-table-row>
+        </template>
+        <template v-else-if="error">
+          <tr>
+            <td :colspan="headers.length">
+              <slot name="error"></slot>
+            </td>
+          </tr>
+        </template>
+        <template v-else-if="!items || items.length === 0">
+          <tr>
+            <td :colspan="headers.length">
+              <slot name="empty"></slot>
+            </td>
+          </tr>
+        </template>
+        <template v-for="(item, index) in items" v-else :key="index">
+          <x-table-row
+            :pointer="pointer"
+            :striped="striped"
+            @click="$emit('click-row', item)"
           >
-            <slot :name="`item-${header.value}`" :item="item">
-              {{ getValue(item, header.value) }}
-            </slot>
-          </x-table-cell>
-        </x-table-row>
+            <x-table-cell v-if="expandable" width="48" class="!p-1">
+              <button class="p-4" @click="internalItems[index].__expanded = !internalItems[index].__expanded">
+                <x-icon
+                  :icon="chevronDownIcon"
+                  :size="dense ? 'xs' : 'md'"
+                  class="transition-transform"
+                  :class="{
+                    'rotate-180': internalItems[index]?.__expanded,
+                  }"
+                />
+              </button>
+            </x-table-cell>
+            <x-table-cell
+              v-for="(header, index2) in headers"
+              :key="index2"
+              :text-align="header.align"
+              :truncate="header.truncate"
+              :width="header.width"
+              :dense="dense"
+              :fixed="fixed"
+            >
+              <slot :name="`item-${header.value}`" :item="item">
+                {{ getValue(item, header.value) }}
+              </slot>
+            </x-table-cell>
+          </x-table-row>
+          <tr v-if="expandable">
+            <td colspan="999">
+              <div class="overflow-hidden transition-opacity" :class="[internalItems[index]?.__expanded ? '' : 'opacity-0 max-h-0']">
+                <slot name="expanded-row" :item="item"></slot>
+              </div>
+            </td>
+          </tr>
+        </template>
       </x-table-body>
       <div
         v-if="loading"

package/src/components/table/TableCell.vue

@@ -10,7 +10,7 @@ const tableCellProps = {
   },
   truncate: Boolean,
   dense: Boolean,
-  fixed: Boolean,
+  width: [String, Number],
   verticalAlign: {
     type: String as PropType<TableCellVerticalAlign>,
     default: 'middle',
@@ -32,22 +32,21 @@ export default {
 </script>
 
 <script setup lang="ts">
-import type { ExtractPublicPropTypes, PropType } from 'vue'
+import { computed, type ExtractPublicPropTypes, type PropType } from 'vue'
 import { useTheme, type ThemeComponent } from '../../composables/useTheme'
 
 const props = defineProps(tableCellProps)
 
-if (props.truncate && !props.fixed) {
-  console.warn('Table must have "fixed" property set to true when using TableCell "truncate" property')
-}
+const computedWidth = computed(() => typeof props.width === 'number' ? `${props.width}px` : props.width)
 
 const { styles, classes, className } = useTheme('TableCell', {}, props)
 </script>
 
 <template>
   <td
-    :style="styles"
+    :style="[styles, { width: computedWidth, minWidth: computedWidth, maxWidth: computedWidth }]"
     :class="[
+      'relative',
       className,
       classes.wrapper,
     ]"

package/src/components/table/TableHead.vue

@@ -0,0 +1,25 @@
+<script lang="ts">
+const tableHeadProps = {}
+
+export type TableHeadProps = ExtractPublicPropTypes<typeof tableHeadProps>
+
+type InternalClasses = 'thead' | 'row'
+export interface TableHeadTheme extends ThemeComponent<TableHeadProps, InternalClasses> {}
+
+export default { name: 'XTableHead' }
+</script>
+
+<script setup lang="ts">
+import type { ExtractPublicPropTypes } from 'vue'
+import { useTheme, type ThemeComponent } from '../../composables/useTheme'
+
+const { styles, classes, className } = useTheme('TableHead', {}, {})
+</script>
+
+<template>
+  <thead :class="[className, classes.thead]" :style="styles">
+    <tr :class="classes.row">
+      <slot></slot>
+    </tr>
+  </thead>
+</template>

package/src/components/table/TableHeader.vue

@@ -22,74 +22,53 @@ export type TableHeaderSort = typeof validators.sort[number]
 export type TableHeaderAlign = typeof validators.textAlign[number]
 export type TableHeaderProps = ExtractPublicPropTypes<typeof tableHeaderProps>
 
+type InternalClasses = 'th' | 'sortIcon'
+export interface TableHeaderTheme extends ThemeComponent<TableHeaderProps, InternalClasses> {}
+
 export default { name: 'XTableHeader', validators }
 </script>
 
 <script setup lang="ts">
 import type { ExtractPublicPropTypes, PropType } from 'vue'
+import { useTheme, type ThemeComponent } from '../../composables/useTheme'
+
+const props = defineProps(tableHeaderProps)
 
-defineProps(tableHeaderProps)
+const { styles, classes, className } = useTheme('TableHeader', {}, props)
 </script>
 
 <template>
-  <th
-    class="py-2 font-semibold tracking-widest uppercase text-xs px-3"
-    :class="[
-      {
-        // sort
-        'cursor-pointer hover:text-gray-800 dark:hover:text-gray-300 transition-colors duration-150 ease-in-out': sortable,
-        // stickyHeader
-        'sticky top-0': stickyHeader,
-        // textAlign
-        'text-left': textAlign === 'left',
-        'text-right': textAlign === 'right',
-        'text-center': textAlign === 'center',
-        'text-justify': textAlign === 'justify',
-      },
-    ]"
-  >
-    <div
+  <th :style="styles" :class="[className, classes.th, 'group/th']">
+    <slot></slot>
+
+    <svg
       v-if="sortable"
-      class="relative inline-block"
+      :class="[
+        classes.sortIcon,
+        [sort && [1, -1].includes(sort) ? '' : 'invisible group-hover/th:visible']
+      ]"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      stroke="currentColor"
+      stroke-linejoin="round"
+      stroke-linecap="round"
+      fill="none"
+      role="presentation"
     >
-      <slot></slot>
-
-      <svg
-        v-if="sort && [1, -1].includes(sort)"
-        class="absolute stroke-2 w-3 h-3 ml-0.5 -right-3 top-0.5"
-        width="24"
-        height="24"
-        viewBox="0 0 24 24"
-        stroke="currentColor"
-        stroke-linejoin="round"
-        stroke-linecap="round"
-        fill="none"
-        role="presentation"
-      >
-        <template v-if="sort === -1">
-          <line
-            x1="12"
-            y1="5"
-            x2="12"
-            y2="19"
-          />
-          <polyline points="19 12 12 19 5 12" />
-        </template>
+      <template v-if="sort === -1">
+        <line x1="12" y1="5" x2="12" y2="19"/>
+        <polyline points="19 12 12 19 5 12" />
+      </template>
 
-        <template v-if="sort === 1">
-          <line
-            x1="12"
-            y1="19"
-            x2="12"
-            y2="5"
-          />
-          <polyline points="5 12 12 5 19 12" />
-        </template>
-      </svg>
-    </div>
+      <template v-else-if="sort === 1">
+        <line x1="12" y1="19" x2="12" y2="5"/>
+        <polyline points="5 12 12 5 19 12" />
+      </template>
 
-    <template v-else>
-      <slot></slot>
-    </template>
+      <template v-else>
+        <path d="m3 9l4-4l4 4M7 5v14m14-4l-4 4l-4-4m4 4V5"/>
+      </template>
+    </svg>
   </th>
 </template>

package/src/components/table/TableRow.vue

@@ -3,13 +3,7 @@ const validators = {
   verticalAlign: ['baseline', 'bottom', 'middle', 'text-bottom', 'text-top', 'top'],
 }
 
-export default { name: 'XTableRow', validators }
-</script>
-
-<script setup lang="ts">
-import { computed, type PropType } from 'vue'
-
-const props = defineProps({
+const tableRowProps = {
   pointer: Boolean,
   striped: Boolean,
   verticalAlign: {
@@ -17,7 +11,21 @@ const props = defineProps({
     default: 'top',
     validator: (value: string) => validators.verticalAlign.includes(value),
   },
-})
+}
+
+export type TableRowProps = ExtractPublicPropTypes<typeof tableRowProps>
+
+type InternalClasses = 'row'
+export interface TableRowTheme extends ThemeComponent<TableRowProps, InternalClasses> {}
+
+export default { name: 'XTableRow', validators }
+</script>
+
+<script setup lang="ts">
+import { computed, type PropType, type ExtractPublicPropTypes } from 'vue'
+import { useTheme, type ThemeComponent } from '../../composables/useTheme'
+
+const props = defineProps(tableRowProps)
 
 const alignClass = computed(() => {
   if (props.verticalAlign === 'baseline') return 'align-baseline'
@@ -29,18 +37,12 @@ const alignClass = computed(() => {
 
   return ''
 })
+
+const { styles, classes, className } = useTheme('TableRow', {}, props)
 </script>
 
 <template>
-  <tr
-    :class="[
-      striped ? 'odd:bg-gray-50 dark:odd:bg-gray-800' : 'border-b border-gray-200 dark:border-gray-700',
-      {
-        'hover:bg-gray-50 dark:hover:bg-gray-700 cursor-pointer': pointer,
-      },
-      alignClass
-    ]"
-  >
+  <tr :style="styles" :class="[className, classes.row, alignClass]">
     <slot></slot>
   </tr>
 </template>

package/src/components/table/index.ts

@@ -1,10 +1,12 @@
 export { default as XTable } from './Table.vue'
 export { default as XTableBody } from './TableBody'
 export { default as XTableCell } from './TableCell.vue'
-export { default as XTableHead } from './TableHead'
+export { default as XTableHead } from './TableHead.vue'
 export { default as XTableHeader } from './TableHeader.vue'
 export { default as XTableRow } from './TableRow.vue'
 
 export type { TableProps, TableHeader, TableTheme } from './Table.vue'
-export type { TableHeaderProps, TableHeaderAlign, TableHeaderSort } from './TableHeader.vue'
+export type { TableHeadProps, TableHeadTheme } from './TableHead.vue'
+export type { TableRowProps, TableRowTheme } from './TableRow.vue'
+export type { TableHeaderProps, TableHeaderAlign, TableHeaderSort, TableHeaderTheme } from './TableHeader.vue'
 export type { TableCellProps, TableCellTextAlign, TableCellVerticalAlign, TableCellTheme } from './TableCell.vue'

package/src/components/table/theme/Table.base.theme.ts

@@ -2,19 +2,21 @@ import type { TableTheme } from '../Table.vue'
 
 const theme: TableTheme = {
   classes: {
-    wrapper: ({ props }) => {
-      const c = ['w-full relative']
+    wrapper: 'w-full h-full overflow-x-auto',
 
-      if (props.scrollable) c.push('overflow-x-scroll sm:overflow-x-auto whitespace-wrap sm:whitespace-normal block sm:table')
+    table: ({ props }) => {
+      const classes = ['w-full relative']
 
-      if (props.stickyHeader) c.push('relative')
+      if (props.scrollable) classes.push('overflow-x-scroll sm:overflow-x-auto whitespace-wrap sm:whitespace-normal')
 
-      if (props.fixed) c.push('table-fixed')
+      if (props.stickyHeader) classes.push('relative')
 
-      return c
+      if (props.fixed) classes.push('md:table-fixed')
+
+      return classes
     },
 
-    loadingWrapper: 'absolute inset-0 flex items-center justify-center z-40 bg-gray-300 dark:bg-gray-600 rounded opacity-50',
+    loadingWrapper: 'absolute inset-0 flex items-center justify-center z-40 bg-secondary-300 dark:bg-secondary-600 rounded opacity-30',
   },
 }
 

package/src/components/table/theme/Table.carbon.theme.ts

@@ -1,7 +1,23 @@
 import type { TableTheme } from '../Table.vue'
 
-import BaseTheme from './Table.base.theme'
+const theme: TableTheme = {
+  classes: {
+    wrapper: 'w-full h-full shadow-sm overflow-x-auto text-sm bg-white dark:bg-secondary-800',
 
-const theme: TableTheme = BaseTheme
+    table: ({ props }) => {
+      const classes = ['w-full relative']
+
+      if (props.scrollable) classes.push('overflow-x-scroll sm:overflow-x-auto whitespace-wrap sm:whitespace-normal')
+
+      if (props.stickyHeader) classes.push('relative')
+
+      if (props.fixed) classes.push('md:table-fixed')
+
+      return classes
+    },
+
+    loadingWrapper: 'absolute inset-0 flex items-center justify-center z-40 bg-secondary-300 dark:bg-secondary-600 rounded opacity-30',
+  },
+}
 
 export default theme