@varlet/use 2.9.6 → 2.10.0-alpha.1682067841655

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/index.d.ts CHANGED
@@ -3,4 +3,3 @@ export * from './useClickOutside.js';
3
3
  export * from './useMounted.js';
4
4
  export * from './useParent.js';
5
5
  export * from './useChildren.js';
6
- export * from './useVModel.js';
package/lib/index.js CHANGED
@@ -3,4 +3,3 @@ export * from './useClickOutside.js';
3
3
  export * from './useMounted.js';
4
4
  export * from './useParent.js';
5
5
  export * from './useChildren.js';
6
- export * from './useVModel.js';
@@ -1,5 +1,5 @@
1
1
  import { type Ref } from 'vue';
2
- export declare type UseEventListenerTarget = EventTarget | Ref<EventTarget | undefined | null>;
2
+ export declare type UseEventListenerTarget = EventTarget | Ref<EventTarget | undefined | null> | (() => EventTarget);
3
3
  export interface UseEventListenerOptions {
4
4
  capture?: boolean;
5
5
  passive?: boolean;
@@ -1,4 +1,4 @@
1
- import { inBrowser } from '@varlet/shared';
1
+ import { inBrowser, isFunction } from '@varlet/shared';
2
2
  import { isRef, onDeactivated, onBeforeUnmount, unref, watch } from 'vue';
3
3
  import { useMounted } from './useMounted.js';
4
4
  export function useEventListener(target, type, listener, options = {}) {
@@ -8,11 +8,14 @@ export function useEventListener(target, type, listener, options = {}) {
8
8
  const { passive = false, capture = false } = options;
9
9
  let listening = false;
10
10
  let cleaned = false;
11
+ const getElement = (target) => {
12
+ return isFunction(target) ? target() : unref(target);
13
+ };
11
14
  const add = (target) => {
12
15
  if (listening || cleaned) {
13
16
  return;
14
17
  }
15
- const element = unref(target);
18
+ const element = getElement(target);
16
19
  if (element) {
17
20
  element.addEventListener(type, listener, {
18
21
  passive,
@@ -25,7 +28,7 @@ export function useEventListener(target, type, listener, options = {}) {
25
28
  if (!listening || cleaned) {
26
29
  return;
27
30
  }
28
- const element = unref(target);
31
+ const element = getElement(target);
29
32
  if (element) {
30
33
  element.removeEventListener(type, listener, {
31
34
  capture,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@varlet/use",
3
- "version": "2.9.6",
3
+ "version": "2.10.0-alpha.1682067841655",
4
4
  "type": "module",
5
5
  "main": "lib/index.js",
6
6
  "module": "lib/index.js",
@@ -24,7 +24,7 @@
24
24
  "url": "https://github.com/varletjs/varlet/issues"
25
25
  },
26
26
  "dependencies": {
27
- "@varlet/shared": "2.9.6"
27
+ "@varlet/shared": "2.10.0-alpha.1682067841655"
28
28
  },
29
29
  "devDependencies": {
30
30
  "typescript": "^4.4.4",