@rjsf/antd 6.0.2 → 6.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/antd",
-  "version": "6.0.2",
+  "version": "6.1.1",
   "description": "Ant Design theme, fields and widgets for react-jsonschema-form",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -34,7 +34,7 @@
     }
   },
   "scripts": {
-    "compileReplacer": "tsc -p tsconfig.replacer.json && move-file lodashReplacer.js lodashReplacer.cjs",
+    "compileReplacer": "tsc -p tsconfig.replacer.json && move-file lodashReplacer.js lodashReplacer.cjs && move-file antdIconsReplacer.js antdIconsReplacer.cjs",
     "build:ts": "npm run compileReplacer && rimraf ./lib && tsc -b tsconfig.build.json && tsc-alias -p tsconfig.build.json",
     "build:cjs": "esbuild ./src/index.ts --bundle --outfile=dist/index.cjs --sourcemap --packages=external --format=cjs",
     "build:esm": "esbuild ./src/index.ts --bundle --outfile=dist/antd.esm.js --sourcemap --packages=external --format=esm",

package/src/templates/ArrayFieldItemTemplate/index.tsx

@@ -10,6 +10,7 @@ import {
 
 const BTN_GRP_STYLE = {
   width: '100%',
+  justifyContent: 'flex-end',
 };
 
 const BTN_STYLE = {
@@ -25,21 +26,21 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, index, registry, uiSchema } = props;
+  const { children, buttonsProps, displayLabel, hasDescription, hasToolbar, index, registry, uiSchema } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     '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 (
     <Row align={toolbarAlign} key={`rjsf-array-item-${index}`} gutter={rowGutter}>
       <Col flex='1'>{children}</Col>
-
       {hasToolbar && (
-        <Col flex='192px'>
+        <Col flex='120px' style={{ marginTop: displayLabel ? `${margin}px` : undefined }}>
           <Space.Compact style={BTN_GRP_STYLE}>
             <ArrayFieldItemButtonsTemplate {...buttonsProps} style={BTN_STYLE} />
           </Space.Compact>

package/src/templates/ArrayFieldTemplate/index.tsx

@@ -82,7 +82,7 @@ export default function ArrayFieldTemplate<
         {canAdd && (
           <Col span={24}>
             <Row gutter={rowGutter} justify='end'>
-              <Col flex='192px'>
+              <Col flex='120px'>
                 <AddButton
                   id={buttonId(fieldPathId, 'add')}
                   className='rjsf-array-item-add'

package/src/templates/FieldHelpTemplate/index.tsx

@@ -0,0 +1,23 @@
+import { helpId, FieldHelpProps, FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import { RichHelp } from '@rjsf/core';
+
+/** The `FieldHelpTemplate` component renders any help desired for a field
+ *
+ * @param props - The `FieldHelpProps` to be rendered
+ */
+export default function FieldHelpTemplate<
+  T = any,
+  S extends StrictRJSFSchema = RJSFSchema,
+  F extends FormContextType = any,
+>(props: FieldHelpProps<T, S, F>) {
+  const { fieldPathId, help, uiSchema, registry } = props;
+  if (!help) {
+    return null;
+  }
+
+  return (
+    <div id={helpId(fieldPathId)} className='help-block'>
+      <RichHelp help={help} registry={registry} uiSchema={uiSchema} />
+    </div>
+  );
+}

package/src/templates/FieldTemplate/index.tsx

@@ -24,23 +24,16 @@ export default function FieldTemplate<
 >(props: FieldTemplateProps<T, S, F>) {
   const {
     children,
-    classNames,
-    style,
     description,
-    disabled,
     displayLabel,
     errors,
     help,
+    rawHelp,
     hidden,
     id,
     label,
-    onKeyRename,
-    onKeyRenameBlur,
-    onRemoveProperty,
     rawErrors,
     rawDescription,
-    rawHelp,
-    readonly,
     registry,
     required,
     schema,
@@ -82,21 +75,7 @@ export default function FieldTemplate<
   }
   const isCheckbox = uiOptions.widget === 'checkbox';
   return (
-    <WrapIfAdditionalTemplate
-      classNames={classNames}
-      style={style}
-      disabled={disabled}
-      id={id}
-      label={label}
-      onKeyRename={onKeyRename}
-      onKeyRenameBlur={onKeyRenameBlur}
-      onRemoveProperty={onRemoveProperty}
-      readonly={readonly}
-      required={required}
-      schema={schema}
-      uiSchema={uiSchema}
-      registry={registry}
-    >
+    <WrapIfAdditionalTemplate {...props}>
       <Form.Item
         colon={colon}
         hasFeedback={schema.type !== 'array' && schema.type !== 'object'}

package/src/templates/ObjectFieldTemplate/index.tsx

@@ -133,7 +133,7 @@ export default function ObjectFieldTemplate<
       {canExpand(schema, uiSchema, formData) && (
         <Col span={24}>
           <Row gutter={rowGutter} justify='end'>
-            <Col flex='192px'>
+            <Col flex='120px'>
               <AddButton
                 id={buttonId(fieldPathId, 'add')}
                 className='rjsf-object-property-expand'

package/src/templates/WrapIfAdditionalTemplate/index.tsx

@@ -32,6 +32,7 @@ export default function WrapIfAdditionalTemplate<
     classNames,
     style,
     disabled,
+    displayLabel,
     id,
     label,
     onRemoveProperty,
@@ -82,7 +83,7 @@ export default function WrapIfAdditionalTemplate<
               className='form-group'
               hasFeedback
               htmlFor={`${id}-key`}
-              label={keyLabel}
+              label={displayLabel ? keyLabel : undefined}
               labelCol={labelCol}
               required={required}
               style={wrapperStyle}
@@ -104,7 +105,7 @@ export default function WrapIfAdditionalTemplate<
         <Col className='form-additional' flex='1'>
           {children}
         </Col>
-        <Col flex='192px'>
+        <Col flex='120px' style={{ marginTop: displayLabel ? '40px' : undefined }}>
           <RemoveButton
             id={buttonId(id, 'remove')}
             className='rjsf-object-property-remove'

package/src/templates/index.ts

@@ -3,7 +3,7 @@ import { FormContextType, RJSFSchema, StrictRJSFSchema, TemplatesType } from '@r
 import ArrayFieldItemTemplate from './ArrayFieldItemTemplate';
 import ArrayFieldTemplate from './ArrayFieldTemplate';
 import BaseInputTemplate from './BaseInputTemplate';
-import DescriptionField from './DescriptionField';
+import DescriptionField from './FieldDescriptionTemplate';
 import ErrorList from './ErrorList';
 import { AddButton, CopyButton, MoveDownButton, MoveUpButton, RemoveButton } from './IconButton';
 import FieldErrorTemplate from './FieldErrorTemplate';

package/lib/templates/DescriptionField/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/DescriptionField/index.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAItC,KAAqC;IACrC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACtD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,CACL,eAAM,EAAE,EAAE,EAAE,YACV,KAAC,eAAe,IAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAI,GAChF,CACR,CAAC;AACJ,CAAC"}