@xyo-network/react-event 7.5.7 → 7.5.8

package/dist/browser/hooks/useCustomEvent.d.ts

@@ -1,4 +1,4 @@
 import type { RefObject } from 'react';
-export type CustomEventListener<T = unknown> = (detail: T, event?: CustomEvent<T>) => boolean | void;
+export type CustomEventListener<T = unknown> = (detail: T, event?: Event) => boolean | void;
 export declare const useCustomEvent: <TElement extends HTMLElement, TDetail = unknown>(type: string, listener?: CustomEventListener<TDetail>, customRef?: RefObject<TElement | null>) => [RefObject<TElement | null>, CustomEventListener<TDetail>];
 //# sourceMappingURL=useCustomEvent.d.ts.map

package/dist/browser/hooks/useCustomEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCustomEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCustomEvent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG,IAAI,CAAA;AAEpG,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,WAAW,EAAE,OAAO,GAAG,OAAO,EAC5E,MAAM,MAAM,EACZ,WAAW,mBAAmB,CAAC,OAAO,CAAC,EACvC,YAAY,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,KACrC,CAAC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAqC3D,CAAA"}
+{"version":3,"file":"useCustomEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCustomEvent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,KAAK,OAAO,GAAG,IAAI,CAAA;AAE3F,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,WAAW,EAAE,OAAO,GAAG,OAAO,EAC5E,MAAM,MAAM,EACZ,WAAW,mBAAmB,CAAC,OAAO,CAAC,EACvC,YAAY,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,KACrC,CAAC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAwC3D,CAAA"}

package/dist/browser/hooks/useEvent.d.ts

@@ -2,12 +2,15 @@ import type { RefObject } from 'react';
 export type EventNoun = 'payload' | 'boundwitness' | 'address' | 'hash' | 'signature' | 'schema';
 export type ExtendEventNoun<Extension extends string | void = void> = Extension extends string ? Extension : EventNoun;
 export type EventVerb = 'click' | 'favorite';
+export type EventData = {
+    sourceEvent?: globalThis.Event;
+};
 export interface Event<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> {
     data?: TData;
     noun: TNoun;
-    originalEvent?: Event;
+    sourceEvent?: globalThis.Event;
     verb: TVerb;
 }
-export type EventDispatch<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> = (noun: TNoun, verb: TVerb, data?: TData, originalEvent?: Event) => boolean | void;
+export type EventDispatch<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> = (noun: TNoun, verb: TVerb, data?: TData, sourceEvent?: globalThis.Event) => boolean | void;
 export declare const useEvent: <T extends HTMLElement, TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string>(listener?: EventDispatch<TNoun, TVerb, TData>, sharableRef?: RefObject<T | null>) => [RefObject<T | null>, EventDispatch<TNoun, TVerb, TData>];
 //# sourceMappingURL=useEvent.d.ts.map

