@freegridjs/core 1.9.0 → 1.9.2

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { default as en } from './locales/en.js';
 declare function createGrid(host: HTMLElement, options: GridOptions): GridApi;
 
 /** FreeGrid version (kept in sync with releases.json by scripts/release.mjs). */
-declare const version = "1.9.0";
+declare const version = "1.9.2";
 
 interface LicenseInfo {
     /** Licensed domains; each also covers every subdomain below it (`*.example.com` means the same as `example.com`). */
@@ -27,12 +27,13 @@ type LicenseResult = {
     reason: 'format' | 'signature' | 'expired' | 'domain' | 'version' | 'unsupported';
     info?: LicenseInfo;
 };
-/** Check a key's signature, expiry, domain and (perpetual keys) the major version. */
-declare function verifyLicense(key: string, host: string, opts?: {
+type VerifyOptions = {
     publicKey?: JsonWebKey;
     now?: Date;
     version?: string;
-}): Promise<LicenseResult>;
+};
+/** Check a key's signature, expiry, domain and (perpetual keys) the major version. */
+declare function verifyLicense(key: string, host: string, opts?: VerifyOptions): Promise<LicenseResult>;
 /** Set the license key once for every grid on the page. */
 declare function setLicenseKey(key: string): void;
 

package/dist/index.js

@@ -2271,6 +2271,24 @@ var Renderer = class {
         else this.paintRow(row.el, node, i, cols, isSel, focusCol, hits, spans, range.first);
       }
     }
