vue-stack-tabs 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-stack-tabs",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Vue.js component for router tab.",
   "private": false,
   "type": "module",

package/src/lib/components/OverlayLoading/{js/Component.vue → Component.vue}

@@ -34,7 +34,7 @@ import {
   watch
 } from 'vue'
 import { removeElement } from './helpers'
-import Loaders from '../loaders'
+import Loaders from './loaders'
 
 const props = withDefaults(
   defineProps<{
@@ -42,7 +42,7 @@ const props = withDefaults(
     programmatic: boolean
     container: HTMLElement | Object | Function
     isFullPage: boolean
-    enforceFocus: boolean
+    enforceFocus?: boolean
     lockScroll: boolean
     transition: string
     /**
@@ -182,4 +182,7 @@ onBeforeUnmount(() => {
   document.removeEventListener('keyup', keyPress)
   document.removeEventListener('focusin', focusIn)
 })
+defineExpose({
+  hide
+})
 </script>

package/src/lib/components/OverlayLoading/{js/api.ts → api.ts}

@@ -12,8 +12,9 @@ export const useLoading = (globalProps = {}, globalSlots = {}) => {
       }
 
       const propsData = { ...globalProps, ...props, ...forceProps }
+      // @ts-ignore
       let container = propsData.container
-
+      // @ts-ignore
       if (!propsData.container) {
         container = document.body
         propsData.isFullPage = true
@@ -23,7 +24,7 @@ export const useLoading = (globalProps = {}, globalSlots = {}) => {
       const instance = createComponent(LoadingComponent, propsData, container, mergedSlots)
 
       return {
-        hide: instance.ctx.hide
+        hide: instance!.exposed!.hide
       }
     }
   }

package/src/lib/components/OverlayLoading/{js/helpers.ts → helpers.ts}

@@ -1,6 +1,6 @@
 import { h, render } from 'vue'
 
-export const removeElement = (el) => {
+export const removeElement = (el: HTMLElement) => {
   if (typeof el.remove !== 'undefined') {
     el.remove()
   } else {
@@ -9,7 +9,12 @@ export const removeElement = (el) => {
 }
 
 // Taken from https://github.com/moyoujun/vue3-loading-overlay/blob/master/src/index.ts
-export function createComponent(component, props, parentContainer, slots = {}) {
+export function createComponent(
+  component: any,
+  props: any,
+  parentContainer: HTMLElement,
+  slots = {}
+) {
   const vNode = h(component, props, slots)
   const container = document.createElement('div')
   container.classList.add('vld-container')

package/src/lib/components/OverlayLoading/index.ts

@@ -1,5 +1,5 @@
-import { useLoading } from './js/api'
-import Component from './js/Component.vue'
+import { useLoading } from './api'
+import Component from './Component.vue'
 import type { App } from 'vue'
 
 const LoadingPlugin = (app: App, props = {}, slots = {}) => {

package/src/lib/hooks/useTabpanel.tsx

@@ -194,17 +194,18 @@ export default () => {
     let activeTabId = ''
     for (let i = tabs.value.length - 1; i >= 0; i--) {
       if (id === unref(tabs)[i].id) {
+        //if it's not closable then return
         if (!unref(tabs)[i].closable) {
-          break
+          return id
         }
         for (const item of unref(tabs)[i].pages.list()) {
           removeComponent(item.id)
           markDeletableCache(item.id)
         }
         unref(tabs)[i].pages.clear()
-        if (tabs.value.length > 1) {
+        if (tabs.value.length > 1 && unref(tabs)[i].active) {
           if (i === 0) {
-            activeTabId = unref(tabs)[1].id
+            activeTabId = unref(tabs)[i + 1].id
           } else {
             activeTabId = unref(tabs)[i - 1].id
           }
@@ -214,11 +215,11 @@ export default () => {
         break
       }
     }
-    active(activeTabId)
-    // if remove inactive tab,then we need remove the cache manually.
-    if (activeTabId !== id) {
-      removeDeletableCache()
+    if (activeTabId !== '') {
+      active(activeTabId)
     }
+    // if remove inactive tab,then we need remove the cache manually.
+    removeDeletableCache()
     return activeTabId
   }