@usertour/helpers 0.0.59 → 0.0.61

package/dist/index.cjs

@@ -332,128 +332,251 @@ var isFile = (x) => {
   return x instanceof File;
 };
 
-// src/convert-settings.ts
-var defaultFontFamily = '-apple-system, "system-ui", "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"';
-var mergeThemeDefaultSettings = (settings) => {
-  return (0, import_deepmerge_ts.deepmerge)(import_types.defaultSettings, settings);
-};
-var convertSettings = (settings) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
-  const data = mergeThemeDefaultSettings(settings);
-  if (settings.mainColor.hover === "Auto") {
-    data.mainColor.hover = settings.mainColor.autoHover;
-  }
-  if (settings.mainColor.active === "Auto") {
-    data.mainColor.active = settings.mainColor.autoActive;
-  }
-  if (settings.brandColor.hover === "Auto") {
-    data.brandColor.hover = settings.brandColor.autoHover;
-  }
-  if (settings.brandColor.active === "Auto") {
-    data.brandColor.active = settings.brandColor.autoActive;
-  }
-  if (settings.border.borderColor === "Auto") {
-    data.border.borderColor = settings.mainColor.color;
-  }
-  if (settings.buttons.primary.textColor.color === "Auto") {
-    data.buttons.primary.textColor.color = settings.brandColor.color;
-  }
-  if (settings.buttons.primary.textColor.hover === "Auto") {
-    data.buttons.primary.textColor.hover = settings.brandColor.color;
-  }
-  if (settings.buttons.primary.textColor.active === "Auto") {
-    data.buttons.primary.textColor.active = settings.brandColor.color;
-  }
-  if (settings.buttons.primary.backgroundColor.background === "Auto") {
-    data.buttons.primary.backgroundColor.background = settings.brandColor.background;
-  }
-  if (settings.buttons.primary.backgroundColor.hover === "Auto") {
-    data.buttons.primary.backgroundColor.hover = settings.brandColor.autoHover;
-  }
-  if (settings.buttons.primary.backgroundColor.active === "Auto") {
-    data.buttons.primary.backgroundColor.active = settings.brandColor.autoActive;
-  }
-  if (settings.buttons.primary.border.color.color === "Auto") {
-    data.buttons.primary.border.color.color = settings.brandColor.background;
-  }
-  if (settings.buttons.primary.border.color.hover === "Auto") {
-    data.buttons.primary.border.color.hover = settings.brandColor.autoHover;
-  }
-  if (settings.buttons.primary.border.color.active === "Auto") {
-    data.buttons.primary.border.color.active = settings.brandColor.autoActive;
-  }
-  if (settings.buttons.secondary.textColor.color === "Auto") {
-    data.buttons.secondary.textColor.color = settings.brandColor.background;
-  }
-  if (settings.buttons.secondary.textColor.hover === "Auto") {
-    data.buttons.secondary.textColor.hover = settings.brandColor.background;
-  }
-  if (settings.buttons.secondary.textColor.active === "Auto") {
-    data.buttons.secondary.textColor.active = settings.brandColor.background;
-  }
-  if (settings.buttons.secondary.backgroundColor.background === "Auto") {
-    data.buttons.secondary.backgroundColor.background = settings.mainColor.background;
-  }
-  if (settings.buttons.secondary.backgroundColor.hover === "Auto") {
-    data.buttons.secondary.backgroundColor.hover = settings.mainColor.autoHover;
-  }
-  if (settings.buttons.secondary.backgroundColor.active === "Auto") {
-    data.buttons.secondary.backgroundColor.active = settings.mainColor.autoActive;
-  }
-  if (settings.buttons.secondary.border.color.color === "Auto") {
-    data.buttons.secondary.border.color.color = settings.brandColor.background;
-  }
-  if (settings.buttons.secondary.border.color.hover === "Auto") {
-    data.buttons.secondary.border.color.hover = settings.brandColor.background;
-  }
-  if (settings.buttons.secondary.border.color.active === "Auto") {
-    data.buttons.secondary.border.color.active = settings.brandColor.background;
-  }
-  if (settings.font.linkColor === "Auto") {
-    data.font.linkColor = settings.brandColor.background;
-  }
-  if (settings.xbutton.color === "Auto") {
-    data.xbutton.color = settings.mainColor.color;
-  }
-  if (((_a = settings == null ? void 0 : settings.progress) == null ? void 0 : _a.color) === "Auto") {
-    data.progress.color = settings.brandColor.background;
-  }
-  if (((_b = settings == null ? void 0 : settings.launcherBeacon) == null ? void 0 : _b.color) === "Auto") {
-    data.launcherBeacon.color = settings.brandColor.background;
-  }
-  if (((_d = (_c = settings == null ? void 0 : settings.launcherIcon) == null ? void 0 : _c.color) == null ? void 0 : _d.color) === "Auto") {
-    data.launcherIcon.color.color = settings.brandColor.background;
-  }
-  if (((_f = (_e = settings == null ? void 0 : settings.launcherIcon) == null ? void 0 : _e.color) == null ? void 0 : _f.hover) === "Auto") {
-    data.launcherIcon.color.hover = settings.brandColor.autoHover;
-  }
-  if (((_h = (_g = settings == null ? void 0 : settings.launcherIcon) == null ? void 0 : _g.color) == null ? void 0 : _h.active) === "Auto") {
-    data.launcherIcon.color.active = settings.brandColor.autoActive;
+// src/utils.ts
+var deepClone = (obj) => {
+  try {
+    return structuredClone(obj);
+  } catch (error) {
+    console.warn("structuredClone failed, falling back to JSON method:", error);
+    return JSON.parse(JSON.stringify(obj));
   }
-  if (((_j = (_i = settings.checklistLauncher) == null ? void 0 : _i.color) == null ? void 0 : _j.color) === "Auto") {
-    data.checklistLauncher.color.color = settings.brandColor.color;
+};
+var parseUrlParams = (url, paramName) => {
+  if (!url || !paramName) {
+    return null;
   }
-  if (((_l = (_k = settings.checklistLauncher) == null ? void 0 : _k.color) == null ? void 0 : _l.background) === "Auto") {
-    data.checklistLauncher.color.background = settings.brandColor.background;
+  try {
+    const urlObj = new URL(url);
+    const searchParams = new URLSearchParams(urlObj.search);
+    if (searchParams.has(paramName)) {
+      return searchParams.get(paramName);
+    }
+    if (urlObj.hash) {
+      const hashSearch = urlObj.hash.split("?")[1];
+      if (hashSearch) {
+        const hashParams = new URLSearchParams(hashSearch);
+        if (hashParams.has(paramName)) {
+          return hashParams.get(paramName);
+        }
+      }
+    }
+    return null;
+  } catch (error) {
+    console.error("Error parsing URL:", error);
+    return null;
   }
-  if (((_n = (_m = settings.checklistLauncher) == null ? void 0 : _m.color) == null ? void 0 : _n.hover) === "Auto") {
-    data.checklistLauncher.color.hover = settings.brandColor.autoHover;
+};
+var wait = (seconds) => {
+  if (typeof seconds !== "number" || Number.isNaN(seconds)) {
+    return Promise.reject(new Error("Invalid wait time: must be a number"));
   }
-  if (((_p = (_o = settings.checklistLauncher) == null ? void 0 : _o.color) == null ? void 0 : _p.active) === "Auto") {
-    data.checklistLauncher.color.active = settings.brandColor.autoActive;
+  if (seconds < 0) {
+    return Promise.reject(new Error("Invalid wait time: cannot be negative"));
   }
-  if (((_r = (_q = settings.checklistLauncher) == null ? void 0 : _q.counter) == null ? void 0 : _r.color) === "Auto") {
-    data.checklistLauncher.counter.color = settings.brandColor.background;
+  if (seconds === 0) {
+    return Promise.resolve();
   }
-  if (((_t = (_s = settings.checklistLauncher) == null ? void 0 : _s.counter) == null ? void 0 : _t.background) === "Auto") {
-    data.checklistLauncher.counter.background = settings.brandColor.color;
+  return new Promise((resolve, reject) => {
+    try {
+      setTimeout(resolve, seconds * 1e3);
+    } catch (error) {
+      reject(error);
+    }
+  });
+};
+
+// src/convert-settings.ts
+var defaultFontFamily = '-apple-system, "system-ui", "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"';
+var mergeWithDefaults = (0, import_deepmerge_ts.deepmergeCustom)({
+  mergeOthers: (values) => {
+    const settingsValue = values[values.length - 1];
+    if (settingsValue === null || settingsValue === void 0) {
+      return values[0];
+    }
+    return settingsValue;
   }
-  if (((_u = settings.survey) == null ? void 0 : _u.color) === "Auto") {
-    data.survey.color = settings.brandColor.background;
+});
+var resolveAutoValue = (value, fallback) => {
+  if (value === "Auto" || value === void 0 || value === null) {
+    return fallback;
   }
-  if (settings.font.fontFamily === "System font") {
+  return value;
+};
+var mergeThemeDefaultSettings = (settings) => {
+  const base = deepClone(import_types.defaultSettings);
+  return mergeWithDefaults(base, settings);
+};
+var convertSettings = (settings) => {
+  const data = mergeThemeDefaultSettings(settings);
+  data.mainColor.hover = resolveAutoValue(data.mainColor.hover, data.mainColor.autoHover);
+  data.mainColor.active = resolveAutoValue(
+    data.mainColor.active,
+    data.mainColor.autoActive
+  );
+  data.brandColor.hover = resolveAutoValue(
+    data.brandColor.hover,
+    data.brandColor.autoHover
+  );
+  data.brandColor.active = resolveAutoValue(
+    data.brandColor.active,
+    data.brandColor.autoActive
+  );
+  data.border.borderColor = resolveAutoValue(data.border.borderColor, data.mainColor.color);
+  data.buttons.primary.textColor.color = resolveAutoValue(
+    data.buttons.primary.textColor.color,
+    data.brandColor.color
+  );
+  data.buttons.primary.textColor.hover = resolveAutoValue(
+    data.buttons.primary.textColor.hover,
+    data.brandColor.color
+  );
+  data.buttons.primary.textColor.active = resolveAutoValue(
+    data.buttons.primary.textColor.active,
+    data.brandColor.color
+  );
+  data.buttons.primary.backgroundColor.background = resolveAutoValue(
+    data.buttons.primary.backgroundColor.background,
+    data.brandColor.background
+  );
+  data.buttons.primary.backgroundColor.hover = resolveAutoValue(
+    data.buttons.primary.backgroundColor.hover,
+    data.brandColor.autoHover
+  );
+  data.buttons.primary.backgroundColor.active = resolveAutoValue(
+    data.buttons.primary.backgroundColor.active,
+    data.brandColor.autoActive
+  );
+  data.buttons.primary.border.color.color = resolveAutoValue(
+    data.buttons.primary.border.color.color,
+    data.brandColor.background
+  );
+  data.buttons.primary.border.color.hover = resolveAutoValue(
+    data.buttons.primary.border.color.hover,
+    data.brandColor.autoHover
+  );
+  data.buttons.primary.border.color.active = resolveAutoValue(
+    data.buttons.primary.border.color.active,
+    data.brandColor.autoActive
+  );
+  data.buttons.secondary.textColor.color = resolveAutoValue(
+    data.buttons.secondary.textColor.color,
+    data.brandColor.background
+  );
+  data.buttons.secondary.textColor.hover = resolveAutoValue(
+    data.buttons.secondary.textColor.hover,
+    data.brandColor.background
+  );
+  data.buttons.secondary.textColor.active = resolveAutoValue(
+    data.buttons.secondary.textColor.active,
+    data.brandColor.background
+  );
+  data.buttons.secondary.backgroundColor.background = resolveAutoValue(
+    data.buttons.secondary.backgroundColor.background,
+    data.mainColor.background
+  );
+  data.buttons.secondary.backgroundColor.hover = resolveAutoValue(
+    data.buttons.secondary.backgroundColor.hover,
+    data.mainColor.autoHover
+  );
+  data.buttons.secondary.backgroundColor.active = resolveAutoValue(
+    data.buttons.secondary.backgroundColor.active,
+    data.mainColor.autoActive
+  );
+  data.buttons.secondary.border.color.color = resolveAutoValue(
+    data.buttons.secondary.border.color.color,
+    data.brandColor.background
+  );
+  data.buttons.secondary.border.color.hover = resolveAutoValue(
+    data.buttons.secondary.border.color.hover,
+    data.brandColor.background
+  );
+  data.buttons.secondary.border.color.active = resolveAutoValue(
+    data.buttons.secondary.border.color.active,
+    data.brandColor.background
+  );
+  data.font.linkColor = resolveAutoValue(data.font.linkColor, data.brandColor.background);
+  data.xbutton.color = resolveAutoValue(data.xbutton.color, data.mainColor.color);
+  data.progress.color = resolveAutoValue(data.progress.color, data.brandColor.background);
+  data.launcherBeacon.color = resolveAutoValue(
+    data.launcherBeacon.color,
+    data.brandColor.background
+  );
+  data.launcherIcon.color.color = resolveAutoValue(
+    data.launcherIcon.color.color,
+    data.brandColor.background
+  );
+  data.launcherIcon.color.hover = resolveAutoValue(
+    data.launcherIcon.color.hover,
+    data.brandColor.autoHover
+  );
+  data.launcherIcon.color.active = resolveAutoValue(
+    data.launcherIcon.color.active,
+    data.brandColor.autoActive
+  );
+  data.checklistLauncher.color.color = resolveAutoValue(
+    data.checklistLauncher.color.color,
+    data.brandColor.color
+  );
+  data.checklistLauncher.color.background = resolveAutoValue(
+    data.checklistLauncher.color.background,
+    data.brandColor.background
+  );
+  data.checklistLauncher.color.hover = resolveAutoValue(
+    data.checklistLauncher.color.hover,
+    data.brandColor.autoHover
+  );
+  data.checklistLauncher.color.active = resolveAutoValue(
+    data.checklistLauncher.color.active,
+    data.brandColor.autoActive
+  );
+  data.checklistLauncher.counter.color = resolveAutoValue(
+    data.checklistLauncher.counter.color,
+    data.brandColor.background
+  );
+  data.checklistLauncher.counter.background = resolveAutoValue(
+    data.checklistLauncher.counter.background,
+    data.brandColor.color
+  );
+  data.survey.color = resolveAutoValue(data.survey.color, data.brandColor.background);
+  data.launcherButtons.primary.textColor.color = resolveAutoValue(
+    data.launcherButtons.primary.textColor.color,
+    data.brandColor.color
+  );
+  data.launcherButtons.primary.textColor.hover = resolveAutoValue(
+    data.launcherButtons.primary.textColor.hover,
+    data.brandColor.color
+  );
+  data.launcherButtons.primary.textColor.active = resolveAutoValue(
+    data.launcherButtons.primary.textColor.active,
+    data.brandColor.color
+  );
+  data.launcherButtons.primary.backgroundColor.background = resolveAutoValue(
+    data.launcherButtons.primary.backgroundColor.background,
+    data.brandColor.background
+  );
+  data.launcherButtons.primary.backgroundColor.hover = resolveAutoValue(
+    data.launcherButtons.primary.backgroundColor.hover,
+    data.brandColor.autoHover
+  );
+  data.launcherButtons.primary.backgroundColor.active = resolveAutoValue(
+    data.launcherButtons.primary.backgroundColor.active,
+    data.brandColor.autoActive
+  );
+  data.launcherButtons.primary.border.color.color = resolveAutoValue(
+    data.launcherButtons.primary.border.color.color,
+    data.brandColor.background
+  );
+  data.launcherButtons.primary.border.color.hover = resolveAutoValue(
+    data.launcherButtons.primary.border.color.hover,
+    data.brandColor.autoHover
+  );
+  data.launcherButtons.primary.border.color.active = resolveAutoValue(
+    data.launcherButtons.primary.border.color.active,
+    data.brandColor.autoActive
+  );
+  if (data.font.fontFamily === "System font") {
     data.font.fontFamily = defaultFontFamily;
-  } else {
+  } else if (!data.font.fontFamily.includes("sans-serif")) {
     data.font.fontFamily += ", sans-serif;";
   }
   return data;
@@ -550,7 +673,22 @@ var convertToCssVars = (settings, type = "tooltip") => {
     "--usertour-checkmark-background-color": settings.checklist.checkmarkColor,
     "--usertour-checklist-trigger-height": `${settings.checklistLauncher.height}px`,
     "--usertour-checklist-trigger-hover-background-color": settings.checklistLauncher.color.hover,
-    "--usertour-question-color": hexToHSLString(settings.survey.color)
+    "--usertour-question-color": hexToHSLString(settings.survey.color),
+    "--usertour-launcher-button-height": `${settings.launcherButtons.height}px`,
+    "--usertour-launcher-button-width": settings.launcherButtons.width === 0 ? "auto" : `${settings.launcherButtons.width}px`,
+    "--usertour-launcher-button-horizontal-padding": `${settings.launcherButtons.px}px`,
+    "--usertour-launcher-button-border-radius": `${settings.launcherButtons.borderRadius}px`,
+    "--usertour-launcher-button-background-color": settings.launcherButtons.primary.backgroundColor.background,
+    "--usertour-launcher-button-hover-background-color": settings.launcherButtons.primary.backgroundColor.hover,
+    "--usertour-launcher-button-active-background-color": settings.launcherButtons.primary.backgroundColor.active,
+    "--usertour-launcher-button-font-color": settings.launcherButtons.primary.textColor.color,
+    "--usertour-launcher-button-hover-font-color": settings.launcherButtons.primary.textColor.hover,
+    "--usertour-launcher-button-active-font-color": settings.launcherButtons.primary.textColor.active,
+    "--usertour-launcher-button-font-weight": settings.launcherButtons.primary.fontWeight,
+    "--usertour-launcher-button-border-width": settings.launcherButtons.primary.border.enabled ? `${settings.launcherButtons.primary.border.borderWidth}px` : "0px",
+    "--usertour-launcher-button-border-color": settings.launcherButtons.primary.border.color.color,
+    "--usertour-launcher-button-hover-border-color": settings.launcherButtons.primary.border.color.hover,
+    "--usertour-launcher-button-active-border-color": settings.launcherButtons.primary.border.color.active
   };
   if (settings.backdrop.highlight.type === "inside") {
     cssMapping["--usertour-backdrop-highlight-inset"] = "inset";
@@ -1228,59 +1366,6 @@ var replaceUserAttr = (editorContents, userAttributes) => {
   });
 };
 
-// src/utils.ts
-var deepClone = (obj) => {
-  try {
-    return structuredClone(obj);
-  } catch (error) {
-    console.warn("structuredClone failed, falling back to JSON method:", error);
-    return JSON.parse(JSON.stringify(obj));
-  }
-};
-var parseUrlParams = (url, paramName) => {
-  if (!url || !paramName) {
-    return null;
-  }
-  try {
-    const urlObj = new URL(url);
-    const searchParams = new URLSearchParams(urlObj.search);
-    if (searchParams.has(paramName)) {
-      return searchParams.get(paramName);
-    }
-    if (urlObj.hash) {
-      const hashSearch = urlObj.hash.split("?")[1];
-      if (hashSearch) {
-        const hashParams = new URLSearchParams(hashSearch);
-        if (hashParams.has(paramName)) {
-          return hashParams.get(paramName);
-        }
-      }
-    }
-    return null;
-  } catch (error) {
-    console.error("Error parsing URL:", error);
-    return null;
-  }
-};
-var wait = (seconds) => {
-  if (typeof seconds !== "number" || Number.isNaN(seconds)) {
-    return Promise.reject(new Error("Invalid wait time: must be a number"));
-  }
-  if (seconds < 0) {
-    return Promise.reject(new Error("Invalid wait time: cannot be negative"));
-  }
-  if (seconds === 0) {
-    return Promise.resolve();
-  }
-  return new Promise((resolve, reject) => {
-    try {
-      setTimeout(resolve, seconds * 1e3);
-    } catch (error) {
-      reject(error);
-    }
-  });
-};
-
 // src/helper.ts
 var import_uuid = require("uuid");
 var import_cuid2 = require("@paralleldrive/cuid2");

package/dist/index.js

@@ -4,11 +4,6 @@ import {
 import {
   defaultStep
 } from "./chunk-FW54TSA3.js";
-import {
-  deepClone,
-  parseUrlParams,
-  wait
-} from "./chunk-5C3J4DM2.js";
 import {
   capitalizeFirstLetter,
   filterNullAttributes,
@@ -80,7 +75,12 @@ import {
   convertSettings,
   convertToCssVars,
   mergeThemeDefaultSettings
-} from "./chunk-MA5IMKG6.js";
+} from "./chunk-XKSTKX45.js";
+import {
+  deepClone,
+  parseUrlParams,
+  wait
+} from "./chunk-5C3J4DM2.js";
 import {
   generateStateColors,
   hexToHSLString,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usertour/helpers",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "type": "module",
   "description": "Utility functions and helpers shared across the UserTour project",
   "homepage": "https://www.usertour.io",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@paralleldrive/cuid2": "^2.2.2",
-    "@usertour/types": "^0.0.43",
+    "@usertour/types": "^0.0.45",
     "chroma-js": "^3.1.2",
     "class-variance-authority": "^0.4.0",
     "date-fns": "^2.30.0",