+    if (spans.size) this.stickMergedText(top);
+  }
+  /**
+   * A vertically merged cell taller than the view keeps its text in sight: the text moves down to the top of the
+   * visible part of the block and stops in the block's last row. Runs on every scroll, also for rows not repainted.
+   */
+  stickMergedText(viewTop) {
+    for (const r of REGIONS3) {
+      for (const row of this.painted[r].values()) {
+        for (const c of row.el.querySelectorAll(".fg-cell-merged")) {
+          const blockTop = Number(c.dataset.mergeTop);
+          const last = Number(c.dataset.mergeLast);
+          if (!Number.isFinite(blockTop) || !Number.isFinite(last)) continue;
+          const shift = `${Math.round(Math.min(last, Math.max(0, viewTop - blockTop)))}px`;
+          if (c.style.getPropertyValue("--fg-merge-shift") !== shift) c.style.setProperty("--fg-merge-shift", shift);
+        }
+      }
+    }
   }
   /**
    * Same row, only the column window moved: drop the cells that left and paint the ones that came in.
@@ -2349,9 +2367,16 @@ var Renderer = class {
           cellEl.style.top = `${-(this.rowTop(i) - this.rowTop(s.start[i]))}px`;
           cellEl.style.height = `${this.rowTop(s.end[i]) + this.rowH(s.end[i]) - this.rowTop(s.start[i])}px`;
           cellEl.style.bottom = "auto";
+          cellEl.dataset.mergeTop = String(this.rowTop(s.start[i]));
+          cellEl.dataset.mergeLast = String(this.rowTop(s.end[i]) - this.rowTop(s.start[i]));
           drawsMerge = true;
         } else cellEl.classList.add("fg-cell-merge-hidden");
       }
+      if (!cellEl.classList.contains("fg-cell-merged") && cellEl.dataset.mergeTop !== void 0) {
+        delete cellEl.dataset.mergeTop;
+        delete cellEl.dataset.mergeLast;
+        cellEl.style.removeProperty("--fg-merge-shift");
+      }
       if (!isSystemCol(col.id) && bounds.some((b) => col.index >= b.c1 && col.index <= b.c2)) cellEl.classList.add("fg-cell-range");
     });
     rowEl.style.zIndex = drawsMerge ? "1" : "";
@@ -3453,6 +3478,7 @@ function attachBody(grid) {
   const keyOf = (e) => mirrored(grid, e);
   let lastPointer = "mouse";
   let pressTimer = 0;
+  let endGesture = null;
   let suppressClick = false;
   const toEvent = (e) => {
     const hit = renderer.cellAt(e.target);
@@ -3675,6 +3701,7 @@ function attachBody(grid) {
       window.removeEventListener("pointermove", move);
       window.removeEventListener("pointerup", cancel);
       window.removeEventListener("pointercancel", cancel);
+      if (endGesture === cancel) endGesture = null;
     };
     const move = (ev) => {
       if (Math.hypot(ev.clientX - x0, ev.clientY - y0) > 8) cancel();
@@ -3690,6 +3717,8 @@ function attachBody(grid) {
       }
       grid.contextMenu.open(x0, y0, hit.rowIndex, hit.colId);
     }, 550);
+    endGesture?.();
+    endGesture = cancel;
     window.addEventListener("pointermove", move);
     window.addEventListener("pointerup", cancel);
     window.addEventListener("pointercancel", cancel);
@@ -3723,11 +3752,16 @@ function attachBody(grid) {
     const up = () => {
       window.removeEventListener("pointermove", move);
       window.removeEventListener("pointerup", up);
+      window.removeEventListener("pointercancel", up);
       root.classList.remove("fg-range-dragging");
       if (dragging) suppressClick = true;
+      if (endGesture === up) endGesture = null;
     };
+    endGesture?.();
+    endGesture = up;
     window.addEventListener("pointermove", move);
     window.addEventListener("pointerup", up);
+    window.addEventListener("pointercancel", up);
   };
   const onKeyDown = (e) => {
     if (e.target !== root && e.target !== renderer.gridEl) return;
@@ -3826,6 +3860,8 @@ function attachBody(grid) {
   root.addEventListener("paste", onPaste);
   root.addEventListener("cut", onCut);
   return () => {
+    clearTimeout(pressTimer);
+    endGesture?.();
     body.removeEventListener("click", onClick);
     body.removeEventListener("dblclick", onDblClick);
     body.removeEventListener("pointerdown", onPointerDown);
@@ -7633,7 +7669,7 @@ var PAID_FEATURES = {
 };
 
 // src/version.ts
-var version = "1.9.0";
+var version = "1.9.2";
 
 // src/license.ts
 var PUBLIC_KEY = { kty: "EC", crv: "P-256", x: "sUTKkglZmk-HMKPNub8p7AeLBKesHCU8irIkw9rJlbE", y: "j0U_aKRDR7iApY9UpaD3hUemhBLZJwDv9-QiT_hUyw8" };
@@ -7648,11 +7684,17 @@ var b64urlDecode = (s) => {
 };
 function isDevHost(host) {
   const h = host.toLowerCase().replace(/^\[|\]$/g, "");
-  return !h || h === "localhost" || h === "127.0.0.1" || h === "::1" || h === "0.0.0.0" || h.endsWith(".localhost") || h.endsWith(".test") || h.endsWith(".local") || /^(10|192\.168|172\.(1[6-9]|2\d|3[01]))\./.test(h);
+  if (!h || h === "localhost" || h === "127.0.0.1" || h === "::1" || h === "0.0.0.0" || h.endsWith(".localhost") || h.endsWith(".test") || h.endsWith(".local")) return true;
+  const ip = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(h);
+  if (!ip) return false;
+  const [a, b, c, d] = ip.slice(1).map(Number);
+  if ([a, b, c, d].some((n) => n > 255)) return false;
+  return a === 10 || a === 192 && b === 168 || a === 172 && b >= 16 && b <= 31;
 }
 function domainMatches(host, domains) {
   const h = host.toLowerCase().replace(/\.$/, "");
   return domains.some((d) => {
+    if (typeof d !== "string") return false;
     const raw = d.toLowerCase().replace(/\.$/, "");
     const dom = raw.startsWith("*.") ? raw.slice(2) : raw;
     if (!dom) return false;
@@ -7666,20 +7708,32 @@ var isDay = (s) => {
   return d.getUTCMonth() === Number(m[2]) - 1 && d.getUTCDate() === Number(m[3]);
 };
 var today = (now) => `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
-async function verifyLicense(key, host, opts = {}) {
+function checkTerms(key, host, opts = {}) {
   const parts = typeof key === "string" ? key.trim().split(".") : [];
-  if (parts.length !== 3 || parts[0] !== "FG1") return { ok: false, reason: "format" };
+  if (parts.length !== 3 || parts[0] !== "FG1") return { fail: { ok: false, reason: "format" } };
   let info;
   try {
     info = JSON.parse(new TextDecoder().decode(b64urlDecode(parts[1])));
-    if (!Array.isArray(info.domains) || !isDay(info.expires)) return { ok: false, reason: "format" };
-    if (info.major !== void 0 && !(Number.isInteger(info.major) && info.major > 0)) return { ok: false, reason: "format" };
-    if (info.plan !== void 0 && info.plan !== "company" && info.plan !== "personal") return { ok: false, reason: "format" };
+    if (!info || !Array.isArray(info.domains) || !info.domains.every((d) => typeof d === "string") || !isDay(info.expires)) return { fail: { ok: false, reason: "format" } };
+    if (info.major !== void 0 && !(Number.isInteger(info.major) && info.major > 0)) return { fail: { ok: false, reason: "format" } };
+    if (info.plan !== void 0 && info.plan !== "company" && info.plan !== "personal") return { fail: { ok: false, reason: "format" } };
   } catch {
-    return { ok: false, reason: "format" };
+    return { fail: { ok: false, reason: "format" } };
   }
-  const subtle = typeof crypto !== "undefined" ? crypto.subtle : void 0;
-  if (!subtle) return { ok: false, reason: "unsupported", info };
+  let fail = null;
+  if (today(opts.now ?? /* @__PURE__ */ new Date()) > info.expires) fail = { ok: false, reason: "expired", info };
+  else if (!domainMatches(host, info.domains)) fail = { ok: false, reason: "domain", info };
+  else if (info.major !== void 0 && majorOf(opts.version ?? version) > info.major) fail = { ok: false, reason: "version", info };
+  return { parts, info, fail };
+}
+var hasSubtle = () => typeof crypto !== "undefined" && !!crypto.subtle;
+async function verifyLicense(key, host, opts = {}) {
+  const checked = checkTerms(key, host, opts);
+  if (!("info" in checked)) return checked.fail;
+  const { parts, info } = checked;
+  const terms = () => checked.fail;
+  if (!hasSubtle()) return terms() ?? { ok: false, reason: "unsupported", info };
+  const subtle = crypto.subtle;
   try {
     const pub = await subtle.importKey("jwk", opts.publicKey ?? PUBLIC_KEY, { name: "ECDSA", namedCurve: "P-256" }, false, ["verify"]);
     const signed = new TextEncoder().encode(`${parts[0]}.${parts[1]}`);
@@ -7688,10 +7742,7 @@ async function verifyLicense(key, host, opts = {}) {
   } catch {
     return { ok: false, reason: "signature", info };
   }
-  if (today(opts.now ?? /* @__PURE__ */ new Date()) > info.expires) return { ok: false, reason: "expired", info };
-  if (!domainMatches(host, info.domains)) return { ok: false, reason: "domain", info };
-  if (info.major !== void 0 && majorOf(opts.version ?? version) > info.major) return { ok: false, reason: "version", info };
-  return { ok: true, info };
+  return terms() ?? { ok: true, info };
 }
 var globalKey;
 var statuses = /* @__PURE__ */ new Map();
@@ -7729,23 +7780,26 @@ function reportUsage(info, host = typeof location !== "undefined" ? location.hos
 }
 function checkLicense(key = globalKey, host = typeof location !== "undefined" ? location.hostname : "") {
   if (isDevHost(host)) return Promise.resolve(true);
-  const k = key ?? globalKey;
+  return keyState(key ?? globalKey, host).then((s) => s === "ok" || s === "unsupported");
+}
+function keyState(k, host) {
   const id = `${k ?? ""}@${host}`;
   let status = statuses.get(id);
   if (status) return status;
   if (!k) {
     console.info(NOTICE.missing);
     reportUsage({ version, licensed: false }, host);
-    status = Promise.resolve(false);
+    status = Promise.resolve("none");
   } else {
     status = verifyLicense(k, host).then((res) => {
       reportUsage({ version, licensed: res.ok, company: res.ok ? res.info.company : void 0 }, host);
-      if (res.ok || res.reason === "unsupported") return res.ok || res.reason === "unsupported";
+      if (res.ok) return "ok";
+      if (res.reason === "unsupported") return "unsupported";
       const extra = res.info ? ` (${res.info.domains.join(", ")}, ${res.info.major ? `${res.info.major}.x` : res.info.expires})` : "";
       console.warn(`${NOTICE[res.reason]}${extra}
 ${PRICING_URL}`);
-      return false;
-    }, () => false);
+      return "bad";
+    }, () => "bad");
   }
   statuses.set(id, status);
   return status;
