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

package/enterprise-wc.all.iife.js

@@ -77375,14 +77375,27 @@ ids-trigger-button[slot=trigger-end] {
       this.input.fieldHeight = String(cell?.dataGrid?.rowHeight) === "xxs" ? `xs` : String(cell?.dataGrid?.rowHeight);
       this.input.labelState = "collapsed";
       const value = cell?.innerText;
-      cell.innerHTML = "";
-      cell?.appendChild(this.input);
+      const treeFieldContainer = cell?.querySelector(".ids-data-grid-tree-field-container");
+      if (treeFieldContainer) {
+        treeFieldContainer.innerHTML = "";
+        treeFieldContainer.appendChild(this.input);
+      } else {
+        cell.innerHTML = "";
+        cell?.appendChild(this.input);
+      }
       this.input.addEventListener("keydown", (e) => applyEditorEndCellEdit(cell, e));
       this.input.value = value;
       if (this.input instanceof IdsInput && cell) {
         if (!isInline) this.input.shadowRoot?.querySelector("input")?.style.setProperty("width", `${cell.offsetWidth - 5}px`);
-        applyEditorSettings(this.input, cell?.column.editor?.editorSettings);
+        const settings = { ...cell?.column.editor?.editorSettings };
+        const shouldAutoselect = settings?.autoselect;
+        delete settings.autoselect;
+        applyEditorSettings(this.input, settings);
         applyEditorValidation(this.input, cell?.column.editor?.editorValidation);
+        const nativeInput = this.input.shadowRoot?.querySelector("input");
+        if (shouldAutoselect) {
+          nativeInput?.select();
+        }
       }
       this.input.focus();
     }
@@ -78562,6 +78575,21 @@ ids-trigger-button[slot=trigger-end] {
      * @param {boolean} trigger whether to trigger the beforecelledit event
      */
     startCellEdit(clickEvent, trigger = true) {
+      if (this.dataGrid.virtualScroll && this.rowIndex !== void 0) {
+        const container = this.dataGrid.container;
+        if (container) {
+          const rowHeight = this.dataGrid.virtualScrollSettings?.ROW_HEIGHT || 30;
+          const scrollTop = container.scrollTop || 0;
+          const containerHeight = container.clientHeight || 0;
+          const effectiveRowIndex = this.dataGrid.treeGrid ? this.dataGrid.virtualRows.findIndex((row) => row === this.dataGrid.data[this.rowIndex]) : this.rowIndex;
+          if (effectiveRowIndex === -1) return;
+          const rowTop = effectiveRowIndex * rowHeight;
+          const rowBottom = rowTop + rowHeight;
+          if (rowBottom < scrollTop || rowTop > scrollTop + containerHeight) {
+            return;
+          }
+        }
+      }
       if (this.dataGrid.activeCellEditor instanceof IdsDataGridCell && this.dataGrid.activeCellEditor !== this) {
         this.dataGrid.activeCellEditor.endCellEdit();
       }
@@ -89810,6 +89838,13 @@ ids-icon {
      * @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);
@@ -91396,7 +91431,6 @@ ids-icon {
   attachKeyboardListeners_fn9 = 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;
@@ -91416,6 +91450,22 @@ ids-icon {
         }
         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);
@@ -91973,7 +92023,7 @@ ids-icon {
       }
     }
     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);
@@ -92024,8 +92074,8 @@ ids-icon {
           __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);
@@ -92034,6 +92084,8 @@ ids-icon {
       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);
       }
@@ -92421,6 +92473,7 @@ ids-icon {
       __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;
@@ -92458,6 +92511,7 @@ ids-icon {
     __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) {
@@ -92794,10 +92848,24 @@ ids-icon {
     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);
@@ -92826,8 +92894,9 @@ ids-icon {
   /**
    * 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;
     }
@@ -92862,6 +92931,9 @@ ids-icon {
     if (!cellElement) {
       return;
     }
+    if (activeCellEditor) {
+      return;
+    }
     this.setActiveCell(columnIndex, rowIndex, false, "internal");
     if (wasEditing === true && cellElement.column?.editor) {
       cellElement.startCellEdit();
@@ -92874,10 +92946,11 @@ ids-icon {
     }
   };
   /**
-   * 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;
     }
@@ -92907,6 +92980,9 @@ ids-icon {
       if (!cellElement) {
         return;
       }
+      if (activeCellEditor) {
+        return;
+      }
       if (originalValue !== void 0) {
         cellElement.originalValue = originalValue;
       }