@sustaina/shared-ui 1.70.7 → 1.71.0

package/dist/index.mjs

@@ -15,7 +15,7 @@ import { createPortal } from 'react-dom';
 import * as SelectPrimitive from '@radix-ui/react-select';
 import { useForm, FormProvider, Controller, useFormContext, useFormState, useFieldArray, useWatch } from 'react-hook-form';
 import * as LabelPrimitive from '@radix-ui/react-label';
-import { format, isValid, parseISO, isAfter, compareAsc, parse } from 'date-fns';
+import { format, isValid, parseISO, compareAsc, parse, isAfter } from 'date-fns';
 import * as PopoverPrimitive from '@radix-ui/react-popover';
 import { Command as Command$1 } from 'cmdk';
 import * as DialogPrimitive2 from '@radix-ui/react-dialog';
@@ -5500,6 +5500,78 @@ var DatePicker2 = (props) => {
 // src/components/advanceSearch/components/constants/index.ts
 var fallbackShortDateFormat = "DD/MM/YYYY";
 var UUIDregex = /^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$/i;
+var RANGE_START_ERROR = "Start value must be before end value.";
+var RANGE_END_ERROR = "End value must be after start value.";
+var RANGE_VALIDATED_TYPES = ["date", "datetime", "datemonth"];
+var sanitizeInput = (val, fieldType) => {
+  if (!val) return val;
+  if (Array.isArray(val)) {
+    return val.map((v) => sanitizeInput(v, fieldType));
+  }
+  if (val.includes("\n") || val.includes("\r") || /[\u2028\u2029]/u.test(val))
+    return "__INVALID_NEWLINE__";
+  if (/\\\\/.test(val)) return "__INVALID_ESCAPE__";
+  if (/\\(n|t|r|b|f|u[0-9a-fA-F]{4})/.test(val)) return "__INVALID_ESCAPE__";
+  if (/\p{Cf}/u.test(val)) return "__INVALID_UNICODE_WHITESPACE__";
+  if (/[\u00A0\u1680\u180E\u202F\u205F\u3000]/u.test(val)) return "__INVALID_UNICODE_WHITESPACE__";
+  if (fieldType === "text") return val;
+  const trimmed = val.trim();
+  if (/^\{.*\}$/s.test(trimmed) || /^\[.*\]$/s.test(trimmed)) return "__INVALID_JSON_LITERAL__";
+  if (/\\\{/.test(val) || /\\\}/.test(val)) return "__INVALID_JSON_ESCAPE__";
+  if (/[%*~^]/.test(trimmed)) return "__INVALID_WILDCARD__";
+  if (/[%><={}\\[\]"']/u.test(trimmed)) return "__INVALID_CHAR__";
+  if (/\p{Cc}/u.test(val)) return "__INVALID_CONTROL_CHAR__";
+  return val;
+};
+var numericTypes = ["number"];
+var dateTypes = ["date", "datemonth"];
+var validateByFieldType = (value, fieldType) => {
+  if (!value) return { valid: true };
+  if (Array.isArray(value)) {
+    return { valid: true };
+  }
+  if (numericTypes.includes(fieldType)) {
+    if (!/^-?\d+(\.\d+)?$/.test(value)) {
+      return { valid: false, message: "Please enter a valid number." };
+    }
+  }
+  if (fieldType === "uuid") {
+    if (!UUIDregex.test(value)) {
+      return { valid: false, message: "Please enter a valid UUID." };
+    }
+  }
+  if (dateTypes.includes(fieldType)) {
+    const normalized = fieldType === "datemonth" ? `${value}-01` : value;
+    const parsed = parseISO(normalized);
+    if (!isValid(parsed)) {
+      return { valid: false, message: "Invalid date format." };
+    }
+  }
+  return { valid: true };
+};
+var parseRangeValue = (raw, fieldType) => {
+  if (!raw) return void 0;
+  const normalized = fieldType === "datemonth" ? `${raw}-01` : raw;
+  const parsed = parseISO(normalized);
+  return isValid(parsed) ? parsed : void 0;
+};
+var validateDateRange = (which, row, formValues) => {
+  if (row.operator !== "between" || !RANGE_VALIDATED_TYPES.includes(row.fieldType)) return true;
+  const start = formValues[`value_${row.id}`];
+  const end = formValues[`value2_${row.id}`];
+  if (typeof start !== "string" || typeof end !== "string" || !start || !end) return true;
+  const d1 = parseRangeValue(start, row.fieldType);
+  const d2 = parseRangeValue(end, row.fieldType);
+  if (d1 && d2 && isAfter(d1, d2)) {
+    return which === "value" ? RANGE_START_ERROR : RANGE_END_ERROR;
+  }
+  return true;
+};
+var buildValueRules = (which, row) => ({
+  required: "This field is required.",
+  validate: (_value, formValues) => validateDateRange(which, row, formValues),
+  deps: [which === "value" ? `value2_${row.id}` : `value_${row.id}`]
+});
 var ConditionDateInput = ({
   row,
   control,
@@ -5523,8 +5595,9 @@ var ConditionDateInput = ({
     {
       control,
       name: fieldName,
-      rules: { required: "This field is required." },
+      rules: buildValueRules(which, row),
       render: ({ field, fieldState }) => {
+        const { value: fieldValue, ...fieldRest } = field;
         const handleValueChange = (next) => {
           field.onChange(next ?? void 0);
           if (!next) {
@@ -5535,8 +5608,8 @@ var ConditionDateInput = ({
           /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(
             DatePicker2,
             {
-              ...field,
-              value: field.value || void 0,
+              ...fieldRest,
+              value: fieldValue || void 0,
               onValueChange: handleValueChange,
               placeholder: dateFormat,
               ariaLabel: buildAriaLabel(options?.isEnd),
@@ -6045,9 +6118,10 @@ var ConditionMonthInput = ({ row, control, onClear }) => {
     {
       control,
       name: fieldName,
-      rules: { required: "This field is required." },
+      rules: buildValueRules(which, row),
       render: ({ field, fieldState }) => {
-        const value = field.value || void 0;
+        const { value: fieldValue, ...fieldRest } = field;
+        const value = fieldValue || void 0;
         const handleValueChange = (next) => {
           field.onChange(next ?? void 0);
           if (!next) {
@@ -6058,7 +6132,7 @@ var ConditionMonthInput = ({ row, control, onClear }) => {
           /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(
             MonthPicker2,
             {
-              ...field,
+              ...fieldRest,
               value,
               onValueChange: handleValueChange,
               placeholder,
@@ -8605,51 +8679,6 @@ function transformFilterKeys(obj, fieldMap = FILTER_FIELD_MAP) {
   }
   return obj;
 }
-var sanitizeInput = (val) => {
-  if (!val) return val;
-  if (Array.isArray(val)) {
-    return val.map((v) => sanitizeInput(v));
-  }
-  if (val.includes("\n") || val.includes("\r") || /[\u2028\u2029]/u.test(val))
-    return "__INVALID_NEWLINE__";
-  if (/\\\\/.test(val)) return "__INVALID_ESCAPE__";
-  if (/\\(n|t|r|b|f|u[0-9a-fA-F]{4})/.test(val)) return "__INVALID_ESCAPE__";
-  if (/\p{Cf}/u.test(val)) return "__INVALID_UNICODE_WHITESPACE__";
-  if (/[\u00A0\u1680\u180E\u202F\u205F\u3000]/u.test(val)) return "__INVALID_UNICODE_WHITESPACE__";
-  const trimmed = val.trim();
-  if (/^\{.*\}$/s.test(trimmed) || /^\[.*\]$/s.test(trimmed)) return "__INVALID_JSON_LITERAL__";
-  if (/\\\{/.test(val) || /\\\}/.test(val)) return "__INVALID_JSON_ESCAPE__";
-  if (/[%*~^]/.test(trimmed)) return "__INVALID_WILDCARD__";
-  if (/[%><={}\\[\]"']/u.test(trimmed)) return "__INVALID_CHAR__";
-  if (/\p{Cc}/u.test(val)) return "__INVALID_CONTROL_CHAR__";
-  return val;
-};
-var numericTypes = ["number"];
-var dateTypes = ["date", "datemonth"];
-var validateByFieldType = (value, fieldType) => {
-  if (!value) return { valid: true };
-  if (Array.isArray(value)) {
-    return { valid: true };
-  }
-  if (numericTypes.includes(fieldType)) {
-    if (!/^-?\d+(\.\d+)?$/.test(value)) {
-      return { valid: false, message: "Please enter a valid number." };
-    }
-  }
-  if (fieldType === "uuid") {
-    if (!UUIDregex.test(value)) {
-      return { valid: false, message: "Please enter a valid UUID." };
-    }
-  }
-  if (dateTypes.includes(fieldType)) {
-    const normalized = fieldType === "datemonth" ? `${value}-01` : value;
-    const parsed = parseISO(normalized);
-    if (!isValid(parsed)) {
-      return { valid: false, message: "Invalid date format." };
-    }
-  }
-  return { valid: true };
-};
 var AdvanceSearch = ({
   fields,
   portalId,
@@ -8702,13 +8731,6 @@ var AdvanceSearch = ({
     },
     [resetField, clearErrors]
   );
-  const parseRangeValue = useCallback((raw, fieldType) => {
-    if (!raw) return void 0;
-    if (Array.isArray(raw)) return void 0;
-    const normalized = fieldType === "datemonth" ? `${raw}-01` : raw;
-    const parsed = parseISO(normalized);
-    return isValid(parsed) ? parsed : void 0;
-  }, []);
   const onSubmit = useCallback(() => {
     const operatorValidation = {};
     rows.forEach((r) => {
@@ -8725,7 +8747,7 @@ var AdvanceSearch = ({
       const endField = `value2_${r.id}`;
       let v1 = currentValues[startField];
       let v2 = currentValues[endField];
-      const s1 = sanitizeInput(v1);
+      const s1 = sanitizeInput(v1, r.fieldType);
       if (Array.isArray(s1) && s1.some((v) => v?.startsWith("__INVALID")) || typeof s1 === "string" && s1?.startsWith("__INVALID")) {
         hasError = true;
         setError(startField, { type: "validate", message: "Invalid input." });
@@ -8739,7 +8761,7 @@ var AdvanceSearch = ({
         return null;
       }
       if (r.operator === "between") {
-        const s2 = sanitizeInput(v2);
+        const s2 = sanitizeInput(v2, r.fieldType);
         if (Array.isArray(s2) && s2.some((v) => v?.startsWith("__INVALID")) || typeof s2 === "string" && s2?.startsWith("__INVALID")) {
           hasError = true;
           setError(endField, { type: "validate", message: "Invalid input." });
@@ -8752,16 +8774,6 @@ var AdvanceSearch = ({
           setError(endField, { type: "validate", message: valid2.message });
           return null;
         }
-        if (v1 && v2 && ["date", "datemonth"].includes(r.fieldType)) {
-          const d1 = parseRangeValue(v1, r.fieldType);
-          const d2 = parseRangeValue(v2, r.fieldType);
-          if (d1 && d2 && isAfter(d1, d2)) {
-            hasError = true;
-            setError(startField, { type: "validate", message: "Start value must be before end value." });
-            setError(endField, { type: "validate", message: "End value must be after start value." });
-            return null;
-          }
-        }
         return { ...r, value: v1, value2: v2 };
       }
       return { ...r, value: v1 };
@@ -8791,7 +8803,6 @@ var AdvanceSearch = ({
     rows,
     operatorsForField,
     getValues,
-    parseRangeValue,
     setError,
     setOperatorErrors,
     filterFieldMap,
@@ -13831,8 +13842,8 @@ var GridSettingsModal = ({
     }
   }, [isOpen, currentColumns, form]);
   const addColumn = async () => {
-    const isValid7 = await trigger("columns");
-    if (isValid7) {
+    const isValid6 = await trigger("columns");
+    if (isValid6) {
       append({ id: "" });
       requestAnimationFrame(() => {
         const container = scrollRef.current;