@devgateway/dvz-ui-react 1.6.16 → 1.6.18

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");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;
+"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;

package/dist/cjs/tracker/withGoogleAnalytics.js

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

package/dist/esm/layout/Layout.js

@@ -2,21 +2,15 @@ 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 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 { 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 "semantic-ui-react";
 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 { CustomizerWrapper as P } from "./Customizer.js";
+import { Config as y } from "../conf/index.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";
@@ -24,16 +18,21 @@ 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 { 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,
   am: O,
   af: N
-}, A = () => {
-  const a = d(), p = g(), i = P.DEFAULT_LOCALE, [D, c] = u(!1), o = a.lan, l = p.pathname;
+}, Z = () => {
+  const a = d(), p = g(), i = y.DEFAULT_LOCALE, [A, l] = u(!1), o = a.lan, c = p.pathname;
   return m(() => {
-    c(!0), process.env.NODE_ENV === "development" && (console.log("----------.env-----------"), console.log(process.env), console.log("----------.env-----------")), typeof window < "u" && window.setTimeout(() => {
+    l(!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" });
@@ -41,11 +40,11 @@ const r = {
     }, 2e3);
   }, []), m(() => {
     e.dispatch(j({ locale: o, formats: {}, messages: r[o ?? "en"] }));
-  }, [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, {}),
+  }, [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, {}),
     /* @__PURE__ */ t(h, {})
-  ] }) }) }) }, o) }) : /* @__PURE__ */ t(s, { to: `/${i}${l}`, replace: !0 }) : /* @__PURE__ */ t(s, { to: i, replace: !0 });
-}, eo = k(A);
+  ] }) }) }) }, o) }) : /* @__PURE__ */ t(s, { to: `/${i}${c}`, replace: !0 }) : /* @__PURE__ */ t(s, { to: i, replace: !0 });
+};
 export {
-  eo as default
+  Z as default
 };

package/dist/esm/tracker/withGoogleAnalytics.js

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

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

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

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

@@ -1,5 +1,2 @@
 import { default as React } from 'react';
-export declare const withTracker: <P extends Record<string, any>>(WrappedComponent: React.ComponentType<P>) => {
-    (props: P): React.JSX.Element;
-    displayName: string;
-};
+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.16",
+  "version": "1.6.18",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",