package/dist/browser/hooks/useEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/useEvent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAItC,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAA;AAChG,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,IAAI,SAAS,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;AAEtH,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,UAAU,CAAA;AAE5C,MAAM,WAAW,KAAK,CAAC,KAAK,GAAG,eAAe,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,MAAM;IAC/E,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,IAAI,EAAE,KAAK,CAAA;IACX,aAAa,CAAC,EAAE,KAAK,CAAA;IACrB,IAAI,EAAE,KAAK,CAAA;CACZ;AAED,MAAM,MAAM,aAAa,CAAC,KAAK,GAAG,eAAe,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,MAAM,IAAI,CACtF,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,EACX,IAAI,CAAC,EAAE,KAAK,EACZ,aAAa,CAAC,EAAE,KAAK,KAClB,OAAO,GAAG,IAAI,CAAA;AAEnB,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,WAAW,EAAE,KAAK,GAAG,eAAe,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,MAAM,EACxG,WAAW,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAC7C,cAAc,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,KAChC,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAiB1D,CAAA"}
+{"version":3,"file":"useEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/useEvent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAItC,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAA;AAChG,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,IAAI,SAAS,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;AAEtH,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,UAAU,CAAA;AAE5C,MAAM,MAAM,SAAS,GAAG;IAAE,WAAW,CAAC,EAAE,UAAU,CAAC,KAAK,CAAA;CAAE,CAAA;AAE1D,MAAM,WAAW,KAAK,CAAC,KAAK,GAAG,eAAe,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,MAAM;IAC/E,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,IAAI,EAAE,KAAK,CAAA;IACX,WAAW,CAAC,EAAE,UAAU,CAAC,KAAK,CAAA;IAC9B,IAAI,EAAE,KAAK,CAAA;CACZ;AAED,MAAM,MAAM,aAAa,CAAC,KAAK,GAAG,eAAe,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,MAAM,IAAI,CACtF,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,EACX,IAAI,CAAC,EAAE,KAAK,EACZ,WAAW,CAAC,EAAE,UAAU,CAAC,KAAK,KAC3B,OAAO,GAAG,IAAI,CAAA;AAEnB,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,WAAW,EAAE,KAAK,GAAG,eAAe,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,MAAM,EACxG,WAAW,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAC7C,cAAc,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,KAChC,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAiB1D,CAAA"}

package/dist/browser/index.mjs

