@dotcms/analytics 1.2.0 → 1.2.1-next.2

package/lib/core/shared/queue/dot-analytics.queue.utils.js

@@ -1,40 +1,51 @@
-import p from "@analytics/queue-utils";
-import { DEFAULT_QUEUE_CONFIG as c } from "../constants/dot-content-analytics.constants.js";
-import { sendAnalyticsEvent as y } from "../dot-content-analytics.http.js";
-const z = (n) => {
-  let e = null, i = null, o = "fetch";
-  const l = {
-    ...c,
-    ...typeof n.queue == "object" ? n.queue : {}
-  }, f = (t) => {
-    if (!i) return;
-    n.debug && console.log(`DotCMS Analytics Queue: Sending batch of ${t.length} event(s)`, {
-      events: t,
-      transport: o
-    }), y({ context: i, events: t }, n, o);
-  }, u = () => {
-    !e || e.size() === 0 || !i || (n.debug && console.warn(
-      `DotCMS Analytics: Flushing ${e.size()} events (page hidden/unload)`
-    ), o = "beacon", e.flush(!0));
-  }, d = () => {
-    document.visibilityState === "hidden" && u();
+import m from "@analytics/queue-utils";
+import v from "@analytics/router-utils";
+import { DEFAULT_QUEUE_CONFIG as y } from "../constants/dot-analytics.constants.js";
+import { sendAnalyticsEvent as b } from "../http/dot-analytics.http.js";
+import { createPluginLogger as w } from "../utils/dot-analytics.utils.js";
+const L = (u) => {
+  const i = w("Queue", u);
+  let t = null, n = null, o = !1, d = !1, f = typeof window < "u" ? window.location.pathname : "";
+  const a = {
+    ...y,
+    ...typeof u.queue == "object" ? u.queue : {}
+  }, g = (e, s) => {
+    if (!n) return;
+    i.debug(`Sending batch of ${e.length} event(s)`, {
+      events: e,
+      keepalive: o
+    }), b({ context: n, events: e }, u, o);
+  }, l = () => {
+    !t || t.size() === 0 || !n || (i.info(`Flushing ${t.size()} events (page hidden/unload)`), o = !0, t.flush(!0));
+  }, c = () => {
+    if (i.debug("handleVisibilityChange", document.visibilityState), document.visibilityState === "hidden") {
+      if (d) {
+        i.debug("Skipping flush (SPA navigation detected)");
+        return;
+      }
+      l();
+    } else document.visibilityState === "visible" && (d = !1);
   };
   return {
     /**
      * Initialize the queue with smart batching
      */
     initialize: () => {
-      e = p(
-        (t) => {
-          f(t);
+      t = m(
+        (e, s) => {
+          g(e);
         },
         {
-          max: l.eventBatchSize,
-          interval: l.flushInterval,
+          max: a.eventBatchSize,
+          interval: a.flushInterval,
           throttle: !1
           // Always false - enables both batch size and interval triggers
         }
-      ), typeof window < "u" && typeof document < "u" && (document.addEventListener("visibilitychange", d), window.addEventListener("pagehide", u));
+      ), typeof window < "u" && typeof document < "u" && (document.addEventListener("visibilitychange", c), window.addEventListener("pagehide", l), v((e) => {
+        d = !0, f = e, i.debug(`SPA navigation detected (${f})`), setTimeout(() => {
+          d = !1;
+        }, 100);
+      }));
     },
     /**
      * Add event to queue
@@ -42,32 +53,28 @@ const z = (n) => {
      * - Sends immediately when eventBatchSize reached (with throttle: false)
      * - Sends pending events every flushInterval
      */
-    enqueue: (t, s) => {
-      if (i = s, !!e) {
-        if (n.debug) {
-          const a = e.size() + 1, r = l.eventBatchSize ?? c.eventBatchSize, h = a >= r;
-          console.log(
-            `DotCMS Analytics Queue: Event added. Queue size: ${a}/${r}${h ? " (full, sending...)" : ""}`,
-            { eventType: t.event_type, event: t }
-          );
-        }
-        e.push(t);
-      }
+    enqueue: (e, s) => {
+      if (n = s, !t) return;
+      const r = t.size() + 1, p = a.eventBatchSize, h = r >= p;
+      i.debug(
+        `Event added. Queue size: ${r}/${p}${h ? " (full, sending...)" : ""}`,
+        { eventType: e.event_type, event: e }
+      ), t.push(e);
     },
     /**
      * Get queue size for debugging
      * Returns the number of events in smartQueue
      */
-    size: () => (e == null ? void 0 : e.size()) ?? 0,
+    size: () => t?.size() ?? 0,
     /**
      * Clean up queue resources
      * Flushes remaining events and cleans up listeners
      */
     cleanup: () => {
-      u(), typeof window < "u" && typeof document < "u" && (document.removeEventListener("visibilitychange", d), window.removeEventListener("pagehide", u)), e = null, i = null, o = "fetch";
+      l(), typeof window < "u" && typeof document < "u" && (document.removeEventListener("visibilitychange", c), window.removeEventListener("pagehide", l)), t = null, n = null, o = !1;
     }
   };
 };
 export {
-  z as createAnalyticsQueue
+  L as createAnalyticsQueue
 };

package/lib/core/shared/{dot-content-analytics.utils.d.ts → utils/dot-analytics.utils.d.ts}

@@ -1,6 +1,27 @@
-import { PageData } from 'analytics';
-import { AnalyticsBasePayloadWithContext, DotCMSAnalyticsConfig, DotCMSAnalyticsEventContext, DotCMSBrowserData, DotCMSEventDeviceData, DotCMSEventUtmData, EnrichedAnalyticsPayload } from './models';
-export { cleanupActivityTracking, getLastActivity, getSessionInfo, initializeActivityTracking, isUserInactive, updateSessionActivity } from './dot-content-analytics.activity-tracker';
+import { AnalyticsPlugin, PageData } from 'analytics';
+import { DotCMSPredefinedEventType } from '../constants';
+import { DotLogger, LogLevel } from '../dot-analytics.logger';
+import { AnalyticsBasePayloadWithContext, ContentletData, DotCMSAnalyticsConfig, DotCMSAnalyticsEventContext, DotCMSBrowserData, DotCMSEventDeviceData, DotCMSEventUtmData, EnrichedAnalyticsPayload } from '../models';
+export { cleanupActivityTracking, initializeActivityTracking, updateSessionActivity } from '../../plugin/identity/dot-analytics.identity.activity-tracker';
+/**
+ * Type guard to check if an event is a predefined event type.
+ * Enables TypeScript type narrowing for better type safety.
+ *
+ * @param event - Event name to check
+ * @returns True if event is a predefined type, false for custom events
+ *
+ * @example
+ * ```typescript
+ * if (isPredefinedEventType(eventName)) {
+ *   // TypeScript knows eventName is DotCMSPredefinedEventType here
+ *   console.log('Predefined event:', eventName);
+ * } else {
+ *   // TypeScript knows eventName is string (custom) here
+ *   console.log('Custom event:', eventName);
+ * }
+ * ```
+ */
+export declare function isPredefinedEventType(event: string): event is DotCMSPredefinedEventType;
 /**
  * Validates required configuration fields for Analytics initialization.
  *
@@ -170,3 +191,70 @@ export declare const enrichPagePayload: (payload: {
         properties: Record<string, unknown>;
     };
 };
+/**
+ * Creates a throttled version of a callback function
+ * Ensures the callback is executed at most once every `limitMs` milliseconds
+ * @param callback - The function to throttle
+ * @param limitMs - The time limit in milliseconds
+ * @returns A throttled function
+ */
+export declare function createThrottle<T extends (...args: unknown[]) => void>(callback: T, limitMs: number): (...args: Parameters<T>) => void;
+/**
+ * Extracts the contentlet identifier from a DOM element
+ * @param element - The HTML element containing data attributes
+ * @returns The contentlet identifier or null if not found
+ */
+export declare function extractContentletIdentifier(element: HTMLElement): string | null;
+/**
+ * Extracts all contentlet data from a DOM element's data attributes
+ * @param element - The HTML element containing data attributes
+ * @returns Complete contentlet data object
+ */
+export declare function extractContentletData(element: HTMLElement): ContentletData;
+/**
+ * Initial scan delay for DOM readiness
+ * Allows React/Next.js to finish rendering before scanning for contentlets
+ */
+export declare const INITIAL_SCAN_DELAY_MS = 100;
+/**
+ * Checks if code is running in a browser environment
+ * @returns true if window and document are available
+ */
+export declare const isBrowser: () => boolean;
+/**
+ * Finds all contentlet elements in the DOM
+ * @returns Array of contentlet HTMLElements
+ */
+export declare const findContentlets: () => HTMLElement[];
+/**
+ * Creates a MutationObserver that watches for contentlet changes in the DOM
+ * @param callback - Function to call when mutations are detected
+ * @param debounceMs - Debounce time in milliseconds (default: 250ms)
+ * @returns Configured and active MutationObserver
+ */
+export declare const createContentletObserver: (callback: () => void, debounceMs?: number) => MutationObserver;
+/**
+ * Sets up cleanup handlers for page unload events
+ * Registers cleanup function to both 'beforeunload' and 'pagehide' for maximum compatibility
+ * @param cleanup - Function to call on page unload
+ */
+export declare const setupPluginCleanup: (cleanup: () => void) => void;
+/**
+ * Creates a logger with plugin-specific prefix and configurable log level
+ * @param pluginName - Name of the plugin (e.g., 'Click', 'Impression')
+ * @param config - Analytics configuration with debug flag and optional logLevel
+ * @returns DotLogger instance with configured log level
+ */
+export declare const createPluginLogger: (pluginName: string, config: {
+    debug: boolean;
+    logLevel?: LogLevel;
+}) => DotLogger;
+/**
+ * Gets enhanced tracking plugins based on configuration
+ * Returns content impression and click tracking plugins if enabled
+ * @param config - Analytics configuration
+ * @param impressionPlugin - Impression tracking plugin factory
+ * @param clickPlugin - Click tracking plugin factory
+ * @returns Array of enabled tracking plugins
+ */
+export declare const getEnhancedTrackingPlugins: (config: DotCMSAnalyticsConfig, impressionPlugin: (config: DotCMSAnalyticsConfig) => AnalyticsPlugin, clickPlugin: (config: DotCMSAnalyticsConfig) => AnalyticsPlugin) => AnalyticsPlugin[];

package/lib/core/shared/utils/dot-analytics.utils.js

@@ -0,0 +1,200 @@
+import { ANALYTICS_JS_DEFAULT_PROPERTIES as _, SESSION_STORAGE_KEY as g, DEFAULT_SESSION_TIMEOUT_MINUTES as p, USER_ID_KEY as m, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as T, EXPECTED_UTM_KEYS as y, ANALYTICS_CONTENTLET_CLASS as h } from "../constants/dot-analytics.constants.js";
+import { DotLogger as I } from "../dot-analytics.logger.js";
+import "../../../../uve/src/internal/constants.js";
+function P(t) {
+  const e = [];
+  return t.siteAuth?.trim() || e.push('"siteAuth"'), t.server?.trim() || e.push('"server"'), e.length > 0 ? e : null;
+}
+let d = null, u = null;
+const l = (t) => {
+  const e = Date.now(), n = Math.random().toString(36).substr(2, 9), s = Math.random().toString(36).substr(2, 9);
+  return `${t}_${e}_${n}${s}`;
+}, f = {
+  getItem: (t) => {
+    try {
+      return localStorage.getItem(t);
+    } catch {
+      return null;
+    }
+  },
+  setItem: (t, e) => {
+    try {
+      localStorage.setItem(t, e);
+    } catch {
+      console.warn(`DotCMS Analytics [Core]: Could not save ${t} to localStorage`);
+    }
+  }
+}, D = () => {
+  let t = f.getItem(m);
+  return t || (t = l("user"), f.setItem(m, t)), t;
+}, E = (t) => {
+  const e = new Date(t), n = /* @__PURE__ */ new Date(), s = new Date(
+    e.getUTCFullYear(),
+    e.getUTCMonth(),
+    e.getUTCDate()
+  ), r = new Date(n.getUTCFullYear(), n.getUTCMonth(), n.getUTCDate());
+  return s.getTime() !== r.getTime();
+}, A = () => {
+  const t = Date.now();
+  if (typeof window > "u")
+    return l("session_fallback");
+  try {
+    const e = sessionStorage.getItem(g);
+    if (e) {
+      const { sessionId: r, startTime: o, lastActivity: a } = JSON.parse(e), i = !E(o), c = t - a < p * 60 * 1e3;
+      if (i && c)
+        return sessionStorage.setItem(
+          g,
+          JSON.stringify({
+            sessionId: r,
+            startTime: o,
+            lastActivity: t
+          })
+        ), r;
+    }
+    const n = l("session"), s = {
+      sessionId: n,
+      startTime: t,
+      lastActivity: t
+    };
+    return sessionStorage.setItem(g, JSON.stringify(s)), n;
+  } catch {
+    return l("session_fallback");
+  }
+}, R = (t) => {
+  const e = A(), n = D(), s = C();
+  return {
+    site_auth: t.siteAuth,
+    session_id: e,
+    user_id: n,
+    device: s
+  };
+}, w = () => d || (d = {
+  user_language: navigator.language,
+  doc_encoding: document.characterSet || document.charset,
+  screen_resolution: typeof screen < "u" && screen.width && screen.height ? `${screen.width}x${screen.height}` : ""
+}, d), C = () => {
+  const t = w(), e = window.innerWidth || document.documentElement.clientWidth || 0, n = window.innerHeight || document.documentElement.clientHeight || 0;
+  return {
+    screen_resolution: t.screen_resolution ?? "",
+    language: t.user_language ?? "",
+    viewport_width: String(e),
+    viewport_height: String(n)
+  };
+}, v = (t) => {
+  const e = t.search;
+  if (u && u.search === e)
+    return u.params;
+  const n = new URLSearchParams(e), s = {};
+  return y.forEach((r) => {
+    const o = n.get(r);
+    if (o) {
+      const a = r.replace("utm_", "");
+      s[a] = o;
+    }
+  }), u = { search: e, params: s }, s;
+}, O = () => {
+  try {
+    const t = (/* @__PURE__ */ new Date()).getTimezoneOffset(), e = t > 0 ? "-" : "+", n = Math.abs(t), s = Math.floor(n / 60), r = n % 60;
+    return `${e}${s.toString().padStart(2, "0")}:${r.toString().padStart(2, "0")}`;
+  } catch {
+    return "+00:00";
+  }
+}, N = () => {
+  try {
+    const t = /* @__PURE__ */ new Date(), e = O(), n = t.getFullYear(), s = (t.getMonth() + 1).toString().padStart(2, "0"), r = t.getDate().toString().padStart(2, "0"), o = t.getHours().toString().padStart(2, "0"), a = t.getMinutes().toString().padStart(2, "0"), i = t.getSeconds().toString().padStart(2, "0");
+    return `${n}-${s}-${r}T${o}:${a}:${i}${e}`;
+  } catch {
+    return (/* @__PURE__ */ new Date()).toISOString();
+  }
+}, Y = (t, e = typeof window < "u" ? window.location : {}) => {
+  const n = N(), s = w(), { properties: r } = t, o = {};
+  Object.keys(r).forEach((c) => {
+    _.includes(c) || (o[c] = r[c]);
+  });
+  const a = {
+    url: e.href,
+    doc_encoding: s.doc_encoding,
+    doc_hash: e.hash,
+    doc_protocol: e.protocol,
+    doc_search: e.search,
+    doc_host: e.hostname,
+    doc_path: e.pathname,
+    title: r.title ?? document?.title
+  }, i = v(e);
+  return {
+    ...t,
+    page: a,
+    ...Object.keys(i).length > 0 && { utm: i },
+    // Only include custom if there are user-provided properties
+    ...Object.keys(o).length > 0 && { custom: o },
+    local_time: n
+  };
+};
+function b(t, e) {
+  let n = 0;
+  return (...s) => {
+    const r = Date.now();
+    r - n >= e && (t(...s), n = r);
+  };
+}
+function x(t) {
+  return t.dataset.dotAnalyticsIdentifier || null;
+}
+function B(t) {
+  return {
+    identifier: t.dataset.dotAnalyticsIdentifier || "",
+    inode: t.dataset.dotAnalyticsInode || "",
+    contentType: t.dataset.dotAnalyticsContenttype || "",
+    title: t.dataset.dotAnalyticsTitle || "",
+    baseType: t.dataset.dotAnalyticsBasetype || ""
+  };
+}
+const F = 100, M = () => typeof window < "u" && typeof document < "u", k = () => Array.from(document.querySelectorAll(`.${h}`)), z = (t, e = T) => {
+  const n = b(t, e), s = new MutationObserver((r) => {
+    r.some((a) => a.addedNodes.length === 0 && a.removedNodes.length === 0 ? !1 : [
+      ...Array.from(a.addedNodes),
+      ...Array.from(a.removedNodes)
+    ].some((c) => {
+      if (c.nodeType !== Node.ELEMENT_NODE)
+        return !1;
+      const S = c;
+      return S.classList?.contains(h) ? !0 : S.querySelector?.(`.${h}`) !== null;
+    })) && n();
+  });
+  return s.observe(document.body, {
+    childList: !0,
+    subtree: !0,
+    attributes: !1,
+    characterData: !1
+  }), s;
+}, H = (t) => {
+  M() && (window.addEventListener("beforeunload", t), window.addEventListener("pagehide", t));
+}, J = (t, e) => {
+  const n = e.logLevel ?? (e.debug ? "debug" : "warn");
+  return new I("Analytics", t, n);
+}, K = (t, e, n) => [
+  t.impressions && e(t),
+  t.clicks && n(t)
+].filter(Boolean);
+export {
+  F as INITIAL_SCAN_DELAY_MS,
+  z as createContentletObserver,
+  J as createPluginLogger,
+  b as createThrottle,
+  Y as enrichPagePayloadOptimized,
+  B as extractContentletData,
+  x as extractContentletIdentifier,
+  v as extractUTMParameters,
+  k as findContentlets,
+  l as generateSecureId,
+  R as getAnalyticsContext,
+  C as getDeviceDataForContext,
+  K as getEnhancedTrackingPlugins,
+  N as getLocalTime,
+  A as getSessionId,
+  D as getUserId,
+  M as isBrowser,
+  H as setupPluginCleanup,
+  P as validateAnalyticsConfig
+};

package/lib/react/hook/useContentAnalytics.js

@@ -1,27 +1,33 @@
-import { useMemo as n, useCallback as o } from "react";
-import { getUVEState as u } from "../../../uve/src/lib/core/core.utils.js";
+import { useMemo as s, useCallback as o } from "react";
+import { getUVEState as l } from "../../../uve/src/lib/core/core.utils.js";
 import "../../../uve/src/internal/constants.js";
-import { initializeAnalytics as l } from "../internal/utils.js";
-const h = (r) => {
-  const t = n(() => l(r), [r.server, r.siteAuth]), e = n(() => !!u(), []);
+import { initializeAnalytics as m } from "../internal/utils.js";
+const h = (i) => {
+  const t = s(() => m(i), [i.server, i.siteAuth]), e = s(() => !!l(), []);
   if (!t)
     throw new Error(
       "DotCMS Analytics: Failed to initialize. Please verify the required configuration (server and siteAuth)."
     );
   const a = o(
-    (i, c = {}) => {
-      e || t.track(i, c);
+    (r, n = {}) => {
+      e || t.track(r, n);
     },
     [t, e]
-  ), s = o(
-    (i = {}) => {
-      e || t.pageView(i);
+  ), c = o(
+    (r = {}) => {
+      e || t.pageView(r);
+    },
+    [t, e]
+  ), u = o(
+    (r, n = {}) => {
+      e || t.conversion(r, n);
     },
     [t, e]
   );
   return {
     track: a,
-    pageView: s
+    pageView: c,
+    conversion: u
   };
 };
 export {

package/lib/react/hook/useRouterTracker.js

@@ -1,18 +1,18 @@
-import { usePathname as u, useSearchParams as p } from "next/navigation";
-import { useRef as c, useEffect as m } from "react";
-import { getUVEState as s } from "../../../uve/src/lib/core/core.utils.js";
+import { usePathname as s, useSearchParams as u } from "next/navigation";
+import { useRef as c, useEffect as a } from "react";
+import { getUVEState as m } from "../../../uve/src/lib/core/core.utils.js";
 import "../../../uve/src/internal/constants.js";
-const g = (e, t) => `${e}${t != null && t.toString() ? "?" + t.toString() : ""}`;
-function A(e, t = !1) {
-  const o = c(null), n = u(), r = p();
-  m(() => {
-    if (!e) return;
+const p = (t, e) => `${t}${e?.toString() ? "?" + e.toString() : ""}`;
+function l(t, e = !1) {
+  const r = c(null), o = s(), n = u();
+  a(() => {
+    if (!t) return;
     const i = (f) => {
-      s() || f !== o.current && (o.current = f, e.pageView());
+      m() || f !== r.current && (r.current = f, t.pageView());
     };
-    t && console.info("DotContentAnalytics: using Next.js App Router tracking"), i(g(n, r));
-  }, [e, n, r, t]);
+    e && console.info("DotCMS Analytics [React]: using Next.js App Router tracking"), i(p(o, n));
+  }, [t, o, n, e]);
 }
 export {
-  A as useRouterTracker
+  l as useRouterTracker
 };

package/lib/react/internal/utils.js

@@ -1,4 +1,4 @@
-import { initializeContentAnalytics as r } from "../../core/dot-content-analytics.js";
+import { initializeContentAnalytics as r } from "../../core/dot-analytics.content.js";
 let t, i;
 const s = (e) => (i && (i.server !== e.server || i.siteAuth !== e.siteAuth) && (t = void 0), t !== void 0 || (i = e, t = r(e)), t);
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcms/analytics",
-  "version": "1.2.0",
+  "version": "1.2.1-next.2",
   "description": "Official JavaScript library for Content Analytics with DotCMS.",
   "repository": {
     "type": "git",
@@ -20,20 +20,21 @@
   },
   "homepage": "https://github.com/dotCMS/core/tree/main/core-web/libs/sdk/analytics/README.md",
   "dependencies": {
-    "analytics": "^0.8.0",
     "@analytics/core": "^0.13.0",
-    "@analytics/storage-utils": "^0.4.0",
     "@analytics/queue-utils": "^0.1.3",
-    "@dotcms/uve": "latest"
+    "@analytics/router-utils": "^0.1.1",
+    "@analytics/storage-utils": "^0.4.0",
+    "@dotcms/uve": "latest",
+    "analytics": "^0.8.0"
   },
   "peerDependencies": {
     "react": "^18 || ^19"
   },
   "devDependencies": {
+    "@dotcms/types": "latest",
     "@testing-library/jest-dom": "^6.1.6",
     "@testing-library/react": "^14.0.0",
-    "vite": "~5.0.0",
-    "@dotcms/types": "latest"
+    "vite": "~5.0.0"
   },
   "main": "./index.js",
   "module": "./index.js",

package/uve/src/internal/events.js

@@ -1,7 +1,7 @@
 import { UVEEventType as a } from "../../../types/src/lib/editor/public.js";
 import { __DOTCMS_UVE_EVENT__ as s } from "../../../types/src/lib/events/internal.js";
-import { findDotCMSElement as M, findDotCMSVTLData as p, getClosestDotCMSContainerData as w, getDotCMSPageBounds as S } from "../lib/dom/dom.utils.js";
-function U(o) {
+import { findDotCMSElement as u, findDotCMSVTLData as C, getClosestDotCMSContainerData as g, getDotCMSPageBounds as v } from "../lib/dom/dom.utils.js";
+function O(o) {
   const t = (n) => {
     n.data.name === s.UVE_SET_PAGE_DATA && o(n.data.payload);
   };
@@ -12,7 +12,7 @@ function U(o) {
     event: a.CONTENT_CHANGES
   };
 }
-function V(o) {
+function b(o) {
   const t = (n) => {
     n.data.name === s.UVE_RELOAD_PAGE && o();
   };
@@ -23,12 +23,12 @@ function V(o) {
     event: a.PAGE_RELOAD
   };
 }
-function I(o) {
+function M(o) {
   const t = (n) => {
     if (n.data.name === s.UVE_REQUEST_BOUNDS) {
       const e = Array.from(
         document.querySelectorAll('[data-dot-object="container"]')
-      ), i = S(e);
+      ), i = v(e);
       o(i);
     }
   };
@@ -39,7 +39,7 @@ function I(o) {
     event: a.REQUEST_BOUNDS
   };
 }
-function Y(o) {
+function p(o) {
   const t = (n) => {
     if (n.data.name === s.UVE_SCROLL_INSIDE_IFRAME) {
       const e = n.data.direction;
@@ -53,12 +53,11 @@ function Y(o) {
     event: a.IFRAME_SCROLL
   };
 }
-function B(o) {
+function w(o) {
   const t = (n) => {
-    var d, r, E, c, T, l, m, _, u, C;
-    const e = M(n.target);
+    const e = u(n.target);
     if (!e) return;
-    const { x: i, y: g, width: v, height: N } = e.getBoundingClientRect(), f = ((d = e.dataset) == null ? void 0 : d.dotObject) === "container", L = {
+    const { x: i, y: d, width: r, height: E } = e.getBoundingClientRect(), c = e.dataset?.dotObject === "container", T = {
       identifier: "TEMP_EMPTY_CONTENTLET",
       title: "TEMP_EMPTY_CONTENTLET",
       contentType: "TEMP_EMPTY_CONTENTLET_TYPE",
@@ -66,29 +65,29 @@ function B(o) {
       widgetTitle: "TEMP_EMPTY_CONTENTLET",
       baseType: "TEMP_EMPTY_CONTENTLET",
       onNumberOfPages: 1
-    }, P = {
-      identifier: (r = e.dataset) == null ? void 0 : r.dotIdentifier,
-      title: (E = e.dataset) == null ? void 0 : E.dotTitle,
-      inode: (c = e.dataset) == null ? void 0 : c.dotInode,
-      contentType: (T = e.dataset) == null ? void 0 : T.dotType,
-      baseType: (l = e.dataset) == null ? void 0 : l.dotBasetype,
-      widgetTitle: (m = e.dataset) == null ? void 0 : m.dotWidgetTitle,
-      onNumberOfPages: (_ = e.dataset) == null ? void 0 : _.dotOnNumberOfPages
-    }, O = p(e), b = {
+    }, l = {
+      identifier: e.dataset?.dotIdentifier,
+      title: e.dataset?.dotTitle,
+      inode: e.dataset?.dotInode,
+      contentType: e.dataset?.dotType,
+      baseType: e.dataset?.dotBasetype,
+      widgetTitle: e.dataset?.dotWidgetTitle,
+      onNumberOfPages: e.dataset?.dotOnNumberOfPages
+    }, m = C(e), _ = {
       container: (
         // Here extract dot-container from contentlet if it is Headless
         // or search in parent container if it is VTL
-        (u = e.dataset) != null && u.dotContainer ? JSON.parse((C = e.dataset) == null ? void 0 : C.dotContainer) : w(e)
+        e.dataset?.dotContainer ? JSON.parse(e.dataset?.dotContainer) : g(e)
       ),
-      contentlet: f ? L : P,
-      vtlFiles: O
+      contentlet: c ? T : l,
+      vtlFiles: m
     };
     o({
       x: i,
-      y: g,
-      width: v,
-      height: N,
-      payload: b
+      y: d,
+      width: r,
+      height: E,
+      payload: _
     });
   };
   return document.addEventListener("pointermove", t), {
@@ -99,9 +98,9 @@ function B(o) {
   };
 }
 export {
-  U as onContentChanges,
-  B as onContentletHovered,
-  Y as onIframeScroll,
-  V as onPageReload,
-  I as onRequestBounds
+  O as onContentChanges,
+  w as onContentletHovered,
+  p as onIframeScroll,
+  b as onPageReload,
+  M as onRequestBounds
 };