@devgateway/dvz-ui-react 1.6.14 → 1.6.16

package/dist/cjs/layout/Layout.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("react/jsx-runtime"),o=require("react"),t=require("react-router"),m=require("../embeddable/index.js"),f=require("react-intl"),s=require("@devgateway/wp-react-lib"),g=require("react-redux");require("semantic-ui-react");require("../utils/AppMedia.js");require("./Footer.js");require("./Header.js");const p=require("./Customizer.js"),h=require("../conf/index.js"),x=require("../translations/en.json.js"),v=require("../translations/fr.json.js"),j=require("../translations/af.json.js"),C=require("../translations/am.json.js"),w=require("../lib/react-intl-redux/index.js");require("immutable");const n=require("../redux/store.js");require("./Favicon.js");require("clsx");require("../utils/semanticUtils.js");require("./SearchControl.js");require("./ClassicHeader.js");require("./FloatingMenuHeader.js");const i={en:x,fr:v,am:C,af:j},I=()=>{const a=t.useParams(),l=t.useLocation(),u=h.Config.DEFAULT_LOCALE,[b,d]=o.useState(!1),e=a.lan,q=l.pathname;return o.useEffect(()=>{d(!0),process.env.NODE_ENV==="development"&&(console.log("----------.env-----------"),console.log(process.env),console.log("----------.env-----------")),typeof window<"u"&&window.setTimeout(()=>{if(window.location.hash){const c=document.getElementById(window.location.hash.substring(1));c&&c.scrollIntoView({behavior:"auto",block:"start"})}},2e3)},[]),o.useEffect(()=>{n.store.dispatch(w.updateIntl({locale:e,formats:{},messages:i[e??"en"]}))},[e]),e?Object.keys(i).includes(e)?r.jsx(g.Provider,{store:n.store,children:r.jsx(f.IntlProvider,{locale:e,messages:i[e],children:r.jsx(s.AppContextProvider,{getComponent:m.getComponentByNameIgnoreCase,store:n.store,locale:e,children:r.jsx(s.SettingProvider,{locale:e,changeUUID:null,children:r.jsxs(s.SettingsConsumer,{children:[r.jsx(p.CustomizerWrapper,{}),r.jsx(t.Outlet,{})]})})})},e)}):r.jsx(t.Navigate,{to:`/${u}${q}`,replace:!0}):r.jsx(t.Navigate,{to:u,replace:!0})};exports.default=I;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("react/jsx-runtime"),o=require("react"),t=require("react-router"),m=require("../embeddable/index.js"),f=require("react-intl"),s=require("@devgateway/wp-react-lib"),g=require("react-redux");require("semantic-ui-react");require("../utils/AppMedia.js");require("./Footer.js");require("./Header.js");const p=require("./Customizer.js");require("./Favicon.js");require("clsx");require("../utils/semanticUtils.js");require("./SearchControl.js");const h=require("../conf/index.js");require("./ClassicHeader.js");require("./FloatingMenuHeader.js");const x=require("../translations/en.json.js"),v=require("../translations/fr.json.js"),j=require("../translations/af.json.js"),w=require("../translations/am.json.js"),C=require("../lib/react-intl-redux/index.js");require("immutable");const n=require("../redux/store.js"),y=require("../tracker/withGoogleAnalytics.js"),i={en:x,fr:v,am:w,af:j},I=()=>{const a=t.useParams(),l=t.useLocation(),u=h.Config.DEFAULT_LOCALE,[b,d]=o.useState(!1),e=a.lan,q=l.pathname;return o.useEffect(()=>{d(!0),process.env.NODE_ENV==="development"&&(console.log("----------.env-----------"),console.log(process.env),console.log("----------.env-----------")),typeof window<"u"&&window.setTimeout(()=>{if(window.location.hash){const c=document.getElementById(window.location.hash.substring(1));c&&c.scrollIntoView({behavior:"auto",block:"start"})}},2e3)},[]),o.useEffect(()=>{n.store.dispatch(C.updateIntl({locale:e,formats:{},messages:i[e??"en"]}))},[e]),e?Object.keys(i).includes(e)?r.jsx(g.Provider,{store:n.store,children:r.jsx(f.IntlProvider,{locale:e,messages:i[e],children:r.jsx(s.AppContextProvider,{getComponent:m.getComponentByNameIgnoreCase,store:n.store,locale:e,children:r.jsx(s.SettingProvider,{locale:e,changeUUID:null,children:r.jsxs(s.SettingsConsumer,{children:[r.jsx(p.CustomizerWrapper,{}),r.jsx(t.Outlet,{})]})})})},e)}):r.jsx(t.Navigate,{to:`/${u}${q}`,replace:!0}):r.jsx(t.Navigate,{to:u,replace:!0})},L=y.withTracker(I);exports.default=L;

