@rjsf/antd 6.0.0-beta.22 → 6.0.0-beta.23

package/dist/antd.esm.js

@@ -802,103 +802,38 @@ function generateTemplates() {
 var templates_default = generateTemplates();
 
 // src/widgets/AltDateWidget/index.tsx
-import { useEffect, useState } from "react";
 import { Row as Row7, Col as Col7, Button as Button3 } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds2,
-  dateRangeOptions,
-  getDateElementProps,
-  parseDateString,
-  toDateString,
-  TranslatableString as TranslatableString4
+  DateElement,
+  TranslatableString as TranslatableString4,
+  useAltDateWidgetProps
 } from "@rjsf/utils";
 import { jsx as jsx16, jsxs as jsxs9 } from "react/jsx-runtime";
-var readyForChange = (state) => {
-  return Object.values(state).every((value) => value !== -1);
-};
 function AltDateWidget(props) {
-  const { autofocus, disabled, id, onBlur, onChange, onFocus, options, readonly, registry, showTime, value } = props;
-  const { formContext, translateString, widgets } = registry;
-  const { SelectWidget: SelectWidget2 } = widgets;
+  const { autofocus, disabled, id, name, onBlur, onFocus, options, readonly, registry } = props;
+  const { formContext, translateString } = registry;
   const { rowGutter = 24 } = formContext;
-  const [state, setState] = useState(parseDateString(value, showTime));
-  useEffect(() => {
-    setState(parseDateString(value, showTime));
-  }, [showTime, value]);
-  const handleChange = (property, nextValue) => {
-    const nextState = {
-      ...state,
-      [property]: typeof nextValue === "undefined" ? -1 : nextValue
-    };
-    if (readyForChange(nextState)) {
-      onChange(toDateString(nextState, showTime));
-    } else {
-      setState(nextState);
-    }
-  };
-  const handleNow = (event) => {
-    event.preventDefault();
-    if (disabled || readonly) {
-      return;
-    }
-    const nextState = parseDateString((/* @__PURE__ */ new Date()).toJSON(), showTime);
-    onChange(toDateString(nextState, showTime));
-  };
-  const handleClear = (event) => {
-    event.preventDefault();
-    if (disabled || readonly) {
-      return;
-    }
-    onChange(void 0);
-  };
-  const renderDateElement = (elemProps) => /* @__PURE__ */ jsx16(
-    SelectWidget2,
-    {
-      autofocus: elemProps.autofocus,
-      className: "form-control",
-      disabled: elemProps.disabled,
-      id: elemProps.id,
-      name: elemProps.name,
-      onBlur: elemProps.onBlur,
-      onChange: (elemValue) => elemProps.select(elemProps.type, elemValue),
-      onFocus: elemProps.onFocus,
-      options: {
-        enumOptions: dateRangeOptions(elemProps.range[0], elemProps.range[1])
-      },
-      placeholder: elemProps.type,
-      readonly: elemProps.readonly,
-      schema: { type: "integer" },
-      value: elemProps.value,
-      registry,
-      label: "",
-      "aria-describedby": ariaDescribedByIds2(id)
-    }
-  );
+  const { elements, handleChange, handleClear, handleSetNow } = useAltDateWidgetProps(props);
   return /* @__PURE__ */ jsxs9(Row7, { gutter: [Math.floor(rowGutter / 2), Math.floor(rowGutter / 2)], children: [
-    getDateElementProps(
-      state,
-      showTime,
-      options.yearsRange,
-      options.format
-    ).map((elemProps, i) => {
-      const elemId = id + "_" + elemProps.type;
-      return /* @__PURE__ */ jsx16(Col7, { flex: "88px", children: renderDateElement({
-        ...elemProps,
-        autofocus: autofocus && i === 0,
-        disabled,
-        id: elemId,
-        name: id,
-        onBlur,
-        onFocus,
-        readonly,
-        registry,
-        select: handleChange,
-        // NOTE: antd components accept -1 rather than issue a warning
-        // like material-ui, so we need to convert -1 to undefined here.
-        value: elemProps.value || -1 < 0 ? void 0 : elemProps.value
-      }) }, elemId);
+    elements.map((elemProps, i) => {
+      const elemId = `${id}_${elemProps.type}`;
+      return /* @__PURE__ */ jsx16(Col7, { flex: "88px", children: /* @__PURE__ */ jsx16(
+        DateElement,
+        {
+          rootId: id,
+          name,
+          select: handleChange,
+          ...elemProps,
+          disabled,
+          readonly,
+          registry,
+          onBlur,
+          onFocus,
+          autofocus: autofocus && i === 0
+        }
+      ) }, elemId);
     }),
-    !options.hideNowButton && /* @__PURE__ */ jsx16(Col7, { flex: "88px", children: /* @__PURE__ */ jsx16(Button3, { block: true, className: "btn-now", onClick: handleNow, type: "primary", children: translateString(TranslatableString4.NowLabel) }) }),
+    !options.hideNowButton && /* @__PURE__ */ jsx16(Col7, { flex: "88px", children: /* @__PURE__ */ jsx16(Button3, { block: true, className: "btn-now", onClick: handleSetNow, type: "primary", children: translateString(TranslatableString4.NowLabel) }) }),
     !options.hideClearButton && /* @__PURE__ */ jsx16(Col7, { flex: "88px", children: /* @__PURE__ */ jsx16(Button3, { block: true, className: "btn-clear", danger: true, onClick: handleClear, type: "primary", children: translateString(TranslatableString4.ClearLabel) }) })
   ] });
 }
@@ -909,24 +844,24 @@ AltDateWidget.defaultProps = {
     yearsRange: [1900, (/* @__PURE__ */ new Date()).getFullYear() + 2]
   },
   readonly: false,
-  showTime: false
+  time: false
 };
 
 // src/widgets/AltDateTimeWidget/index.tsx
 import { jsx as jsx17 } from "react/jsx-runtime";
 function AltDateTimeWidget(props) {
   const { AltDateWidget: AltDateWidget2 } = props.registry.widgets;
-  return /* @__PURE__ */ jsx17(AltDateWidget2, { showTime: true, ...props });
+  return /* @__PURE__ */ jsx17(AltDateWidget2, { time: true, ...props });
 }
 AltDateTimeWidget.defaultProps = {
   ...AltDateWidget.defaultProps,
-  showTime: true
+  time: true
 };
 
 // src/widgets/CheckboxesWidget/index.tsx
 import { Checkbox } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds3,
+  ariaDescribedByIds as ariaDescribedByIds2,
   enumOptionsIndexForValue,
   enumOptionsValueForIndex,
   optionId
@@ -965,7 +900,7 @@ function CheckboxesWidget({
       onChange: !readonly ? handleChange : void 0,
       value: selectedIndexes,
       ...extraProps,
-      "aria-describedby": ariaDescribedByIds3(id),
+      "aria-describedby": ariaDescribedByIds2(id),
       children: Array.isArray(enumOptions) && enumOptions.map((option, i) => /* @__PURE__ */ jsxs10("span", { children: [
         /* @__PURE__ */ jsx18(
           Checkbox,
@@ -987,7 +922,7 @@ function CheckboxesWidget({
 // src/widgets/CheckboxWidget/index.tsx
 import { Checkbox as Checkbox2 } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds4,
+  ariaDescribedByIds as ariaDescribedByIds3,
   labelValue
 } from "@rjsf/utils";
 import { jsx as jsx19 } from "react/jsx-runtime";
@@ -1012,7 +947,7 @@ function CheckboxWidget(props) {
       name: htmlName || id,
       onChange: !readonly ? handleChange : void 0,
       ...extraProps,
-      "aria-describedby": ariaDescribedByIds4(id),
+      "aria-describedby": ariaDescribedByIds3(id),
       children: labelValue(label, hideLabel, "")
     }
   );
@@ -1021,7 +956,7 @@ function CheckboxWidget(props) {
 // src/widgets/DateTimeWidget/index.tsx
 import dayjs from "dayjs";
 import {
-  ariaDescribedByIds as ariaDescribedByIds5
+  ariaDescribedByIds as ariaDescribedByIds4
 } from "@rjsf/utils";
 import { DatePicker } from "antd";
 import { jsx as jsx20 } from "react/jsx-runtime";
@@ -1050,7 +985,7 @@ function DateTimeWidget(props) {
       showTime: true,
       style: DATE_PICKER_STYLE,
       value: value && dayjs(value),
-      "aria-describedby": ariaDescribedByIds5(id)
+      "aria-describedby": ariaDescribedByIds4(id)
     }
   );
 }
@@ -1058,7 +993,7 @@ function DateTimeWidget(props) {
 // src/widgets/DateWidget/index.tsx
 import dayjs2 from "dayjs";
 import {
-  ariaDescribedByIds as ariaDescribedByIds6
+  ariaDescribedByIds as ariaDescribedByIds5
 } from "@rjsf/utils";
 import { DatePicker as DatePicker2 } from "antd";
 import { jsx as jsx21 } from "react/jsx-runtime";
@@ -1087,7 +1022,7 @@ function DateWidget(props) {
       showTime: false,
       style: DATE_PICKER_STYLE2,
       value: value && dayjs2(value),
-      "aria-describedby": ariaDescribedByIds6(id)
+      "aria-describedby": ariaDescribedByIds5(id)
     }
   );
 }
@@ -1095,7 +1030,7 @@ function DateWidget(props) {
 // src/widgets/PasswordWidget/index.tsx
 import { Input as Input3 } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds7
+  ariaDescribedByIds as ariaDescribedByIds6
 } from "@rjsf/utils";
 import { jsx as jsx22 } from "react/jsx-runtime";
 function PasswordWidget(props) {
@@ -1117,7 +1052,7 @@ function PasswordWidget(props) {
       onFocus: !readonly ? handleFocus : void 0,
       placeholder,
       value: value || "",
-      "aria-describedby": ariaDescribedByIds7(id)
+      "aria-describedby": ariaDescribedByIds6(id)
     }
   );
 }
@@ -1125,7 +1060,7 @@ function PasswordWidget(props) {
 // src/widgets/RadioWidget/index.tsx
 import { Radio } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds8,
+  ariaDescribedByIds as ariaDescribedByIds7,
   enumOptionsIndexForValue as enumOptionsIndexForValue2,
   enumOptionsValueForIndex as enumOptionsValueForIndex2,
   optionId as optionId2
@@ -1161,7 +1096,7 @@ function RadioWidget({
       onBlur: !readonly ? handleBlur : void 0,
       onFocus: !readonly ? handleFocus : void 0,
       value: selectedIndexes,
-      "aria-describedby": ariaDescribedByIds8(id),
+      "aria-describedby": ariaDescribedByIds7(id),
       children: Array.isArray(enumOptions) && enumOptions.map((option, i) => /* @__PURE__ */ jsx23(
         Radio,
         {
@@ -1181,7 +1116,7 @@ function RadioWidget({
 // src/widgets/RangeWidget/index.tsx
 import { Slider } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds9,
+  ariaDescribedByIds as ariaDescribedByIds8,
   rangeSpec
 } from "@rjsf/utils";
 import { jsx as jsx24 } from "react/jsx-runtime";
@@ -1225,7 +1160,7 @@ function RangeWidget(props) {
       step,
       value,
       ...extraProps,
-      "aria-describedby": ariaDescribedByIds9(id)
+      "aria-describedby": ariaDescribedByIds8(id)
     }
   );
 }
@@ -1233,7 +1168,7 @@ function RangeWidget(props) {
 // src/widgets/SelectWidget/index.tsx
 import { Select } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds10,
+  ariaDescribedByIds as ariaDescribedByIds9,
   enumOptionsIndexForValue as enumOptionsIndexForValue3,
   enumOptionsValueForIndex as enumOptionsValueForIndex3
 } from "@rjsf/utils";
@@ -1308,7 +1243,7 @@ function SelectWidget({
       value: selectedIndexes,
       ...extraProps,
       filterOption,
-      "aria-describedby": ariaDescribedByIds10(id),
+      "aria-describedby": ariaDescribedByIds9(id),
       options: selectOptions
     }
   );
@@ -1317,7 +1252,7 @@ function SelectWidget({
 // src/widgets/TextareaWidget/index.tsx
 import { Input as Input4 } from "antd";
 import {
-  ariaDescribedByIds as ariaDescribedByIds11
+  ariaDescribedByIds as ariaDescribedByIds10
 } from "@rjsf/utils";
 import { jsx as jsx26 } from "react/jsx-runtime";
 var INPUT_STYLE3 = {
@@ -1358,7 +1293,7 @@ function TextareaWidget({
       style: INPUT_STYLE3,
       value,
       ...extraProps,
-      "aria-describedby": ariaDescribedByIds11(id)
+      "aria-describedby": ariaDescribedByIds10(id)
     }
   );
 }