@rjsf/antd 5.3.0 → 5.4.0

package/dist/antd.umd.development.js

@@ -196,7 +196,7 @@
               span: 24,
               style: DESCRIPTION_COL_STYLE$1,
               children: jsxRuntime.jsx(ArrayFieldDescriptionTemplate, {
-                description: uiOptions.description || schema.description || '',
+                description: uiOptions.description || schema.description,
                 idSchema: idSchema,
                 schema: schema,
                 uiSchema: uiSchema,
@@ -478,7 +478,9 @@
       labelCol = _formContext$labelCol === void 0 ? VERTICAL_LABEL_COL$1 : _formContext$labelCol,
       _formContext$wrapperC = formContext.wrapperCol,
       wrapperCol = _formContext$wrapperC === void 0 ? VERTICAL_WRAPPER_COL$1 : _formContext$wrapperC,
-      wrapperStyle = formContext.wrapperStyle;
+      wrapperStyle = formContext.wrapperStyle,
+      _formContext$descript = formContext.descriptionLocation,
+      descriptionLocation = _formContext$descript === void 0 ? 'below' : _formContext$descript;
     var uiOptions = utils.getUiOptions(uiSchema);
     var WrapIfAdditionalTemplate = utils.getTemplate('WrapIfAdditionalTemplate', registry, uiOptions);
     if (hidden) {
@@ -487,6 +489,19 @@
         children: children
       });
     }
+    // check to see if there is rawDescription(string) before using description(ReactNode)
+    // to prevent showing a blank description area
+    var descriptionNode = rawDescription ? description : undefined;
+    var descriptionProps = {};
+    switch (descriptionLocation) {
+      case 'tooltip':
+        descriptionProps.tooltip = descriptionNode;
+        break;
+      case 'below':
+      default:
+        descriptionProps.extra = descriptionNode;
+        break;
+    }
     return jsxRuntime.jsx(WrapIfAdditionalTemplate, {
       classNames: classNames,
       style: style,
@@ -500,9 +515,8 @@
       schema: schema,
       uiSchema: uiSchema,
       registry: registry,
-      children: id === 'root' ? children : jsxRuntime.jsx(Form__default["default"].Item, {
+      children: id === 'root' ? children : jsxRuntime.jsx(Form__default["default"].Item, _extends({
         colon: colon,
-        extra: rawDescription && description,
         hasFeedback: schema.type !== 'array' && schema.type !== 'object',
         help: !!rawHelp && help || (rawErrors !== null && rawErrors !== void 0 && rawErrors.length ? errors : undefined),
         htmlFor: id,
@@ -511,9 +525,10 @@
         required: required,
         style: wrapperStyle,
         validateStatus: rawErrors !== null && rawErrors !== void 0 && rawErrors.length ? 'error' : undefined,
-        wrapperCol: wrapperCol,
+        wrapperCol: wrapperCol
+      }, descriptionProps, {
         children: children
-      })
+      }))
     });
   }
 