package/dist/cjs/tracker/InternalTrafficToggle.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("react/jsx-runtime"),l=require("react"),f=require("react-router"),g=require("./internalTrafficUtils.js"),x=({token:c})=>{const[a]=f.useSearchParams(),d=f.useNavigate(),[e,s]=l.useState("validating"),[u,n]=l.useState("Processing...");l.useEffect(()=>{const o=a.get("enable"),v=a.get("k");if(!g.validateToken(v,c)){s("error"),n("Invalid or missing token. Access denied."),console.error("Invalid token provided for internal traffic toggle");return}if(o!=="0"&&o!=="1"){s("error"),n("Invalid enable parameter. Use ?enable=0 or ?enable=1"),console.error("Invalid enable parameter:",o);return}try{const r=o==="1";g.setInternalTrafficCookie(r),s("success"),n(r?"✓ Internal traffic enabled. GA4 events will be tagged as internal.":"✓ Internal traffic disabled. GA4 events will be tagged as external."),console.log(`Internal traffic ${r?"enabled":"disabled"} successfully`),setTimeout(()=>{d("/")},3e3)}catch(r){s("error"),n(`Error: ${r instanceof Error?r.message:"Unknown error"}`),console.error("Error setting internal traffic cookie:",r)}},[a,c,d]);const b={display:"flex",justifyContent:"center",alignItems:"center",minHeight:"100vh",fontFamily:'-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif'},i={textAlign:"center",padding:"2rem",borderRadius:"8px",boxShadow:"0 2px 8px rgba(0, 0, 0, 0.1)",maxWidth:"500px"},m=e==="success"?{...i,backgroundColor:"#f0f9ff",borderLeft:"4px solid #10b981"}:e==="error"?{...i,backgroundColor:"#fef2f2",borderLeft:"4px solid #ef4444"}:{...i,backgroundColor:"#f3f4f6",borderLeft:"4px solid #3b82f6"},p={fontSize:"1.5rem",fontWeight:"600",margin:"0 0 1rem 0",color:e==="success"?"#059669":e==="error"?"#dc2626":"#1f2937"},y={fontSize:"1rem",margin:"1rem 0",color:e==="success"?"#047857":e==="error"?"#991b1b":"#374151",lineHeight:"1.5"},S={fontSize:"0.875rem",color:"#6b7280",marginTop:"1.5rem",fontStyle:"italic"};return t.jsx("div",{style:b,children:t.jsxs("div",{style:m,children:[t.jsx("h1",{style:p,children:e==="success"?"Success":e==="error"?"Error":"Processing"}),t.jsx("p",{style:y,children:u}),e==="success"&&t.jsx("p",{style:S,children:"Redirecting to home page in 3 seconds..."})]})})};exports.default=x;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const s=require("react/jsx-runtime"),l=require("react"),g=require("react-router"),u=require("./internalTrafficUtils.js"),h=({token:c,redirectTo:d="/"})=>{const[a]=g.useSearchParams(),f=g.useNavigate(),[e,t]=l.useState("validating"),[b,n]=l.useState("Processing...");l.useEffect(()=>{const o=a.get("enable"),x=a.get("k");if(!u.validateToken(x,c)){t("error"),n("Invalid or missing token. Access denied."),console.error("Invalid token provided for internal traffic toggle");return}if(o!=="0"&&o!=="1"){t("error"),n("Invalid enable parameter. Use ?enable=0 or ?enable=1"),console.error("Invalid enable parameter:",o);return}try{const r=o==="1";u.setInternalTrafficCookie(r),t("success"),n(r?"✓ Internal traffic enabled. GA4 events will be tagged as internal.":"✓ Internal traffic disabled. GA4 events will be tagged as external."),console.log(`Internal traffic ${r?"enabled":"disabled"} successfully`),setTimeout(()=>{f(d)},3e3)}catch(r){t("error"),n(`Error: ${r instanceof Error?r.message:"Unknown error"}`),console.error("Error setting internal traffic cookie:",r)}},[a,c,f,d]);const m={display:"flex",justifyContent:"center",alignItems:"center",minHeight:"100vh",fontFamily:'-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif'},i={textAlign:"center",padding:"2rem",borderRadius:"8px",boxShadow:"0 2px 8px rgba(0, 0, 0, 0.1)",maxWidth:"500px"},p=e==="success"?{...i,backgroundColor:"#f0f9ff",borderLeft:"4px solid #10b981"}:e==="error"?{...i,backgroundColor:"#fef2f2",borderLeft:"4px solid #ef4444"}:{...i,backgroundColor:"#f3f4f6",borderLeft:"4px solid #3b82f6"},y={fontSize:"1.5rem",fontWeight:"600",margin:"0 0 1rem 0",color:e==="success"?"#059669":e==="error"?"#dc2626":"#1f2937"},S={fontSize:"1rem",margin:"1rem 0",color:e==="success"?"#047857":e==="error"?"#991b1b":"#374151",lineHeight:"1.5"},v={fontSize:"0.875rem",color:"#6b7280",marginTop:"1.5rem",fontStyle:"italic"};return s.jsx("div",{style:m,children:s.jsxs("div",{style:p,children:[s.jsx("h1",{style:y,children:e==="success"?"Success":e==="error"?"Error":"Processing"}),s.jsx("p",{style:S,children:b}),e==="success"&&s.jsx("p",{style:v,children:"Redirecting to home page in 3 seconds..."})]})})};exports.default=h;

