@sustaina/shared-ui 1.62.1 → 1.62.3

package/dist/index.mjs

@@ -4462,20 +4462,26 @@ function SelectScrollDownButton({
     }
   );
 }
-var FieldSelect = ({ row, fieldOptions, onChangeField }) => /* @__PURE__ */ jsx("div", { className: "w-full", children: /* @__PURE__ */ jsxs(Select, { value: row.fieldName, onValueChange: (value) => onChangeField(value), children: [
-  /* @__PURE__ */ jsx(
-    SelectTrigger,
-    {
-      className: "w-full justify-between rounded-md bg-white px-4 text-sm font-medium text-gray-700 shadow-none focus:ring-0",
-      "data-testid": "advsearch-dropdown-selectfield",
-      children: /* @__PURE__ */ jsx(SelectValue, { placeholder: "Select field" })
-    }
-  ),
-  /* @__PURE__ */ jsx(SelectContent, { className: "w-full min-w-[unset]", children: fieldOptions.map((f) => /* @__PURE__ */ jsx(SelectItem, { value: f.value, children: f.decorator ? /* @__PURE__ */ jsxs("span", { className: "flex items-center", children: [
-    f.decorator,
-    /* @__PURE__ */ jsx("span", { className: cn(f.labelStyle), children: f.label })
-  ] }) : f.label }, f.value)) })
-] }) });
+var FieldSelect = ({ row, fieldOptions, onChangeField }) => {
+  const selected = fieldOptions.find((f) => f.value === row.fieldName);
+  return /* @__PURE__ */ jsx("div", { className: "w-full", children: /* @__PURE__ */ jsxs(Select, { value: row.fieldName, onValueChange: (value) => onChangeField(value), children: [
+    /* @__PURE__ */ jsx(
+      SelectTrigger,
+      {
+        className: "w-full justify-between rounded-md bg-white px-4 text-sm font-medium text-gray-700 shadow-none focus:ring-0",
+        "data-testid": "advsearch-dropdown-selectfield",
+        children: selected ? selected.decorator ? /* @__PURE__ */ jsxs("span", { className: "flex items-center", children: [
+          selected.decorator,
+          /* @__PURE__ */ jsx("span", { className: cn(selected.labelStyle), children: selected.label })
+        ] }) : /* @__PURE__ */ jsx("span", { className: cn(selected.labelStyle), children: selected.label }) : /* @__PURE__ */ jsx(SelectValue, { placeholder: "Select field" })
+      }
+    ),
+    /* @__PURE__ */ jsx(SelectContent, { className: "w-full min-w-[unset]", children: fieldOptions.map((f) => /* @__PURE__ */ jsx(SelectItem, { value: f.value, children: f.decorator ? /* @__PURE__ */ jsxs("span", { className: "flex items-center", children: [
+      f.decorator,
+      /* @__PURE__ */ jsx("span", { className: cn(f.labelStyle), children: f.label })
+    ] }) : f.label }, f.value)) })
+  ] }) });
+};
 
 // src/components/advanceSearch/types.ts
 var OPERATOR_LABEL = {
@@ -5644,17 +5650,15 @@ function MonthCal({
   const minMonth = effectiveMin?.getMonth();
   const maxYear = max?.getFullYear();
   const maxMonth = max?.getMonth();
+  const selectedMonthYear = selectedMonthDate?.getFullYear();
   const [menuYear, setMenuYear] = React.useState(
     () => selectedMonthDate?.getFullYear() ?? today.getFullYear()
   );
   React.useEffect(() => {
-    if (selectedMonthDate) {
-      const year = selectedMonthDate.getFullYear();
-      if (year !== menuYear) {
-        setMenuYear(year);
-      }
+    if (typeof selectedMonthYear === "number") {
+      setMenuYear(selectedMonthYear);
     }
-  }, [selectedMonthDate]);
+  }, [selectedMonthYear]);
   React.useEffect(() => {
     if (typeof minYear === "number" && menuYear < minYear) {
       setMenuYear(minYear);
@@ -7151,6 +7155,7 @@ var ComboboxInner = ({
   virtual = true,
   isLoading,
   loadingContent,
+  valueRender,
   popoverProps,
   popoverContentProps,
   ...props
@@ -7176,7 +7181,7 @@ var ComboboxInner = ({
     }
     if (!selectedValue) return placeholder2;
     if (currentSelectedOption) {
-      return getLabelField(currentSelectedOption);
+      return valueRender ? valueRender(currentSelectedOption) : getLabelField(currentSelectedOption);
     }
     if (showValueWhenNoMatch) {
       return selectedValue;
@@ -7385,6 +7390,13 @@ var ConditionDropdownInput = ({ row, control, fieldSchema, onClear }) => {
                   /* @__PURE__ */ jsx("span", { className: cn(opt.labelStyle), children: opt.label })
                 ] });
               },
+              valueRender: (option) => {
+                const opt = option;
+                return opt.decorator ? /* @__PURE__ */ jsxs("span", { className: "flex items-center", children: [
+                  opt.decorator,
+                  /* @__PURE__ */ jsx("span", { className: cn(opt.labelStyle), children: opt.label })
+                ] }) : /* @__PURE__ */ jsx("span", { className: cn(opt.labelStyle), children: opt.label });
+              },
               onSelect: (val) => field.onChange(val),
               onClear: handleClear
             }