define values on useTrack fn

KurtGokhan · Mar 30, 2024 · bf708a8 · bf708a8
1 parent a3dcd61
commit bf708a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/packages/react-on/src/lib/handlers.tsx b/packages/react-on/src/lib/handlers.tsx
@@ -64,13 +64,13 @@ export function createTrackingHandlerProvider<TBase extends ReactOnBase = ReactO
     return <TrackingHandler {...props} onHandle={onHandle} />;
   }
 
-  function useTrack() {
+  function useTrack({ values }: { values?: Partial<TValues> } = {}) {
     const handler = useContext(handlerCtx).handle;
     const ctxValue = useContext(ctx);
 
     return useStableCallback<TTrackFn>((options) => {
       if (ctxValue.enabled) {
-        handler({ ...options, values: { ...ctxValue.values, ...options?.values } as TValues });
+        handler({ ...options, values: { ...ctxValue.values, ...values, ...options?.values } as TValues });
       }
     });
   }

diff --git a/packages/react-on/src/lib/track-callback.tsx b/packages/react-on/src/lib/track-callback.tsx
@@ -11,18 +11,15 @@ export function createTrackCallback<TBase extends ReactOnBase = ReactOn>(useTrac
   function TrackCallback<
     ComponentType = DOMAttributes<any>,
     CallbackName extends PropertyKey = CallbackNames<ComponentType> | (string & {}),
-  >({ children, callback, name, disabled, ...props }: TProps & { callback: CallbackName }) {
+  >({ children, callback, name, disabled, values, ...props }: TProps & { callback: CallbackName }) {
     children = Children.only(children) as ReactElement;
 
     if (!children) throw new Error('Children passed to track directive must be an element with ref');
     if (!callback) throw new Error('Callback name must be provided');
 
     const resolvedName = name ?? String(callback);
     const track = useTrack();
-
-    const trackFn = useStableCallback((...args: any[]) =>
-      track({ values: props.values, args: [resolvedName, ...args] }),
-    );
+    const trackFn = useStableCallback((...args: any[]) => track({ values, args: [resolvedName, ...args] }));
 
     const originalCallback = children.props[callback];
     const handle = useCallback(

diff --git a/packages/react-on/src/lib/track-event.tsx b/packages/react-on/src/lib/track-event.tsx
@@ -23,7 +23,8 @@ export function createTrackEvent<TBase extends ReactOnBase = ReactOn>(useTrack:
 
     const resolvedName = name ?? event;
     const track = useTrack();
-    const trackFn = useStableCallback((...args: any[]) => track({ values: values, args: [resolvedName, ...args] }));
+    const trackFn = useStableCallback((...args: any[]) => track({ values, args: [resolvedName, ...args] }));
+
     const handle = useCallback(
       (ev: HTMLElementEventMap[EventName], ...args: any[]) => {
         trackFn(ev, ...args);