inviton-powerduck 0.0.79 → 0.0.81

package/components/datatable/datatable.tsx

@@ -336,6 +336,10 @@ export class DataTableFilterItemCollection extends Array<DataTableFilterItem> {
     }
 }
 
+export class DataTableConfig {
+    static filterMarking = true;
+}
+
 @Component
 class TableButtonComponent extends TsxComponent<TableButton> implements TableButton {
     @Prop() title!: string;
@@ -453,9 +457,12 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
         this.currentMobileBehavior = this.mobileBehavior;
         this.performColumnRefresh();
         this.handleWindowResized();
-        this.markInstance = new Mark(this.$el);
         window.addEventListener("resize", this.handleWindowResized, true);
 
+        if (DataTableConfig.filterMarking) {
+            this.markInstance = new Mark(this.$el);
+        }
+
         if (this.handleInitialFilter) {
             this.parseInitialFilter();
         }
@@ -847,6 +854,24 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
         return selectedRows;
     }
 
+    unmarkSelection(cb: () => void): void {
+        if (DataTableConfig.filterMarking) {
+            this.markInstance.unmark({
+                done: () => {
+                    this.enforceBodyRedraw = true;
+                    this.$nextTick(() => {
+                        this.enforceBodyRedraw = false;
+                        this.$nextTick(() => {
+                            cb();
+                        });
+                    });
+                },
+            });
+        } else {
+            cb();
+        }
+    }
+
     markSelection(): void {
         var mySelf = this;
         var escapeRegExp = function (string) {
@@ -881,11 +906,11 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
             regexBuilder += escapeRegExp(this.fullTextQuery);
         }
 
-        this.markInstance.unmark({
-            done: function () {
+        if (DataTableConfig.filterMarking) {
+            this.unmarkSelection(() => {
                 mySelf.markInstance.markRegExp(new RegExp("(" + regexBuilder + ")", "i"));
-            },
-        });
+            });
+        }
     }
 
     addFilterItem(dtColumn: TableColumn, newFilter: DataTablePostBackFilterItem): void {
@@ -917,11 +942,13 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
 
     handleClientsideFilter(markResults?: boolean): boolean {
         if (this.filterMode == DataTableFilterMode.Clientside) {
-            this.performClientsideFilter();
+            this.unmarkSelection(() => {
+                this.performClientsideFilter();
 
-            if (markResults) {
-                this.$nextTick(() => this.markSelection());
-            }
+                if (markResults) {
+                    this.markSelection();
+                }
+            });
 
             return true;
         }
@@ -1316,34 +1343,33 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
                 loadPromise = mySelf.customAjaxCall(mySelf.getAjaxArgs(paginationPosition, paginationLength));
             }
 
-            loadPromise
-                .then((data: any) => {
-                    mySelf.markInstance.unmark({
-                        done: function () {
-                            mySelf.enforceBodyRedraw = true;
-                            mySelf.$nextTick(() => {
-                                mySelf.enforceBodyRedraw = false;
-                                mySelf.isLoading = false;
-
-                                if (mySelf.parseLoadedRowset != null) {
-                                    let rowset = mySelf.parseLoadedRowset(data);
-                                    mySelf.totalCount = rowset.TotalCount;
-                                    mySelf.totalFilteredCount = rowset.TotalFilteredCount;
-                                    mySelf.rows = rowset.Rows;
-                                } else {
-                                    mySelf.totalCount = data.TotalCount;
-                                    mySelf.totalFilteredCount = data.TotalFilteredCount;
-                                    mySelf.rows = data.Rows;
-                                }
-
-                                mySelf.loadedRows = mySelf.rows;
-                                mySelf.$forceUpdate();
-                                mySelf.$nextTick(() => mySelf.markSelection());
-                                resolve(data);
-                            });
-                        },
+
+
+            loadPromise.then((data: any) => {
+                mySelf.unmarkSelection(() => {
+                    mySelf.enforceBodyRedraw = true;
+                    mySelf.$nextTick(() => {
+                        mySelf.enforceBodyRedraw = false;
+                        mySelf.isLoading = false;
+
+                        if (mySelf.parseLoadedRowset != null) {
+                            let rowset = mySelf.parseLoadedRowset(data);
+                            mySelf.totalCount = rowset.TotalCount;
+                            mySelf.totalFilteredCount = rowset.TotalFilteredCount;
+                            mySelf.rows = rowset.Rows;
+                        } else {
+                            mySelf.totalCount = data.TotalCount;
+                            mySelf.totalFilteredCount = data.TotalFilteredCount;
+                            mySelf.rows = data.Rows;
+                        }
+
+                        mySelf.loadedRows = mySelf.rows;
+                        mySelf.$forceUpdate();
+                        mySelf.$nextTick(() => mySelf.markSelection());
+                        resolve(data);
                     });
-                })
+                });
+            })
                 .catch((err) => {
                     mySelf.isLoading = false;
                     NotificationProvider.showErrorMessage(PowerduckState.getResourceValue('errorFetchingData'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inviton-powerduck",
-  "version": "0.0.79",
+  "version": "0.0.81",
   "type": "module",
   "scripts": {
     "build": " vite build && vue-tsc  --declaration --emitDeclarationOnly",