From 192b0e63018ae73e8acaa8b4b1771cda2b59bdb6 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Thu, 1 Jun 2023 17:12:18 +0200
Subject: [PATCH] fix(Table): override of `sortButton` and `emptyState` props

---
 docs/content/4.data/1.table.md        | 1 +
 src/runtime/components/data/Table.vue | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/content/4.data/1.table.md b/docs/content/4.data/1.table.md
index 89ae743a19..96334f23d4 100644
--- a/docs/content/4.data/1.table.md
+++ b/docs/content/4.data/1.table.md
@@ -274,6 +274,7 @@ props:
     color: 'primary'
     variant: 'outline'
     size: '2xs'
+    square: false
     ui:
       rounded: 'rounded-full'
 excludedProps:
diff --git a/src/runtime/components/data/Table.vue b/src/runtime/components/data/Table.vue
index 4992bec225..9a197f398f 100644
--- a/src/runtime/components/data/Table.vue
+++ b/src/runtime/components/data/Table.vue
@@ -11,7 +11,7 @@
             <slot :name="`${column.key}-header`" :column="column" :sort="sort" :on-sort="onSort">
               <UButton
                 v-if="column.sortable"
-                v-bind="sortButton"
+                v-bind="{ ...ui.default.sortButton, ...sortButton }"
                 :icon="(!sort.column || sort.column !== column.key) ? sortButton.icon : sort.direction === 'asc' ? sortAscIcon : sortDescIcon"
                 :label="column[columnAttribute]"
                 @click="onSort(column)"
@@ -145,6 +145,8 @@ export default defineComponent({
 
     const indeterminate = computed(() => selected.value && selected.value.length > 0 && selected.value.length < props.rows.length)
 
+    const emptyState = computed(() => ({ ...ui.value.default.emptyState, ...props.emptyState }))
+
     function compare (a: any, z: any) {
       if (typeof props.by === 'string') {
         const property = props.by as unknown as any
@@ -180,6 +182,8 @@ export default defineComponent({
       rows,
       selected,
       indeterminate,
+      // eslint-disable-next-line vue/no-dupe-keys
+      emptyState,
       isSelected,
       onSort
     }