main 🧊 rework wrap function for local hook

Author: debabin

packages/core/src/bundle/hooks/useDocumentEvent/useDocumentEvent.js

@@ -1,4 +1,4 @@
-import { target } from '@/utils/helpers';
+import { isTarget } from '@/utils/helpers';
 import { useEventListener } from '../useEventListener/useEventListener';
 /**
  * @name useDocumentEvent
@@ -16,4 +16,4 @@ import { useEventListener } from '../useEventListener/useEventListener';
  * useDocumentEvent('click', () => console.log('clicked'));
  */
 export const useDocumentEvent = (event, listener, options) =>
-  useEventListener(target(document), event, listener, options);
+  useEventListener(isTarget.wrap(document), event, listener, options);

packages/core/src/bundle/hooks/useWindowEvent/useWindowEvent.js

@@ -1,4 +1,4 @@
-import { target } from '@/utils/helpers';
+import { isTarget } from '@/utils/helpers';
 import { useEventListener } from '../useEventListener/useEventListener';
 /**
  * @name useWindowEvent
@@ -16,4 +16,4 @@ import { useEventListener } from '../useEventListener/useEventListener';
  * useWindowEvent('click', () => console.log('clicked'));
  */
 export const useWindowEvent = (event, listener, options) =>
-  useEventListener(target(window), event, listener, options);
+  useEventListener(isTarget.wrap(window), event, listener, options);

packages/core/src/bundle/utils/helpers/getElement.js

@@ -1,8 +1,3 @@
-export const targetSymbol = Symbol('target');
-export const target = (target) => ({
-  value: target,
-  type: targetSymbol
-});
 export const getElement = (target) => {
   if ('current' in target) {
     return target.current;

packages/core/src/bundle/utils/helpers/isTarget.js

@@ -1,3 +1,8 @@
-import { targetSymbol } from './getElement';
+export const targetSymbol = Symbol('target');
+export const target = (target) => ({
+  value: target,
+  type: targetSymbol
+});
 export const isTarget = (target) =>
-  typeof target === 'object' && ('current' in target || target.type === targetSymbol);
+  typeof target === 'object' && ('current' in target || (target && target.type === targetSymbol));
+isTarget.wrap = target;

packages/core/src/hooks/useDocumentEvent/useDocumentEvent.ts

@@ -1,4 +1,4 @@
-import { target } from '@/utils/helpers';
+import { isTarget } from '@/utils/helpers';
 
 import type { UseEventListenerOptions } from '../useEventListener/useEventListener';
 
@@ -23,4 +23,4 @@ export const useDocumentEvent = <Event extends keyof DocumentEventMap>(
   event: Event,
   listener: (this: Document, event: DocumentEventMap[Event]) => any,
   options?: UseEventListenerOptions
-) => useEventListener(target(document), event, listener, options);
+) => useEventListener(isTarget.wrap(document), event, listener, options);

packages/core/src/hooks/useWindowEvent/useWindowEvent.ts

@@ -1,4 +1,4 @@
-import { target } from '@/utils/helpers';
+import { isTarget } from '@/utils/helpers';
 
 import type { UseEventListenerOptions } from '../useEventListener/useEventListener';
 
@@ -23,4 +23,4 @@ export const useWindowEvent = <Event extends keyof WindowEventMap>(
   event: Event,
   listener: (this: Window, event: WindowEventMap[Event]) => any,
   options?: UseEventListenerOptions
-) => useEventListener(target(window), event, listener, options);
+) => useEventListener(isTarget.wrap(window), event, listener, options);

packages/core/src/utils/helpers/getElement.ts

@@ -1,6 +1,6 @@
 import type { RefObject } from 'react';
 
-import { Target } from './target';
+export type Target = (() => Element) | string | Document | Element | Window;
 
 export type HookTarget =
   | RefObject<Element | null | undefined>

packages/core/src/utils/helpers/index.ts

@@ -4,6 +4,4 @@ export * from './getDate';
 export * from './getElement';
 export * from './getRetry';
 export * from './isTarget';
-export * from './target';
-export * from './targetSymbol';
 export * from './throttle';

packages/core/src/utils/helpers/isTarget.ts

@@ -1,6 +1,14 @@
-import type { HookTarget } from './getElement';
+import type { HookTarget, Target } from './getElement';
 
-import { targetSymbol } from './targetSymbol';
+export const targetSymbol = Symbol('target');
+
+export const target = (target: Target) => ({
+  value: target,
+  type: targetSymbol
+});
 
 export const isTarget = (target: HookTarget) =>
-  typeof target === 'object' && ('current' in target || target.type === targetSymbol);
+  typeof target === 'object' &&
+  ('current' in target || (target && (target as any).type === targetSymbol));
+
+isTarget.wrap = target;