@@ -13,7 +13,7 @@ var useCustomEvent = /* @__PURE__ */ __name((type, listener, customRef) => {
     const handler = currentListener ? (event) => {
       const customEvent = event;
       const detail = assertEx(customEvent.detail, () => "Event missing detail");
-      const stop = currentListener(detail, customEvent);
+      const stop = currentListener(detail);
       if (stop) {
         event.stopPropagation();
       }
@@ -27,12 +27,15 @@ var useCustomEvent = /* @__PURE__ */ __name((type, listener, customRef) => {
       }
     };
   });
-  const dispatch = /* @__PURE__ */ __name((detail) => {
+  const dispatch = /* @__PURE__ */ __name((detail, sourceEvent) => {
     const event = new CustomEvent(type, {
       bubbles: true,
       cancelable: true,
       composed: true,
-      detail
+      detail: {
+        ...detail,
+        sourceEvent
+      }
     });
     ref.current?.dispatchEvent(event);
   }, "dispatch");
@@ -45,15 +48,14 @@ var useCustomEvent = /* @__PURE__ */ __name((type, listener, customRef) => {
 // src/hooks/useEvent.ts
 var useEvent = /* @__PURE__ */ __name((listener, sharableRef) => {
   const [ref, customDispatch] = useCustomEvent("xyo", listener ? (detail) => {
-    return listener(detail.noun, detail.verb, detail.data, detail.originalEvent);
+    return listener(detail.noun, detail.verb, detail.data, detail.sourceEvent);
   } : void 0, sharableRef);
-  const dispatch = /* @__PURE__ */ __name((noun, verb, data, originalEvent) => {
+  const dispatch = /* @__PURE__ */ __name((noun, verb, data, sourceEvent) => {
     return customDispatch({
       data,
       noun,
-      originalEvent,
       verb
-    });
+    }, sourceEvent);
   }, "dispatch");
   return [
     ref,

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/useCustomEvent.ts","../../src/hooks/useEvent.ts"],"sourcesContent":["import { assertEx } from '@xylabs/sdk-js'\nimport type { RefObject } from 'react'\nimport { useEffect, useRef } from 'react'\n\nexport type CustomEventListener<T = unknown> = (detail: T, event?: CustomEvent<T>) => boolean | void\n\nexport const useCustomEvent = <TElement extends HTMLElement, TDetail = unknown>(\n  type: string,\n  listener?: CustomEventListener<TDetail>,\n  customRef?: RefObject<TElement | null>,\n): [RefObject<TElement | null>, CustomEventListener<TDetail>] => {\n  const newRef = useRef<TElement>(null)\n  const ref = customRef ?? newRef\n  useEffect(() => {\n    const element = ref?.current\n    const currentListener = listener\n    const handler\n      = currentListener\n        ? (event: Event) => {\n            const customEvent = event as CustomEvent<TDetail>\n            const detail = assertEx(customEvent.detail, () => 'Event missing detail')\n            const stop = currentListener(detail, customEvent)\n            if (stop) {\n              event.stopPropagation()\n            }\n          }\n        : undefined\n\n    if (handler && element) {\n      element?.addEventListener(type, handler)\n    }\n    return () => {\n      if (handler && element) {\n        element?.removeEventListener(type, handler)\n      }\n    }\n  })\n  const dispatch: CustomEventListener<TDetail> = (detail?: TDetail) => {\n    const event = new CustomEvent<TDetail>(type, {\n      bubbles: true,\n      cancelable: true,\n      composed: true,\n      detail,\n    })\n    ref.current?.dispatchEvent(event)\n  }\n  return [ref, dispatch]\n}\n","import type { RefObject } from 'react'\n\nimport { useCustomEvent } from './useCustomEvent.ts'\n\nexport type EventNoun = 'payload' | 'boundwitness' | 'address' | 'hash' | 'signature' | 'schema'\nexport type ExtendEventNoun<Extension extends string | void = void> = Extension extends string ? Extension : EventNoun\n\nexport type EventVerb = 'click' | 'favorite'\n\nexport interface Event<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> {\n  data?: TData\n  noun: TNoun\n  originalEvent?: Event\n  verb: TVerb\n}\n\nexport type EventDispatch<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> = (\n  noun: TNoun,\n  verb: TVerb,\n  data?: TData,\n  originalEvent?: Event,\n) => boolean | void\n\nexport const useEvent = <T extends HTMLElement, TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string>(\n  listener?: EventDispatch<TNoun, TVerb, TData>,\n  sharableRef?: RefObject<T | null>,\n): [RefObject<T | null>, EventDispatch<TNoun, TVerb, TData>] => {\n  const [ref, customDispatch] = useCustomEvent<T, Event<TNoun, TVerb, TData>>(\n    'xyo',\n    listener\n      ? (detail: Event<TNoun, TVerb, TData>) => {\n          return listener(detail.noun, detail.verb, detail.data, detail.originalEvent)\n        }\n      : undefined,\n    sharableRef,\n  )\n\n  const dispatch: EventDispatch<TNoun, TVerb, TData> = (noun: TNoun, verb: TVerb, data?: TData, originalEvent?: Event) => {\n    return customDispatch({\n      data, noun, originalEvent, verb,\n    })\n  }\n  return [ref, dispatch]\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,WAAWC,cAAc;AAI3B,IAAMC,iBAAiB,wBAC5BC,MACAC,UACAC,cAAAA;AAEA,QAAMC,SAASC,OAAiB,IAAA;AAChC,QAAMC,MAAMH,aAAaC;AACzBG,YAAU,MAAA;AACR,UAAMC,UAAUF,KAAKG;AACrB,UAAMC,kBAAkBR;AACxB,UAAMS,UACFD,kBACE,CAACE,UAAAA;AACC,YAAMC,cAAcD;AACpB,YAAME,SAASC,SAASF,YAAYC,QAAQ,MAAM,sBAAA;AAClD,YAAME,OAAON,gBAAgBI,QAAQD,WAAAA;AACrC,UAAIG,MAAM;AACRJ,cAAMK,gBAAe;MACvB;IACF,IACAC;AAEN,QAAIP,WAAWH,SAAS;AACtBA,eAASW,iBAAiBlB,MAAMU,OAAAA;IAClC;AACA,WAAO,MAAA;AACL,UAAIA,WAAWH,SAAS;AACtBA,iBAASY,oBAAoBnB,MAAMU,OAAAA;MACrC;IACF;EACF,CAAA;AACA,QAAMU,WAAyC,wBAACP,WAAAA;AAC9C,UAAMF,QAAQ,IAAIU,YAAqBrB,MAAM;MAC3CsB,SAAS;MACTC,YAAY;MACZC,UAAU;MACVX;IACF,CAAA;AACAR,QAAIG,SAASiB,cAAcd,KAAAA;EAC7B,GAR+C;AAS/C,SAAO;IAACN;IAAKe;;AACf,GAzC8B;;;ACiBvB,IAAMM,WAAW,wBACtBC,UACAC,gBAAAA;AAEA,QAAM,CAACC,KAAKC,cAAAA,IAAkBC,eAC5B,OACAJ,WACI,CAACK,WAAAA;AACC,WAAOL,SAASK,OAAOC,MAAMD,OAAOE,MAAMF,OAAOG,MAAMH,OAAOI,aAAa;EAC7E,IACAC,QACJT,WAAAA;AAGF,QAAMU,WAA+C,wBAACL,MAAaC,MAAaC,MAAcC,kBAAAA;AAC5F,WAAON,eAAe;MACpBK;MAAMF;MAAMG;MAAeF;IAC7B,CAAA;EACF,GAJqD;AAKrD,SAAO;IAACL;IAAKS;;AACf,GApBwB;","names":["assertEx","useEffect","useRef","useCustomEvent","type","listener","customRef","newRef","useRef","ref","useEffect","element","current","currentListener","handler","event","customEvent","detail","assertEx","stop","stopPropagation","undefined","addEventListener","removeEventListener","dispatch","CustomEvent","bubbles","cancelable","composed","dispatchEvent","useEvent","listener","sharableRef","ref","customDispatch","useCustomEvent","detail","noun","verb","data","originalEvent","undefined","dispatch"]}
+{"version":3,"sources":["../../src/hooks/useCustomEvent.ts","../../src/hooks/useEvent.ts"],"sourcesContent":["import { assertEx } from '@xylabs/sdk-js'\nimport type { RefObject } from 'react'\nimport { useEffect, useRef } from 'react'\n\nexport type CustomEventListener<T = unknown> = (detail: T, event?: Event) => boolean | void\n\nexport const useCustomEvent = <TElement extends HTMLElement, TDetail = unknown>(\n  type: string,\n  listener?: CustomEventListener<TDetail>,\n  customRef?: RefObject<TElement | null>,\n): [RefObject<TElement | null>, CustomEventListener<TDetail>] => {\n  const newRef = useRef<TElement>(null)\n  const ref = customRef ?? newRef\n  useEffect(() => {\n    const element = ref?.current\n    const currentListener = listener\n    const handler\n      = currentListener\n        ? (event: Event) => {\n            const customEvent = event as CustomEvent<TDetail>\n            const detail = assertEx(customEvent.detail, () => 'Event missing detail')\n            const stop = currentListener(detail)\n            if (stop) {\n              event.stopPropagation()\n            }\n          }\n        : undefined\n\n    if (handler && element) {\n      element?.addEventListener(type, handler)\n    }\n    return () => {\n      if (handler && element) {\n        element?.removeEventListener(type, handler)\n      }\n    }\n  })\n  const dispatch: CustomEventListener<TDetail> = (detail?: TDetail, sourceEvent?: Event) => {\n    const event = new CustomEvent<TDetail>(type, {\n      bubbles: true,\n      cancelable: true,\n      composed: true,\n      detail: {\n        ...detail,\n        sourceEvent,\n      } as TDetail,\n    })\n    ref.current?.dispatchEvent(event)\n  }\n  return [ref, dispatch]\n}\n","import type { RefObject } from 'react'\n\nimport { useCustomEvent } from './useCustomEvent.ts'\n\nexport type EventNoun = 'payload' | 'boundwitness' | 'address' | 'hash' | 'signature' | 'schema'\nexport type ExtendEventNoun<Extension extends string | void = void> = Extension extends string ? Extension : EventNoun\n\nexport type EventVerb = 'click' | 'favorite'\n\nexport type EventData = { sourceEvent?: globalThis.Event }\n\nexport interface Event<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> {\n  data?: TData\n  noun: TNoun\n  sourceEvent?: globalThis.Event\n  verb: TVerb\n}\n\nexport type EventDispatch<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> = (\n  noun: TNoun,\n  verb: TVerb,\n  data?: TData,\n  sourceEvent?: globalThis.Event,\n) => boolean | void\n\nexport const useEvent = <T extends HTMLElement, TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string>(\n  listener?: EventDispatch<TNoun, TVerb, TData>,\n  sharableRef?: RefObject<T | null>,\n): [RefObject<T | null>, EventDispatch<TNoun, TVerb, TData>] => {\n  const [ref, customDispatch] = useCustomEvent<T, Event<TNoun, TVerb, TData>>(\n    'xyo',\n    listener\n      ? (detail: Event<TNoun, TVerb, TData>) => {\n          return listener(detail.noun, detail.verb, detail.data, detail.sourceEvent)\n        }\n      : undefined,\n    sharableRef,\n  )\n\n  const dispatch: EventDispatch<TNoun, TVerb, TData> = (noun: TNoun, verb: TVerb, data?: TData, sourceEvent?: globalThis.Event) => {\n    return customDispatch({\n      data, noun, verb,\n    }, sourceEvent)\n  }\n  return [ref, dispatch]\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,WAAWC,cAAc;AAI3B,IAAMC,iBAAiB,wBAC5BC,MACAC,UACAC,cAAAA;AAEA,QAAMC,SAASC,OAAiB,IAAA;AAChC,QAAMC,MAAMH,aAAaC;AACzBG,YAAU,MAAA;AACR,UAAMC,UAAUF,KAAKG;AACrB,UAAMC,kBAAkBR;AACxB,UAAMS,UACFD,kBACE,CAACE,UAAAA;AACC,YAAMC,cAAcD;AACpB,YAAME,SAASC,SAASF,YAAYC,QAAQ,MAAM,sBAAA;AAClD,YAAME,OAAON,gBAAgBI,MAAAA;AAC7B,UAAIE,MAAM;AACRJ,cAAMK,gBAAe;MACvB;IACF,IACAC;AAEN,QAAIP,WAAWH,SAAS;AACtBA,eAASW,iBAAiBlB,MAAMU,OAAAA;IAClC;AACA,WAAO,MAAA;AACL,UAAIA,WAAWH,SAAS;AACtBA,iBAASY,oBAAoBnB,MAAMU,OAAAA;MACrC;IACF;EACF,CAAA;AACA,QAAMU,WAAyC,wBAACP,QAAkBQ,gBAAAA;AAChE,UAAMV,QAAQ,IAAIW,YAAqBtB,MAAM;MAC3CuB,SAAS;MACTC,YAAY;MACZC,UAAU;MACVZ,QAAQ;QACN,GAAGA;QACHQ;MACF;IACF,CAAA;AACAhB,QAAIG,SAASkB,cAAcf,KAAAA;EAC7B,GAX+C;AAY/C,SAAO;IAACN;IAAKe;;AACf,GA5C8B;;;ACmBvB,IAAMO,WAAW,wBACtBC,UACAC,gBAAAA;AAEA,QAAM,CAACC,KAAKC,cAAAA,IAAkBC,eAC5B,OACAJ,WACI,CAACK,WAAAA;AACC,WAAOL,SAASK,OAAOC,MAAMD,OAAOE,MAAMF,OAAOG,MAAMH,OAAOI,WAAW;EAC3E,IACAC,QACJT,WAAAA;AAGF,QAAMU,WAA+C,wBAACL,MAAaC,MAAaC,MAAcC,gBAAAA;AAC5F,WAAON,eAAe;MACpBK;MAAMF;MAAMC;IACd,GAAGE,WAAAA;EACL,GAJqD;AAKrD,SAAO;IAACP;IAAKS;;AACf,GApBwB;","names":["assertEx","useEffect","useRef","useCustomEvent","type","listener","customRef","newRef","useRef","ref","useEffect","element","current","currentListener","handler","event","customEvent","detail","assertEx","stop","stopPropagation","undefined","addEventListener","removeEventListener","dispatch","sourceEvent","CustomEvent","bubbles","cancelable","composed","dispatchEvent","useEvent","listener","sharableRef","ref","customDispatch","useCustomEvent","detail","noun","verb","data","sourceEvent","undefined","dispatch"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/react-event",
-  "version": "7.5.7",
+  "version": "7.5.8",
   "description": "Common React library for all XYO projects that use React",
   "keywords": [
     "xyo",

package/src/hooks/useCustomEvent.ts

@@ -2,7 +2,7 @@ import { assertEx } from '@xylabs/sdk-js'
 import type { RefObject } from 'react'
 import { useEffect, useRef } from 'react'
 
-export type CustomEventListener<T = unknown> = (detail: T, event?: CustomEvent<T>) => boolean | void
+export type CustomEventListener<T = unknown> = (detail: T, event?: Event) => boolean | void
 
 export const useCustomEvent = <TElement extends HTMLElement, TDetail = unknown>(
   type: string,
@@ -19,7 +19,7 @@ export const useCustomEvent = <TElement extends HTMLElement, TDetail = unknown>(
         ? (event: Event) => {
             const customEvent = event as CustomEvent<TDetail>
             const detail = assertEx(customEvent.detail, () => 'Event missing detail')
-            const stop = currentListener(detail, customEvent)
+            const stop = currentListener(detail)
             if (stop) {
               event.stopPropagation()
             }
@@ -35,12 +35,15 @@ export const useCustomEvent = <TElement extends HTMLElement, TDetail = unknown>(
       }
     }
   })
-  const dispatch: CustomEventListener<TDetail> = (detail?: TDetail) => {
+  const dispatch: CustomEventListener<TDetail> = (detail?: TDetail, sourceEvent?: Event) => {
     const event = new CustomEvent<TDetail>(type, {
       bubbles: true,
       cancelable: true,
       composed: true,
-      detail,
+      detail: {
+        ...detail,
+        sourceEvent,
+      } as TDetail,
     })
     ref.current?.dispatchEvent(event)
   }

package/src/hooks/useEvent.ts

@@ -7,10 +7,12 @@ export type ExtendEventNoun<Extension extends string | void = void> = Extension
 
 export type EventVerb = 'click' | 'favorite'
 
+export type EventData = { sourceEvent?: globalThis.Event }
+
 export interface Event<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string> {
   data?: TData
   noun: TNoun
-  originalEvent?: Event
+  sourceEvent?: globalThis.Event
   verb: TVerb
 }
 
@@ -18,7 +20,7 @@ export type EventDispatch<TNoun = ExtendEventNoun, TVerb = EventVerb, TData = st
   noun: TNoun,
   verb: TVerb,
   data?: TData,
-  originalEvent?: Event,
+  sourceEvent?: globalThis.Event,
 ) => boolean | void
 
 export const useEvent = <T extends HTMLElement, TNoun = ExtendEventNoun, TVerb = EventVerb, TData = string>(
@@ -29,16 +31,16 @@ export const useEvent = <T extends HTMLElement, TNoun = ExtendEventNoun, TVerb =
     'xyo',
     listener
       ? (detail: Event<TNoun, TVerb, TData>) => {
-          return listener(detail.noun, detail.verb, detail.data, detail.originalEvent)
+          return listener(detail.noun, detail.verb, detail.data, detail.sourceEvent)
         }
       : undefined,
     sharableRef,
   )
 
-  const dispatch: EventDispatch<TNoun, TVerb, TData> = (noun: TNoun, verb: TVerb, data?: TData, originalEvent?: Event) => {
+  const dispatch: EventDispatch<TNoun, TVerb, TData> = (noun: TNoun, verb: TVerb, data?: TData, sourceEvent?: globalThis.Event) => {
     return customDispatch({
-      data, noun, originalEvent, verb,
-    })
+      data, noun, verb,
+    }, sourceEvent)
   }
   return [ref, dispatch]
 }