@rjsf/antd 6.0.0 → 6.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/antd",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Ant Design theme, fields and widgets for react-jsonschema-form",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -63,8 +63,8 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^6.0.0",
-    "@rjsf/core": "^6.0.0-beta.23",
-    "@rjsf/utils": "^6.0.0-beta.23",
+    "@rjsf/core": "^6.x",
+    "@rjsf/utils": "^6.x",
     "antd": "^5.8.5",
     "dayjs": "^1.8.0",
     "react": ">=18"
@@ -77,10 +77,10 @@
   },
   "devDependencies": {
     "@ant-design/icons": "^6.1.0",
-    "@rjsf/core": "^6.0.0-beta.23",
-    "@rjsf/snapshot-tests": "^6.0.0-beta.23",
-    "@rjsf/utils": "^6.0.0-beta.23",
-    "@rjsf/validator-ajv8": "^6.0.0-beta.23",
+    "@rjsf/core": "^6.x",
+    "@rjsf/snapshot-tests": "^6.x",
+    "@rjsf/utils": "^6.x",
+    "@rjsf/validator-ajv8": "^6.x",
     "@rollup/plugin-replace": "^6.0.3",
     "antd": "^5.27.6",
     "atob": "^2.1.2",

package/src/templates/ArrayFieldTemplate/index.tsx

@@ -12,10 +12,6 @@ import classNames from 'classnames';
 import { Col, Row, ConfigProvider } from 'antd';
 import { useContext } from 'react';
 
-const DESCRIPTION_COL_STYLE = {
-  paddingBottom: '8px',
-};
-
 /** The `ArrayFieldTemplate` component is the template used to render all items in an array.
  *
  * @param props - The `ArrayFieldTemplateProps` props for the component
@@ -41,11 +37,6 @@ export default function ArrayFieldTemplate<
     uiSchema,
   } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
-  const ArrayFieldDescriptionTemplate = getTemplate<'ArrayFieldDescriptionTemplate', T, S, F>(
-    'ArrayFieldDescriptionTemplate',
-    registry,
-    uiOptions,
-  );
   const ArrayFieldTitleTemplate = getTemplate<'ArrayFieldTitleTemplate', T, S, F>(
     'ArrayFieldTitleTemplate',
     registry,
@@ -84,17 +75,6 @@ export default function ArrayFieldTemplate<
             />
           </Col>
         )}
-        {(uiOptions.description || schema.description) && (
-          <Col span={24} style={DESCRIPTION_COL_STYLE}>
-            <ArrayFieldDescriptionTemplate
-              description={uiOptions.description || schema.description}
-              fieldPathId={fieldPathId}
-              schema={schema}
-              uiSchema={uiSchema}
-              registry={registry}
-            />
-          </Col>
-        )}
         <Col className='row array-item-list' span={24}>
           {!showOptionalDataControlInTitle ? optionalDataControl : undefined}
           {items}

package/src/templates/FieldTemplate/index.tsx

@@ -56,6 +56,7 @@ export default function FieldTemplate<
   } = formContext as GenericObjectType;
 
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
+
   const WrapIfAdditionalTemplate = getTemplate<'WrapIfAdditionalTemplate', T, S, F>(
     'WrapIfAdditionalTemplate',
     registry,
@@ -79,7 +80,7 @@ export default function FieldTemplate<
       descriptionProps.extra = descriptionNode;
       break;
   }
-
+  const isCheckbox = uiOptions.widget === 'checkbox';
   return (
     <WrapIfAdditionalTemplate
       classNames={classNames}
@@ -101,7 +102,7 @@ export default function FieldTemplate<
         hasFeedback={schema.type !== 'array' && schema.type !== 'object'}
         help={(!!rawHelp && help) || (rawErrors?.length ? errors : undefined)}
         htmlFor={id}
-        label={displayLabel && label}
+        label={displayLabel && !isCheckbox && label}
         labelCol={labelCol}
         required={required}
         style={wrapperStyle}

package/src/templates/ObjectFieldTemplate/index.tsx

@@ -11,7 +11,6 @@ import {
   StrictRJSFSchema,
   UiSchema,
   canExpand,
-  descriptionId,
   getTemplate,
   getUiOptions,
   titleId,
@@ -20,10 +19,6 @@ import {
 import { Col, Row, ConfigProvider } from 'antd';
 import { useContext } from 'react';
 
-const DESCRIPTION_COL_STYLE = {
-  paddingBottom: '8px',
-};
-
 /** The `ObjectFieldTemplate` is the template to use to render all the inner properties of an object along with the
  * title and description if available. If the object is expandable, then an `AddButton` is also rendered after all
  * the properties.
@@ -36,7 +31,6 @@ export default function ObjectFieldTemplate<
   F extends FormContextType = any,
 >(props: ObjectFieldTemplateProps<T, S, F>) {
   const {
-    description,
     disabled,
     formData,
     fieldPathId,
@@ -52,11 +46,6 @@ export default function ObjectFieldTemplate<
   } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const TitleFieldTemplate = getTemplate<'TitleFieldTemplate', T, S, F>('TitleFieldTemplate', registry, uiOptions);
-  const DescriptionFieldTemplate = getTemplate<'DescriptionFieldTemplate', T, S, F>(
-    'DescriptionFieldTemplate',
-    registry,
-    uiOptions,
-  );
   const { formContext } = registry;
   const showOptionalDataControlInTitle = !readonly && !disabled;
   // Button templates are not overridden in the uiSchema
@@ -132,17 +121,6 @@ export default function ObjectFieldTemplate<
             />
           </Col>
         )}
-        {description && (
-          <Col span={24} style={DESCRIPTION_COL_STYLE}>
-            <DescriptionFieldTemplate
-              id={descriptionId(fieldPathId)}
-              description={description}
-              schema={schema}
-              uiSchema={uiSchema}
-              registry={registry}
-            />
-          </Col>
-        )}
         {!showOptionalDataControlInTitle ? <Col span={24}>{optionalDataControl}</Col> : undefined}
         {properties
           .filter((e) => !e.hidden)