sanity-plugin-recurring-dates 1.3.1 → 1.4.0

package/dist/index.js

@@ -4381,6 +4381,7 @@ function CustomRule(_ref8) {
     onChange,
     initialValue,
     startDate,
+    endDate,
     dateTimeOptions
   } = _ref8;
   const initialRule = React.useMemo(() => {
@@ -4391,6 +4392,7 @@ function CustomRule(_ref8) {
   const [count, setCount] = React.useState(initialRule.origOptions.count || null);
   const [until, setUntil] = React.useState(initialRule.origOptions.until || null);
   const [byweekday, setByweekday] = React.useState(initialRule.origOptions.byweekday || null);
+  const [untilValid, setUntilValid] = React.useState(true);
   const handleChange = React.useCallback(event => {
     const {
       name,
@@ -4420,9 +4422,15 @@ function CustomRule(_ref8) {
   }, [frequency, startDate]);
   const handleUntilChange = React.useCallback(date => {
     if (date) {
-      setUntil(dateFnsTz.toDate(`${date}T23:59:59`));
+      const untilDate = dateFnsTz.toDate(`${date}T23:59:59`);
+      if (endDate && untilDate < dateFnsTz.toDate(endDate) || startDate && untilDate < dateFnsTz.toDate(startDate)) {
+        setUntilValid(false);
+      } else {
+        setUntilValid(true);
+      }
+      setUntil(untilDate);
     }
-  }, []);
+  }, [endDate, startDate]);
   const handleEndChange = React.useCallback(event => {
     const {
       value
@@ -4561,6 +4569,12 @@ function CustomRule(_ref8) {
                   value: until ? formatUntilValue(new Date(until)) : formatUntilValue(getUntilDate()),
                   readOnly: !until
                 })
+              }), !untilValid && /* @__PURE__ */jsxRuntime.jsx(sanityPluginUtils.Feedback, {
+                tone: "critical",
+                children: /* @__PURE__ */jsxRuntime.jsx(ui.Text, {
+                  size: 1,
+                  children: "Until date must be after event ends"
+                })
               })]
             }), /* @__PURE__ */jsxRuntime.jsxs(ui.Flex, {
               gap: 2,
@@ -4614,7 +4628,8 @@ function CustomRule(_ref8) {
           }), /* @__PURE__ */jsxRuntime.jsx(ui.Button, {
             text: "Done",
             tone: "positive",
-            onClick: handleConfirm
+            onClick: handleConfirm,
+            disabled: !untilValid
           })]
         })
       })]
@@ -4723,33 +4738,44 @@ function RecurringDates(props) {
       ...startDateMember?.field?.schemaType.options,
       ...dateTimeOptions
     };