@@ -603,23 +618,23 @@
           id: idSchema.$id,
           children: [jsxRuntime.jsxs(Row__default["default"], {
             gutter: rowGutter,
-            children: [(uiOptions.title || title) && jsxRuntime.jsx(Col__default["default"], {
+            children: [title && jsxRuntime.jsx(Col__default["default"], {
               className: labelColClassName,
               span: 24,
               children: jsxRuntime.jsx(TitleFieldTemplate, {
                 id: utils.titleId(idSchema),
-                title: uiOptions.title || title,
+                title: title,
                 required: required,
                 schema: schema,
                 uiSchema: uiSchema,
                 registry: registry
               })
-            }), (uiOptions.description || description) && jsxRuntime.jsx(Col__default["default"], {
+            }), description && jsxRuntime.jsx(Col__default["default"], {
               span: 24,
               style: DESCRIPTION_COL_STYLE,
               children: jsxRuntime.jsx(DescriptionFieldTemplate, {
                 id: utils.descriptionId(idSchema),
-                description: uiOptions.description || description,
+                description: description,
                 schema: schema,
                 uiSchema: uiSchema,
                 registry: registry
@@ -1056,14 +1071,20 @@
       disabled = _ref.disabled,
       formContext = _ref.formContext,
       id = _ref.id,
+      label = _ref.label,
+      hideLabel = _ref.hideLabel,
       onBlur = _ref.onBlur,
       onChange = _ref.onChange,
       onFocus = _ref.onFocus,
       options = _ref.options,
       readonly = _ref.readonly,
+      registry = _ref.registry,
+      schema = _ref.schema,
+      uiSchema = _ref.uiSchema,
       value = _ref.value;
     var _formContext$readonly = formContext.readonlyAsDisabled,
       readonlyAsDisabled = _formContext$readonly === void 0 ? true : _formContext$readonly;
+    var TitleFieldTemplate = utils.getTemplate('TitleFieldTemplate', registry, options);
     var enumOptions = options.enumOptions,
       enumDisabled = options.enumDisabled,
       inline = options.inline,
@@ -1087,26 +1108,36 @@
       onFocus: !readonly ? handleFocus : undefined
     };
     var selectedIndexes = utils.enumOptionsIndexForValue(value, enumOptions, true);
-    return Array.isArray(enumOptions) && enumOptions.length > 0 ? jsxRuntime.jsx(Checkbox__default["default"].Group, _extends({
-      disabled: disabled || readonlyAsDisabled && readonly,
-      name: id,
-      onChange: !readonly ? handleChange : undefined,
-      value: selectedIndexes
-    }, extraProps, {
-      "aria-describedby": utils.ariaDescribedByIds(id),
-      children: Array.isArray(enumOptions) && enumOptions.map(function (option, i) {
-        return jsxRuntime.jsxs("span", {
-          children: [jsxRuntime.jsx(Checkbox__default["default"], {
-            id: utils.optionId(id, i),
-            name: id,
-            autoFocus: i === 0 ? autofocus : false,
-            disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1,
-            value: String(i),
-            children: option.label
-          }), !inline && jsxRuntime.jsx("br", {})]
-        }, i);
-      })
-    })) : null;
+    return Array.isArray(enumOptions) && enumOptions.length > 0 ? jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [!hideLabel && !!label && jsxRuntime.jsx("div", {
+        children: jsxRuntime.jsx(TitleFieldTemplate, {
+          id: utils.titleId(id),
+          title: label,
+          schema: schema,
+          uiSchema: uiSchema,
+          registry: registry
+        })
+      }), jsxRuntime.jsx(Checkbox__default["default"].Group, _extends({
+        disabled: disabled || readonlyAsDisabled && readonly,
+        name: id,
+        onChange: !readonly ? handleChange : undefined,
+        value: selectedIndexes
+      }, extraProps, {
+        "aria-describedby": utils.ariaDescribedByIds(id),
+        children: Array.isArray(enumOptions) && enumOptions.map(function (option, i) {
+          return jsxRuntime.jsxs("span", {
+            children: [jsxRuntime.jsx(Checkbox__default["default"], {
+              id: utils.optionId(id, i),
+              name: id,
+              autoFocus: i === 0 ? autofocus : false,
+              disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1,
+              value: String(i),
+              children: option.label
+            }), !inline && jsxRuntime.jsx("br", {})]
+          }, i);
+        })
+      }))]
+    }) : null;
   }
 
   /** The `CheckBoxWidget` is a widget for rendering boolean properties.
@@ -1115,18 +1146,25 @@
    * @param props - The `WidgetProps` for this component
    */
   function CheckboxWidget(props) {
+    var _options$description;
     var autofocus = props.autofocus,
       disabled = props.disabled,
       formContext = props.formContext,
       id = props.id,
       label = props.label,
+      hideLabel = props.hideLabel,
       onBlur = props.onBlur,
       onChange = props.onChange,
       onFocus = props.onFocus,
       readonly = props.readonly,
-      value = props.value;
+      value = props.value,
+      registry = props.registry,
+      options = props.options,
+      schema = props.schema,
+      uiSchema = props.uiSchema;
     var _formContext$readonly = formContext.readonlyAsDisabled,
       readonlyAsDisabled = _formContext$readonly === void 0 ? true : _formContext$readonly;
+    var DescriptionFieldTemplate = utils.getTemplate('DescriptionFieldTemplate', registry, options);
     var handleChange = function handleChange(_ref) {
       var target = _ref.target;
       return onChange(target.checked);
@@ -1145,17 +1183,28 @@
       onBlur: !readonly ? handleBlur : undefined,
       onFocus: !readonly ? handleFocus : undefined
     };
-    return jsxRuntime.jsx(Checkbox__default["default"], _extends({
-      autoFocus: autofocus,
-      checked: typeof value === 'undefined' ? false : value,
-      disabled: disabled || readonlyAsDisabled && readonly,
-      id: id,
-      name: id,
-      onChange: !readonly ? handleChange : undefined
-    }, extraProps, {
-      "aria-describedby": utils.ariaDescribedByIds(id),
-      children: label
-    }));
+    var description = (_options$description = options.description) != null ? _options$description : schema.description;
+    return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [!hideLabel && !!description && jsxRuntime.jsx("div", {
+        children: jsxRuntime.jsx(DescriptionFieldTemplate, {
+          id: utils.descriptionId(id),
+          description: description,
+          schema: schema,
+          uiSchema: uiSchema,
+          registry: registry
+        })
+      }), jsxRuntime.jsx(Checkbox__default["default"], _extends({
+        autoFocus: autofocus,
+        checked: typeof value === 'undefined' ? false : value,
+        disabled: disabled || readonlyAsDisabled && readonly,
+        id: id,
+        name: id,
+        onChange: !readonly ? handleChange : undefined
+      }, extraProps, {
+        "aria-describedby": utils.ariaDescribedByIds(id),
+        children: utils.labelValue(label, hideLabel, '')
+      }))]
+    });
   }
 
   var DatePicker = /*#__PURE__*/generatePicker__default["default"](dayjsGenerateConfig__default["default"]);
@@ -1425,6 +1474,8 @@
       _ref$formContext = _ref.formContext,
       formContext = _ref$formContext === void 0 ? {} : _ref$formContext,
       id = _ref.id,
+      label = _ref.label,
+      hideLabel = _ref.hideLabel,
       multiple = _ref.multiple,
       onBlur = _ref.onBlur,
       onChange = _ref.onChange,
@@ -1432,9 +1483,13 @@
       options = _ref.options,
       placeholder = _ref.placeholder,
       readonly = _ref.readonly,
+      registry = _ref.registry,
+      schema = _ref.schema,
+      uiSchema = _ref.uiSchema,
       value = _ref.value;
     var _formContext$readonly = formContext.readonlyAsDisabled,
       readonlyAsDisabled = _formContext$readonly === void 0 ? true : _formContext$readonly;
+    var TitleFieldTemplate = utils.getTemplate('TitleFieldTemplate', registry, options);
     var enumOptions = options.enumOptions,
       enumDisabled = options.enumDisabled,
       emptyValue = options.emptyValue;
@@ -1463,31 +1518,39 @@
     var extraProps = {
       name: id
     };
-    return jsxRuntime.jsx(Select__default["default"], _extends({
-      autoFocus: autofocus,
-      disabled: disabled || readonlyAsDisabled && readonly,
-      getPopupContainer: getPopupContainer,
-      id: id,
-      mode: typeof multiple !== 'undefined' ? 'multiple' : undefined,
-      onBlur: !readonly ? handleBlur : undefined,
-      onChange: !readonly ? handleChange : undefined,
-      onFocus: !readonly ? handleFocus : undefined,
-      placeholder: placeholder,
-      style: SELECT_STYLE,
-      value: selectedIndexes
-    }, extraProps, {
-      filterOption: filterOption,
-      "aria-describedby": utils.ariaDescribedByIds(id),
-      children: Array.isArray(enumOptions) && enumOptions.map(function (_ref2, index) {
-        var optionValue = _ref2.value,
-          optionLabel = _ref2.label;
-        return jsxRuntime.jsx(Select__default["default"].Option, {
-          disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(optionValue) !== -1,
-          value: String(index),
-          children: optionLabel
-        }, String(index));
-      })
-    }));
+    return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [!hideLabel && !!label && jsxRuntime.jsx(TitleFieldTemplate, {
+        id: utils.titleId(id),
+        title: label,
+        schema: schema,
+        uiSchema: uiSchema,
+        registry: registry
+      }), jsxRuntime.jsx(Select__default["default"], _extends({
+        autoFocus: autofocus,
+        disabled: disabled || readonlyAsDisabled && readonly,
+        getPopupContainer: getPopupContainer,
+        id: id,
+        mode: typeof multiple !== 'undefined' ? 'multiple' : undefined,
+        onBlur: !readonly ? handleBlur : undefined,
+        onChange: !readonly ? handleChange : undefined,
+        onFocus: !readonly ? handleFocus : undefined,
+        placeholder: placeholder,
+        style: SELECT_STYLE,
+        value: selectedIndexes
+      }, extraProps, {
+        filterOption: filterOption,
+        "aria-describedby": utils.ariaDescribedByIds(id),
+        children: Array.isArray(enumOptions) && enumOptions.map(function (_ref2, index) {
+          var optionValue = _ref2.value,
+            optionLabel = _ref2.label;
+          return jsxRuntime.jsx(Select__default["default"].Option, {
+            disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(optionValue) !== -1,
+            value: String(index),
+            children: optionLabel
+          }, String(index));
+        })
+      }))]
+    });
   }
 
   var INPUT_STYLE = {