@clyrex-digital/clyrex-controls-dev 0.8.1-dev.20260824072352 → 0.8.1-dev.20260824103828

package/dist/{DataBindingControls-XCAIDMDC.mjs → DataBindingControls-2LHGICW3.mjs}

@@ -18,6 +18,36 @@ var InputControl_default = InputControl;
 import { jsx, jsxs } from "react/jsx-runtime";
 var humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
 var escapeODataString = (value) => value.replace(/'/g, "''");
+var parseFacetSelections = (filter) => {
+  const selections = /* @__PURE__ */ new Map();
+  const groupedExpression = /\(\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*\)/gi;
+  for (const match of filter.matchAll(groupedExpression)) {
+    selections.set(match[1].trim(), match[2].replace(/''/g, "'"));
+  }
+  if (selections.size === 0) {
+    const singleExpression = filter.match(
+      /^\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*$/i
+    );
+    if (singleExpression) {
+      selections.set(
+        singleExpression[1].trim(),
+        singleExpression[2].replace(/''/g, "'")
+      );
+    }
+  }
+  return selections;
+};
+var buildFacetFilter = (selections) => Array.from(selections.entries()).map(
+  ([field, value]) => `(${field} eq '${escapeODataString(value)}')`
+).join(" and ");
+var parseODataSearch = (value) => {
+  if (!value) return "";
+  const trimmedValue = value.trim();
+  if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+    return trimmedValue.slice(1, -1).replace(/''/g, "'");
+  }
+  return trimmedValue;
+};
 var normalizeSortOption = (option) => {
   const direction = option.direction.trim();
   return {
@@ -63,8 +93,9 @@ var DataBindingControls = ({
   const resolvedSortOptions = apiSortOptions.length > 0 ? apiSortOptions : DUMMY_SORT_OPTIONS;
   const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
   const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
+  const selectedFacetValues = parseFacetSelections(currentFilter);
   const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-  const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+  const currentSearch = parseODataSearch(query?.["$Search"]);
   const [searchText, setSearchText] = useState(currentSearch);
   const lastNavigationUrl = useRef(null);
   useEffect(() => {
@@ -82,15 +113,24 @@ var DataBindingControls = ({
       });
       params.delete("$skip");
       params.delete("skip");
-      const queryString = params.toString();
+      const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
       return queryString ? `${path}?${queryString}` : path;
     },
     [path, query]
   );
-  const getFacetUrl = (field, value) => getQueryUrl({
-    $filter: value ? `${field} eq '${escapeODataString(value)}'` : void 0,
-    filter: void 0
-  });
+  const getFacetUrl = (field, value) => {
+    const updatedSelections = new Map(selectedFacetValues);
+    if (value) {
+      updatedSelections.set(field, value);
+    } else {
+      updatedSelections.delete(field);
+    }
+    const updatedFilter = buildFacetFilter(updatedSelections);
+    return getQueryUrl({
+      $filter: updatedFilter || void 0,
+      filter: void 0
+    });
+  };
   const navigateWithoutReload = useCallback(
     (url) => {
       if (lastNavigationUrl.current === url) {
@@ -115,8 +155,7 @@ var DataBindingControls = ({
     const timeout = window.setTimeout(() => {
       navigateWithoutReload(
         getQueryUrl({
-          searchTerm: trimmedSearchText || void 0,
-          searchText: void 0
+          "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
         })
       );
     }, 500);
@@ -135,20 +174,20 @@ var DataBindingControls = ({
       {
         type: "button",
         onClick: () => navigateWithoutReload(getFacetUrl(field)),
-        "aria-pressed": !currentFilter,
-        className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter ? "" : "bg-primary-base font-semibold"}`,
+        "aria-pressed": !selectedFacetValues.has(field),
+        className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${selectedFacetValues.has(field) ? "" : "bg-primary-base font-semibold"}`,
         children: "All"
       }
     ),
     values.map((facet) => {
-      const filter = `${field} eq '${escapeODataString(facet.value)}'`;
+      const isSelected = selectedFacetValues.get(field) === facet.value;
       return /* @__PURE__ */ jsxs(
         "button",
         {
           type: "button",
           onClick: () => navigateWithoutReload(getFacetUrl(field, facet.value)),
-          "aria-pressed": currentFilter === filter,
-          className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter === filter ? "bg-primary-base font-semibold" : ""}`,
+          "aria-pressed": isSelected,
+          className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${isSelected ? "bg-primary-base font-semibold" : ""}`,
           children: [
             facet.value,
             " (",

package/dist/{DataBindingControls-QZ7ES2AS.mjs → DataBindingControls-VTCI7X5Y.mjs}

@@ -14,6 +14,36 @@ import { useRouter } from "next/navigation";
 import { jsx, jsxs } from "react/jsx-runtime";
 var humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
 var escapeODataString = (value) => value.replace(/'/g, "''");
+var parseFacetSelections = (filter) => {
+  const selections = /* @__PURE__ */ new Map();
+  const groupedExpression = /\(\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*\)/gi;
+  for (const match of filter.matchAll(groupedExpression)) {
+    selections.set(match[1].trim(), match[2].replace(/''/g, "'"));
+  }
+  if (selections.size === 0) {
+    const singleExpression = filter.match(
+      /^\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*$/i
+    );
+    if (singleExpression) {
+      selections.set(
+        singleExpression[1].trim(),
+        singleExpression[2].replace(/''/g, "'")
+      );
+    }
+  }
+  return selections;
+};
+var buildFacetFilter = (selections) => Array.from(selections.entries()).map(
+  ([field, value]) => `(${field} eq '${escapeODataString(value)}')`
+).join(" and ");
+var parseODataSearch = (value) => {
+  if (!value) return "";
+  const trimmedValue = value.trim();
+  if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+    return trimmedValue.slice(1, -1).replace(/''/g, "'");
+  }
+  return trimmedValue;
+};
 var normalizeSortOption = (option) => {
   const direction = option.direction.trim();
   return {
@@ -59,8 +89,9 @@ var DataBindingControls = ({
   const resolvedSortOptions = apiSortOptions.length > 0 ? apiSortOptions : DUMMY_SORT_OPTIONS;
   const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
   const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
+  const selectedFacetValues = parseFacetSelections(currentFilter);
   const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-  const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+  const currentSearch = parseODataSearch(query?.["$Search"]);
   const [searchText, setSearchText] = useState(currentSearch);
   const lastNavigationUrl = useRef(null);
   useEffect(() => {
@@ -78,15 +109,24 @@ var DataBindingControls = ({
       });
       params.delete("$skip");
       params.delete("skip");
-      const queryString = params.toString();
+      const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
       return queryString ? `${path}?${queryString}` : path;
     },
     [path, query]
   );
-  const getFacetUrl = (field, value) => getQueryUrl({
-    $filter: value ? `${field} eq '${escapeODataString(value)}'` : void 0,
-    filter: void 0
-  });
+  const getFacetUrl = (field, value) => {
+    const updatedSelections = new Map(selectedFacetValues);
+    if (value) {
+      updatedSelections.set(field, value);
+    } else {
+      updatedSelections.delete(field);
+    }
+    const updatedFilter = buildFacetFilter(updatedSelections);
+    return getQueryUrl({
+      $filter: updatedFilter || void 0,
+      filter: void 0
+    });
+  };
   const navigateWithoutReload = useCallback(
     (url) => {
       if (lastNavigationUrl.current === url) {
@@ -111,8 +151,7 @@ var DataBindingControls = ({
     const timeout = window.setTimeout(() => {
       navigateWithoutReload(
         getQueryUrl({
-          searchTerm: trimmedSearchText || void 0,
-          searchText: void 0
+          "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
         })
       );
     }, 500);
@@ -131,20 +170,20 @@ var DataBindingControls = ({
       {
         type: "button",
         onClick: () => navigateWithoutReload(getFacetUrl(field)),
-        "aria-pressed": !currentFilter,
-        className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter ? "" : "bg-primary-base font-semibold"}`,
+        "aria-pressed": !selectedFacetValues.has(field),
+        className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${selectedFacetValues.has(field) ? "" : "bg-primary-base font-semibold"}`,
         children: "All"
       }
     ),
     values.map((facet) => {
-      const filter = `${field} eq '${escapeODataString(facet.value)}'`;
+      const isSelected = selectedFacetValues.get(field) === facet.value;
       return /* @__PURE__ */ jsxs(
         "button",
         {
           type: "button",
           onClick: () => navigateWithoutReload(getFacetUrl(field, facet.value)),
-          "aria-pressed": currentFilter === filter,
-          className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter === filter ? "bg-primary-base font-semibold" : ""}`,
+          "aria-pressed": isSelected,
+          className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${isSelected ? "bg-primary-base font-semibold" : ""}`,
           children: [
             facet.value,
             " (",

package/dist/{Pagination-GL6B4MNO.mjs → Pagination-2KVND6JU.mjs}

@@ -3,7 +3,7 @@
 "use client";
 import {
   OdataBuilder
-} from "./chunk-4P4HO663.mjs";
+} from "./chunk-TKJDEJSU.mjs";
 import {
   Hyperlink,
   Icon_default

package/dist/{Pagination-ZQO3EUKB.mjs → Pagination-PDU7V3HY.mjs}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-6PW2RLUJ.mjs";
 import {
   OdataBuilder
-} from "./chunk-Q46GMD3P.mjs";
+} from "./chunk-4OH67SPF.mjs";
 import {
   Hyperlink
 } from "./chunk-2R26M6CK.mjs";

package/dist/{chunk-Q46GMD3P.mjs → chunk-4OH67SPF.mjs}

@@ -38,6 +38,9 @@ var OdataBuilder = class {
           if (key == "searchCols") {
             this.searchCols = odata[key];
           }
+          if (key == "$Search") {
+            this.search = odata[key];
+          }
           if (key == "filter") {
             this.apiFilter = odata[key];
           }
@@ -70,6 +73,9 @@ var OdataBuilder = class {
     if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
       queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
     }
+    if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+      queryString += `&$Search=${obj["$Search"]}`;
+    }
     if (obj?.["filter"] && obj["filter"].trim() !== "") {
       queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
     }
@@ -124,8 +130,8 @@ var OdataBuilder = class {
     return pageNumber;
   }
   appendApiQueryParameters(url) {
-    if (this.searchTerm) {
-      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    if (this.search) {
+      url += `&$Search=${this.search}`;
     }
     if (this.apiFilter) {
       url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -211,6 +217,12 @@ var OdataBuilder = class {
     if (this.orderBy !== null && this.orderBy !== "") {
       url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
     }
+    if (this.searchTerm) {
+      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    }
+    if (this.searchCols) {
+      url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+    }
     return this.appendApiQueryParameters(url);
   }
   getOrderBy() {

package/dist/{chunk-4P4HO663.mjs → chunk-TKJDEJSU.mjs}

@@ -40,6 +40,9 @@ var OdataBuilder = class {
           if (key == "searchCols") {
             this.searchCols = odata[key];
           }
+          if (key == "$Search") {
+            this.search = odata[key];
+          }
           if (key == "filter") {
             this.apiFilter = odata[key];
           }
@@ -72,6 +75,9 @@ var OdataBuilder = class {
     if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
       queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
     }
+    if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+      queryString += `&$Search=${obj["$Search"]}`;
+    }
     if (obj?.["filter"] && obj["filter"].trim() !== "") {
       queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
     }
@@ -126,8 +132,8 @@ var OdataBuilder = class {
     return pageNumber;
   }
   appendApiQueryParameters(url) {
-    if (this.searchTerm) {
-      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    if (this.search) {
+      url += `&$Search=${this.search}`;
     }
     if (this.apiFilter) {
       url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -213,6 +219,12 @@ var OdataBuilder = class {
     if (this.orderBy !== null && this.orderBy !== "") {
       url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
     }
+    if (this.searchTerm) {
+      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    }
+    if (this.searchCols) {
+      url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+    }
     return this.appendApiQueryParameters(url);
   }
   getOrderBy() {

package/dist/index.js

@@ -4123,6 +4123,9 @@ var init_OdataBuilder = __esm({
               if (key == "searchCols") {
                 this.searchCols = odata[key];
               }
+              if (key == "$Search") {
+                this.search = odata[key];
+              }
               if (key == "filter") {
                 this.apiFilter = odata[key];
               }
@@ -4155,6 +4158,9 @@ var init_OdataBuilder = __esm({
         if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
           queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
         }
+        if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+          queryString += `&$Search=${obj["$Search"]}`;
+        }
         if (obj?.["filter"] && obj["filter"].trim() !== "") {
           queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
         }
@@ -4209,8 +4215,8 @@ var init_OdataBuilder = __esm({
         return pageNumber;
       }
       appendApiQueryParameters(url) {
-        if (this.searchTerm) {
-          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        if (this.search) {
+          url += `&$Search=${this.search}`;
         }
         if (this.apiFilter) {
           url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -4296,6 +4302,12 @@ var init_OdataBuilder = __esm({
         if (this.orderBy !== null && this.orderBy !== "") {
           url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
         }
+        if (this.searchTerm) {
+          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        }
+        if (this.searchCols) {
+          url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+        }
         return this.appendApiQueryParameters(url);
       }
       getOrderBy() {
@@ -4494,7 +4506,7 @@ var DataBindingControls_exports = {};
 __export(DataBindingControls_exports, {
   default: () => DataBindingControls_default
 });
-var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
+var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, parseFacetSelections, buildFacetFilter, parseODataSearch, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
 var init_DataBindingControls = __esm({
   "src/components/pageRenderingEngine/nodes/DataBindingControls.tsx"() {
     "use strict";
@@ -4506,6 +4518,36 @@ var init_DataBindingControls = __esm({
     import_jsx_runtime77 = require("react/jsx-runtime");
     humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
     escapeODataString = (value) => value.replace(/'/g, "''");
+    parseFacetSelections = (filter) => {
+      const selections = /* @__PURE__ */ new Map();
+      const groupedExpression = /\(\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*\)/gi;
+      for (const match of filter.matchAll(groupedExpression)) {
+        selections.set(match[1].trim(), match[2].replace(/''/g, "'"));
+      }
+      if (selections.size === 0) {
+        const singleExpression = filter.match(
+          /^\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*$/i
+        );
+        if (singleExpression) {
+          selections.set(
+            singleExpression[1].trim(),
+            singleExpression[2].replace(/''/g, "'")
+          );
+        }
+      }
+      return selections;
+    };
+    buildFacetFilter = (selections) => Array.from(selections.entries()).map(
+      ([field, value]) => `(${field} eq '${escapeODataString(value)}')`
+    ).join(" and ");
+    parseODataSearch = (value) => {
+      if (!value) return "";
+      const trimmedValue = value.trim();
+      if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+        return trimmedValue.slice(1, -1).replace(/''/g, "'");
+      }
+      return trimmedValue;
+    };
     normalizeSortOption = (option) => {
       const direction = option.direction.trim();
       return {
@@ -4551,8 +4593,9 @@ var init_DataBindingControls = __esm({
       const resolvedSortOptions = apiSortOptions.length > 0 ? apiSortOptions : DUMMY_SORT_OPTIONS;
       const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
       const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
+      const selectedFacetValues = parseFacetSelections(currentFilter);
       const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-      const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+      const currentSearch = parseODataSearch(query?.["$Search"]);
       const [searchText, setSearchText] = (0, import_react55.useState)(currentSearch);
       const lastNavigationUrl = (0, import_react55.useRef)(null);
       (0, import_react55.useEffect)(() => {
@@ -4570,15 +4613,24 @@ var init_DataBindingControls = __esm({
           });
           params.delete("$skip");
           params.delete("skip");
-          const queryString = params.toString();
+          const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
           return queryString ? `${path}?${queryString}` : path;
         },
         [path, query]
       );
-      const getFacetUrl = (field, value) => getQueryUrl({
-        $filter: value ? `${field} eq '${escapeODataString(value)}'` : void 0,
-        filter: void 0
-      });
+      const getFacetUrl = (field, value) => {
+        const updatedSelections = new Map(selectedFacetValues);
+        if (value) {
+          updatedSelections.set(field, value);
+        } else {
+          updatedSelections.delete(field);
+        }
+        const updatedFilter = buildFacetFilter(updatedSelections);
+        return getQueryUrl({
+          $filter: updatedFilter || void 0,
+          filter: void 0
+        });
+      };
       const navigateWithoutReload = (0, import_react55.useCallback)(
         (url) => {
           if (lastNavigationUrl.current === url) {
@@ -4603,8 +4655,7 @@ var init_DataBindingControls = __esm({
         const timeout = window.setTimeout(() => {
           navigateWithoutReload(
             getQueryUrl({
-              searchTerm: trimmedSearchText || void 0,
-              searchText: void 0
+              "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
             })
           );
         }, 500);
@@ -4623,20 +4674,20 @@ var init_DataBindingControls = __esm({
           {
             type: "button",
             onClick: () => navigateWithoutReload(getFacetUrl(field)),
-            "aria-pressed": !currentFilter,
-            className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter ? "" : "bg-primary-base font-semibold"}`,
+            "aria-pressed": !selectedFacetValues.has(field),
+            className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${selectedFacetValues.has(field) ? "" : "bg-primary-base font-semibold"}`,
             children: "All"
           }
         ),
         values.map((facet) => {
-          const filter = `${field} eq '${escapeODataString(facet.value)}'`;
+          const isSelected = selectedFacetValues.get(field) === facet.value;
           return /* @__PURE__ */ (0, import_jsx_runtime77.jsxs)(
             "button",
             {
               type: "button",
               onClick: () => navigateWithoutReload(getFacetUrl(field, facet.value)),
-              "aria-pressed": currentFilter === filter,
-              className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter === filter ? "bg-primary-base font-semibold" : ""}`,
+              "aria-pressed": isSelected,
+              className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${isSelected ? "bg-primary-base font-semibold" : ""}`,
               children: [
                 facet.value,
                 " (",

package/dist/index.mjs

@@ -2,7 +2,7 @@
 
 import {
   OdataBuilder
-} from "./chunk-4P4HO663.mjs";
+} from "./chunk-TKJDEJSU.mjs";
 import {
   InputControl_default
 } from "./chunk-GKI42H4B.mjs";
@@ -2295,8 +2295,8 @@ var GoogleMapNode_default = GoogleMapNode;
 
 // src/components/pageRenderingEngine/nodes/DivContainer.tsx
 import { jsx as jsx35, jsxs as jsxs13 } from "react/jsx-runtime";
-var Pagination = dynamic11(() => import("./Pagination-GL6B4MNO.mjs"), { ssr: true });
-var DataBindingControls = dynamic11(() => import("./DataBindingControls-QZ7ES2AS.mjs"), {
+var Pagination = dynamic11(() => import("./Pagination-2KVND6JU.mjs"), { ssr: true });
+var DataBindingControls = dynamic11(() => import("./DataBindingControls-VTCI7X5Y.mjs"), {
   ssr: true
 });
 var Slider = dynamic11(() => import("./Slider-554BKC7N.mjs"), {

package/dist/server.js

@@ -1945,6 +1945,9 @@ var init_OdataBuilder = __esm({
               if (key == "searchCols") {
                 this.searchCols = odata[key];
               }
+              if (key == "$Search") {
+                this.search = odata[key];
+              }
               if (key == "filter") {
                 this.apiFilter = odata[key];
               }
@@ -1977,6 +1980,9 @@ var init_OdataBuilder = __esm({
         if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
           queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
         }
+        if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+          queryString += `&$Search=${obj["$Search"]}`;
+        }
         if (obj?.["filter"] && obj["filter"].trim() !== "") {
           queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
         }
@@ -2031,8 +2037,8 @@ var init_OdataBuilder = __esm({
         return pageNumber;
       }
       appendApiQueryParameters(url) {
-        if (this.searchTerm) {
-          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        if (this.search) {
+          url += `&$Search=${this.search}`;
         }
         if (this.apiFilter) {
           url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -2118,6 +2124,12 @@ var init_OdataBuilder = __esm({
         if (this.orderBy !== null && this.orderBy !== "") {
           url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
         }
+        if (this.searchTerm) {
+          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        }
+        if (this.searchCols) {
+          url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+        }
         return this.appendApiQueryParameters(url);
       }
       getOrderBy() {
@@ -4492,7 +4504,7 @@ var DataBindingControls_exports = {};
 __export(DataBindingControls_exports, {
   default: () => DataBindingControls_default
 });
-var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
+var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, parseFacetSelections, buildFacetFilter, parseODataSearch, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
 var init_DataBindingControls = __esm({
   "src/components/pageRenderingEngine/nodes/DataBindingControls.tsx"() {
     "use strict";
@@ -4504,6 +4516,36 @@ var init_DataBindingControls = __esm({
     import_jsx_runtime77 = require("react/jsx-runtime");
     humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
     escapeODataString = (value) => value.replace(/'/g, "''");
+    parseFacetSelections = (filter) => {
+      const selections = /* @__PURE__ */ new Map();
+      const groupedExpression = /\(\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*\)/gi;
+      for (const match of filter.matchAll(groupedExpression)) {
+        selections.set(match[1].trim(), match[2].replace(/''/g, "'"));
+      }
+      if (selections.size === 0) {
+        const singleExpression = filter.match(
+          /^\s*([^()]+?)\s+eq\s+'((?:''|[^'])*)'\s*$/i
+        );
+        if (singleExpression) {
+          selections.set(
+            singleExpression[1].trim(),
+            singleExpression[2].replace(/''/g, "'")
+          );
+        }
+      }
+      return selections;
+    };
+    buildFacetFilter = (selections) => Array.from(selections.entries()).map(
+      ([field, value]) => `(${field} eq '${escapeODataString(value)}')`
+    ).join(" and ");
+    parseODataSearch = (value) => {
+      if (!value) return "";
+      const trimmedValue = value.trim();
+      if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+        return trimmedValue.slice(1, -1).replace(/''/g, "'");
+      }
+      return trimmedValue;
+    };
     normalizeSortOption = (option) => {
       const direction = option.direction.trim();
       return {
@@ -4549,8 +4591,9 @@ var init_DataBindingControls = __esm({
       const resolvedSortOptions = apiSortOptions.length > 0 ? apiSortOptions : DUMMY_SORT_OPTIONS;
       const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
       const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
+      const selectedFacetValues = parseFacetSelections(currentFilter);
       const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-      const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+      const currentSearch = parseODataSearch(query?.["$Search"]);
       const [searchText, setSearchText] = (0, import_react55.useState)(currentSearch);
       const lastNavigationUrl = (0, import_react55.useRef)(null);
       (0, import_react55.useEffect)(() => {
@@ -4568,15 +4611,24 @@ var init_DataBindingControls = __esm({
           });
           params.delete("$skip");
           params.delete("skip");
-          const queryString = params.toString();
+          const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
           return queryString ? `${path}?${queryString}` : path;
         },
         [path, query]
       );
-      const getFacetUrl = (field, value) => getQueryUrl({
-        $filter: value ? `${field} eq '${escapeODataString(value)}'` : void 0,
-        filter: void 0
-      });
+      const getFacetUrl = (field, value) => {
+        const updatedSelections = new Map(selectedFacetValues);
+        if (value) {
+          updatedSelections.set(field, value);
+        } else {
+          updatedSelections.delete(field);
+        }
+        const updatedFilter = buildFacetFilter(updatedSelections);
+        return getQueryUrl({
+          $filter: updatedFilter || void 0,
+          filter: void 0
+        });
+      };
       const navigateWithoutReload = (0, import_react55.useCallback)(
         (url) => {
           if (lastNavigationUrl.current === url) {
@@ -4601,8 +4653,7 @@ var init_DataBindingControls = __esm({
         const timeout = window.setTimeout(() => {
           navigateWithoutReload(
             getQueryUrl({
-              searchTerm: trimmedSearchText || void 0,
-              searchText: void 0
+              "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
             })
           );
         }, 500);
@@ -4621,20 +4672,20 @@ var init_DataBindingControls = __esm({
           {
             type: "button",
             onClick: () => navigateWithoutReload(getFacetUrl(field)),
-            "aria-pressed": !currentFilter,
-            className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter ? "" : "bg-primary-base font-semibold"}`,
+            "aria-pressed": !selectedFacetValues.has(field),
+            className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${selectedFacetValues.has(field) ? "" : "bg-primary-base font-semibold"}`,
             children: "All"
           }
         ),
         values.map((facet) => {
-          const filter = `${field} eq '${escapeODataString(facet.value)}'`;
+          const isSelected = selectedFacetValues.get(field) === facet.value;
           return /* @__PURE__ */ (0, import_jsx_runtime77.jsxs)(
             "button",
             {
               type: "button",
               onClick: () => navigateWithoutReload(getFacetUrl(field, facet.value)),
-              "aria-pressed": currentFilter === filter,
-              className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${currentFilter === filter ? "bg-primary-base font-semibold" : ""}`,
+              "aria-pressed": isSelected,
+              className: `px-3 py-2 text-left text-sm ${stacked ? "w-full" : "border"} ${isSelected ? "bg-primary-base font-semibold" : ""}`,
               children: [
                 facet.value,
                 " (",

package/dist/server.mjs

@@ -1,6 +1,6 @@
 import {
   OdataBuilder
-} from "./chunk-Q46GMD3P.mjs";
+} from "./chunk-4OH67SPF.mjs";
 import {
   AssetUtility_default
 } from "./chunk-TQ6BXQ3A.mjs";
@@ -2263,8 +2263,8 @@ var GoogleMapNode_default = GoogleMapNode;
 
 // src/components/pageRenderingEngine/nodes/DivContainer.tsx
 import { jsx as jsx35, jsxs as jsxs13 } from "react/jsx-runtime";
-var Pagination = dynamic11(() => import("./Pagination-ZQO3EUKB.mjs"), { ssr: true });
-var DataBindingControls = dynamic11(() => import("./DataBindingControls-XCAIDMDC.mjs"), {
+var Pagination = dynamic11(() => import("./Pagination-PDU7V3HY.mjs"), { ssr: true });
+var DataBindingControls = dynamic11(() => import("./DataBindingControls-2LHGICW3.mjs"), {
   ssr: true
 });
 var Slider = dynamic11(() => import("./Slider-PEIVH6A5.mjs"), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clyrex-digital/clyrex-controls-dev",
-  "version": "0.8.1-dev.20260824072352",
+  "version": "0.8.1-dev.20260824103828",
   "description": "Reusable React components",
   "main": "dist/index.js",
   "module": "dist/index.mjs",