+    if (dateOnly === true) {
+      startDateMember.field.schemaType.name = "date";
+    } else {
+      startDateMember.field.schemaType.name = "datetime";
+    }
+    if (validation?.startDate) {
+      startDateMember.field.schemaType.validation = CustomValidation => validation?.startDate?.(CustomValidation);
+    } else {
+      startDateMember.field.schemaType.validation = DefaultRule => DefaultRule.required();
+    }
+    if (options?.fieldTitles?.startDate) {
+      startDateMember.field.schemaType.title = options.fieldTitles.startDate;
+    }
+    if (options?.fieldDescriptions?.startDate) {
+      startDateMember.field.schemaType.description = options.fieldDescriptions.startDate;
+    }
   }
   if (endDateMember?.kind == "field") {
     endDateMember.field.schemaType.options = {
       ...endDateMember?.field?.schemaType.options,
       ...dateTimeOptions
     };
-  }
-  if (dateOnly === true) {
-    if (startDateMember?.kind == "field") {
-      startDateMember.field.schemaType.name = "date";
-    }
-    if (endDateMember?.kind == "field") {
+    if (dateOnly === true) {
       endDateMember.field.schemaType.name = "date";
+    } else {
+      endDateMember.field.schemaType.name = "datetime";
     }
-  } else {
-    if (startDateMember?.kind == "field") {
-      startDateMember.field.schemaType.name = "datetime";
+    if (validation?.endDate) {
+      endDateMember.field.schemaType.validation = CustomValidation => validation?.endDate?.(CustomValidation);
+    } else {
+      endDateMember.field.schemaType.validation = DefaultRule => DefaultRule.min(DefaultRule.valueOfField("startDate"));
     }
-    if (endDateMember?.kind == "field") {
-      endDateMember.field.schemaType.name = "datetime";
+    if (options?.fieldTitles?.endDate) {
+      endDateMember.field.schemaType.title = options.fieldTitles.endDate;
+    }
+    if (options?.fieldDescriptions?.endDate) {
+      endDateMember.field.schemaType.description = options.fieldDescriptions.endDate;
     }
-  }
-  if (validation?.startDate && startDateMember?.kind == "field") {
-    startDateMember.field.schemaType.validation = CustomValidation => validation?.startDate?.(CustomValidation);
-  }
-  if (validation?.endDate && endDateMember?.kind == "field") {
-    endDateMember.field.schemaType.validation = CustomValidation => validation?.endDate?.(CustomValidation);
   }
   const hasEndDate = currentValue?.endDate;
   return /* @__PURE__ */jsxRuntime.jsxs(ui.Stack, {
@@ -4802,6 +4828,7 @@ function RecurringDates(props) {
           return null;
         }
         const rule = rrule.rrulestr(recurrence);
+        rule.options.until = rule?.options?.until && rrule.datetime(rule?.options?.until?.getFullYear(), rule?.options?.until?.getMonth() + 1, rule?.options?.until?.getDate(), rule?.options?.until?.getHours(), rule?.options?.until?.getMinutes(), rule?.options?.until?.getSeconds());
         return /* @__PURE__ */jsxRuntime.jsx("option", {
           value: recurrence,
           children: lodash.upperFirst(rule.toText())
@@ -4819,6 +4846,7 @@ function RecurringDates(props) {
       onChange,
       initialValue: currentValue?.rrule,
       startDate: startDateMember?.kind == "field" ? startDateMember?.field?.value : void 0,
+      endDate: endDateMember?.kind == "field" ? endDateMember?.field?.value : void 0,
       dateTimeOptions
     })]
   });
@@ -4840,6 +4868,9 @@ function RecurringDatesPreview(props) {
     ...options
   };
   const rule = rrule$1 && rrule.rrulestr(rrule$1);
+  if (rule) {
+    rule.options.until = rule?.options?.until && rrule.datetime(rule?.options?.until?.getFullYear(), rule?.options?.until?.getMonth() + 1, rule?.options?.until?.getDate(), rule?.options?.until?.getHours(), rule?.options?.until?.getMinutes(), rule?.options?.until?.getSeconds());
+  }
   const dateFormat = dateTimeOptions?.dateFormat || legacyDateFormat.DEFAULT_DATE_FORMAT;
   const timeFormat = dateTimeOptions?.timeFormat || legacyDateFormat.DEFAULT_TIME_FORMAT;
   const start = startDate ? new Date(startDate) : void 0;
@@ -4870,7 +4901,9 @@ var recurringDateSchema = config => {
   const {
     dateTimeOptions,
     dateOnly,
-    validation
+    validation,
+    fieldTitles,
+    fieldDescriptions
   } = config;
   return sanity.defineField({
     name: "recurringDates",
@@ -4878,13 +4911,15 @@ var recurringDateSchema = config => {
     type: "object",
     icon: icons.CalendarIcon,
     fields: [sanity.defineField({
-      title: "Start Date",
+      title: fieldTitles?.startDate || "Start Date",
+      description: fieldDescriptions?.startDate || "",
       name: "startDate",
       type: dateOnly ? "date" : "datetime",
       options: dateTimeOptions,
       validation: Rule => validation?.startDate ? validation.startDate(Rule) : Rule.required()
     }), sanity.defineField({
-      title: "End Date",
+      title: fieldTitles?.endDate || "End Date",
+      description: fieldDescriptions?.endDate || "",
       name: "endDate",
       type: dateOnly ? "date" : "datetime",
       options: dateTimeOptions,