Merge pull request #46 from hairyf/hairyf/issue44

Hairyf/issue44

packages/@vue/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @overlays/vue
 
+## 0.4.5
+
+### Patch Changes
+
+- chore(release): v0.4.5 @overlays/vue
+
 ## 0.4.4
 
 ### Patch Changes

packages/@vue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@overlays/vue",
   "type": "module",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "license": "MIT",
   "homepage": "https://github.com/hairyf/unoverlays#readme",
   "repository": {
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@overlays/core": "workspace:^",
+    "@vueuse/core": "^10.0.0",
     "pascal-case": "latest",
     "vue": "^3.3.2",
     "vue-demi": ">=0.14.0"

packages/@vue/src/composable/useOverlay.ts

@@ -1,5 +1,6 @@
 import type { Ref } from 'vue-demi'
-import { getCurrentInstance, inject, onMounted, provide, useModel } from 'vue-demi'
+import { getCurrentInstance, inject, onMounted, provide } from 'vue-demi'
+import { useVModel } from '@vueuse/core'
 import type { Deferred } from '@overlays/core'
 import { delay, noop } from '@overlays/core'
 import { OverlayMetaKey } from '../internal'
@@ -66,7 +67,7 @@ export interface UseOverlayReturn {
  */
 export function useOverlay(options: UseOverlayOptions = {}) {
   const { duration = 0, immediate = true, model = 'visible', automatic = true } = options
-  const meta = inject(OverlayMetaKey, useDeclarative(model, options)) as UseOverlayReturn
+  const meta = inject(OverlayMetaKey, useDeclarative(model, options))
   const dec = Reflect.get(meta, 'in_dec')
 
   // The component directly obtains the default value
@@ -95,7 +96,7 @@ export function useDeclarative(model: string, options: UseOverlayOptions = {}) {
   if (!instance)
     throw new Error('Please use useOverlay in component setup')
 
-  const visible = useModel(instance.props, model, { local: true }) as Ref<boolean>
+  const visible = useVModel(instance.props, model, instance.emit, { passive: true }) as Ref<boolean>
 
   const _reject = (value?: any) => {
     instance?.emit(reject, value)