ids-enterprise-wc 1.15.9-patch.12 → 1.15.9-patch.13

package/chunks/{ids-chunk-A5IOTIO6-full.js → ids-chunk-DSWFDICX-full.js}

@@ -24,7 +24,7 @@ import {
 } from "./ids-chunk-6QUPN2OT-full.js";
 import {
   editors
-} from "./ids-chunk-MZTBZCHG-full.js";
+} from "./ids-chunk-CVY6XSRY-full.js";
 import {
   IdsDataGridToggleEmptyMessage,
   emptyMessageTemplate,
@@ -34,7 +34,7 @@ import {
 } from "./ids-chunk-3BYETIBG-full.js";
 import {
   IdsDataGridFilters
-} from "./ids-chunk-FV5W3K6S-full.js";
+} from "./ids-chunk-O32SEXUF-full.js";
 import {
   IdsDataGridFormatters
 } from "./ids-chunk-LZ3MVUCD-full.js";
@@ -43,10 +43,10 @@ import {
 } from "./ids-chunk-HUXAWVOG-full.js";
 import {
   IdsDataGridRow
-} from "./ids-chunk-5GV6Y3WM-full.js";
+} from "./ids-chunk-OP5EXDDT-full.js";
 import {
   IdsDataGridCell
-} from "./ids-chunk-EGZI5ZV3-full.js";
+} from "./ids-chunk-6YJ4HIUC-full.js";
 import {
   DEFAULT_COLUMN_MIN_WIDTH
 } from "./ids-chunk-5XYPHVID-full.js";