package/dist/cjs/tracker/withGoogleAnalytics.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("react/jsx-runtime"),t=require("react"),s=require("react-ga4"),p=require("react-router"),C=require("../conf/index.js"),g=require("@devgateway/wp-react-lib"),A=require("./internalTrafficUtils.js"),u=new Set,_=(f,T={})=>l=>{var o;const i=t.useContext(g.SettingsContext)??{},e=((o=i==null?void 0:i.data)==null?void 0:o.google_analytics_code)??C.Config.GA_CODE,r=p.useLocation(),n=t.useRef(!1);return t.useEffect(()=>{e&&e!=="#REACT_APP_GA_CODE#"&&!n.current&&(u.has(e)||(s.initialize(e),u.add(e),console.log("GA initialized with code:",e)),n.current=!0)},[e]),t.useEffect(()=>{if(e&&e!=="#REACT_APP_GA_CODE#"&&n.current){const c=r.pathname,a=A.isInternalTrafficEnabled()?"internal":"external";s.send({hitType:"pageview",page:c,traffic_type:a}),console.log("GA pageview sent:",{page:c,traffic_type:a})}},[r.pathname,e]),d.jsx(f,{...l})};exports.withTracker=_;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("react/jsx-runtime"),i=require("react"),c=require("react-ga4"),x=require("react-router"),P=require("../conf/index.js"),b=require("@devgateway/wp-react-lib"),E=require("./internalTrafficUtils.js"),C=new Set;let s=!1;const L=l=>{const f=T=>{var m;const d=i.useContext(b.SettingsContext)??{},e=((m=d==null?void 0:d.data)==null?void 0:m.google_analytics_code)??P.Config.GA_CODE,a=x.useLocation(),_=i.useRef(null),u=i.useRef(!1),g=i.useRef(!1);if(typeof window<"u"&&!s&&e&&e!=="#REACT_APP_GA_CODE#"){if(!C.has(e))try{c.initialize(e),C.add(e),console.log("GA initialized with code:",e)}catch(t){console.error("Failed to initialize GA:",t)}s=!0}return i.useEffect(()=>{if(typeof window>"u"||!e||e==="#REACT_APP_GA_CODE#"||!s)return;const t=a.pathname;if(_.current!==t){_.current=t,u.current=!1;try{const r=E.isInternalTrafficEnabled()?"internal":"external";c.event("page_view",{page_path:t,traffic_type:r}),console.log("GA pageview sent:",{page:t,traffic_type:r})}catch(r){console.error("Failed to send pageview:",r)}}},[a.pathname,e]),i.useEffect(()=>{if(typeof window>"u"||!e||e==="#REACT_APP_GA_CODE#"||!s||g.current)return;const t=E.isInternalTrafficEnabled()?"internal":"external",r=()=>{if(u.current)return;const n=Math.round(window.scrollY/(document.documentElement.scrollHeight-window.innerHeight)*100);if(n>10)try{c.event("scroll",{engagement_type:"scroll",scroll_depth:n,traffic_type:t}),console.log("GA scroll event sent:",{scrollPercentage:n,traffic_type:t}),u.current=!0}catch(o){console.error("Failed to send scroll event:",o)}},p=n=>{var A;const o=n.target,h=((A=o.textContent)==null?void 0:A.substring(0,50))||"",v=o.id||"",y=o.className||"";if(!(!h&&!v&&!y))try{c.event("element_click",{element_id:v,element_class:y,element_text:h.substring(0,50),traffic_type:t})}catch{}},G=Date.now(),w=()=>{const n=Math.round((Date.now()-G)/1e3);if(n>3)try{c.event("time_on_page",{page_path:a.pathname,duration_seconds:n,traffic_type:t}),console.log("GA time_on_page event sent:",{timeOnPage:n,path:a.pathname})}catch(o){console.error("Failed to send time_on_page event:",o)}};return window.addEventListener("scroll",r,{passive:!0}),document.addEventListener("click",p),window.addEventListener("beforeunload",w),g.current=!0,()=>{window.removeEventListener("scroll",r),document.removeEventListener("click",p),window.removeEventListener("beforeunload",w)}},[a.pathname,e]),R.jsx(l,{...T})};return f.displayName=`withTracker(${l.displayName||l.name||"Component"})`,f};exports.withTracker=L;