@@ -7792,41 +7846,64 @@ function badgeRequested(host = currentHost()) {
   return fetchDomainStatus(host).then((s) => s?.badge === true);
 }
 async function needsFreeBadge(key, host = currentHost()) {
+  await Promise.resolve();
   if (await checkLicense(key, host)) return false;
   return badgeRequested(host);
 }
 var GATE_KEY = "freegrid:gate";
+var MAX_VERIFIED_KEYS = 5;
 var keyIdOf = (key) => {
   if (!key) return "";
   const parts = key.trim().split(".");
   return parts[parts.length - 1].slice(-16);
 };
+var readGate = (host) => {
+  const c = JSON.parse(localStorage.getItem(GATE_KEY) ?? "null");
+  if (!c || typeof c !== "object" || c.host !== host || typeof c.trialEnded !== "boolean" || !Array.isArray(c.verifiedKeys) || !c.verifiedKeys.every((k) => typeof k === "string")) return null;
+  return { host, trialEnded: c.trialEnded, ...typeof c.trialEnds === "string" ? { trialEnds: c.trialEnds } : {}, verifiedKeys: c.verifiedKeys };
+};
 function paidAllowed(key, host = currentHost()) {
   if (isDevHost(host)) return true;
+  const k = key ?? globalKey;
+  if (k && !hasSubtle()) {
+    const checked = checkTerms(k, host);
+    if ("info" in checked && !checked.fail) return true;
+  }
   try {
-    const cache2 = JSON.parse(localStorage.getItem(GATE_KEY) ?? "null");
-    if (!cache2 || cache2.host !== host || cache2.keyId !== keyIdOf(key ?? globalKey)) return true;
-    return cache2.paid !== false;
+    const cache2 = readGate(host);
+    if (!cache2) return true;
+    const id = keyIdOf(k);
+    if (id && cache2.verifiedKeys.includes(id)) return true;
+    return !cache2.trialEnded;
   } catch {
     return true;
   }
 }
