@usermaven/react 1.4.4 → 1.5.0-rc.90

package/lib/usePageView.d.ts

@@ -1,4 +1,5 @@
-import { EventPayload, UsermavenClient } from "@usermaven/sdk-js";
+import { UsermavenClient } from "./useUsermaven";
+import { EventPayload } from "@usermaven/sdk-js";
 declare function usePageView(opts?: {
     before?: (usermaven: UsermavenClient) => void;
     typeName?: string;

package/lib/usePageView.js

@@ -1,17 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
-const react_router_1 = require("react-router");
 const useUsermaven_1 = require("./useUsermaven");
+function useUrlChange() {
+    const [url, setUrl] = (0, react_1.useState)(window.location.href);
+    const lastUrlRef = (0, react_1.useRef)(window.location.href);
+    (0, react_1.useEffect)(() => {
+        const handleUrlChange = () => {
+            const currentUrl = window.location.href;
+            if (currentUrl !== lastUrlRef.current) {
+                lastUrlRef.current = currentUrl;
+                setUrl(currentUrl);
+            }
+        };
+        window.addEventListener('popstate', handleUrlChange);
+        const originalPushState = window.history.pushState;
+        const originalReplaceState = window.history.replaceState;
+        window.history.pushState = function () {
+            originalPushState.apply(this, arguments);
+            handleUrlChange();
+        };
+        window.history.replaceState = function () {
+            originalReplaceState.apply(this, arguments);
+            handleUrlChange();
+        };
+        return () => {
+            window.removeEventListener('popstate', handleUrlChange);
+            window.history.pushState = originalPushState;
+            window.history.replaceState = originalReplaceState;
+        };
+    }, []);
+    return url;
+}
 function usePageView(opts = {}) {
-    let location = (0, react_router_1.useLocation)();
+    const url = useUrlChange();
     const usermaven = (0, useUsermaven_1.default)();
-    (0, react_1.useEffect)(() => {
-        if (opts.before) {
-            opts.before(usermaven);
+    const lastTrackedUrl = (0, react_1.useRef)('');
+    const trackPageView = (0, react_1.useCallback)(() => {
+        if (url !== lastTrackedUrl.current) {
+            if (opts.before) {
+                opts.before(usermaven);
+            }
+            usermaven.track((opts === null || opts === void 0 ? void 0 : opts.typeName) || 'pageview', Object.assign(Object.assign({}, opts.payload), { url: window.location.href, path: window.location.pathname, referrer: document.referrer, title: document.title }));
+            lastTrackedUrl.current = url;
         }
-        usermaven.track((opts === null || opts === void 0 ? void 0 : opts.typeName) || 'pageview', opts.payload);
-    }, [location, usermaven.track, opts.payload, opts.before]);
+    }, [usermaven, url, opts.before, opts.typeName, opts.payload]);
+    (0, react_1.useEffect)(() => {
+        trackPageView();
+    }, [url, trackPageView]);
     return usermaven;
 }
 exports.default = usePageView;

package/lib/useUsermaven.d.ts

@@ -1,5 +1,17 @@
-import { UsermavenClient } from "@usermaven/sdk-js";
-declare function useUsermaven(): UsermavenClient & {
-    trackPageView: () => Promise<void>;
+import { EventPayload, UserProps } from "@usermaven/sdk-js";
+export type UsermavenClient = {
+    trackPageView: () => void;
+    id: (userData: UserProps, doNotSendEvent?: boolean) => Promise<void>;
+    track: (typeName: string, payload?: EventPayload) => void;
+    rawTrack: (payload: any) => void;
+    set: (properties: Record<string, any>, opts?: {
+        eventType?: string;
+        persist?: boolean;
+    }) => void;
+    unset: (propertyName: string, opts?: {
+        eventType?: string;
+        persist?: boolean;
+    }) => void;
 };
+declare function useUsermaven(): UsermavenClient;
 export default useUsermaven;

package/lib/useUsermaven.js

@@ -11,14 +11,12 @@ function useUsermaven() {
     const trackPageView = (0, react_1.useCallback)(() => client === null || client === void 0 ? void 0 : client.track('pageview'), [client]);
     const track = (0, react_1.useCallback)((typeName, payload) => client === null || client === void 0 ? void 0 : client.track(typeName, payload), [client]);
     const rawTrack = (0, react_1.useCallback)((payload) => client === null || client === void 0 ? void 0 : client.rawTrack(payload), [client]);
-    const interceptAnalytics = (0, react_1.useCallback)((analytics) => client === null || client === void 0 ? void 0 : client.interceptAnalytics(analytics), [client]);
     const set = (0, react_1.useCallback)((properties, opts) => client === null || client === void 0 ? void 0 : client.set(properties, opts), [client]);
     const unset = (0, react_1.useCallback)((propertyName, opts) => client === null || client === void 0 ? void 0 : client.unset(propertyName, opts), [client]);
     return Object.assign(Object.assign({}, client), { id,
         track,
         trackPageView,
         rawTrack,
-        interceptAnalytics,
         set,
         unset });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usermaven/react",
-  "version": "1.4.4",
+  "version": "1.5.0-rc.90",
   "description": "Usermaven JavaScript SDK for React",
   "author": "Usermaven <hello@usermaven.com>",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@usermaven/sdk-js": "^1.2.5"
+    "@usermaven/sdk-js": "1.5.0-rc.90"
   },
   "peerDependencies": {
     "react": "15.x || 16.x || 17.x || 18.x",
@@ -34,13 +34,13 @@
     "rollup": "^2.70.1",
     "rollup-plugin-peer-deps-external": "^2.2.4"
   },
-  "scripts": {
-    "build": "rollup -c && tsc",
-    "test": "echo \"Error: run tests from root\" && exit 1"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/usermaven/usermaven-js",
     "directory": "packages/react"
+  },
+  "scripts": {
+    "build": "rollup -c && tsc",
+    "test": "echo \"Error: run tests from root\" && exit 1"
   }
-}
+}