@den4ik92/ng2-smart-table 19.2.4 → 19.2.6

package/fesm2022/den4ik92-ng2-smart-table.mjs

@@ -465,7 +465,6 @@ var SmartTableOnChangedEventName;
     SmartTableOnChangedEventName["sort"] = "sort";
     SmartTableOnChangedEventName["add"] = "add";
     SmartTableOnChangedEventName["remove"] = "remove";
-    SmartTableOnChangedEventName["append"] = "append";
     SmartTableOnChangedEventName["appendMany"] = "appendMany";
     SmartTableOnChangedEventName["prepend"] = "prepend";
     SmartTableOnChangedEventName["refresh"] = "refresh";
@@ -484,7 +483,7 @@ class DataSource {
             display: false,
             perPageSelect: [],
         });
-        this.data = [];
+        this.data = signal([]);
     }
     refresh() {
         this.emitOnChanged({ action: SmartTableOnChangedEventName.refresh });
@@ -496,28 +495,23 @@ class DataSource {
         return this.onChangedSource.asObservable();
     }
     prepend(element) {
-        this.data.unshift(element);
+        this.data.update((old) => [element, ...old]);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.prepend, newItems: [element] });
         return Promise.resolve(true);
     }
     appendMany(elements) {
-        this.data = [...this.data, ...elements];
-        this.emitOnChanged({ action: SmartTableOnChangedEventName.appendMany, newItems: elements }, this.data);
-        return Promise.resolve(true);
-    }
-    append(element) {
-        this.data.push(element);
-        this.emitOnChanged({ action: SmartTableOnChangedEventName.append, newItems: [element] });
+        this.data.update((old) => [...old, ...elements,]);
+        this.emitOnChanged({ action: SmartTableOnChangedEventName.appendMany, newItems: elements });
         return Promise.resolve(true);
     }
     add(element) {
-        this.data.push(element);
+        this.data.update((old) => [...old, element,]);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.add, newItems: [element] });
         return Promise.resolve(true);
     }
     remove(element) {
-        this.data = this.data.filter((el) => el !== element);
-        this.emitOnChanged({ action: SmartTableOnChangedEventName.remove, item: element }, this.data);
+        this.data.update((old) => old.filter((el) => el !== element));
+        this.emitOnChanged({ action: SmartTableOnChangedEventName.remove, item: element });
         return Promise.resolve(true);
     }
     update(oldItem, newItem) {
@@ -525,7 +519,7 @@ class DataSource {
         return Promise.resolve(true);
     }
     empty() {
-        this.data = [];
+        this.data.set([]);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.empty });
         return Promise.resolve(true);
     }
@@ -579,24 +573,17 @@ class DataSource {
         }
     }
     emitOnChanged(eventData, newElements) {
-        const actionData = () => {
-            const elements = newElements || this.data;
-            const emitData = {
-                ...eventData,
-                elements,
-                paging: this.pagingConf(),
-                filters: this.getFilters(),
-                sort: this.getSort(),
-            };
-            if (eventData.action === SmartTableOnChangedEventName.remove) {
-                return {
-                    ...emitData,
-                    elements: elements.filter((el) => el !== eventData.item),
-                };
-            }
-            return emitData;
+        const actionData = {
+            ...eventData,
+            elements: newElements || this.data(),
+            paging: this.pagingConf(),
+            filters: this.getFilters(),
+            sort: this.getSort(),
         };
-        this.onChangedSource.next(actionData());
+        if (eventData.action === SmartTableOnChangedEventName.remove) {
+            actionData.elements = (newElements || this.data()).filter((el) => el !== eventData.item);
+        }
+        this.onChangedSource.next(actionData);
     }
 }
 
@@ -647,10 +634,10 @@ class LocalDataSource extends DataSource {
         super();
         this.filteredAndSorted = signal([]);
         this.count = computed(() => this.filteredAndSorted().length);
-        this.data = data;
+        this.data.set(data);
     }
     load(data) {
-        this.data = data;
+        this.data.set(data);
         this.emitOnChanged({ action: SmartTableOnChangedEventName.load });
         return Promise.resolve(true);
     }
@@ -662,12 +649,12 @@ class LocalDataSource extends DataSource {
         this.reset(true);
         return super.appendMany(elements);
     }
-    append(element) {
+    add(element) {
         this.reset(true);
-        return super.append(element);
+        return super.add(element);
     }
     getAll() {
-        const data = this.data.slice(0);
+        const data = this.data().slice(0);
         return Promise.resolve(data);
     }
     reset(silent = false) {
@@ -693,8 +680,8 @@ class LocalDataSource extends DataSource {
     emitOnChanged(event) {
         let renderData = this.filteredAndSorted();
         const action = event.action;
-        if (['filter', 'refresh', 'load'].includes(action)) {
-            renderData = this.filter(this.data.slice(0));
+        if (['filter', 'refresh', 'load', 'add', 'prepend', 'appendMany'].includes(action)) {
+            renderData = this.filter(this.data().slice(0));
             this.filteredAndSorted.set(this.sort(renderData));
             renderData = this.filteredAndSorted();
         }
@@ -747,7 +734,7 @@ class ServerDataSource extends DataSource {
         this.requestFunction = requestFunction;
     }
     getAll() {
-        return Promise.resolve(this.data);
+        return Promise.resolve(this.data());
     }
     getSort() {
         return this.sortConf;
@@ -771,7 +758,7 @@ class ServerDataSource extends DataSource {
             })
                 .pipe(switchMap((params) => this.requestFunction(params)))
                 .subscribe((res) => {
-                this.data = res.data;
+                this.data.set(res.data);
                 this.pagingConf.update((old) => ({ ...old, total: res.total }));
                 super.emitOnChanged(eventData, res.data);
             });
@@ -1606,15 +1593,14 @@ class Grid {
         if (event.action === 'load') {
             this.dataSet.deselectAll();
         }
-        if (event.action !== 'update') {
-            this.dataSet.setData(event.elements);
-        }
-        else {
+        if (event.action === 'update') {
             const changedRow = this.dataSet.findRowByData(event.oldItem);
             if (changedRow) {
                 changedRow.setData(event.newItem || event.oldItem);
             }
+            return;
         }
+        this.dataSet.setData(event.elements);
     }
     prepareSource(source, initialSort, initialPaging) {
         const preparedSource = source || new LocalDataSource();