Merge pull request #428 from VividLemon/main

Various easy component errors fixes

Author: mariusa

src/components/BToast/BToast.vue

@@ -11,13 +11,13 @@ import {
   VNode,
   watch,
 } from 'vue'
-import {normalizeSlot} from '../../utils/normalize-slot'
-import {ColorVariant} from '../../types'
-import {toInteger} from '../../utils/number'
+import {normalizeSlot} from '@/utils/normalize-slot'
+import {ColorVariant} from '@/types'
+import {toInteger} from '@/utils/number'
 import BTransition from '../BTransition/BTransition.vue'
-import {requestAF} from '../../utils/dom'
+import {requestAF} from '@/utils/dom'
 import BButtonClose from '../BButton/BCloseButton.vue'
-import {isLink} from '../../utils/router'
+import {isLink} from '@/utils/router'
 import {BLINK_PROPS} from '../BLink/BLink.vue'
 import {BodyProp} from './plugin'
 
@@ -59,11 +59,12 @@ export default defineComponent({
       show: localShow.value || isTransitioning.value,
     }))
 
-    let dismissTimer: number | undefined
+    let dismissTimer: ReturnType<typeof setTimeout> | undefined
     let dismissStarted: number
     let resumeDismiss: number
 
     const clearDismissTimer = () => {
+      if (dismissTimer === undefined) return
       clearTimeout(dismissTimer)
       dismissTimer = undefined
     }

src/components/BToast/BToaster.vue

@@ -1,7 +1,7 @@
 <template>
   <div :class="[positionClass]" class="b-toaster position-fixed p-3" style="z-index: 11">
     <b-toast
-      v-for="toast in instance.toasts(position).value"
+      v-for="toast in instance?.toasts(position).value"
       :id="toast.options.id"
       :key="toast.options.id"
       v-model="toast.options.value"
@@ -23,7 +23,7 @@ import type {ToastInstance} from '@/components/BToast/plugin'
 
 interface BToasterProps {
   position?: ContainerPosition
-  instance: ToastInstance
+  instance?: ToastInstance
   // appendToast?: boolean
 }
 

src/main.ts

@@ -32,7 +32,7 @@ const routes = [
       name: 'About',
       props: {id: [Number, String]},
       render() {
-        return h('h1', {}, `About page ${this.id}`)
+        return h('h1', {}, `About page ${this.props.id}`)
       },
     },
     props: true,