@polygrid/core 1.0.478 → 1.0.479

package/dist/api/set-external-loading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-external-loading.d.ts","sourceRoot":"","sources":["../../src/api/set-external-loading.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,QAElE"}
+{"version":3,"file":"set-external-loading.d.ts","sourceRoot":"","sources":["../../src/api/set-external-loading.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,QAIlE"}

package/dist/api/set-external-loading.js

@@ -1,4 +1,6 @@
 export function setExternalLoading(grid, visible) {
-    grid._store.emitEvent("setLoading", { visible });
+    grid._store.update((draft) => {
+        draft.view.externalLoading = visible;
+    });
 }
 //# sourceMappingURL=set-external-loading.js.map

package/dist/api/set-external-loading.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-external-loading.js","sourceRoot":"","sources":["../../src/api/set-external-loading.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAAC,IAAc,EAAE,OAAgB;IACjE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"set-external-loading.js","sourceRoot":"","sources":["../../src/api/set-external-loading.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAAC,IAAc,EAAE,OAAgB;IACjE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/engine/core/interfaces/grid-event-map.d.ts

@@ -7,8 +7,5 @@ export interface GridEventMap {
     rowFilterCleared: {
         filter: Filter;
     };
-    setLoading: {
-        visible: boolean;
-    };
 }
 //# sourceMappingURL=grid-event-map.d.ts.map

package/dist/engine/core/interfaces/grid-event-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-event-map.d.ts","sourceRoot":"","sources":["../../../../src/engine/core/interfaces/grid-event-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,mBAAmB,EAAE,EAAE,CAAC;IACxB,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,UAAU,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAClC"}
+{"version":3,"file":"grid-event-map.d.ts","sourceRoot":"","sources":["../../../../src/engine/core/interfaces/grid-event-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,mBAAmB,EAAE,EAAE,CAAC;IACxB,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACtC"}

package/dist/engine/services/loading/loading.d.ts

@@ -7,6 +7,9 @@ export declare class LoadingService {
     destroy$: ObservableLike<void>;
     gridDom: GridDOM;
     grid: PolyGrid;
+    externalLoading$: ObservableLike<boolean>;
+    internalLoading$: ObservableLike<boolean>;
+    loading$: ObservableLike<boolean>;
     constructor(grid: PolyGrid);
     initApiSubscriptions(): void;
 }

package/dist/engine/services/loading/loading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loading.d.ts","sourceRoot":"","sources":["../../../../src/engine/services/loading/loading.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIvD,qBAAa,cAAc;IACzB,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;gBAEH,IAAI,EAAE,QAAQ;IAwB1B,oBAAoB;CACrB"}
+{"version":3,"file":"loading.d.ts","sourceRoot":"","sources":["../../../../src/engine/services/loading/loading.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,qBAAa,cAAc;IACzB,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;IAEf,gBAAgB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1C,gBAAgB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1C,QAAQ,EAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBAEvB,IAAI,EAAE,QAAQ;IAgB1B,oBAAoB;CAYrB"}

package/dist/engine/services/loading/loading.js

@@ -1,28 +1,23 @@
-import { recomputeVirtualRows } from "../row/methods/recompute-virtual-rows";
+import { distinctUntilChanged } from "../../rx-lite/operators/distinct-until-changed";
+import { map } from "../../rx-lite/operators/map";
+import * as methods from "./methods/index";
 export class LoadingService {
     constructor(grid) {
         this.store = grid._store;
         this.destroy$ = grid._destroy$;
         this.gridDom = grid._gridDom;
         this.grid = grid;
-        this.store.on("setLoading", (payload) => {
-            grid._store.update((draft) => {
-                draft.view.externalLoading = payload.visible;
-                if (payload.visible) {
-                    draft.view.rows = [];
-                    draft.view.viewRows = [];
-                    draft.ui.virtualRows.totalRowCount = 0;
-                    recomputeVirtualRows(draft.ui.virtualRows);
-                }
-                else {
-                    draft.ui.virtualRows = {
-                        ...draft.ui.virtualRows,
-                    };
-                }
-            });
-            console.log("TOGGLE LOADING");
-        });
+        this.externalLoading$ = this.store.selectKeyed("view.externalLoading", (s) => s.view.externalLoading);
+        this.internalLoading$ = this.store.selectKeyed("view.internalLoading", (s) => s.view.internalLoading);
+    }
+    initApiSubscriptions() {
+        this.loading$ = this.store
+            .merge(this.externalLoading$, this.internalLoading$)
+            .pipe(map(() => {
+            const s = this.store.getState();
+            return s.view.externalLoading || s.view.internalLoading;
+        }), distinctUntilChanged());
+        methods.toggleLoading(this, this.destroy$);
     }
-    initApiSubscriptions() { }
 }
 //# sourceMappingURL=loading.js.map

package/dist/engine/services/loading/loading.js.map

@@ -1 +1 @@
-{"version":3,"file":"loading.js","sourceRoot":"","sources":["../../../../src/engine/services/loading/loading.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAG7E,MAAM,OAAO,cAAc;IAMzB,YAAY,IAAc;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC3B,KAAK,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;gBAC7C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpB,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;oBACrB,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;oBACzB,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,aAAa,GAAG,CAAC,CAAC;oBACvC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,EAAE,CAAC,WAAW,GAAG;wBACrB,GAAG,KAAK,CAAC,EAAE,CAAC,WAAW;qBACxB,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB,KAAI,CAAC;CAC1B"}
+{"version":3,"file":"loading.js","sourceRoot":"","sources":["../../../../src/engine/services/loading/loading.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAElD,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAC;AAE3C,MAAM,OAAO,cAAc;IAUzB,YAAY,IAAc;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAC5C,sBAAsB,EACtB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAC9B,CAAC;QACF,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAC5C,sBAAsB,EACtB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAC9B,CAAC;IACJ,CAAC;IAED,oBAAoB;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK;aACvB,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC;aACnD,IAAI,CACH,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,OAAO,CAAC,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;QAC1D,CAAC,CAAC,EACF,oBAAoB,EAAE,CACvB,CAAC;QACJ,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;CACF"}

package/dist/engine/services/loading/methods/toggle-loading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toggle-loading.d.ts","sourceRoot":"","sources":["../../../../../src/engine/services/loading/methods/toggle-loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAM7E,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,wBAAgB,aAAa,CAC3B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,QAC5B"}
+{"version":3,"file":"toggle-loading.d.ts","sourceRoot":"","sources":["../../../../../src/engine/services/loading/methods/toggle-loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAM7E,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,wBAAgB,aAAa,CAC3B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,QAqD/B"}

package/dist/engine/services/loading/methods/toggle-loading.js

@@ -1,2 +1,48 @@
-export function toggleLoading(loadingService, destroy$) { }
+import { takeUntil } from "../../../rx-lite/operators/takeuntil";
+import { updateColumnWidths } from "../../layout/methods";
+import { RowPool } from "../../row/classes/row-pool";
+import { recomputeVirtualRows } from "../../row/methods/recompute-virtual-rows";
+export function toggleLoading(loadingService, destroy$) {
+    const grid = loadingService.grid;
+    loadingService.loading$.pipe(takeUntil(destroy$)).subscribe((visible) => {
+        const state = grid._store.getState();
+        grid._store.update((draft) => {
+            if (visible) {
+                // loading ON → clear rows
+                draft.view.rows = [];
+                draft.view.viewRows = [];
+                draft.ui.virtualRows.totalRowCount = 0;
+                recomputeVirtualRows(draft.ui.virtualRows);
+            }
+            else {
+                // loading OFF - if loading is still visible, remove it and create a new row pool
+                // this is needed, because in angular setting visible to false happens for some reason as the last step
+                if (grid._runtime.loadingContainer) {
+                    grid._runtime.loadingContainer.remove();
+                    grid._runtime.loadingContainer = null;
+                    // Destroy dynamic template if any
+                    grid._runtime.loadingHandle?.destroy();
+                    grid._runtime.loadingHandle = null;
+                    // create a new row pool
+                    const rowHeight = state.view.rowHeight;
+                    const columns = state.view.internalColumns;
+                    const viewportHeight = state.view.viewportHeight;
+                    const rowPool = new RowPool(grid._gridDom, columns, rowHeight, grid, viewportHeight);
+                    grid._runtime.rowPool = rowPool;
+                    // use fresh virtualRows
+                    const v = state.ui.virtualRows;
+                    recomputeVirtualRows(v);
+                    const data = state.view.rows;
+                    rowPool.update(v, data);
+                    // update col widths (for body cells)
+                    updateColumnWidths(loadingService.gridDom, state, state.view.resolvedColumnWidths, loadingService.grid);
+                    // trigger a virtual rows update
+                    draft.ui.virtualRows = {
+                        ...draft.ui.virtualRows,
+                    };
+                }
+            }
+        });
+    }, "TOGGLE-LOADING");
+}
 //# sourceMappingURL=toggle-loading.js.map

package/dist/engine/services/loading/methods/toggle-loading.js.map

@@ -1 +1 @@
-{"version":3,"file":"toggle-loading.js","sourceRoot":"","sources":["../../../../../src/engine/services/loading/methods/toggle-loading.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,aAAa,CAC3B,cAA8B,EAC9B,QAA8B,IAC7B,CAAC"}
+{"version":3,"file":"toggle-loading.js","sourceRoot":"","sources":["../../../../../src/engine/services/loading/methods/toggle-loading.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAIhF,MAAM,UAAU,aAAa,CAC3B,cAA8B,EAC9B,QAA8B;IAE9B,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;IACjC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;QACtE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,OAAO,EAAE,CAAC;gBACZ,0BAA0B;gBAC1B,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;gBACrB,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;gBACzB,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,aAAa,GAAG,CAAC,CAAC;gBACvC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,iFAAiF;gBACjF,uGAAuG;gBACvG,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;oBACxC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC;oBACtC,kCAAkC;oBAClC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,EAAE,CAAC;oBACvC,IAAI,CAAC,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC;oBACnC,wBAAwB;oBACxB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;oBACvC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;oBAC3C,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;oBACjD,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,IAAI,CAAC,QAAQ,EACb,OAAO,EACP,SAAS,EACT,IAAI,EACJ,cAAc,CACf,CAAC;oBACF,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;oBAChC,wBAAwB;oBACxB,MAAM,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC;oBAC/B,oBAAoB,CAAC,CAAC,CAAC,CAAC;oBACxB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC7B,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;oBACxB,qCAAqC;oBACrC,kBAAkB,CAChB,cAAc,CAAC,OAAO,EACtB,KAAK,EACL,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAC/B,cAAc,CAAC,IAAI,CACpB,CAAC;oBACF,gCAAgC;oBAChC,KAAK,CAAC,EAAE,CAAC,WAAW,GAAG;wBACrB,GAAG,KAAK,CAAC,EAAE,CAAC,WAAW;qBACxB,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,gBAAgB,CAAC,CAAC;AACvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polygrid/core",
-  "version": "1.0.478",
+  "version": "1.0.479",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",