From dae42a4657d1345777160a34d24671e0d37c03ba Mon Sep 17 00:00:00 2001
From: Geriano <gerznewbie@gmail.com>
Date: Mon, 18 Jul 2022 18:47:17 +0700
Subject: [PATCH] fix bug floating border rounded th element

---
 resources/js/Components/DataTable/Builder.vue | 37 +++++++++++++++++--
 resources/js/Components/DataTable/Th.vue      | 28 +-------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/resources/js/Components/DataTable/Builder.vue b/resources/js/Components/DataTable/Builder.vue
index 77de201..ea2e2e1 100644
--- a/resources/js/Components/DataTable/Builder.vue
+++ b/resources/js/Components/DataTable/Builder.vue
@@ -4,6 +4,7 @@ import axios from 'axios'
 import Swal from 'sweetalert2'
 import { getCurrentInstance, onMounted, ref } from 'vue'
 
+const self = getCurrentInstance()
 const { url, sticky } = defineProps({
   url: String,
   sticky: {
@@ -45,7 +46,37 @@ const fetch = async u => {
   }
 }
 
+const createFloatingTh = () => {
+  const { thead, tfoot, tbody } = self.refs
+
+  if (thead) {
+    let ths = thead.querySelectorAll('th')
+    ths.forEach((th, i) => {
+      const floating = document.createElement('div')
+      floating.className = 'absolute top-0 left-0 w-full h-full border border-1 border-inherit'
+      i === 0 && floating.classList.add('rounded-tl-md')
+      i + 1 === ths.length && floating.classList.add('rounded-tr-md')
+
+      th.append(floating)
+    })
+  }
+
+  if (tfoot) {
+    let ths = tfoot.querySelectorAll('th')
+    ths.forEach((th, i) => {
+      const floating = document.createElement('div')
+      floating.className = 'absolute top-0 left-0 w-full h-full border border-1 border-inherit'
+      i === 0 && floating.classList.add('rounded-bl-md')
+      i + 1 === ths.length && floating.classList.add('rounded-br-md')
+
+      th.append(floating)
+    })
+  }
+}
+
 onMounted(fetch)
+
+onMounted(() => config.sticky && createFloatingTh())
 </script>
 
 <template>
@@ -71,15 +102,15 @@ onMounted(fetch)
     <div class="p-2">
       <div class="overflow-auto rounded-md border dark:border-gray-900">
         <table class="w-full border-collapse">
-          <thead class="border-inherit">
+          <thead ref="thead" class="border-inherit">
             <slot name="thead" :config="config" :paginator="paginator" :data="paginator.data" :refresh="fetch" />
           </thead>
 
-          <tfoot class="border-inherit">
+          <tfoot ref="tfoot" class="border-inherit">
             <slot name="tfoot" :config="config" :paginator="paginator" :data="paginator.data" :refresh="fetch" />
           </tfoot>
 
-          <tbody class="border-inherit">
+          <tbody ref="tbody" class="border-inherit">
             <slot name="tbody" :config="config" :paginator="paginator" :data="paginator.data" :refresh="fetch" />
           </tbody>
         </table>
diff --git a/resources/js/Components/DataTable/Th.vue b/resources/js/Components/DataTable/Th.vue
index f5be5f5..2b97ff7 100644
--- a/resources/js/Components/DataTable/Th.vue
+++ b/resources/js/Components/DataTable/Th.vue
@@ -29,33 +29,10 @@ const click = () => {
 
   table.refresh()
 }
-
-const floating = () => {
-  if (table && table.config.sticky) {
-    const { th, float } = self.refs
-
-    if (th && float) {
-      // float.style.width = th.clientWidth + 'px'
-      // float.style.height = th.clientHeight + 'px'
-
-      const parent = th.parentElement
-
-      if (parent.firstElementChild == th) {
-        float.classList.add('rounded-tl-md')
-      }
-
-      if (parent.children[parent.children.length - 1] === th) {
-        float.classList.add('rounded-tr-md')
-      }
-    }
-  }
-}
-
-onMounted(floating)
 </script>
 
 <template>
-  <th ref="th" class="relative uppercase font-semibold" :class="`${table?.config?.sticky && 'sticky top-0 left-0 border-0'} ${sort && 'cursor-pointer'} ${$props.class}`" @click.prevent="sort && table && click()">
+  <th ref="th" class="relative uppercase font-semibold" :class="`${table?.config?.sticky ? 'sticky top-0 left-0 border-0' : 'border-1'} ${sort && 'cursor-pointer'} ${$props.class}`" @click.prevent="sort && table && click()">
     <div class="flex items-center justify-center space-x-2">
       <div>
         <slot />
@@ -68,8 +45,5 @@ onMounted(floating)
         </div>
       </template>
     </div>
-
-    <div ref="float" v-if="table?.config?.sticky" class="absolute top-0 left-0 w-full h-full" :class="`${sort && 'cursor-pointer'} ${$props.class} bg-transparent dark:bg-transparent`">
-    </div>
   </th>
 </template>
\ No newline at end of file