package/dist/esm/layout/Layout.js

@@ -2,15 +2,21 @@ import { jsx as t, jsxs as f } from "react/jsx-runtime";
 import { useState as u, useEffect as m } from "react";
 import { useParams as d, useLocation as g, Navigate as s, Outlet as h } from "react-router";
 import { getComponentByNameIgnoreCase as v } from "../embeddable/index.js";
-import { IntlProvider as C } from "react-intl";
-import { AppContextProvider as w, SettingProvider as I, SettingsConsumer as E } from "@devgateway/wp-react-lib";
-import { Provider as L } from "react-redux";
+import { IntlProvider as w } from "react-intl";
+import { AppContextProvider as C, SettingProvider as I, SettingsConsumer as L } from "@devgateway/wp-react-lib";
+import { Provider as y } from "react-redux";
 import "semantic-ui-react";
 import "../utils/AppMedia.js";
 import "./Footer.js";
 import "./Header.js";
-import { CustomizerWrapper as P } from "./Customizer.js";
-import { Config as y } from "../conf/index.js";
+import { CustomizerWrapper as E } from "./Customizer.js";
+import "./Favicon.js";
+import "clsx";
+import "../utils/semanticUtils.js";
+import "./SearchControl.js";
+import { Config as P } from "../conf/index.js";
+import "./ClassicHeader.js";
+import "./FloatingMenuHeader.js";
 import * as b from "../translations/en.json.js";
 import * as x from "../translations/fr.json.js";
 import * as N from "../translations/af.json.js";
@@ -18,21 +24,16 @@ import * as O from "../translations/am.json.js";
 import { updateIntl as j } from "../lib/react-intl-redux/index.js";
 import "immutable";
 import { store as e } from "../redux/store.js";
