@rjsf/antd 6.4.1 → 6.5.0

package/dist/antd.esm.js

@@ -134,6 +134,7 @@ function BaseInputTemplate(props) {
     options,
     placeholder,
     readonly,
+    required,
     schema,
     value,
     type
@@ -154,6 +155,7 @@ function BaseInputTemplate(props) {
     },
     [onChange, options.emptyValue]
   );
+  const { min, max, ...restInputProps } = inputProps;
   const input = inputProps.type === "number" || inputProps.type === "integer" ? /* @__PURE__ */ jsx3(
     InputNumber,
     {
@@ -164,9 +166,14 @@ function BaseInputTemplate(props) {
       onChange: !readonly ? handleNumberChange : void 0,
       onFocus: !readonly ? handleFocus : void 0,
       placeholder,
+      required,
       style: INPUT_STYLE,
+      changeOnWheel: false,
       list: schema.examples ? examplesId(id) : void 0,
-      ...inputProps,
+      ...restInputProps,
+      min: typeof min === "number" ? min : void 0,
+      max: typeof max === "number" ? max : void 0,
+      type: void 0,
       value,
       "aria-describedby": ariaDescribedByIds(id, !!schema.examples)
     }
@@ -180,6 +187,7 @@ function BaseInputTemplate(props) {
       onChange: !readonly ? handleTextChange : void 0,
       onFocus: !readonly ? handleFocus : void 0,
       placeholder,
+      required,
       style: INPUT_STYLE,
       list: schema.examples ? examplesId(id) : void 0,
       ...inputProps,
@@ -206,38 +214,49 @@ function DescriptionField(props) {
 }
 
 // src/templates/ErrorList/index.tsx
-import { Alert, List, Space as Space2 } from "antd";
-import ExclamationCircleOutlined from "@ant-design/icons/ExclamationCircleOutlined";
+import { Alert, Space as Space2, theme, version } from "antd";
+import { ExclamationCircleOutlined } from "@ant-design/icons";
 import { TranslatableString } from "@rjsf/utils";
 import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+var antdMajor = parseInt(version.split(".")[0], 10);
 function ErrorList({
   errors,
   registry
 }) {
   const { translateString } = registry;
-  const renderErrors = () => /* @__PURE__ */ jsx5(List, { className: "list-group", size: "small", children: errors.map((error, index) => /* @__PURE__ */ jsx5(List.Item, { children: /* @__PURE__ */ jsxs4(Space2, { children: [
-    /* @__PURE__ */ jsx5(ExclamationCircleOutlined, {}),
-    error.stack
-  ] }) }, index)) });
-  return /* @__PURE__ */ jsx5(
-    Alert,
+  const { token } = theme.useToken();
+  const itemBorder = `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`;
+  const renderErrors = () => /* @__PURE__ */ jsx5("ul", { style: { margin: 0, padding: 0, listStyle: "none" }, children: errors.map((error, index) => /* @__PURE__ */ jsx5(
+    "li",
     {
-      className: "panel panel-danger errors",
-      description: renderErrors(),
-      message: translateString(TranslatableString.ErrorsLabel),
-      type: "error"
-    }
-  );
+      style: {
+        display: "flex",
+        alignItems: "center",
+        padding: `${token.paddingXS}px ${token.padding}px`,
+        color: token.colorText,
+        borderBlockEnd: index < errors.length - 1 ? itemBorder : "none"
+      },
+      children: /* @__PURE__ */ jsxs4(Space2, { children: [
+        /* @__PURE__ */ jsx5(ExclamationCircleOutlined, {}),
+        error.stack
+      ] })
+    },
+    index
+  )) });
+  const headerProp = antdMajor >= 6 ? { title: translateString(TranslatableString.ErrorsLabel) } : { message: translateString(TranslatableString.ErrorsLabel) };
+  return /* @__PURE__ */ jsx5(Alert, { className: "panel panel-danger errors", description: renderErrors(), type: "error", ...headerProp });
 }
 
 // src/templates/IconButton/index.tsx
 import { Button } from "antd";
-import ArrowDownOutlined from "@ant-design/icons/ArrowDownOutlined";
-import ArrowUpOutlined from "@ant-design/icons/ArrowUpOutlined";
-import CopyOutlined from "@ant-design/icons/CopyOutlined";
-import DeleteOutlined from "@ant-design/icons/DeleteOutlined";
-import PlusCircleOutlined from "@ant-design/icons/PlusCircleOutlined";
-import CloseOutlined from "@ant-design/icons/CloseOutlined";
+import {
+  ArrowDownOutlined,
+  ArrowUpOutlined,
+  CopyOutlined,
+  DeleteOutlined,
+  PlusCircleOutlined,
+  CloseOutlined
+} from "@ant-design/icons";
 import {
   getUiOptions as getUiOptions3,
   TranslatableString as TranslatableString2
@@ -720,7 +739,8 @@ function WrapIfAdditionalTemplate(props) {
             onBlur: !readonly ? onKeyRenameBlur : void 0,
             style: INPUT_STYLE2,
             type: "text"
-          }
+          },
+          label
         )
       }
     ) }) }),
