@fundamental-ngx/platform 0.62.0-rc.2 → 0.62.0-rc.21

package/fesm2022/fundamental-ngx-platform-table-helpers.mjs

@@ -2823,8 +2823,6 @@ class TableDraggableDirective extends TableDraggable {
         /** @hidden */
         this.dragDropInProgress = false;
         /** @hidden */
-        this._ngZone = inject(NgZone);
-        /** @hidden */
         this._cdr = inject(ChangeDetectorRef, {
             host: true
         });
@@ -2872,41 +2870,35 @@ class TableDraggableDirective extends TableDraggable {
     /** Method called when drag&drop event being cancelled. */
     dropCancelled() {
         /** After timeout to make click event handled first */
-        this._ngZone.runOutsideAngular(() => {
-            setTimeout(() => this._setDragInProgress(false));
-        });
+        setTimeout(() => this._setDragInProgress(false));
     }
     /** Method called when dragged item being dropped. */
     dragDropItemDrop(event) {
         /** After timeout to make click event handled first */
-        this._ngZone.runOutsideAngular(() => {
-            setTimeout(() => {
-                this._setDragInProgress(false);
-            });
+        setTimeout(() => {
+            this._setDragInProgress(false);
         });
-        this._onZoneFree(() => {
-            if (this.isTreeTable && event.draggedItemIndex !== event.replacedItemIndex) {
-                event.draggedItemIndex = this._table._tableCurrentlyRenderedRowsPlaceholder[event.draggedItemIndex];
-                event.replacedItemIndex = this._table._tableCurrentlyRenderedRowsPlaceholder[event.replacedItemIndex];
-                const dragRow = this._table._tableRows.find((row) => row === this._table._tableRowsVisible[event.draggedItemIndex]);
-                const dropRow = this._table._tableRows.find((row) => row === this._table._tableRowsVisible[event.replacedItemIndex]);
-                if (!dragRow || !dropRow || this._isDroppedInsideItself(dropRow, dragRow)) {
-                    return;
-                }
-                this._dragDropUpdateDragParentRowAttributes(dragRow);
-                this._dragDropRearrangeTreeRows(dragRow, dropRow, event);
-                this._dragDropUpdateDropRowAttributes(dragRow, dropRow, event.mode);
-                if (!dropRow.expanded && event.mode === 'group') {
-                    this._table.toggleExpandableTableRow(dropRow, true);
-                }
-                else {
-                    this._table.onTableRowsChanged();
-                }
-                this._cdr.detectChanges();
-                this._emitRowsRearrangeEvent(dragRow, dropRow, event);
-                this._table.refreshDndList();
+        if (this.isTreeTable && event.draggedItemIndex !== event.replacedItemIndex) {
+            event.draggedItemIndex = this._table._tableCurrentlyRenderedRowsPlaceholder[event.draggedItemIndex];
+            event.replacedItemIndex = this._table._tableCurrentlyRenderedRowsPlaceholder[event.replacedItemIndex];
+            const dragRow = this._table._tableRows.find((row) => row === this._table._tableRowsVisible[event.draggedItemIndex]);
+            const dropRow = this._table._tableRows.find((row) => row === this._table._tableRowsVisible[event.replacedItemIndex]);
+            if (!dragRow || !dropRow || this._isDroppedInsideItself(dropRow, dragRow)) {
+                return;
             }
-        });
+            this._dragDropUpdateDragParentRowAttributes(dragRow);
+            this._dragDropRearrangeTreeRows(dragRow, dropRow, event);
+            this._dragDropUpdateDropRowAttributes(dragRow, dropRow, event.mode);
+            if (!dropRow.expanded && event.mode === 'group') {
+                this._table.toggleExpandableTableRow(dropRow, true);
+            }
+            else {
+                this._table.onTableRowsChanged();
+            }
+            this._cdr.detectChanges();
+            this._emitRowsRearrangeEvent(dragRow, dropRow, event);
+            this._table.refreshDndList();
+        }
     }
     /**
      * @hidden
@@ -3013,12 +3005,6 @@ class TableDraggableDirective extends TableDraggable {
         this._table._tableRows = [...allRows, ...dropRowItems, ...rowsToMove, ...rowsAfterDropRow];
     }
     /** @hidden */
-    _onZoneFree(callback) {
-        this._ngZone.onMicrotaskEmpty.pipe(take(1)).subscribe(() => {
-            callback();
-        });
-    }
-    /** @hidden */
     _blockScrolling() {
         this._table._focusableGrid._preventKeydown = true;
         this._table.tableContainer.nativeElement.addEventListener('DOMMouseScroll', preventDefault, false);
@@ -3664,7 +3650,7 @@ class TableVirtualScrollDirective extends TableVirtualScroll {
             .pipe(filter$1(() => this.virtualScroll && !!this.bodyHeight), takeUntilDestroyed(this._destroyRef))
             .subscribe((scrollable) => {
             this.calculateVirtualScrollRows();
-            this._table.setTableState({
+            this._tableService.setTableState({
                 ...this._table.getTableState(),
                 scrollTopPosition: scrollable.getScrollTop()
             });