@rjsf/antd 6.0.1 → 6.1.0

package/dist/antd.esm.js

@@ -9,23 +9,25 @@ import {
 } from "@rjsf/utils";
 import { jsx, jsxs } from "react/jsx-runtime";
 var BTN_GRP_STYLE = {
-  width: "100%"
+  width: "100%",
+  justifyContent: "flex-end"
 };
 var BTN_STYLE = {
   width: "calc(100% / 4)"
 };
 function ArrayFieldItemTemplate(props) {
-  const { children, buttonsProps, hasToolbar, index, registry, uiSchema } = props;
+  const { children, buttonsProps, displayLabel, hasDescription, hasToolbar, index, registry, uiSchema } = props;
   const uiOptions = getUiOptions(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate(
     "ArrayFieldItemButtonsTemplate",
     registry,
     uiOptions
   );
-  const { rowGutter = 24, toolbarAlign = "top" } = registry.formContext;
+  const { rowGutter = 24, toolbarAlign = displayLabel ? "middle" : "top" } = registry.formContext;
+  const margin = hasDescription ? -8 : 16;
   return /* @__PURE__ */ jsxs(Row, { align: toolbarAlign, gutter: rowGutter, children: [
     /* @__PURE__ */ jsx(Col, { flex: "1", children }),
-    hasToolbar && /* @__PURE__ */ jsx(Col, { flex: "192px", children: /* @__PURE__ */ jsx(Space.Compact, { style: BTN_GRP_STYLE, children: /* @__PURE__ */ jsx(ArrayFieldItemButtonsTemplate, { ...buttonsProps, style: BTN_STYLE }) }) })
+    hasToolbar && /* @__PURE__ */ jsx(Col, { flex: "120px", style: { marginTop: displayLabel ? `${margin}px` : void 0 }, children: /* @__PURE__ */ jsx(Space.Compact, { style: BTN_GRP_STYLE, children: /* @__PURE__ */ jsx(ArrayFieldItemButtonsTemplate, { ...buttonsProps, style: BTN_STYLE }) }) })
   ] }, `rjsf-array-item-${index}`);
 }
 
@@ -39,9 +41,6 @@ import classNames from "classnames";
 import { Col as Col2, Row as Row2, ConfigProvider } from "antd";
 import { useContext } from "react";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
-var DESCRIPTION_COL_STYLE = {
-  paddingBottom: "8px"
-};
 function ArrayFieldTemplate(props) {
   const {
     canAdd,
@@ -59,11 +58,6 @@ function ArrayFieldTemplate(props) {
     uiSchema
   } = props;
   const uiOptions = getUiOptions2(uiSchema);
-  const ArrayFieldDescriptionTemplate = getTemplate2(
-    "ArrayFieldDescriptionTemplate",
-    registry,
-    uiOptions
-  );
   const ArrayFieldTitleTemplate = getTemplate2(
     "ArrayFieldTitleTemplate",
     registry,
@@ -96,21 +90,11 @@ function ArrayFieldTemplate(props) {
         optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
       }
     ) }),
-    (uiOptions.description || schema.description) && /* @__PURE__ */ jsx2(Col2, { span: 24, style: DESCRIPTION_COL_STYLE, children: /* @__PURE__ */ jsx2(
-      ArrayFieldDescriptionTemplate,
-      {
-        description: uiOptions.description || schema.description,
-        fieldPathId,
-        schema,
-        uiSchema,
-        registry
-      }
-    ) }),
     /* @__PURE__ */ jsxs2(Col2, { className: "row array-item-list", span: 24, children: [
       !showOptionalDataControlInTitle ? optionalDataControl : void 0,
       items
     ] }),
-    canAdd && /* @__PURE__ */ jsx2(Col2, { span: 24, children: /* @__PURE__ */ jsx2(Row2, { gutter: rowGutter, justify: "end", children: /* @__PURE__ */ jsx2(Col2, { flex: "192px", children: /* @__PURE__ */ jsx2(
+    canAdd && /* @__PURE__ */ jsx2(Col2, { span: 24, children: /* @__PURE__ */ jsx2(Row2, { gutter: rowGutter, justify: "end", children: /* @__PURE__ */ jsx2(Col2, { flex: "120px", children: /* @__PURE__ */ jsx2(
       AddButton2,
       {
         id: buttonId(fieldPathId, "add"),
@@ -200,7 +184,7 @@ function BaseInputTemplate(props) {
   ] });
 }
 
-// src/templates/DescriptionField/index.tsx
+// src/templates/FieldDescriptionTemplate/index.tsx
 import { RichDescription } from "@rjsf/core";
 import { jsx as jsx4 } from "react/jsx-runtime";
 function DescriptionField(props) {
@@ -340,23 +324,16 @@ var VERTICAL_WRAPPER_COL = { span: 24 };
 function FieldTemplate(props) {
   const {
     children,
-    classNames: classNames4,
-    style,
     description,
-    disabled,
     displayLabel,
     errors,
     help,
+    rawHelp,
     hidden,
     id,
     label,
-    onKeyRename,
-    onKeyRenameBlur,
-    onRemoveProperty,
     rawErrors,
     rawDescription,
-    rawHelp,
-    readonly,
     registry,
     required,
     schema,
@@ -390,41 +367,24 @@ function FieldTemplate(props) {
       descriptionProps.extra = descriptionNode;
       break;
   }
-  return /* @__PURE__ */ jsx8(
-    WrapIfAdditionalTemplate2,
+  const isCheckbox = uiOptions.widget === "checkbox";
+  return /* @__PURE__ */ jsx8(WrapIfAdditionalTemplate2, { ...props, children: /* @__PURE__ */ jsx8(
+    Form.Item,
     {
-      classNames: classNames4,
-      style,
-      disabled,
-      id,
-      label,
-      onKeyRename,
-      onKeyRenameBlur,
-      onRemoveProperty,
-      readonly,
+      colon,
+      hasFeedback: schema.type !== "array" && schema.type !== "object",
+      help: !!rawHelp && help || (rawErrors?.length ? errors : void 0),
+      htmlFor: id,
+      label: displayLabel && !isCheckbox && label,
+      labelCol,
       required,
-      schema,
-      uiSchema,
-      registry,
-      children: /* @__PURE__ */ jsx8(
-        Form.Item,
-        {
-          colon,
-          hasFeedback: schema.type !== "array" && schema.type !== "object",
-          help: !!rawHelp && help || (rawErrors?.length ? errors : void 0),
-          htmlFor: id,
-          label: displayLabel && label,
-          labelCol,
-          required,
-          style: wrapperStyle,
-          validateStatus: rawErrors?.length ? "error" : void 0,
-          wrapperCol,
-          ...descriptionProps,
-          children
-        }
-      )
+      style: wrapperStyle,
+      validateStatus: rawErrors?.length ? "error" : void 0,
+      wrapperCol,
+      ...descriptionProps,
+      children
     }
-  );
+  ) });
 }
 
 // src/templates/GridTemplate/index.tsx
@@ -455,7 +415,6 @@ import isNumber from "lodash/isNumber";
 import isString from "lodash/isString";
 import {
   canExpand,
-  descriptionId,
   getTemplate as getTemplate4,
   getUiOptions as getUiOptions5,
   titleId,
@@ -464,12 +423,8 @@ import {
 import { Col as Col4, Row as Row4, ConfigProvider as ConfigProvider2 } from "antd";
 import { useContext as useContext2 } from "react";
 import { jsx as jsx11, jsxs as jsxs6 } from "react/jsx-runtime";
-var DESCRIPTION_COL_STYLE2 = {
-  paddingBottom: "8px"
-};
 function ObjectFieldTemplate(props) {
   const {
-    description,
     disabled,
     formData,
     fieldPathId,
@@ -485,11 +440,6 @@ function ObjectFieldTemplate(props) {
   } = props;
   const uiOptions = getUiOptions5(uiSchema);
   const TitleFieldTemplate = getTemplate4("TitleFieldTemplate", registry, uiOptions);
-  const DescriptionFieldTemplate = getTemplate4(
-    "DescriptionFieldTemplate",
-    registry,
-    uiOptions
-  );
   const { formContext } = registry;
   const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
@@ -546,20 +496,10 @@ function ObjectFieldTemplate(props) {
           optionalDataControl: showOptionalDataControlInTitle ? optionalDataControl : void 0
         }
       ) }),
-      description && /* @__PURE__ */ jsx11(Col4, { span: 24, style: DESCRIPTION_COL_STYLE2, children: /* @__PURE__ */ jsx11(
-        DescriptionFieldTemplate,
-        {
-          id: descriptionId(fieldPathId),
-          description,
-          schema,
-          uiSchema,
-          registry
-        }
-      ) }),
       !showOptionalDataControlInTitle ? /* @__PURE__ */ jsx11(Col4, { span: 24, children: optionalDataControl }) : void 0,
       properties.filter((e) => !e.hidden).map((element) => /* @__PURE__ */ jsx11(Col4, { span: calculateColSpan(element), children: element.content }, element.name))
     ] }),
-    canExpand(schema, uiSchema, formData) && /* @__PURE__ */ jsx11(Col4, { span: 24, children: /* @__PURE__ */ jsx11(Row4, { gutter: rowGutter, justify: "end", children: /* @__PURE__ */ jsx11(Col4, { flex: "192px", children: /* @__PURE__ */ jsx11(
+    canExpand(schema, uiSchema, formData) && /* @__PURE__ */ jsx11(Col4, { span: 24, children: /* @__PURE__ */ jsx11(Row4, { gutter: rowGutter, justify: "end", children: /* @__PURE__ */ jsx11(Col4, { flex: "120px", children: /* @__PURE__ */ jsx11(
       AddButton2,
       {
         id: buttonId2(fieldPathId, "add"),
@@ -699,6 +639,7 @@ function WrapIfAdditionalTemplate(props) {
     classNames: classNames4,
     style,
     disabled,
+    displayLabel,
     id,
     label,
     onRemoveProperty,
@@ -738,7 +679,7 @@ function WrapIfAdditionalTemplate(props) {
         className: "form-group",
         hasFeedback: true,
         htmlFor: `${id}-key`,
-        label: keyLabel,
+        label: displayLabel ? keyLabel : void 0,
         labelCol,
         required,
         style: wrapperStyle,
@@ -759,7 +700,7 @@ function WrapIfAdditionalTemplate(props) {
       }
     ) }) }),
     /* @__PURE__ */ jsx15(Col6, { className: "form-additional", flex: "1", children }),
-    /* @__PURE__ */ jsx15(Col6, { flex: "192px", children: /* @__PURE__ */ jsx15(
+    /* @__PURE__ */ jsx15(Col6, { flex: "120px", style: { marginTop: displayLabel ? "40px" : void 0 }, children: /* @__PURE__ */ jsx15(
       RemoveButton2,
       {
         id: buttonId3(id, "remove"),