-import "./Favicon.js";
-import "clsx";
-import "../utils/semanticUtils.js";
-import "./SearchControl.js";
-import "./ClassicHeader.js";
-import "./FloatingMenuHeader.js";
+import { withTracker as k } from "../tracker/withGoogleAnalytics.js";
 const r = {
   en: b,
   fr: x,
   am: O,
   af: N
-}, Z = () => {
-  const a = d(), p = g(), i = y.DEFAULT_LOCALE, [A, l] = u(!1), o = a.lan, c = p.pathname;
+}, A = () => {
+  const a = d(), p = g(), i = P.DEFAULT_LOCALE, [D, c] = u(!1), o = a.lan, l = p.pathname;
   return m(() => {
-    l(!0), process.env.NODE_ENV === "development" && (console.log("----------.env-----------"), console.log(process.env), console.log("----------.env-----------")), typeof window < "u" && window.setTimeout(() => {
+    c(!0), process.env.NODE_ENV === "development" && (console.log("----------.env-----------"), console.log(process.env), console.log("----------.env-----------")), typeof window < "u" && window.setTimeout(() => {
       if (window.location.hash) {
         const n = document.getElementById(window.location.hash.substring(1));
         n && n.scrollIntoView({ behavior: "auto", block: "start" });
@@ -40,11 +41,11 @@ const r = {
     }, 2e3);
   }, []), m(() => {
     e.dispatch(j({ locale: o, formats: {}, messages: r[o ?? "en"] }));
-  }, [o]), o ? Object.keys(r).includes(o) ? /* @__PURE__ */ t(L, { store: e, children: /* @__PURE__ */ t(C, { locale: o, messages: r[o], children: /* @__PURE__ */ t(w, { getComponent: v, store: e, locale: o, children: /* @__PURE__ */ t(I, { locale: o, changeUUID: null, children: /* @__PURE__ */ f(E, { children: [
-    /* @__PURE__ */ t(P, {}),
+  }, [o]), o ? Object.keys(r).includes(o) ? /* @__PURE__ */ t(y, { store: e, children: /* @__PURE__ */ t(w, { locale: o, messages: r[o], children: /* @__PURE__ */ t(C, { getComponent: v, store: e, locale: o, children: /* @__PURE__ */ t(I, { locale: o, changeUUID: null, children: /* @__PURE__ */ f(L, { children: [
+    /* @__PURE__ */ t(E, {}),
     /* @__PURE__ */ t(h, {})
-  ] }) }) }) }, o) }) : /* @__PURE__ */ t(s, { to: `/${i}${c}`, replace: !0 }) : /* @__PURE__ */ t(s, { to: i, replace: !0 });
-};
+  ] }) }) }) }, o) }) : /* @__PURE__ */ t(s, { to: `/${i}${l}`, replace: !0 }) : /* @__PURE__ */ t(s, { to: i, replace: !0 });
+}, eo = k(A);
 export {
-  Z as default
+  eo as default
 };

package/dist/esm/tracker/InternalTrafficToggle.js

@@ -1,31 +1,31 @@
-import { jsx as n, jsxs as u } from "react/jsx-runtime";
-import { useState as d, useEffect as p } from "react";
-import { useSearchParams as y, useNavigate as S } from "react-router";
-import { validateToken as h, setInternalTrafficCookie as v } from "./internalTrafficUtils.js";
-const w = ({ token: l }) => {
-  const [a] = y(), c = S(), [e, s] = d("validating"), [f, t] = d("Processing...");
-  p(() => {
-    const o = a.get("enable"), b = a.get("k");
-    if (!h(b, l)) {
+import { jsx as o, jsxs as p } from "react/jsx-runtime";
+import { useState as d, useEffect as y } from "react";
+import { useSearchParams as S, useNavigate as h } from "react-router";
+import { validateToken as v, setInternalTrafficCookie as x } from "./internalTrafficUtils.js";
+const M = ({ token: l, redirectTo: c = "/" }) => {
+  const [a] = S(), f = h(), [e, s] = d("validating"), [g, t] = d("Processing...");
+  y(() => {
+    const n = a.get("enable"), u = a.get("k");
+    if (!v(u, l)) {
       s("error"), t("Invalid or missing token. Access denied."), console.error("Invalid token provided for internal traffic toggle");
       return;
     }
-    if (o !== "0" && o !== "1") {
-      s("error"), t("Invalid enable parameter. Use ?enable=0 or ?enable=1"), console.error("Invalid enable parameter:", o);
+    if (n !== "0" && n !== "1") {
+      s("error"), t("Invalid enable parameter. Use ?enable=0 or ?enable=1"), console.error("Invalid enable parameter:", n);
       return;
     }
     try {
-      const r = o === "1";
-      v(r), s("success"), t(
+      const r = n === "1";
+      x(r), s("success"), t(
         r ? "✓ Internal traffic enabled. GA4 events will be tagged as internal." : "✓ Internal traffic disabled. GA4 events will be tagged as external."
       ), console.log(`Internal traffic ${r ? "enabled" : "disabled"} successfully`), setTimeout(() => {
-        c("/");
+        f(c);
       }, 3e3);
     } catch (r) {
       s("error"), t(`Error: ${r instanceof Error ? r.message : "Unknown error"}`), console.error("Error setting internal traffic cookie:", r);
     }
-  }, [a, l, c]);
-  const g = {
+  }, [a, l, f, c]);
+  const m = {
     display: "flex",
     justifyContent: "center",
     alignItems: "center",
@@ -37,7 +37,7 @@ const w = ({ token: l }) => {
     borderRadius: "8px",
     boxShadow: "0 2px 8px rgba(0, 0, 0, 0.1)",
     maxWidth: "500px"
-  }, m = e === "success" ? {
+  }, b = e === "success" ? {
     ...i,
     backgroundColor: "#f0f9ff",
     borderLeft: "4px solid #10b981"
@@ -50,20 +50,20 @@ const w = ({ token: l }) => {
     backgroundColor: "#f3f4f6",
     borderLeft: "4px solid #3b82f6"
   };
-  return /* @__PURE__ */ n("div", { style: g, children: /* @__PURE__ */ u("div", { style: m, children: [
-    /* @__PURE__ */ n("h1", { style: {
+  return /* @__PURE__ */ o("div", { style: m, children: /* @__PURE__ */ p("div", { style: b, children: [
+    /* @__PURE__ */ o("h1", { style: {
       fontSize: "1.5rem",
       fontWeight: "600",
       margin: "0 0 1rem 0",
       color: e === "success" ? "#059669" : e === "error" ? "#dc2626" : "#1f2937"
     }, children: e === "success" ? "Success" : e === "error" ? "Error" : "Processing" }),
-    /* @__PURE__ */ n("p", { style: {
+    /* @__PURE__ */ o("p", { style: {
       fontSize: "1rem",
       margin: "1rem 0",
       color: e === "success" ? "#047857" : e === "error" ? "#991b1b" : "#374151",
       lineHeight: "1.5"
-    }, children: f }),
-    e === "success" && /* @__PURE__ */ n("p", { style: {
+    }, children: g }),
+    e === "success" && /* @__PURE__ */ o("p", { style: {
       fontSize: "0.875rem",
       color: "#6b7280",
       marginTop: "1.5rem",
@@ -72,5 +72,5 @@ const w = ({ token: l }) => {
   ] }) });
 };
 export {
-  w as default
+  M as default
 };

package/dist/esm/tracker/withGoogleAnalytics.js

@@ -1,26 +1,90 @@
-import { jsx as m } from "react/jsx-runtime";
-import d, { useRef as C, useEffect as c } from "react";
-import s from "react-ga4";
-import { useLocation as A } from "react-router";
-import { Config as _ } from "../conf/index.js";
-import { SettingsContext as u } from "@devgateway/wp-react-lib";
-import { isInternalTrafficEnabled as g } from "./internalTrafficUtils.js";
-const f = /* @__PURE__ */ new Set(), z = (p, h = {}) => (l) => {
-  var n;
-  const e = d.useContext(u) ?? {}, t = ((n = e == null ? void 0 : e.data) == null ? void 0 : n.google_analytics_code) ?? _.GA_CODE, i = A(), o = C(!1);
-  return c(() => {
-    t && t !== "#REACT_APP_GA_CODE#" && !o.current && (f.has(t) || (s.initialize(t), f.add(t), console.log("GA initialized with code:", t)), o.current = !0);
-  }, [t]), c(() => {
-    if (t && t !== "#REACT_APP_GA_CODE#" && o.current) {
-      const r = i.pathname, a = g() ? "internal" : "external";
-      s.send({
-        hitType: "pageview",
-        page: r,
-        traffic_type: a
-      }), console.log("GA pageview sent:", { page: r, traffic_type: a });
+import { jsx as P } from "react/jsx-runtime";
+import L, { useRef as f, useEffect as E } from "react";
+import a from "react-ga4";
+import { useLocation as k } from "react-router";
+import { Config as D } from "../conf/index.js";
+import { SettingsContext as O } from "@devgateway/wp-react-lib";
+import { isInternalTrafficEnabled as C } from "./internalTrafficUtils.js";
+const G = /* @__PURE__ */ new Set();
+let c = !1;
+const M = (l) => {
+  const m = (T) => {
+    var _;
+    const s = L.useContext(O) ?? {}, e = ((_ = s == null ? void 0 : s.data) == null ? void 0 : _.google_analytics_code) ?? D.GA_CODE, i = k(), u = f(null), d = f(!1), p = f(!1);
+    if (typeof window < "u" && !c && e && e !== "#REACT_APP_GA_CODE#") {
+      if (!G.has(e))
+        try {
+          a.initialize(e), G.add(e), console.log("GA initialized with code:", e);
+        } catch (t) {
+          console.error("Failed to initialize GA:", t);
+        }
+      c = !0;
     }
-  }, [i.pathname, t]), /* @__PURE__ */ m(p, { ...l });
+    return E(() => {
+      if (typeof window > "u" || !e || e === "#REACT_APP_GA_CODE#" || !c) return;
+      const t = i.pathname;
+      if (u.current !== t) {
+        u.current = t, d.current = !1;
+        try {
+          const r = C() ? "internal" : "external";
+          a.event("page_view", {
+            page_path: t,
+            traffic_type: r
+          }), console.log("GA pageview sent:", { page: t, traffic_type: r });
+        } catch (r) {
+          console.error("Failed to send pageview:", r);
+        }
+      }
+    }, [i.pathname, e]), E(() => {
+      if (typeof window > "u" || !e || e === "#REACT_APP_GA_CODE#" || !c || p.current) return;
+      const t = C() ? "internal" : "external", r = () => {
+        if (d.current) return;
+        const n = Math.round(
+          window.scrollY / (document.documentElement.scrollHeight - window.innerHeight) * 100
+        );
+        if (n > 10)
+          try {
+            a.event("scroll", {
+              engagement_type: "scroll",
+              scroll_depth: n,
+              traffic_type: t
+            }), console.log("GA scroll event sent:", { scrollPercentage: n, traffic_type: t }), d.current = !0;
+          } catch (o) {
+            console.error("Failed to send scroll event:", o);
+          }
+      }, g = (n) => {
+        var A;
+        const o = n.target, h = ((A = o.textContent) == null ? void 0 : A.substring(0, 50)) || "", v = o.id || "", y = o.className || "";
+        if (!(!h && !v && !y))
+          try {
+            a.event("element_click", {
+              element_id: v,
+              element_class: y,
+              element_text: h.substring(0, 50),
+              traffic_type: t
+            });
+          } catch {
+          }
+      }, x = Date.now(), w = () => {
+        const n = Math.round((Date.now() - x) / 1e3);
+        if (n > 3)
+          try {
+            a.event("time_on_page", {
+              page_path: i.pathname,
+              duration_seconds: n,
+              traffic_type: t
+            }), console.log("GA time_on_page event sent:", { timeOnPage: n, path: i.pathname });
+          } catch (o) {
+            console.error("Failed to send time_on_page event:", o);
+          }
+      };
+      return window.addEventListener("scroll", r, { passive: !0 }), document.addEventListener("click", g), window.addEventListener("beforeunload", w), p.current = !0, () => {
+        window.removeEventListener("scroll", r), document.removeEventListener("click", g), window.removeEventListener("beforeunload", w);
+      };
+    }, [i.pathname, e]), /* @__PURE__ */ P(l, { ...T });
+  };
+  return m.displayName = `withTracker(${l.displayName || l.name || "Component"})`, m;
 };
 export {
-  z as withTracker
+  M as withTracker
 };

package/dist/types/layout/Layout.d.ts

@@ -1,3 +1,6 @@
 import { default as React } from 'react';
-declare const RootLayout: () => React.JSX.Element;
-export default RootLayout;
+declare const _default: {
+    (props: Record<string, any>): React.JSX.Element;
+    displayName: string;
+};
+export default _default;

package/dist/types/tracker/InternalTrafficToggle.d.ts

@@ -1,6 +1,7 @@
 import { default as React } from 'react';
 interface InternalTrafficToggleProps {
     token: string;
+    redirectTo?: string;
 }
 declare const InternalTrafficToggle: React.FC<InternalTrafficToggleProps>;
 export default InternalTrafficToggle;

package/dist/types/tracker/withGoogleAnalytics.d.ts

@@ -1,6 +1,5 @@
 import { default as React } from 'react';
-export interface WithGoogleAnalyticsProps {
-    WrappedComponent: React.ComponentType<any>;
-    options?: any;
-}
-export declare const withTracker: <T extends WithGoogleAnalyticsProps>(WrappedComponent: React.ComponentType<T>, options?: {}) => (props: T) => React.JSX.Element;
+export declare const withTracker: <P extends Record<string, any>>(WrappedComponent: React.ComponentType<P>) => {
+    (props: P): React.JSX.Element;
+    displayName: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devgateway/dvz-ui-react",
-  "version": "1.6.14",
+  "version": "1.6.16",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -122,7 +122,7 @@
     "vite-plugin-env-compatible": "^2.0.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "^5.1.4",
-    "@devgateway/wp-react-lib": "0.6.1"
+    "@devgateway/wp-react-lib": "0.5.1"
   },
   "peerDependencies": {
     "react": "^18.3.1",