Merge pull request #67 from SpeciesFileGroup/development

Fix Skeleton component
wbbaker · May 8, 2023 · 9c5088c · 9c5088c
2 parents e3c8b54 + c69e0cf
commit 9c5088c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/components/VSkeleton.global.vue b/src/components/VSkeleton.global.vue
@@ -1,7 +1,7 @@
 <template>
   <slot />
   <span
-    v-if="isEmpty"
+    v-if="isLoading"
     :class="class"
   >
     <span
@@ -15,7 +15,7 @@
 </template>
 
 <script setup>
-import { useAttrs, useSlots, computed } from 'vue'
+import { useSlots, computed } from 'vue'
 
 const props = defineProps({
   class: {
@@ -30,9 +30,8 @@ const props = defineProps({
 })
 
 const slots = useSlots()
-const attrs = useAttrs()
 
-const isEmpty = computed(() => {
+const isLoading = computed(() => {
   const children = slots.default?.()
 
   return isEmptyVNode(children)
@@ -44,6 +43,6 @@ function isEmptyVNode(children) {
   const [firstNode] = children
   let str = firstNode.children
 
-  return firstNode.el || str
+  return firstNode.el !== null || str !== null
 }
 </script>
diff --git a/src/modules/otus/views/Index.vue b/src/modules/otus/views/Index.vue
@@ -71,10 +71,9 @@
 import { ref, watch, onServerPrefetch, computed, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useOtuStore } from '../store/store'
+import { useHead } from 'unhead'
 import Breadcrumb from '../components/Breadcrumb/Breadcrumb.vue'
 import TaxaInfo from '../components/TaxaInfo.vue'
-import { useHead, createHead } from 'unhead'
-import VSkeletonGlobal from '@/components/VSkeleton.global.vue'
 
 //import useChildrenRoutes from '../composables/useChildrenRoutes'