@@ -4464,6 +4464,13 @@ var IdsDataGrid = class extends Base {
    * @param {boolean} isClear do not keep current data
    */
   updateDatasetAndRefresh(row, data, isClear) {
+    if (this.activeCell.row === row && this.activeCellEditor?.isEditing) {
+      this.commitCellEdit();
+      const committedRow = this.data[row];
+      if (committedRow && isClear) {
+        data = { ...data, ...committedRow };
+      }
+    }
     const existingRow = this.data[row];
     __privateMethod(this, _IdsDataGrid_instances, saveCellOriginalValue_fn).call(this, existingRow, row, data);
     this.updateDataset(row, data, isClear);
@@ -6050,7 +6057,6 @@ attachCopyPasteCellHandlers_fn = function() {
 attachKeyboardListeners_fn = function() {
   this.listen(["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End"], this, (e) => {
     if (["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"].includes(e.key) && document.activeElement?.nodeName === "IDS-DATA-GRID" && __privateGet(this, _activeCellCache) && __privateGet(this, _activeCellCache)?.hasLeaveViewport) {
-      __privateMethod(this, _IdsDataGrid_instances, scrollRowIntoView_fn).call(this, Math.max(__privateGet(this, _activeCellCache).rowIndex - 3, 0));
       e.preventDefault();
       e.stopPropagation();
       const previousActiveRow2 = __privateGet(this, _activeCellCache).rowIndex;
@@ -6070,6 +6076,22 @@ attachKeyboardListeners_fn = function() {
       }
       const maxCol = this.visibleColumns.length - 1;
       __privateGet(this, _activeCellCache).columnIndex = Math.min(Math.max(__privateGet(this, _activeCellCache).columnIndex + newColIndex, 0), maxCol);
+      if (__privateGet(this, _activeCellCache).rowIndex !== previousActiveRow2) {
+        __privateGet(this, _activeCellCache).wasEditing = false;
+        __privateGet(this, _activeCellCache).currentValue = void 0;
+      }
+      if (this.treeGrid) {
+        const visibleRowIdx = __privateMethod(this, _IdsDataGrid_instances, getVisibleRowIndex_fn).call(this, __privateGet(this, _activeCellCache).rowIndex);
+        if (visibleRowIdx !== -1 && this.container) {
+          const { ROW_HEIGHT } = this.virtualScrollSettings;
+          const headerHeight = this.header?.clientHeight ?? 0;
+          const maxScroll = this.container.scrollHeight - this.container.clientHeight;
+          const targetScrollTop = Math.max(visibleRowIdx * ROW_HEIGHT - headerHeight, 0);
+          this.container.scrollTop = Math.min(targetScrollTop, maxScroll);
+        }
+      } else {
+        __privateMethod(this, _IdsDataGrid_instances, scrollRowIntoView_fn).call(this, Math.max(__privateGet(this, _activeCellCache).rowIndex - 3, 0));
+      }
       if ((this.rowSelection === "mixed" || this.rowSelection === "multiple") && newRowIndex !== 0 && e.shiftKey) {
         const activeRowIndex2 = __privateGet(this, _activeCellCache).rowIndex;
         __privateGet(this, _lastShiftedRow) ?? __privateSet(this, _lastShiftedRow, previousActiveRow2);
@@ -6627,7 +6649,7 @@ appendMissingRows_fn = function() {
     }
   }
   if (missingRows.length && this.body) {
-    this.body.innerHTML += missingRows.join("");
+    this.body.insertAdjacentHTML("beforeend", missingRows.join(""));
   }
   if (missingRows.length === 0 && data.length - 1 > lastRowIndex) {
     __privateMethod(this, _IdsDataGrid_instances, handleVirtualScroll_fn).call(this, ROW_HEIGHT);
@@ -6678,8 +6700,8 @@ attachVirtualScrollEvent_fn = function() {
         __privateMethod(this, _IdsDataGrid_instances, calculateColumnsOnscreen_fn).call(this);
       }, 3);
     }
-    __privateMethod(this, _IdsDataGrid_instances, restoreActiveCellAfterScroll_fn).call(this);
-    __privateMethod(this, _IdsDataGrid_instances, restoreEditedCellsAfterScroll_fn).call(this);
+    __privateMethod(this, _IdsDataGrid_instances, restoreActiveCellAfterScroll_fn).call(this, this.activeCellEditor);
+    __privateMethod(this, _IdsDataGrid_instances, restoreEditedCellsAfterScroll_fn).call(this, this.activeCellEditor);
   }, { capture: true, passive: true });
   let debounceScrollend = null;
   this.offEvent("scrollend.data-grid.virtual-scroll", this.container);
@@ -6688,6 +6710,8 @@ attachVirtualScrollEvent_fn = function() {
     if (!this.treeGrid) {
       clearTimeout(debounceScrollend);
       debounceScrollend = setTimeout(() => {
+        const isEditing = this.activeCellEditor || this.activeCell?.node?.classList.contains("is-editing");
+        if (isEditing) return;
         __privateMethod(this, _IdsDataGrid_instances, handleVirtualScroll_fn).call(this, virtualRowHeight);
       }, 500);
     }
@@ -7075,6 +7099,7 @@ scrollTreeRowIntoView_fn = function(cursorIndex) {
     __privateMethod(this, _IdsDataGrid_instances, saveEditedCellsBeforeScroll_fn).call(this);
     __privateMethod(this, _IdsDataGrid_instances, recycleAllTreeRows_fn).call(this, cursorIndex);
     __privateMethod(this, _IdsDataGrid_instances, restoreEditedCellsAfterScroll_fn).call(this);
+    __privateMethod(this, _IdsDataGrid_instances, restoreActiveCellAfterScroll_fn).call(this);
     return;
   }
   const moveRowsDown = upperLimitIndex - firstDomRowVirtualIndex;
@@ -7112,6 +7137,7 @@ scrollTreeRowIntoView_fn = function(cursorIndex) {
   __privateMethod(this, _IdsDataGrid_instances, positionVirtualScrollWindow_fn).call(this, firstVisibleRowIndex, virtualRows.length, scrollSettings);
   if (needsRecycling) {
     __privateMethod(this, _IdsDataGrid_instances, restoreEditedCellsAfterScroll_fn).call(this);
+    __privateMethod(this, _IdsDataGrid_instances, restoreActiveCellAfterScroll_fn).call(this);
   }
 };
 recycleTreeRowsDown_fn = function(obj, staleRows) {
@@ -7448,10 +7474,24 @@ saveEditedCellsBeforeScroll_fn = function() {
   if (this.activeCell?.node?.isEditing) {
     editedCells.push(this.activeCell?.node);
     const activeCell = this.activeCell.node;
-    const currentValue = activeCell.editor?.input?.value || "";
+    const columnId = this.columns[this.activeCell.cell].id;
+    const cellValue = this.data[this.activeCell.row][columnId];
+    const currentValue = activeCell.editor?.input?.value || cellValue || "";
     this.updateActiveCellCache(this.activeCell.row, this.activeCell.cell, currentValue, true);
     __privateGet(this, _activeCellCache).shouldReinstateCell = true;
-    this.commitCellEdit();
+    const scrollTop = this.container?.scrollTop || 0;
+    const containerHeight = this.container?.clientHeight || 0;
+    const rowHeight = this.virtualScrollSettings.ROW_HEIGHT;
+    const effectiveRowIndex = __privateMethod(this, _IdsDataGrid_instances, getVisibleRowIndex_fn).call(this, this.activeCell.row);
+    if (effectiveRowIndex === -1) return;
+    const rowTop = effectiveRowIndex * rowHeight;
+    const rowBottom = rowTop + rowHeight;
+    const viewportTop = scrollTop;
+    const viewportBottom = scrollTop + containerHeight;
+    const isInViewport = rowTop >= viewportTop && rowBottom <= viewportBottom;
+    if (!isInViewport) {
+      this.commitCellEdit();
+    }
   }
   for (const dirtyCell of this.dirtyCells) {
     const idsCell = this.cellByIndex(dirtyCell.row, dirtyCell.cell);
@@ -7480,8 +7520,9 @@ saveEditedCellsBeforeScroll_fn = function() {
 /**
  * Restore active cell focus and edit state after scroll ends
  * @private
+ * @param {IdsDataGridCell} activeCellEditor optional cell editor to restore
  */
-restoreActiveCellAfterScroll_fn = function() {
+restoreActiveCellAfterScroll_fn = function(activeCellEditor) {
   if (!__privateGet(this, _activeCellCache) || !__privateGet(this, _activeCellCache)?.shouldReinstateCell) {
     return;
   }
@@ -7516,6 +7557,9 @@ restoreActiveCellAfterScroll_fn = function() {
   if (!cellElement) {
     return;
   }
+  if (activeCellEditor) {
+    return;
+  }
   this.setActiveCell(columnIndex, rowIndex, false, "internal");
   if (wasEditing === true && cellElement.column?.editor) {
     cellElement.startCellEdit();
@@ -7528,10 +7572,11 @@ restoreActiveCellAfterScroll_fn = function() {
   }
 };
 /**
- * Restore edited cell values after DOM recycling
+ * Restore active cell focus and edit state after scroll ends
  * @private
+ * @param {IdsDataGridCell} activeCellEditor optional cell editor to restore
  */
-restoreEditedCellsAfterScroll_fn = function() {
+restoreEditedCellsAfterScroll_fn = function(activeCellEditor) {
   if (__privateGet(this, _editedCellsCache).size === 0) {
     return;
   }
@@ -7561,6 +7606,9 @@ restoreEditedCellsAfterScroll_fn = function() {
     if (!cellElement) {
       return;
     }
+    if (activeCellEditor) {
+      return;
+    }
     if (originalValue !== void 0) {
       cellElement.originalValue = originalValue;
     }
@@ -7581,4 +7629,4 @@ IdsDataGrid = __decorateClass([
 export {
   IdsDataGrid
 };
-//# sourceMappingURL=ids-chunk-A5IOTIO6-full.js.map
+//# sourceMappingURL=ids-chunk-DSWFDICX-full.js.map