@toolbox-web/grid 1.14.1 → 1.16.0

package/lib/plugins/editing/index.js

@@ -1,59 +1,59 @@
-function P(r) {
-  r && r.querySelectorAll(".cell-focus").forEach((e) => e.classList.remove("cell-focus"));
+function M(o) {
+  o && o.querySelectorAll(".cell-focus").forEach((e) => e.classList.remove("cell-focus"));
 }
-const w = 'input,select,textarea,[contenteditable="true"],[contenteditable=""],[tabindex]:not([tabindex="-1"])', M = document.createElement("template");
-M.innerHTML = '<div class="cell" role="gridcell" part="cell"></div>';
-const H = document.createElement("template");
-H.innerHTML = '<div class="data-grid-row" role="row" part="row"></div>';
-function L(r, e) {
-  if (r._virtualization?.enabled) {
-    const { rowHeight: l, container: o, viewportEl: c } = r._virtualization, a = o, d = c?.clientHeight ?? a?.clientHeight ?? 0;
+const v = 'input,select,textarea,[contenteditable="true"],[contenteditable=""],[tabindex]:not([tabindex="-1"])', P = document.createElement("template");
+P.innerHTML = '<div class="cell" role="gridcell" part="cell"></div>';
+const D = document.createElement("template");
+D.innerHTML = '<div class="data-grid-row" role="row" part="row"></div>';
+function L(o, e) {
+  if (o._virtualization?.enabled) {
+    const { rowHeight: n, container: l, viewportEl: c } = o._virtualization, a = l, d = c?.clientHeight ?? a?.clientHeight ?? 0;
     if (a && d > 0) {
-      const g = r._focusRow * l;
-      g < a.scrollTop ? a.scrollTop = g : g + l > a.scrollTop + d && (a.scrollTop = g - d + l);
+      const g = o._focusRow * n;
+      g < a.scrollTop ? a.scrollTop = g : g + n > a.scrollTop + d && (a.scrollTop = g - d + n);
     }
   }
-  const t = r._activeEditRows !== void 0 && r._activeEditRows !== -1;
-  t || r.refreshVirtualWindow(!1), P(r._bodyEl), Array.from(r._bodyEl.querySelectorAll('[aria-selected="true"]')).forEach((l) => {
-    l.setAttribute("aria-selected", "false");
+  const t = o._activeEditRows !== void 0 && o._activeEditRows !== -1;
+  t || o.refreshVirtualWindow(!1), M(o._bodyEl), Array.from(o._bodyEl.querySelectorAll('[aria-selected="true"]')).forEach((n) => {
+    n.setAttribute("aria-selected", "false");
   });
-  const i = r._focusRow, n = r._virtualization.start ?? 0, s = r._virtualization.end ?? r._rows.length;
-  if (i >= n && i < s) {
-    const l = r._bodyEl.querySelectorAll(".data-grid-row")[i - n];
-    let o = l?.children[r._focusCol];
-    if ((!o || !o.classList?.contains("cell")) && (o = l?.querySelector(`.cell[data-col="${r._focusCol}"]`) ?? l?.querySelector(".cell[data-col]")), o) {
-      o.classList.add("cell-focus"), o.setAttribute("aria-selected", "true");
-      const c = r.querySelector(".tbw-scroll-area");
-      if (c && o && (!t || e?.forceHorizontalScroll))
+  const i = o._focusRow, r = o._virtualization.start ?? 0, s = o._virtualization.end ?? o._rows.length;
+  if (i >= r && i < s) {
+    const n = o._bodyEl.querySelectorAll(".data-grid-row")[i - r];
+    let l = n?.children[o._focusCol];
+    if ((!l || !l.classList?.contains("cell")) && (l = n?.querySelector(`.cell[data-col="${o._focusCol}"]`) ?? n?.querySelector(".cell[data-col]")), l) {
+      l.classList.add("cell-focus"), l.setAttribute("aria-selected", "true");
+      const c = o.querySelector(".tbw-scroll-area");
+      if (c && l && (!t || e?.forceHorizontalScroll))
         if (e?.forceScrollLeft)
           c.scrollLeft = 0;
         else if (e?.forceScrollRight)
           c.scrollLeft = c.scrollWidth - c.clientWidth;
         else {
-          const a = r._getHorizontalScrollOffsets?.(l ?? void 0, o) ?? { left: 0, right: 0 };
+          const a = o._getHorizontalScrollOffsets?.(n ?? void 0, l) ?? { left: 0, right: 0 };
           if (!a.skipScroll) {
-            const d = o.getBoundingClientRect(), g = c.getBoundingClientRect(), f = d.left - g.left + c.scrollLeft, E = f + d.width, p = c.scrollLeft + a.left, m = c.scrollLeft + c.clientWidth - a.right;
+            const d = l.getBoundingClientRect(), g = c.getBoundingClientRect(), f = d.left - g.left + c.scrollLeft, E = f + d.width, p = c.scrollLeft + a.left, m = c.scrollLeft + c.clientWidth - a.right;
             f < p ? c.scrollLeft = f - a.left : E > m && (c.scrollLeft = E - c.clientWidth + a.right);
           }
         }
-      if (r._activeEditRows !== void 0 && r._activeEditRows !== -1 && o.classList.contains("editing")) {
-        const a = o.querySelector(w);
+      if (o._activeEditRows !== void 0 && o._activeEditRows !== -1 && l.classList.contains("editing")) {
+        const a = l.querySelector(v);
         if (a && document.activeElement !== a)
           try {
             a.focus({ preventScroll: !0 });
           } catch {
           }
-      } else if (!o.contains(document.activeElement)) {
-        o.hasAttribute("tabindex") || o.setAttribute("tabindex", "-1");
+      } else if (!l.contains(document.activeElement)) {
+        l.hasAttribute("tabindex") || l.setAttribute("tabindex", "-1");
         try {
-          o.focus({ preventScroll: !0 });
+          l.focus({ preventScroll: !0 });
         } catch {
         }
       }
     }
   }
 }
-const I = '<svg viewBox="0 0 16 16" width="12" height="12"><path fill="currentColor" d="M6 10.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/></svg>', D = {
+const I = '<svg viewBox="0 0 16 16" width="12" height="12"><path fill="currentColor" d="M6 10.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/></svg>', H = {
   expand: "▶",
   collapse: "▼",
   sortAsc: "▲",
@@ -356,7 +356,7 @@ class O {
    */
   get gridIcons() {
     const e = this.grid?.gridConfig?.icons ?? {};
-    return { ...D, ...e };
+    return { ...H, ...e };
   }
   // #region Animation Helpers
   /**
@@ -432,123 +432,123 @@ class O {
   }
   // #endregion
 }
-const x = "@layer tbw-plugins{tbw-grid{--tbw-editing-bg: var(--tbw-color-selection);--tbw-editing-row-bg: var(--tbw-editing-bg);--tbw-editing-border: var(--tbw-border-input, 1px solid var(--tbw-color-border-strong));--tbw-padding-editing-input: var(--tbw-cell-padding-input, 2px 6px);--tbw-font-size-editor: inherit;--tbw-editing-row-outline-color: var(--tbw-color-accent);--tbw-editing-row-outline-width: 1px;--tbw-invalid-bg: light-dark(#fef2f2, #450a0a);--tbw-invalid-border-color: light-dark(#ef4444, #f87171)}tbw-grid:not(.tbw-grid-mode) .data-grid-row:has(.editing){background:var(--tbw-editing-row-bg);outline:var(--tbw-editing-row-outline-width) solid var(--tbw-editing-row-outline-color);outline-offset:calc(-1 * var(--tbw-editing-row-outline-width))}tbw-grid .data-grid-row>.cell.editing{overflow:hidden;padding:0;display:flex;min-height:calc(var(--tbw-row-height) + 2px);align-items:center;justify-content:center}tbw-grid .data-grid-row>.cell.editing input:not([type=checkbox]),tbw-grid .data-grid-row>.cell.editing select,tbw-grid .data-grid-row>.cell.editing textarea{width:100%;height:100%;flex:1 1 auto;min-width:0;border:var(--tbw-editing-border);padding:var(--tbw-padding-editing-input);font-size:var(--tbw-font-size-editor)}tbw-grid .tbw-editor-host{display:contents}tbw-grid .data-grid-row>.cell[data-invalid=true]{background:var(--tbw-invalid-bg);outline:1px solid var(--tbw-invalid-border-color);outline-offset:-1px}}";
-function B(r) {
-  const e = r.options;
+const B = "@layer tbw-plugins{tbw-grid{--tbw-editing-bg: var(--tbw-color-selection);--tbw-editing-row-bg: var(--tbw-editing-bg);--tbw-editing-border: var(--tbw-border-input, 1px solid var(--tbw-color-border-strong));--tbw-padding-editing-input: var(--tbw-cell-padding-input, 2px 6px);--tbw-font-size-editor: inherit;--tbw-editing-row-outline-color: var(--tbw-color-accent);--tbw-editing-row-outline-width: 1px;--tbw-invalid-bg: light-dark(#fef2f2, #450a0a);--tbw-invalid-border-color: light-dark(#ef4444, #f87171)}tbw-grid:not(.tbw-grid-mode) .data-grid-row:has(.editing){background:var(--tbw-editing-row-bg);outline:var(--tbw-editing-row-outline-width) solid var(--tbw-editing-row-outline-color);outline-offset:calc(-1 * var(--tbw-editing-row-outline-width))}tbw-grid .data-grid-row>.cell.editing{overflow:hidden;padding:0;display:flex;min-height:calc(var(--tbw-row-height) + 2px);align-items:center;justify-content:center}tbw-grid .data-grid-row>.cell.editing input:not([type=checkbox]),tbw-grid .data-grid-row>.cell.editing select,tbw-grid .data-grid-row>.cell.editing textarea{width:100%;height:100%;flex:1 1 auto;min-width:0;border:var(--tbw-editing-border);padding:var(--tbw-padding-editing-input);font-size:var(--tbw-font-size-editor)}tbw-grid .tbw-editor-host{display:contents}tbw-grid .data-grid-row>.cell[data-invalid=true]{background:var(--tbw-invalid-bg);outline:1px solid var(--tbw-invalid-border-color);outline-offset:-1px}}";
+function x(o) {
+  const e = o.options;
   return e ? typeof e == "function" ? e() : e : [];
 }
-function N(r) {
+function N(o) {
   return (e) => {
-    const t = r.editorParams, i = document.createElement("input");
+    const t = o.editorParams, i = document.createElement("input");
     i.type = "number", i.value = e.value != null ? String(e.value) : "", t?.min !== void 0 && (i.min = String(t.min)), t?.max !== void 0 && (i.max = String(t.max)), t?.step !== void 0 && (i.step = String(t.step)), t?.placeholder && (i.placeholder = t.placeholder);
-    const n = () => e.commit(i.value === "" ? null : Number(i.value));
-    return i.addEventListener("blur", n), i.addEventListener("keydown", (s) => {
-      s.key === "Enter" && n(), s.key === "Escape" && e.cancel();
+    const r = () => e.commit(i.value === "" ? null : Number(i.value));
+    return i.addEventListener("blur", r), i.addEventListener("keydown", (s) => {
+      s.key === "Enter" && r(), s.key === "Escape" && e.cancel();
     }), i;
   };
 }
 function $() {
-  return (r) => {
+  return (o) => {
     const e = document.createElement("input");
-    return e.type = "checkbox", e.checked = !!r.value, e.addEventListener("change", () => r.commit(e.checked)), e;
+    return e.type = "checkbox", e.checked = !!o.value, e.addEventListener("change", () => o.commit(e.checked)), e;
   };
 }
-function z(r) {
+function G(o) {
   return (e) => {
-    const t = r.editorParams, i = document.createElement("input");
+    const t = o.editorParams, i = document.createElement("input");
     i.type = "date", e.value instanceof Date ? i.valueAsDate = e.value : typeof e.value == "string" && e.value && (i.value = e.value.split("T")[0]), t?.min && (i.min = t.min), t?.max && (i.max = t.max), t?.placeholder && (i.placeholder = t.placeholder);
-    const n = () => {
+    const r = () => {
       typeof e.value == "string" ? e.commit(i.value) : e.commit(i.valueAsDate);
     };
-    return i.addEventListener("change", n), i.addEventListener("keydown", (s) => {
+    return i.addEventListener("change", r), i.addEventListener("keydown", (s) => {
       s.key === "Escape" && e.cancel();
     }), i;
   };
 }
-function G(r) {
+function z(o) {
   return (e) => {
-    const t = r.editorParams, i = document.createElement("select");
-    if (r.multi && (i.multiple = !0), t?.includeEmpty) {
-      const l = document.createElement("option");
-      l.value = "", l.textContent = t.emptyLabel ?? "", i.appendChild(l);
+    const t = o.editorParams, i = document.createElement("select");
+    if (o.multi && (i.multiple = !0), t?.includeEmpty) {
+      const n = document.createElement("option");
+      n.value = "", n.textContent = t.emptyLabel ?? "", i.appendChild(n);
     }
-    B(r).forEach((l) => {
-      const o = document.createElement("option");
-      o.value = String(l.value), o.textContent = l.label, (r.multi && Array.isArray(e.value) && e.value.includes(l.value) || !r.multi && e.value === l.value) && (o.selected = !0), i.appendChild(o);
+    x(o).forEach((n) => {
+      const l = document.createElement("option");
+      l.value = String(n.value), l.textContent = n.label, (o.multi && Array.isArray(e.value) && e.value.includes(n.value) || !o.multi && e.value === n.value) && (l.selected = !0), i.appendChild(l);
     });
     const s = () => {
-      if (r.multi) {
-        const l = Array.from(i.selectedOptions).map((o) => o.value);
-        e.commit(l);
+      if (o.multi) {
+        const n = Array.from(i.selectedOptions).map((l) => l.value);
+        e.commit(n);
       } else
         e.commit(i.value);
     };
-    return i.addEventListener("change", s), i.addEventListener("blur", s), i.addEventListener("keydown", (l) => {
-      l.key === "Escape" && e.cancel();
+    return i.addEventListener("change", s), i.addEventListener("blur", s), i.addEventListener("keydown", (n) => {
+      n.key === "Escape" && e.cancel();
     }), i;
   };
 }
-function F(r) {
+function F(o) {
   return (e) => {
-    const t = r.editorParams, i = document.createElement("input");
+    const t = o.editorParams, i = document.createElement("input");
     i.type = "text", i.value = e.value != null ? String(e.value) : "", t?.maxLength !== void 0 && (i.maxLength = t.maxLength), t?.pattern && (i.pattern = t.pattern), t?.placeholder && (i.placeholder = t.placeholder);
-    const n = () => {
+    const r = () => {
       const s = i.value;
       (e.value === null || e.value === void 0) && s === "" || typeof e.value == "string" && s === e.value.replace(/[\n\r]/g, "") || (typeof e.value == "number" && s !== "" ? e.commit(Number(s)) : e.commit(s));
     };
-    return i.addEventListener("blur", n), i.addEventListener("keydown", (s) => {
-      s.key === "Enter" && n(), s.key === "Escape" && e.cancel();
+    return i.addEventListener("blur", r), i.addEventListener("keydown", (s) => {
+      s.key === "Enter" && r(), s.key === "Escape" && e.cancel();
     }), i;
   };
 }
-function j(r) {
-  switch (r.type) {
+function K(o) {
+  switch (o.type) {
     case "number":
-      return N(r);
+      return N(o);
     case "boolean":
       return $();
     case "date":
-      return z(r);
+      return G(o);
     case "select":
-      return G(r);
+      return z(o);
     default:
-      return F(r);
+      return F(o);
   }
 }
-function W(r, e) {
+function j(o, e) {
   if (e.editor) return e.editor;
   if (e.__editorTemplate) return "template";
   if (!e.type) return;
-  const i = r.effectiveConfig?.typeDefaults;
+  const i = o.effectiveConfig?.typeDefaults;
   if (i?.[e.type]?.editor)
     return i[e.type].editor;
-  const n = r.__frameworkAdapter;
-  if (n?.getTypeDefault) {
-    const s = n.getTypeDefault(e.type);
+  const r = o.__frameworkAdapter;
+  if (r?.getTypeDefault) {
+    const s = r.getTypeDefault(e.type);
     if (s?.editor)
       return s.editor;
   }
 }
-function S(r) {
-  return !(typeof r != "string" || r === "__proto__" || r === "constructor" || r === "prototype");
+function S(o) {
+  return !(typeof o != "string" || o === "__proto__" || o === "constructor" || o === "prototype");
 }
-function K(r) {
-  const e = (r.__editingCellCount ?? 0) + 1;
-  r.__editingCellCount = e, r.setAttribute("data-has-editing", "");
+function W(o) {
+  const e = (o.__editingCellCount ?? 0) + 1;
+  o.__editingCellCount = e, o.setAttribute("data-has-editing", "");
 }
-function U(r) {
-  r.__editingCellCount = 0, r.removeAttribute("data-has-editing");
+function U(o) {
+  o.__editingCellCount = 0, o.removeAttribute("data-has-editing");
 }
-function _(r, e, t) {
-  return r instanceof HTMLInputElement ? r.type === "checkbox" ? r.checked : r.type === "number" ? r.value === "" ? null : Number(r.value) : r.type === "date" ? typeof t == "string" ? r.value : r.valueAsDate : typeof t == "number" ? r.value === "" ? null : Number(r.value) : t == null && r.value === "" || typeof t == "string" && r.value === t.replace(/[\n\r]/g, "") ? t : r.value : e?.type === "number" && r.value !== "" || typeof t == "number" && r.value !== "" ? Number(r.value) : t == null && r.value === "" ? t : r.value;
+function _(o, e, t) {
+  return o instanceof HTMLInputElement ? o.type === "checkbox" ? o.checked : o.type === "number" ? o.value === "" ? null : Number(o.value) : o.type === "date" ? typeof t == "string" ? o.value : o.valueAsDate : typeof t == "number" ? o.value === "" ? null : Number(o.value) : t == null && o.value === "" || typeof t == "string" && o.value === t.replace(/[\n\r]/g, "") ? t : o.value : e?.type === "number" && o.value !== "" || typeof t == "number" && o.value !== "" ? Number(o.value) : t == null && o.value === "" ? t : o.value;
 }
-function T(r) {
+function T(o) {
 }
-function Q(r, e, t, i) {
-  const n = r.querySelector("input,textarea,select");
-  n && (n.addEventListener("blur", () => {
-    t(_(n, e, i));
-  }), n instanceof HTMLInputElement && n.type === "checkbox" ? n.addEventListener("change", () => t(n.checked)) : n instanceof HTMLSelectElement && n.addEventListener("change", () => t(_(n, e, i))));
+function Q(o, e, t, i) {
+  const r = o.querySelector("input,textarea,select");
+  r && (r.addEventListener("blur", () => {
+    t(_(r, e, i));
+  }), r instanceof HTMLInputElement && r.type === "checkbox" ? r.addEventListener("change", () => t(r.checked)) : r instanceof HTMLSelectElement && r.addEventListener("change", () => t(_(r, e, i))));
 }
 class X extends O {
   /**
@@ -590,7 +590,7 @@ class X extends O {
   /** @internal */
   name = "editing";
   /** @internal */
-  styles = x;
+  styles = B;
   /** @internal */
   get defaultConfig() {
     return {
@@ -608,11 +608,11 @@ class X extends O {
   /** Currently active edit row index, or -1 if not editing */
   #e = -1;
   /** Currently active edit column index, or -1 if not editing */
-  #d = -1;
+  #u = -1;
   /** Snapshots of row data before editing started */
   #l = /* @__PURE__ */ new Map();
   /** Set of row IDs that have been modified (ID-based for stability) */
-  #s = /* @__PURE__ */ new Set();
+  #r = /* @__PURE__ */ new Set();
   /** Set of cells currently in edit mode: "rowIndex:colIndex" */
   #o = /* @__PURE__ */ new Set();
   /**
@@ -622,9 +622,9 @@ class X extends O {
    */
   #c = /* @__PURE__ */ new Map();
   /** Flag to restore focus after next render (used when exiting edit mode) */
-  #u = !1;
+  #f = !1;
   /** Row index pending animation after render, or -1 if none */
-  #f = -1;
+  #h = -1;
   /**
    * Invalid cell tracking: Map<rowId, Map<field, message>>
    * Used for validation feedback without canceling edits.
@@ -636,13 +636,18 @@ class X extends O {
    * When false: arrow keys navigate between cells (navigation mode).
    * Escape switches to navigation mode, Enter switches to edit mode.
    */
-  #r = !1;
+  #n = !1;
   /**
    * In grid mode, when true, prevents inputs from auto-focusing.
    * This is set when Escape is pressed (navigation mode) and cleared
    * when Enter is pressed or user explicitly clicks an input.
    */
   #a = !1;
+  /**
+   * When true, only a single cell is being edited (triggered by F2 or `beginCellEdit`).
+   * Tab and Arrow keys commit and close the editor instead of navigating to adjacent cells.
+   */
+  #d = !1;
   // #endregion
   // #region Lifecycle
   /** @internal */
@@ -655,77 +660,80 @@ class X extends O {
     }), Object.defineProperty(e, "changedRowIds", {
       get: () => this.changedRowIds,
       configurable: !0
-    }), e.resetChangedRows = (n) => this.resetChangedRows(n), e.beginBulkEdit = (n, s) => {
-      s && this.beginCellEdit(n, s);
+    }), e.resetChangedRows = (r) => this.resetChangedRows(r), e.beginBulkEdit = (r, s) => {
+      s && this.beginCellEdit(r, s);
     }, document.addEventListener(
       "keydown",
-      (n) => {
-        if (!this.#t && n.key === "Escape" && this.#e !== -1) {
-          if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(n) === !1)
+      (r) => {
+        if (!this.#t && r.key === "Escape" && this.#e !== -1) {
+          if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(r) === !1)
             return;
-          this.#n(this.#e, !0);
+          this.#s(this.#e, !0);
         }
       },
       { capture: !0, signal: t }
     ), document.addEventListener(
       "mousedown",
-      (n) => {
+      (r) => {
         if (this.#t || this.#e === -1) return;
         const s = i.findRenderedRowElement?.(this.#e);
-        !s || (n.composedPath && n.composedPath() || []).includes(s) || this.config.onBeforeEditClose && this.config.onBeforeEditClose(n) === !1 || queueMicrotask(() => {
-          this.#e !== -1 && this.#n(this.#e, !1);
+        !s || (r.composedPath && r.composedPath() || []).includes(s) || this.config.onBeforeEditClose && this.config.onBeforeEditClose(r) === !1 || queueMicrotask(() => {
+          this.#e !== -1 && this.#s(this.#e, !1);
         });
       },
       { signal: t }
     ), this.gridElement.addEventListener(
       "cell-change",
-      (n) => {
-        const s = n.detail;
+      (r) => {
+        const s = r.detail;
         if (s.source === "user") return;
-        const l = `${s.rowIndex}:${s.field}`, o = this.#c.get(l);
-        o && o(s.newValue);
+        const n = `${s.rowIndex}:${s.field}`, l = this.#c.get(n);
+        l && l(s.newValue);
       },
       { signal: t }
-    ), this.#t && (this.gridElement.classList.add("tbw-grid-mode"), this.requestRender(), this.gridElement.addEventListener(
+    ), this.#t && (i._isGridEditMode = !0, this.gridElement.classList.add("tbw-grid-mode"), this.requestRender(), this.gridElement.addEventListener(
       "focusin",
-      (n) => {
-        const s = n.target;
-        if (s.matches(w)) {
+      (r) => {
+        const s = r.target;
+        if (s.matches(v)) {
           if (this.#a) {
             s.blur(), this.gridElement.focus();
             return;
           }
-          this.#r = !0;
+          this.#n = !0;
         }
       },
       { signal: t }
     ), this.gridElement.addEventListener(
       "focusout",
-      (n) => {
-        const s = n.relatedTarget;
-        (!s || !this.gridElement.contains(s) || !s.matches(w)) && (this.#r = !1);
+      (r) => {
+        const s = r.relatedTarget;
+        (!s || !this.gridElement.contains(s) || !s.matches(v)) && (this.#n = !1);
       },
       { signal: t }
     ), this.gridElement.addEventListener(
       "keydown",
-      (n) => {
-        if (n.key === "Escape" && this.#r) {
+      (r) => {
+        if (r.key === "Escape" && this.#n) {
+          if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(r) === !1)
+            return;
           const s = document.activeElement;
-          s && this.gridElement.contains(s) && (s.blur(), this.gridElement.focus()), this.#r = !1, this.#a = !0, n.preventDefault(), n.stopPropagation();
+          s && this.gridElement.contains(s) && (s.blur(), this.gridElement.focus()), this.#n = !1, this.#a = !0, r.preventDefault(), r.stopPropagation();
         }
       },
       { capture: !0, signal: t }
     ), this.gridElement.addEventListener(
       "mousedown",
-      (n) => {
-        n.target.matches(w) && (this.#a = !1);
+      (r) => {
+        r.target.matches(v) && (this.#a = !1);
       },
       { signal: t }
     ));
   }
   /** @internal */
   detach() {
-    this.gridElement.classList.remove("tbw-grid-mode"), this.#e = -1, this.#d = -1, this.#l.clear(), this.#s.clear(), this.#o.clear(), this.#c.clear(), this.#r = !1, this.#a = !1, super.detach();
+    const e = this.gridElement;
+    e._isGridEditMode = !1, this.gridElement.classList.remove("tbw-grid-mode"), this.#e = -1, this.#u = -1, this.#l.clear(), this.#r.clear(), this.#o.clear(), this.#c.clear(), this.#n = !1, this.#a = !1, this.#d = !1, super.detach();
   }
   /**
    * Handle plugin queries.
@@ -747,10 +755,10 @@ class X extends O {
     if (this.#t) return !1;
     const t = this.grid, i = this.config.editOn ?? t.effectiveConfig?.editOn;
     if (i === !1 || i === "manual" || i !== "click" && i !== "dblclick") return !1;
-    const n = e.originalEvent.type === "dblclick";
-    if (i === "click" && n || i === "dblclick" && !n) return !1;
+    const r = e.originalEvent.type === "dblclick";
+    if (i === "click" && r || i === "dblclick" && !r) return !1;
     const { rowIndex: s } = e;
-    return t._columns?.some((o) => o.editable) ? (e.originalEvent.stopPropagation(), this.beginBulkEdit(s), !0) : !1;
+    return t._columns?.some((l) => l.editable) ? (e.originalEvent.stopPropagation(), this.beginBulkEdit(s), !0) : !1;
   }
   /**
    * Handle keyboard events for edit lifecycle.
@@ -759,56 +767,61 @@ class X extends O {
   onKeyDown(e) {
     const t = this.grid;
     if (e.key === "Escape") {
-      if (this.#t && this.#r) {
+      if (this.#t && this.#n) {
+        if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(e) === !1)
+          return !0;
         const i = document.activeElement;
-        return i && this.gridElement.contains(i) && i.blur(), this.#r = !1, this.requestAfterRender(), !0;
+        return i && this.gridElement.contains(i) && i.blur(), this.#n = !1, this.requestAfterRender(), !0;
       }
       if (this.#e !== -1 && !this.#t)
-        return this.config.onBeforeEditClose && this.config.onBeforeEditClose(e) === !1 || this.#n(this.#e, !0), !0;
+        return this.config.onBeforeEditClose && this.config.onBeforeEditClose(e) === !1 || this.#s(this.#e, !0), !0;
     }
-    if (this.#t && !this.#r && (e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight"))
+    if (this.#t && !this.#n && (e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight"))
       return !1;
+    if (this.#t && this.#n && (e.key === "ArrowUp" || e.key === "ArrowDown"))
+      return !0;
     if ((e.key === "ArrowUp" || e.key === "ArrowDown") && this.#e !== -1 && !this.#t) {
       if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(e) === !1)
         return !0;
-      const i = t._rows.length - 1, n = this.#e;
-      return this.#n(n, !1), e.key === "ArrowDown" ? t._focusRow = Math.min(i, t._focusRow + 1) : t._focusRow = Math.max(0, t._focusRow - 1), e.preventDefault(), L(t), this.requestAfterRender(), !0;
+      const i = t._rows.length - 1, r = this.#e;
+      return this.#s(r, !1), e.key === "ArrowDown" ? t._focusRow = Math.min(i, t._focusRow + 1) : t._focusRow = Math.max(0, t._focusRow - 1), e.preventDefault(), L(t), this.requestAfterRender(), !0;
     }
     if (e.key === "Tab" && (this.#e !== -1 || this.#t)) {
-      e.preventDefault();
+      if (e.preventDefault(), this.#d)
+        return this.#s(this.#e, !1), !0;
       const i = !e.shiftKey;
-      return this.#y(i), !0;
+      return this.#C(i), !0;
     }
     if (e.key === " " || e.key === "Spacebar") {
       if (this.#e !== -1)
         return !1;
-      const i = t._focusRow, n = t._focusCol;
-      if (i >= 0 && n >= 0) {
-        const s = t._visibleColumns[n], l = t._rows[i];
-        if (s?.editable && s.type === "boolean" && l) {
-          const o = s.field;
-          if (S(o)) {
-            const a = !l[o];
-            return this.#m(i, s, a, l), e.preventDefault(), this.requestRender(), !0;
+      const i = t._focusRow, r = t._focusCol;
+      if (i >= 0 && r >= 0) {
+        const s = t._visibleColumns[r], n = t._rows[i];
+        if (s?.editable && s.type === "boolean" && n) {
+          const l = s.field;
+          if (S(l)) {
+            const a = !n[l];
+            return this.#E(i, s, a, n), e.preventDefault(), this.requestRender(), !0;
           }
         }
       }
       return !1;
     }
-    if (e.key === "Enter" && !e.shiftKey) {
-      if (this.#t && !this.#r)
-        return this.#b(), !0;
+    if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.altKey && !e.metaKey) {
+      if (this.#t && !this.#n)
+        return this.#y(), !0;
       if (this.#e !== -1)
         return !!(this.config.onBeforeEditClose && this.config.onBeforeEditClose(e) === !1);
       const i = this.config.editOn ?? t.effectiveConfig?.editOn;
       if (i === !1 || i === "manual") return !1;
-      const n = t._focusRow, s = t._focusCol;
-      if (n >= 0 && t._columns?.some((o) => o.editable)) {
-        const o = t._visibleColumns[s], c = t._rows[n], a = o?.field ?? "", d = a && c ? c[a] : void 0, g = this.gridElement.querySelector(`[data-row="${n}"][data-col="${s}"]`), f = new CustomEvent("cell-activate", {
+      const r = t._focusRow, s = t._focusCol;
+      if (r >= 0 && t._columns?.some((l) => l.editable)) {
+        const l = t._visibleColumns[s], c = t._rows[r], a = l?.field ?? "", d = a && c ? c[a] : void 0, g = this.gridElement.querySelector(`[data-row="${r}"][data-col="${s}"]`), f = new CustomEvent("cell-activate", {
           cancelable: !0,
           bubbles: !0,
           detail: {
-            rowIndex: n,
+            rowIndex: r,
             colIndex: s,
             field: a,
             value: d,
@@ -822,9 +835,19 @@ class X extends O {
         const E = new CustomEvent("activate-cell", {
           cancelable: !0,
           bubbles: !0,
-          detail: { row: n, col: s }
+          detail: { row: r, col: s }
         });
-        return this.gridElement.dispatchEvent(E), f.defaultPrevented || E.defaultPrevented ? (e.preventDefault(), !0) : (this.beginBulkEdit(n), !0);
+        return this.gridElement.dispatchEvent(E), f.defaultPrevented || E.defaultPrevented ? (e.preventDefault(), !0) : (this.beginBulkEdit(r), !0);
+      }
+      return !1;
+    }
+    if (e.key === "F2") {
+      if (this.#e !== -1 || this.#t || (this.config.editOn ?? t.effectiveConfig?.editOn) === !1) return !1;
+      const r = t._focusRow, s = t._focusCol;
+      if (r >= 0 && s >= 0) {
+        const n = t._visibleColumns[s];
+        if (n?.editable && n.field)
+          return e.preventDefault(), this.beginCellEdit(r, n.field), !0;
       }
       return !1;
     }
@@ -838,17 +861,17 @@ class X extends O {
    * @internal
    */
   processColumns(e) {
-    const t = this.grid, i = t.effectiveConfig?.typeDefaults, n = t.__frameworkAdapter;
-    return !i && !n?.getTypeDefault ? e : e.map((s) => {
+    const t = this.grid, i = t.effectiveConfig?.typeDefaults, r = t.__frameworkAdapter;
+    return !i && !r?.getTypeDefault ? e : e.map((s) => {
       if (!s.type) return s;
-      let l;
-      if (i?.[s.type]?.editorParams && (l = i[s.type].editorParams), !l && n?.getTypeDefault) {
-        const o = n.getTypeDefault(s.type);
-        o?.editorParams && (l = o.editorParams);
+      let n;
+      if (i?.[s.type]?.editorParams && (n = i[s.type].editorParams), !n && r?.getTypeDefault) {
+        const l = r.getTypeDefault(s.type);
+        l?.editorParams && (n = l.editorParams);
       }
-      return l ? {
+      return n ? {
         ...s,
-        editorParams: { ...l, ...s.editorParams }
+        editorParams: { ...n, ...s.editorParams }
       } : s;
     });
   }
@@ -860,18 +883,18 @@ class X extends O {
    */
   afterRender() {
     const e = this.grid;
-    if (this.#u && (this.#u = !1, this.#v(e)), this.#f !== -1) {
-      const t = this.#f;
-      this.#f = -1, e.animateRow?.(t, "change");
+    if (this.#f && (this.#f = !1, this.#v(e)), this.#h !== -1) {
+      const t = this.#h;
+      this.#h = -1, e.animateRow?.(t, "change");
     }
     if (!this.#t && this.#o.size !== 0)
       for (const t of this.#o) {
-        const [i, n] = t.split(":"), s = parseInt(i, 10), l = parseInt(n, 10), o = e.findRenderedRowElement?.(s);
-        if (!o) continue;
-        const c = o.querySelector(`.cell[data-col="${l}"]`);
+        const [i, r] = t.split(":"), s = parseInt(i, 10), n = parseInt(r, 10), l = e.findRenderedRowElement?.(s);
+        if (!l) continue;
+        const c = l.querySelector(`.cell[data-col="${n}"]`);
         if (!c || c.classList.contains("editing")) continue;
-        const a = e._rows[s], d = e._visibleColumns[l];
-        a && d && this.#p(a, s, d, l, c, !0);
+        const a = e._rows[s], d = e._visibleColumns[n];
+        a && d && this.#m(a, s, d, n, c, !0);
       }
   }
   /**
@@ -881,8 +904,8 @@ class X extends O {
    */
   afterCellRender(e) {
     if (!this.#t) return;
-    const { row: t, rowIndex: i, column: n, colIndex: s, cellElement: l } = e;
-    n.editable && (l.classList.contains("editing") || this.#p(t, i, n, s, l, !0));
+    const { row: t, rowIndex: i, column: r, colIndex: s, cellElement: n } = e;
+    r.editable && (n.classList.contains("editing") || this.#m(t, i, r, s, n, !0));
   }
   /**
    * On scroll render, reapply editors to recycled cells.
@@ -899,7 +922,7 @@ class X extends O {
    */
   get changedRows() {
     const e = [];
-    for (const t of this.#s) {
+    for (const t of this.#r) {
       const i = this.grid.getRow(t);
       i && e.push(i);
     }
@@ -909,7 +932,7 @@ class X extends O {
    * Get IDs of all modified rows.
    */
   get changedRowIds() {
-    return Array.from(this.#s);
+    return Array.from(this.#r);
   }
   /**
    * Get the currently active edit row index, or -1 if not editing.
@@ -921,7 +944,7 @@ class X extends O {
    * Get the currently active edit column index, or -1 if not editing.
    */
   get activeEditCol() {
-    return this.#d;
+    return this.#u;
   }
   /**
    * Check if a specific row is currently being edited.
@@ -943,8 +966,8 @@ class X extends O {
     const t = this.grid, i = t._rows[e];
     if (!i) return !1;
     try {
-      const n = t.getRowId?.(i);
-      return n ? this.#s.has(n) : !1;
+      const r = t.getRowId?.(i);
+      return r ? this.#r.has(r) : !1;
     } catch {
       return !1;
     }
@@ -954,7 +977,7 @@ class X extends O {
    * @param rowId - Row ID to check
    */
   isRowChangedById(e) {
-    return this.#s.has(e);
+    return this.#r.has(e);
   }
   // #region Cell Validation
   /**
@@ -979,8 +1002,8 @@ class X extends O {
    * ```
    */
   setInvalid(e, t, i = "") {
-    let n = this.#i.get(e);
-    n || (n = /* @__PURE__ */ new Map(), this.#i.set(e, n)), n.set(t, i), this.#h(e, t, !0);
+    let r = this.#i.get(e);
+    r || (r = /* @__PURE__ */ new Map(), this.#i.set(e, r)), r.set(t, i), this.#g(e, t, !0);
   }
   /**
    * Clear the invalid state for a specific cell.
@@ -990,7 +1013,7 @@ class X extends O {
    */
   clearInvalid(e, t) {
     const i = this.#i.get(e);
-    i && (i.delete(t), i.size === 0 && this.#i.delete(e)), this.#h(e, t, !1);
+    i && (i.delete(t), i.size === 0 && this.#i.delete(e)), this.#g(e, t, !1);
   }
   /**
    * Clear all invalid cells for a specific row.
@@ -1001,7 +1024,7 @@ class X extends O {
     const t = this.#i.get(e);
     if (t) {
       const i = Array.from(t.keys());
-      this.#i.delete(e), i.forEach((n) => this.#h(e, n, !1));
+      this.#i.delete(e), i.forEach((r) => this.#g(e, r, !1));
     }
   }
   /**
@@ -1010,7 +1033,7 @@ class X extends O {
   clearAllInvalid() {
     const e = Array.from(this.#i.entries());
     this.#i.clear(), e.forEach(([t, i]) => {
-      i.forEach((n, s) => this.#h(t, s, !1));
+      i.forEach((r, s) => this.#g(t, s, !1));
     });
   }
   /**
@@ -1055,18 +1078,18 @@ class X extends O {
   /**
    * Sync the data-invalid attribute on a cell element.
    */
-  #h(e, t, i) {
-    const n = this.grid, s = n._visibleColumns?.findIndex((d) => d.field === t);
+  #g(e, t, i) {
+    const r = this.grid, s = r._visibleColumns?.findIndex((d) => d.field === t);
     if (s === -1 || s === void 0) return;
-    const o = n._rows?.findIndex((d) => {
+    const l = r._rows?.findIndex((d) => {
       try {
-        return n.getRowId?.(d) === e;
+        return r.getRowId?.(d) === e;
       } catch {
         return !1;
       }
     });
-    if (o === -1 || o === void 0) return;
-    const a = n.findRenderedRowElement?.(o)?.querySelector(`.cell[data-col="${s}"]`);
+    if (l === -1 || l === void 0) return;
+    const a = r.findRenderedRowElement?.(l)?.querySelector(`.cell[data-col="${s}"]`);
     if (a)
       if (i) {
         a.setAttribute("data-invalid", "true");
@@ -1083,7 +1106,7 @@ class X extends O {
    */
   resetChangedRows(e) {
     const t = this.changedRows, i = this.changedRowIds;
-    this.#s.clear(), this.#g(), e || this.emit("changed-rows-reset", { rows: t, ids: i }), this.grid._rowPool?.forEach((s) => s.classList.remove("changed"));
+    this.#r.clear(), this.#p(), e || this.emit("changed-rows-reset", { rows: t, ids: i }), this.grid._rowPool?.forEach((s) => s.classList.remove("changed"));
   }
   /**
    * Programmatically begin editing a cell.
@@ -1092,10 +1115,10 @@ class X extends O {
    * @fires cell-commit - Emitted when the cell value is committed (on blur or Enter)
    */
   beginCellEdit(e, t) {
-    const i = this.grid, n = i._visibleColumns.findIndex((c) => c.field === t);
-    if (n === -1 || !i._visibleColumns[n]?.editable) return;
-    const o = i.findRenderedRowElement?.(e)?.querySelector(`.cell[data-col="${n}"]`);
-    o && this.#w(e, n, o);
+    const i = this.grid, r = i._visibleColumns.findIndex((c) => c.field === t);
+    if (r === -1 || !i._visibleColumns[r]?.editable) return;
+    const l = i.findRenderedRowElement?.(e)?.querySelector(`.cell[data-col="${r}"]`);
+    l && (this.#d = !0, this.#b(e, r, l));
   }
   /**
    * Programmatically begin editing all editable cells in a row.
@@ -1105,20 +1128,21 @@ class X extends O {
    */
   beginBulkEdit(e) {
     const t = this.grid;
-    if ((this.config.editOn ?? t.effectiveConfig?.editOn) === !1 || !t._columns?.some((o) => o.editable)) return;
+    if ((this.config.editOn ?? t.effectiveConfig?.editOn) === !1 || !t._columns?.some((l) => l.editable)) return;
     const s = t.findRenderedRowElement?.(e);
     if (!s) return;
-    const l = t._rows[e];
-    this.#E(e, l), Array.from(s.children).forEach((o, c) => {
+    this.#d = !1;
+    const n = t._rows[e];
+    this.#w(e, n), Array.from(s.children).forEach((l, c) => {
       const a = t._visibleColumns[c];
       if (a?.editable) {
-        const d = o;
-        d.classList.contains("editing") || this.#p(l, e, a, c, d, !0);
+        const d = l;
+        d.classList.contains("editing") || this.#m(n, e, a, c, d, !0);
       }
     }), setTimeout(() => {
-      let o = s.querySelector(`.cell[data-col="${t._focusCol}"]`);
-      if (o?.classList.contains("editing") || (o = s.querySelector(".cell.editing")), o?.classList.contains("editing")) {
-        const c = o.querySelector(w);
+      let l = s.querySelector(`.cell[data-col="${t._focusCol}"]`);
+      if (l?.classList.contains("editing") || (l = s.querySelector(".cell.editing")), l?.classList.contains("editing")) {
+        const c = l.querySelector(v);
         try {
           c?.focus({ preventScroll: !0 });
         } catch {
@@ -1131,34 +1155,34 @@ class X extends O {
    * @fires row-commit - Emitted after the row edit is committed
    */
   commitActiveRowEdit() {
-    this.#e !== -1 && this.#n(this.#e, !1);
+    this.#e !== -1 && this.#s(this.#e, !1);
   }
   /**
    * Cancel the currently active row edit.
    */
   cancelActiveRowEdit() {
-    this.#e !== -1 && this.#n(this.#e, !0);
+    this.#e !== -1 && this.#s(this.#e, !0);
   }
   // #endregion
   // #region Internal Methods
   /**
    * Begin editing a single cell.
    */
-  #w(e, t, i) {
-    const n = this.grid, s = n._rows[e], l = n._visibleColumns[t];
-    !s || !l?.editable || i.classList.contains("editing") || (this.#e !== e && this.#E(e, s), this.#d = t, this.#p(s, e, l, t, i, !1));
+  #b(e, t, i) {
+    const r = this.grid, s = r._rows[e], n = r._visibleColumns[t];
+    !s || !n?.editable || i.classList.contains("editing") || (this.#e !== e && this.#w(e, s), this.#u = t, this.#m(s, e, n, t, i, !1));
   }
   /**
    * Focus the editor input in the currently focused cell (grid mode only).
    * Used when pressing Enter to enter edit mode from navigation mode.
    */
-  #b() {
+  #y() {
     const e = this.grid, t = e._focusRow, i = e._focusCol;
     if (t < 0 || i < 0) return;
     const s = e.findRenderedRowElement?.(t)?.querySelector(`.cell[data-col="${i}"]`);
     if (s?.classList.contains("editing")) {
-      const l = s.querySelector(w);
-      l && (this.#a = !1, l.focus(), this.#r = !0, l instanceof HTMLInputElement && (l.type === "text" || l.type === "number") && l.select());
+      const n = s.querySelector(v);
+      n && (this.#a = !1, n.focus(), this.#n = !0, n instanceof HTMLInputElement && (n.type === "text" || n.type === "number") && n.select());
     }
   }
   /**
@@ -1166,43 +1190,43 @@ class X extends O {
    * Moves to next/previous editable cell, staying in edit mode.
    * Wraps to next/previous row when reaching row boundaries.
    */
-  #y(e) {
-    const t = this.grid, i = t._rows, n = this.#t ? t._focusRow : this.#e, s = t._visibleColumns.map((a, d) => a.editable ? d : -1).filter((a) => a >= 0);
+  #C(e) {
+    const t = this.grid, i = t._rows, r = this.#t ? t._focusRow : this.#e, s = t._visibleColumns.map((a, d) => a.editable ? d : -1).filter((a) => a >= 0);
     if (s.length === 0) return;
-    const o = s.indexOf(t._focusCol) + (e ? 1 : -1);
-    if (o >= 0 && o < s.length) {
-      t._focusCol = s[o];
-      const d = t.findRenderedRowElement?.(n)?.querySelector(`.cell[data-col="${s[o]}"]`);
-      d?.classList.contains("editing") && d.querySelector(w)?.focus({ preventScroll: !0 }), L(t, { forceHorizontalScroll: !0 });
+    const l = s.indexOf(t._focusCol) + (e ? 1 : -1);
+    if (l >= 0 && l < s.length) {
+      t._focusCol = s[l];
+      const d = t.findRenderedRowElement?.(r)?.querySelector(`.cell[data-col="${s[l]}"]`);
+      d?.classList.contains("editing") && d.querySelector(v)?.focus({ preventScroll: !0 }), L(t, { forceHorizontalScroll: !0 });
       return;
     }
-    const c = n + (e ? 1 : -1);
+    const c = r + (e ? 1 : -1);
     c >= 0 && c < i.length && (this.#t ? (t._focusRow = c, t._focusCol = e ? s[0] : s[s.length - 1], L(t, { forceHorizontalScroll: !0 }), this.requestAfterRender(), setTimeout(() => {
       const d = t.findRenderedRowElement?.(c)?.querySelector(`.cell[data-col="${t._focusCol}"]`);
-      d?.classList.contains("editing") && d.querySelector(w)?.focus({ preventScroll: !0 });
-    }, 0)) : (this.#n(n, !1), t._focusRow = c, t._focusCol = e ? s[0] : s[s.length - 1], this.beginBulkEdit(c), L(t, { forceHorizontalScroll: !0 })));
+      d?.classList.contains("editing") && d.querySelector(v)?.focus({ preventScroll: !0 });
+    }, 0)) : (this.#s(r, !1), t._focusRow = c, t._focusCol = e ? s[0] : s[s.length - 1], this.beginBulkEdit(c), L(t, { forceHorizontalScroll: !0 })));
   }
   /**
    * Sync the internal grid state with the plugin's editing state.
    */
-  #g() {
+  #p() {
     const e = this.grid;
     e._activeEditRows = this.#e, e._rowEditSnapshots = this.#l;
   }
   /**
    * Snapshot original row data and mark as editing.
    */
-  #E(e, t) {
-    if (this.#e !== e && (this.#l.set(e, { ...t }), this.#e = e, this.#g(), !this.#t)) {
+  #w(e, t) {
+    if (this.#e !== e && (this.#l.set(e, { ...t }), this.#e = e, this.#p(), !this.#t)) {
       const i = this.grid;
-      let n = "";
+      let r = "";
       try {
-        n = i.getRowId?.(t) ?? "";
+        r = i.getRowId?.(t) ?? "";
       } catch {
       }
       this.emit("edit-open", {
         rowIndex: e,
-        rowId: n,
+        rowId: r,
         row: t
       });
     }
@@ -1210,16 +1234,16 @@ class X extends O {
   /**
    * Exit editing for a row.
    */
-  #n(e, t) {
+  #s(e, t) {
     if (this.#e !== e) return;
-    const i = this.grid, n = this.#l.get(e), s = i._rows[e], l = i.findRenderedRowElement?.(e);
-    let o;
+    const i = this.grid, r = this.#l.get(e), s = i._rows[e], n = i.findRenderedRowElement?.(e);
+    let l;
     if (s)
       try {
-        o = i.getRowId?.(s);
+        l = i.getRowId?.(s);
       } catch {
       }
-    if (!t && l && s && l.querySelectorAll(".cell.editing").forEach((a) => {
+    if (!t && n && s && n.querySelectorAll(".cell.editing").forEach((a) => {
       const d = Number(a.getAttribute("data-col"));
       if (isNaN(d)) return;
       const g = i._visibleColumns[d];
@@ -1228,37 +1252,37 @@ class X extends O {
       const f = a.querySelector("input,textarea,select");
       if (f) {
         const E = g.field, p = s[E], m = _(f, g, p);
-        p !== m && this.#m(e, g, m, s);
+        p !== m && this.#E(e, g, m, s);
       }
-    }), t && n && s)
-      Object.keys(n).forEach((c) => {
-        s[c] = n[c];
-      }), o && (this.#s.delete(o), this.clearRowInvalid(o));
+    }), t && r && s)
+      Object.keys(r).forEach((c) => {
+        s[c] = r[c];
+      }), l && (this.#r.delete(l), this.clearRowInvalid(l));
     else if (!t && s) {
-      const c = this.#R(n, s), a = o ? this.#s.has(o) : c, d = this.emitCancelable("row-commit", {
+      const c = this.#_(r, s), a = l ? this.#r.has(l) : c, d = this.emitCancelable("row-commit", {
         rowIndex: e,
-        rowId: o ?? "",
+        rowId: l ?? "",
         row: s,
-        oldValue: n,
+        oldValue: r,
         newValue: s,
         changed: a,
         changedRows: this.changedRows,
         changedRowIds: this.changedRowIds
       });
-      d && n ? (Object.keys(n).forEach((g) => {
-        s[g] = n[g];
-      }), o && (this.#s.delete(o), this.clearRowInvalid(o))) : !d && c && this.isAnimationEnabled && (this.#f = e);
+      d && r ? (Object.keys(r).forEach((g) => {
+        s[g] = r[g];
+      }), l && (this.#r.delete(l), this.clearRowInvalid(l))) : !d && c && this.isAnimationEnabled && (this.#h = e);
     }
-    this.#l.delete(e), this.#e = -1, this.#d = -1, this.#g();
+    this.#l.delete(e), this.#e = -1, this.#u = -1, this.#d = !1, this.#p();
     for (const c of this.#o)
       c.startsWith(`${e}:`) && this.#o.delete(c);
     for (const c of this.#c.keys())
       c.startsWith(`${e}:`) && this.#c.delete(c);
-    l && (l.querySelectorAll(".cell.editing").forEach((c) => {
+    n && (n.querySelectorAll(".cell.editing").forEach((c) => {
       c.classList.remove("editing"), U(c.parentElement);
-    }), this.requestRender()), this.#u = !0, l || (this.#v(i), this.#u = !1), !this.#t && s && this.emit("edit-close", {
+    }), this.requestRender()), this.#f = !0, n || (this.#v(i), this.#f = !1), !this.#t && s && this.emit("edit-close", {
       rowIndex: e,
-      rowId: o ?? "",
+      rowId: l ?? "",
       row: s,
       reverted: t
     });
@@ -1267,28 +1291,28 @@ class X extends O {
    * Commit a single cell value change.
    * Uses ID-based change tracking for stability when rows are reordered.
    */
-  #m(e, t, i, n) {
+  #E(e, t, i, r) {
     const s = t.field;
     if (!S(s)) return;
-    const l = n[s];
-    if (l === i) return;
-    const o = this.grid;
+    const n = r[s];
+    if (n === i) return;
+    const l = this.grid;
     let c;
     try {
-      c = this.grid.getRowId(n);
+      c = this.grid.getRowId(r);
     } catch {
     }
-    const a = c ? !this.#s.has(c) : !0, d = c ? (m) => this.grid.updateRow(c, m, "cascade") : T;
+    const a = c ? !this.#r.has(c) : !0, d = c ? (m) => this.grid.updateRow(c, m, "cascade") : T;
     let g = !1;
     const f = c ? (m) => {
       g = !0, this.setInvalid(c, s, m ?? "");
     } : () => {
     };
     if (this.emitCancelable("cell-commit", {
-      row: n,
+      row: r,
       rowId: c ?? "",
       field: s,
-      oldValue: l,
+      oldValue: n,
       value: i,
       rowIndex: e,
       changedRows: this.changedRows,
@@ -1297,34 +1321,39 @@ class X extends O {
       updateRow: d,
       setInvalid: f
     })) return;
-    c && !g && this.isCellInvalid(c, s) && this.clearInvalid(c, s), n[s] = i, c && this.#s.add(c), this.#g(), this.emitPluginEvent("cell-edit-committed", {
+    c && !g && this.isCellInvalid(c, s) && this.clearInvalid(c, s), r[s] = i, c && this.#r.add(c), this.#p(), this.emitPluginEvent("cell-edit-committed", {
       rowIndex: e,
       field: s,
-      oldValue: l,
+      oldValue: n,
       newValue: i
     });
-    const p = o.findRenderedRowElement?.(e);
+    const p = l.findRenderedRowElement?.(e);
     p && p.classList.add("changed");
   }
   /**
    * Inject an editor into a cell.
    */
-  #p(e, t, i, n, s, l) {
+  #m(e, t, i, r, s, n) {
     if (!i.editable || s.classList.contains("editing")) return;
-    let o;
+    let l;
     try {
-      o = this.grid.getRowId(e);
+      l = this.grid.getRowId(e);
     } catch {
     }
-    const c = o ? (u) => this.grid.updateRow(o, u, "cascade") : T, a = S(i.field) ? e[i.field] : void 0;
-    s.classList.add("editing"), this.#o.add(`${t}:${n}`);
+    const c = l ? (u) => this.grid.updateRow(l, u, "cascade") : T, a = S(i.field) ? e[i.field] : void 0;
+    s.classList.add("editing"), this.#o.add(`${t}:${r}`);
     const d = s.parentElement;
-    d && K(d);
+    d && W(d);
     let g = !1;
     const f = (u) => {
-      g || !this.#t && this.#e === -1 || this.#m(t, i, u, e);
+      if (g || !this.#t && this.#e === -1) return;
+      const h = this.grid._rows[t] ?? e;
+      this.#E(t, i, u, h);
     }, E = () => {
-      g = !0, S(i.field) && (e[i.field] = a);
+      if (g = !0, S(i.field)) {
+        const u = this.grid._rows[t] ?? e;
+        u[i.field] = a;
+      }
     }, p = document.createElement("div");
     p.className = "tbw-editor-host", s.innerHTML = "", s.appendChild(p), p.addEventListener("keydown", (u) => {
       if (u.key === "Enter") {
@@ -1336,7 +1365,7 @@ class X extends O {
         }
         if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(u) === !1)
           return;
-        u.stopPropagation(), u.preventDefault(), g = !0, this.#n(t, !1);
+        u.stopPropagation(), u.preventDefault(), g = !0, this.#s(t, !1);
       }
       if (u.key === "Escape") {
         if (this.#t) {
@@ -1345,34 +1374,34 @@ class X extends O {
         }
         if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(u) === !1)
           return;
-        u.stopPropagation(), u.preventDefault(), E(), this.#n(t, !0);
+        u.stopPropagation(), u.preventDefault(), E(), this.#s(t, !0);
       }
     });
-    const m = i, y = m.__editorTemplate, v = W(this.grid, m) ?? j(i), k = a, q = `${t}:${i.field}`, A = [];
+    const m = i, y = m.__editorTemplate, w = j(this.grid, m) ?? K(i), k = a, q = `${t}:${i.field}`, A = [];
     this.#c.set(q, (u) => {
       for (const h of A) h(u);
     });
     const C = (u) => {
       A.push(u);
     };
-    if (v === "template" && y)
-      this.#C(p, m, e, a, f, E, l, t), C((u) => {
+    if (w === "template" && y)
+      this.#R(p, m, e, a, f, E, n, t), C((u) => {
         const h = p.querySelector(
           "input,textarea,select"
         );
         h && (h instanceof HTMLInputElement && h.type === "checkbox" ? h.checked = !!u : h.value = String(u ?? ""));
       });
-    else if (typeof v == "string") {
-      const u = document.createElement(v);
+    else if (typeof w == "string") {
+      const u = document.createElement(w);
       u.value = k, u.addEventListener("change", () => f(u.value)), C((h) => {
         u.value = h;
-      }), p.appendChild(u), l || queueMicrotask(() => {
-        p.querySelector(w)?.focus({ preventScroll: !0 });
+      }), p.appendChild(u), n || queueMicrotask(() => {
+        p.querySelector(v)?.focus({ preventScroll: !0 });
       });
-    } else if (typeof v == "function") {
+    } else if (typeof w == "function") {
       const u = {
         row: e,
-        rowId: o ?? "",
+        rowId: l ?? "",
         value: k,
         field: i.field,
         column: i,
@@ -1380,7 +1409,7 @@ class X extends O {
         cancel: E,
         updateRow: c,
         onValueChange: C
-      }, h = v(u);
+      }, h = w(u);
       typeof h == "string" ? (p.innerHTML = h, Q(p, i, f, a), C((R) => {
         const b = p.querySelector(
           "input,textarea,select"
@@ -1388,15 +1417,15 @@ class X extends O {
         b && (b instanceof HTMLInputElement && b.type === "checkbox" ? b.checked = !!R : b.value = String(R ?? ""));
       })) : h instanceof Node && (p.appendChild(h), h instanceof HTMLInputElement || h instanceof HTMLSelectElement || h instanceof HTMLTextAreaElement ? C((b) => {
         h instanceof HTMLInputElement && h.type === "checkbox" ? h.checked = !!b : h.value = String(b ?? "");
-      }) : s.setAttribute("data-editor-managed", "")), l || queueMicrotask(() => {
-        p.querySelector(w)?.focus({ preventScroll: !0 });
+      }) : s.setAttribute("data-editor-managed", "")), n || queueMicrotask(() => {
+        p.querySelector(v)?.focus({ preventScroll: !0 });
       });
-    } else if (v && typeof v == "object") {
+    } else if (w && typeof w == "object") {
       const u = document.createElement("div");
       u.setAttribute("data-external-editor", ""), u.setAttribute("data-field", i.field), p.appendChild(u), s.setAttribute("data-editor-managed", "");
       const h = {
         row: e,
-        rowId: o ?? "",
+        rowId: l ?? "",
         value: k,
         field: i.field,
         column: i,
@@ -1405,34 +1434,34 @@ class X extends O {
         updateRow: c,
         onValueChange: C
       };
-      if (v.mount)
+      if (w.mount)
         try {
-          v.mount({ placeholder: u, context: h, spec: v });
+          w.mount({ placeholder: u, context: h, spec: w });
         } catch (R) {
           console.warn(`[tbw-grid] External editor mount error for column '${i.field}':`, R);
         }
       else
         this.grid.dispatchEvent(
-          new CustomEvent("mount-external-editor", { detail: { placeholder: u, spec: v, context: h } })
+          new CustomEvent("mount-external-editor", { detail: { placeholder: u, spec: w, context: h } })
         );
     }
   }
   /**
    * Render a template-based editor.
    */
-  #C(e, t, i, n, s, l, o, c) {
+  #R(e, t, i, r, s, n, l, c) {
     const a = t.__editorTemplate;
     if (!a) return;
     const d = a.cloneNode(!0), g = t.__compiledEditor;
     g ? d.innerHTML = g({
       row: i,
-      value: n,
+      value: r,
       field: t.field,
       column: t,
       commit: s,
-      cancel: l
+      cancel: n
     }) : d.querySelectorAll("*").forEach((E) => {
-      E.childNodes.length === 1 && E.firstChild?.nodeType === Node.TEXT_NODE && (E.textContent = E.textContent?.replace(/{{\s*value\s*}}/g, n == null ? "" : String(n)).replace(/{{\s*row\.([a-zA-Z0-9_]+)\s*}}/g, (p, m) => {
+      E.childNodes.length === 1 && E.firstChild?.nodeType === Node.TEXT_NODE && (E.textContent = E.textContent?.replace(/{{\s*value\s*}}/g, r == null ? "" : String(r)).replace(/{{\s*row\.([a-zA-Z0-9_]+)\s*}}/g, (p, m) => {
         if (!S(m)) return "";
         const y = i[m];
         return y == null ? "" : String(y);
@@ -1442,23 +1471,23 @@ class X extends O {
       "input,textarea,select"
     );
     if (f) {
-      f instanceof HTMLInputElement && f.type === "checkbox" ? f.checked = !!n : f.value = String(n ?? "");
+      f instanceof HTMLInputElement && f.type === "checkbox" ? f.checked = !!r : f.value = String(r ?? "");
       let E = !1;
       f.addEventListener("blur", () => {
-        E || s(_(f, t, n));
+        E || s(_(f, t, r));
       }), f.addEventListener("keydown", (p) => {
         const m = p;
         if (m.key === "Enter") {
           if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(m) === !1)
             return;
-          m.stopPropagation(), m.preventDefault(), E = !0, s(_(f, t, n)), this.#n(c, !1);
+          m.stopPropagation(), m.preventDefault(), E = !0, s(_(f, t, r)), this.#s(c, !1);
         }
         if (m.key === "Escape") {
           if (this.config.onBeforeEditClose && this.config.onBeforeEditClose(m) === !1)
             return;
-          m.stopPropagation(), m.preventDefault(), l(), this.#n(c, !0);
+          m.stopPropagation(), m.preventDefault(), n(), this.#s(c, !0);
         }
-      }), f instanceof HTMLInputElement && f.type === "checkbox" && f.addEventListener("change", () => s(f.checked)), o || setTimeout(() => f.focus({ preventScroll: !0 }), 0);
+      }), f instanceof HTMLInputElement && f.type === "checkbox" && f.addEventListener("change", () => s(f.checked)), l || setTimeout(() => f.focus({ preventScroll: !0 }), 0);
     }
     e.appendChild(d);
   }
@@ -1466,11 +1495,11 @@ class X extends O {
    * Compare snapshot vs current row to detect if any values changed during this edit session.
    * Uses shallow comparison of all properties.
    */
-  #R(e, t) {
+  #_(e, t) {
     if (!e) return !1;
-    const i = e, n = t, s = /* @__PURE__ */ new Set([...Object.keys(i), ...Object.keys(n)]);
-    for (const l of s)
-      if (i[l] !== n[l])
+    const i = e, r = t, s = /* @__PURE__ */ new Set([...Object.keys(i), ...Object.keys(r)]);
+    for (const n of s)
+      if (i[n] !== r[n])
         return !0;
     return !1;
   }
@@ -1480,12 +1509,12 @@ class X extends O {
   #v(e) {
     queueMicrotask(() => {
       try {
-        const t = e._focusRow, i = e._focusCol, n = e.findRenderedRowElement?.(t);
-        if (n) {
+        const t = e._focusRow, i = e._focusCol, r = e.findRenderedRowElement?.(t);
+        if (r) {
           Array.from(e._bodyEl.querySelectorAll(".cell-focus")).forEach(
-            (l) => l.classList.remove("cell-focus")
+            (n) => n.classList.remove("cell-focus")
           );
-          const s = n.querySelector(`.cell[data-row="${t}"][data-col="${i}"]`);
+          const s = r.querySelector(`.cell[data-row="${t}"][data-col="${i}"]`);
           s && (s.classList.add("cell-focus"), s.setAttribute("aria-selected", "true"), s.hasAttribute("tabindex") || s.setAttribute("tabindex", "-1"), s.focus({ preventScroll: !0 }));
         }
       } catch {
@@ -1496,6 +1525,6 @@ class X extends O {
 }
 export {
   X as EditingPlugin,
-  j as defaultEditorFor
+  K as defaultEditorFor
 };
 //# sourceMappingURL=index.js.map