-var writeGate = (cache2) => {
+var updateGate = (host, patch) => {
   try {
-    localStorage.setItem(GATE_KEY, JSON.stringify(cache2));
+    let cur = null;
+    try {
+      cur = readGate(host);
+    } catch {
+    }
+    localStorage.setItem(GATE_KEY, JSON.stringify(patch(cur ?? { host, trialEnded: false, verifiedKeys: [] })));
   } catch {
   }
 };
 async function resolveGate(key, host = currentHost()) {
+  if (isDevHost(host)) return true;
+  await Promise.resolve();
   const k = key ?? globalKey;
-  const keyId = keyIdOf(k);
-  if (await checkLicense(k, host)) {
-    writeGate({ host, keyId, paid: true });
+  const state = await keyState(k, host);
+  if (state === "ok") {
+    const id = keyIdOf(k);
+    updateGate(host, (c) => ({ ...c, verifiedKeys: [id, ...c.verifiedKeys.filter((x) => x !== id)].slice(0, MAX_VERIFIED_KEYS) }));
     return true;
   }
+  if (state === "unsupported") return true;
   const trial = (await fetchDomainStatus(host))?.trial;
   if (!trial) return true;
-  writeGate({ host, keyId, paid: trial.active, trialEnds: trial.ends });
+  updateGate(host, (c) => ({ ...c, trialEnded: !trial.active, trialEnds: trial.ends }));
   const notice = `${trial.active ? "trial" : "ended"}@${host}`;
   if (!gateNotices.has(notice)) {
     gateNotices.add(notice);