@acorex/platform 20.6.0-next.11 → 20.6.0-next.12

package/fesm2022/acorex-platform-layout-widgets.mjs

@@ -5146,23 +5146,18 @@ class AXPSelectBoxWidgetEditComponent extends AXPDataListWidgetComponent {
         this.hasClearButton = computed(() => this.options()['hasClearButton'], ...(ngDevMode ? [{ debugName: "hasClearButton" }] : []));
         this.allowSearch = computed(() => this.options()['allowSearch'] ?? false, ...(ngDevMode ? [{ debugName: "allowSearch" }] : []));
         this.filter = computed(() => this.options()['filter'], ...(ngDevMode ? [{ debugName: "filter" }] : []));
-        //#region ----   Filtering Helpers   ----
-        /**
-         * Holds the filter generated by the search box to merge with configured filters.
-         */
-        this.searchFilter = signal(null, ...(ngDevMode ? [{ debugName: "searchFilter" }] : []));
-        this.#baseFilterEffect = effect(() => {
-            const baseFilter = this.filter();
-            const textFilter = untracked(() => this.searchFilter());
-            this.applyFilters(baseFilter, textFilter, 'component');
-        }, ...(ngDevMode ? [{ debugName: "#baseFilterEffect" }] : []));
-        this.#searchFilterEffect = effect(() => {
-            const searchFilter = this.searchFilter();
-            const baseFilter = untracked(() => this.filter());
-            this.applyFilters(baseFilter, searchFilter, 'dataSource');
-        }, ...(ngDevMode ? [{ debugName: "#searchFilterEffect" }] : []));
+        this.searchValue = signal(undefined, ...(ngDevMode ? [{ debugName: "searchValue" }] : []));
+        this.#effect = effect(() => {
+            if (this.filter()) {
+                const cleanedFilters = AXPCleanNestedFilters([this.filter()]);
+                if (cleanedFilters.length > 0) {
+                    untracked(() => {
+                        this.dataSource()?.filter(this.filterOperatorMiddleware.transformFilter(cleanedFilters[0]));
+                    });
+                }
+            }
+        }, ...(ngDevMode ? [{ debugName: "#effect" }] : []));
     }
-    //#endregion
     outputs() {
         return [
             {
@@ -5175,23 +5170,6 @@ class AXPSelectBoxWidgetEditComponent extends AXPDataListWidgetComponent {
             },
         ];
     }
-    handleSearchValueChange(e) {
-        if (!e) {
-            return;
-        }
-        const normalizedValue = typeof e.value === 'string' ? e.value.trim() : e.value === undefined ? undefined : String(e.value);
-        if (normalizedValue === undefined || normalizedValue === null || normalizedValue === '') {
-            this.searchFilter.set(null);
-            return;
-        }
-        this.searchFilter.set({
-            field: this.textField(),
-            operator: {
-                type: 'contains',
-            },
-            value: normalizedValue,
-        });
-    }
     handleValueChange(e) {
         this.selectedItems.set(e.component.selectedItems);
         if (e.isUserInteraction) {
@@ -5228,14 +5206,39 @@ class AXPSelectBoxWidgetEditComponent extends AXPDataListWidgetComponent {
             }
         }
     }
-    #baseFilterEffect;
-    #searchFilterEffect;
+    handleSearchValueChange(e) {
+        if (e.isUserInteraction) {
+            this.searchValue.set(e.value);
+            const searchFilter = this.filterOperatorMiddleware.transformFilter({
+                field: this.textField(),
+                operator: { type: 'contains' },
+                value: e.value,
+            });
+            const baseFilter = this.filter() ? AXPCleanNestedFilters([this.filter()])[0] : null;
+            let mergedFilter = searchFilter;
+            if (baseFilter) {
+                if (this.searchValue() !== undefined) {
+                    mergedFilter = {
+                        logic: 'and',
+                        filters: [baseFilter, searchFilter],
+                    };
+                }
+                else {
+                    mergedFilter = baseFilter;
+                }
+            }
+            else if (this.searchValue() === undefined) {
+                mergedFilter = {};
+            }
+            this.dataSource()?.filter(mergedFilter);
+            this.dataSource()?.refresh();
+        }
+    }
+    #effect;
     refresh() {
-        //TODO: why do we need this?
-        const value = this.getValue();
         setTimeout(() => {
+            this.searchValue.set(undefined);
             this.selectBox()?.refresh();
-            this.selectBox()?.writeValue(value);
         }, 0);
     }
     clear() {
@@ -5258,54 +5261,6 @@ class AXPSelectBoxWidgetEditComponent extends AXPDataListWidgetComponent {
     singleOrMultiple(values) {
         return this.multiple() ? values : values[0];
     }
-    /**
-     * Applies merged filters to the data source and triggers appropriate refresh behavior.
-     */
-    applyFilters(baseFilter, textFilter, refreshTarget) {
-        const dataSource = this.dataSource();
-        if (!dataSource) {
-            return;
-        }
-        const mergedFilter = this.mergeFilters(baseFilter, textFilter);
-        if (mergedFilter) {
-            dataSource.filter(this.filterOperatorMiddleware.transformFilter(mergedFilter));
-        }
-        else if (typeof dataSource.clearFilter === 'function') {
-            dataSource.clearFilter();
-        }
-        else {
-            dataSource.filter(undefined);
-        }
-        if (refreshTarget === 'component') {
-            this.refresh();
-        }
-        else if (refreshTarget === 'dataSource') {
-            const ds = dataSource;
-            if (typeof ds.refresh === 'function') {
-                ds.refresh();
-            }
-        }
-    }
-    /**
-     * Merges provided filters using logical AND while cleaning invalid entries.
-     */
-    mergeFilters(...filters) {
-        const validFilters = filters.filter(Boolean);
-        if (!validFilters.length) {
-            return null;
-        }
-        const cleanedFilters = AXPCleanNestedFilters(validFilters);
-        if (cleanedFilters.length === 0) {
-            return null;
-        }
-        if (cleanedFilters.length === 1) {
-            return cleanedFilters[0];
-        }
-        return {
-            logic: 'and',
-            filters: cleanedFilters,
-        };
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPSelectBoxWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPSelectBoxWidgetEditComponent, isStandalone: true, selector: "axp-select-box-widget-edit", host: { properties: { "class": "this.__class" } }, viewQueries: [{ propertyName: "selectBox", first: true, predicate: AXSelectBoxComponent, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
     <ax-select-box
@@ -5321,7 +5276,7 @@ class AXPSelectBoxWidgetEditComponent extends AXPDataListWidgetComponent {
       (onValueChanged)="handleValueChange($event)"
     >
       @if (allowSearch()) {
-        <ax-search-box [autoSearch]="false" (onValueChanged)="handleSearchValueChange($event)"
+        <ax-search-box [autoSearch]="false" [ngModel]="searchValue()" (onValueChanged)="handleSearchValueChange($event)"
           ><ax-clear-button></ax-clear-button
         ></ax-search-box>
       }
@@ -5356,7 +5311,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
       (onValueChanged)="handleValueChange($event)"
     >
       @if (allowSearch()) {
-        <ax-search-box [autoSearch]="false" (onValueChanged)="handleSearchValueChange($event)"
+        <ax-search-box [autoSearch]="false" [ngModel]="searchValue()" (onValueChanged)="handleSearchValueChange($event)"
           ><ax-clear-button></ax-clear-button
         ></ax-search-box>
       }