@@ -821,8 +841,10 @@ function AltDateWidget({ autofocus = false, disabled = false, options, readonly
 import { Checkbox } from "antd";
 import {
   ariaDescribedByIds as ariaDescribedByIds2,
-  enumOptionsIndexForValue,
-  enumOptionsValueForIndex,
+  enumOptionSelectedValue,
+  enumOptionValueDecoder,
+  enumOptionValueEncoder,
+  getOptionValueFormat,
   optionId
 } from "@rjsf/utils";
 import { Fragment as Fragment3, jsx as jsx18, jsxs as jsxs10 } from "react/jsx-runtime";
@@ -842,22 +864,23 @@ function CheckboxesWidget({
   const { formContext } = registry;
   const { readonlyAsDisabled = true } = formContext;
   const { enumOptions, enumDisabled, inline, emptyValue } = options;
-  const handleChange = (nextValue) => onChange(enumOptionsValueForIndex(nextValue, enumOptions, emptyValue));
-  const handleBlur = ({ target }) => onBlur(id, enumOptionsValueForIndex(target.value, enumOptions, emptyValue));
-  const handleFocus = ({ target }) => onFocus(id, enumOptionsValueForIndex(target.value, enumOptions, emptyValue));
+  const optionValueFormat = getOptionValueFormat(options);
+  const handleChange = (nextValue) => onChange(enumOptionValueDecoder(nextValue, enumOptions, optionValueFormat, emptyValue));
+  const handleBlur = ({ target }) => onBlur(id, enumOptionValueDecoder(target.value, enumOptions, optionValueFormat, emptyValue));
+  const handleFocus = ({ target }) => onFocus(id, enumOptionValueDecoder(target.value, enumOptions, optionValueFormat, emptyValue));
   const extraProps = {
     id,
     onBlur: !readonly ? handleBlur : void 0,
     onFocus: !readonly ? handleFocus : void 0
   };
-  const selectedIndexes = enumOptionsIndexForValue(value, enumOptions, true);
+  const selectValue = enumOptionSelectedValue(value, enumOptions, true, optionValueFormat, []);
   return Array.isArray(enumOptions) && enumOptions.length > 0 ? /* @__PURE__ */ jsx18(Fragment3, { children: /* @__PURE__ */ jsx18(
     Checkbox.Group,
     {
       disabled: disabled || readonlyAsDisabled && readonly,
       name: htmlName || id,
       onChange: !readonly ? handleChange : void 0,
-      value: selectedIndexes,
+      value: selectValue,
       ...extraProps,
       "aria-describedby": ariaDescribedByIds2(id),
       children: Array.isArray(enumOptions) && enumOptions.map((option, i) => /* @__PURE__ */ jsxs10("span", { children: [
@@ -868,7 +891,7 @@ function CheckboxesWidget({
             name: htmlName || id,
             autoFocus: i === 0 ? autofocus : false,
             disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1,
-            value: String(i),
+            value: enumOptionValueEncoder(option.value, i, optionValueFormat),
             children: option.label
           }
         ),
@@ -1020,8 +1043,10 @@ function PasswordWidget(props) {
 import { Radio } from "antd";
 import {
   ariaDescribedByIds as ariaDescribedByIds7,
-  enumOptionsIndexForValue as enumOptionsIndexForValue2,
-  enumOptionsValueForIndex as enumOptionsValueForIndex2,
+  enumOptionSelectedValue as enumOptionSelectedValue2,
+  enumOptionValueDecoder as enumOptionValueDecoder2,
+  enumOptionValueEncoder as enumOptionValueEncoder2,
+  getOptionValueFormat as getOptionValueFormat2,
   optionId as optionId2
 } from "@rjsf/utils";
 import { jsx as jsx23 } from "react/jsx-runtime";
@@ -1041,10 +1066,11 @@ function RadioWidget({
   const { formContext } = registry;
   const { readonlyAsDisabled = true } = formContext;
   const { enumOptions, enumDisabled, emptyValue } = options;
-  const handleChange = ({ target: { value: nextValue } }) => onChange(enumOptionsValueForIndex2(nextValue, enumOptions, emptyValue));
-  const handleBlur = ({ target }) => onBlur(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue));
-  const handleFocus = ({ target }) => onFocus(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue));
-  const selectedIndexes = enumOptionsIndexForValue2(value, enumOptions);
+  const optionValueFormat = getOptionValueFormat2(options);
+  const handleChange = ({ target: { value: nextValue } }) => onChange(enumOptionValueDecoder2(nextValue, enumOptions, optionValueFormat, emptyValue));
+  const handleBlur = ({ target }) => onBlur(id, enumOptionValueDecoder2(target && target.value, enumOptions, optionValueFormat, emptyValue));
+  const handleFocus = ({ target }) => onFocus(id, enumOptionValueDecoder2(target && target.value, enumOptions, optionValueFormat, emptyValue));
+  const selectValue = enumOptionSelectedValue2(value, enumOptions, false, optionValueFormat, emptyValue);
   return /* @__PURE__ */ jsx23(
     Radio.Group,
     {
@@ -1054,7 +1080,7 @@ function RadioWidget({
       onChange: !readonly ? handleChange : void 0,
       onBlur: !readonly ? handleBlur : void 0,
       onFocus: !readonly ? handleFocus : void 0,
-      value: selectedIndexes,
+      value: selectValue,
       "aria-describedby": ariaDescribedByIds7(id),
       children: Array.isArray(enumOptions) && enumOptions.map((option, i) => /* @__PURE__ */ jsx23(
         Radio,
@@ -1063,7 +1089,7 @@ function RadioWidget({
           name: htmlName || id,
           autoFocus: i === 0 ? autofocus : false,
           disabled: disabled || Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1,
-          value: String(i),
+          value: enumOptionValueEncoder2(option.value, i, optionValueFormat),
           children: option.label
         },
         i
@@ -1129,8 +1155,10 @@ import { useMemo, useState } from "react";
 import { Select } from "antd";
 import {
   ariaDescribedByIds as ariaDescribedByIds9,
-  enumOptionsIndexForValue as enumOptionsIndexForValue3,
-  enumOptionsValueForIndex as enumOptionsValueForIndex3
+  enumOptionSelectedValue as enumOptionSelectedValue3,
+  enumOptionValueDecoder as enumOptionValueDecoder3,
+  enumOptionValueEncoder as enumOptionValueEncoder3,
+  getOptionValueFormat as getOptionValueFormat3
 } from "@rjsf/utils";
 import isString2 from "lodash/isString";
 import { jsx as jsx25 } from "react/jsx-runtime";
@@ -1157,9 +1185,10 @@ function SelectWidget({
   const { formContext } = registry;
   const { readonlyAsDisabled = true } = formContext;
   const { enumOptions, enumDisabled, emptyValue } = options;
-  const handleChange = (nextValue) => onChange(enumOptionsValueForIndex3(nextValue, enumOptions, emptyValue));
-  const handleBlur = () => onBlur(id, enumOptionsValueForIndex3(value, enumOptions, emptyValue));
-  const handleFocus = () => onFocus(id, enumOptionsValueForIndex3(value, enumOptions, emptyValue));
+  const optionValueFormat = getOptionValueFormat3(options);
+  const handleChange = (nextValue) => onChange(enumOptionValueDecoder3(nextValue, enumOptions, optionValueFormat, emptyValue));
+  const handleBlur = () => onBlur(id, enumOptionValueDecoder3(value, enumOptions, optionValueFormat, emptyValue));
+  const handleFocus = () => onFocus(id, enumOptionValueDecoder3(value, enumOptions, optionValueFormat, emptyValue));
   const filterOption = (input, option) => {
     if (option && isString2(option.label)) {
       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -1167,7 +1196,7 @@ function SelectWidget({
     return false;
   };
   const getPopupContainer = SelectWidget.getPopupContainerCallback();
-  const selectedIndexes = enumOptionsIndexForValue3(value, enumOptions, multiple);
+  const selectValue = enumOptionSelectedValue3(value, enumOptions, !!multiple, optionValueFormat, emptyValue);
   const extraProps = {
     name: htmlName || id
   };
@@ -1177,7 +1206,7 @@ function SelectWidget({
       const options2 = enumOptions.map(({ value: optionValue, label: optionLabel }, index) => ({
         disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(optionValue) !== -1,
         key: String(index),
-        value: String(index),
+        value: enumOptionValueEncoder3(optionValue, index, optionValueFormat),
         label: optionLabel
       }));
       if (showPlaceholderOption) {
@@ -1186,7 +1215,7 @@ function SelectWidget({
       return options2;
     }
     return void 0;
-  }, [enumDisabled, enumOptions, placeholder, showPlaceholderOption]);
+  }, [enumDisabled, enumOptions, placeholder, showPlaceholderOption, optionValueFormat]);
   return /* @__PURE__ */ jsx25(
     Select,
     {
@@ -1201,7 +1230,7 @@ function SelectWidget({
       onFocus: !readonly ? handleFocus : void 0,
       placeholder,
       style: SELECT_STYLE,
-      value: selectedIndexes,
+      value: selectValue,
       ...extraProps,
       onOpenChange: setOpen,
       filterOption,