@devgateway/dvz-ui-react 1.6.15 → 1.6.17

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"),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");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: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;
+"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/withGoogleAnalytics.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("react/jsx-runtime"),t=require("react"),u=require("react-ga4"),g=require("react-router"),C=require("../conf/index.js"),w=require("@devgateway/wp-react-lib"),A=require("./internalTrafficUtils.js"),f=new Set,_=(l,y={})=>d=>{var a;const r=t.useContext(w.SettingsContext)??{},e=((a=r==null?void 0:r.data)==null?void 0:a.google_analytics_code)??C.Config.GA_CODE,o=g.useLocation(),i=t.useRef(!1),c=t.useRef(null);return t.useEffect(()=>{typeof window>"u"||!e||e==="#REACT_APP_GA_CODE#"||i.current||(f.has(e)||(u.initialize(e),f.add(e),console.log("GA initialized with code:",e)),i.current=!0)},[e]),t.useEffect(()=>{if(typeof window>"u"||!e||e==="#REACT_APP_GA_CODE#"||!i.current)return;const n=o.pathname;if(c.current===n)return;c.current=n;const s=A.isInternalTrafficEnabled()?"internal":"external";u.send({hitType:"pageview",page:n,traffic_type:s}),console.log("GA pageview sent:",{page:n,traffic_type:s})},[o.pathname,e]),p.jsx(l,{...d})};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

@@ -10,7 +10,13 @@ import "../utils/AppMedia.js";
 import "./Footer.js";
 import "./Header.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";
@@ -19,12 +25,6 @@ import { updateIntl as j } from "../lib/react-intl-redux/index.js";
 import "immutable";
 import { store as e } from "../redux/store.js";
 import { withTracker as k } from "../tracker/withGoogleAnalytics.js";
-import "./Favicon.js";
-import "clsx";
-import "../utils/semanticUtils.js";
-import "./SearchControl.js";
-import "./ClassicHeader.js";
-import "./FloatingMenuHeader.js";
 const r = {
   en: b,
   fr: x,

package/dist/esm/tracker/withGoogleAnalytics.js

@@ -1,28 +1,90 @@
-import { jsx as m } from "react/jsx-runtime";
-import C, { useRef as c, useEffect as s } from "react";
-import u from "react-ga4";
-import { useLocation as A } from "react-router";
-import { Config as _ } from "../conf/index.js";
-import { SettingsContext as g } from "@devgateway/wp-react-lib";
-import { isInternalTrafficEnabled as w } from "./internalTrafficUtils.js";
-const p = /* @__PURE__ */ new Set(), z = (l, h = {}) => (d) => {
-  var a;
-  const n = C.useContext(g) ?? {}, t = ((a = n == null ? void 0 : n.data) == null ? void 0 : a.google_analytics_code) ?? _.GA_CODE, i = A(), r = c(!1), o = c(null);
-  return s(() => {
-    typeof window > "u" || !t || t === "#REACT_APP_GA_CODE#" || r.current || (p.has(t) || (u.initialize(t), p.add(t), console.log("GA initialized with code:", t)), r.current = !0);
-  }, [t]), s(() => {
-    if (typeof window > "u" || !t || t === "#REACT_APP_GA_CODE#" || !r.current) return;
-    const e = i.pathname;
-    if (o.current === e) return;
-    o.current = e;
-    const f = w() ? "internal" : "external";
-    u.send({
-      hitType: "pageview",
-      page: e,
-      traffic_type: f
-    }), console.log("GA pageview sent:", { page: e, traffic_type: f });
-  }, [i.pathname, t]), /* @__PURE__ */ m(l, { ...d });
+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;
+    }
+    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,2 @@
-import { default as React } from 'react';
-declare const _default: (props: import('../tracker').WithGoogleAnalyticsProps) => React.JSX.Element;
+declare const _default: any;
 export default _default;

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

@@ -1,6 +1,2 @@
 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>) => React.ComponentType<P>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devgateway/dvz-ui-react",
-  "version": "1.6.15",
+  "version": "1.6.17",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",