@rjsf/react-bootstrap 6.0.0-beta.19 → 6.0.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/react-bootstrap",
-  "version": "6.0.0-beta.19",
+  "version": "6.0.0-beta.20",
   "main": "dist/index.js",
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -61,8 +61,8 @@
     ]
   },
   "peerDependencies": {
-    "@rjsf/core": "^6.0.0-beta.19",
-    "@rjsf/utils": "^6.0.0-beta.19",
+    "@rjsf/core": "^6.0.0-beta.20",
+    "@rjsf/utils": "^6.0.0-beta.20",
     "react": ">=18",
     "react-bootstrap": "^2.x"
   },
@@ -71,10 +71,10 @@
     "node": ">=20"
   },
   "devDependencies": {
-    "@rjsf/core": "^6.0.0-beta.19",
-    "@rjsf/snapshot-tests": "^6.0.0-beta.19",
-    "@rjsf/utils": "^6.0.0-beta.19",
-    "@rjsf/validator-ajv8": "^6.0.0-beta.19",
+    "@rjsf/core": "^6.0.0-beta.20",
+    "@rjsf/snapshot-tests": "^6.0.0-beta.20",
+    "@rjsf/utils": "^6.0.0-beta.20",
+    "@rjsf/validator-ajv8": "^6.0.0-beta.20",
     "eslint": "^8.57.1",
     "react-bootstrap": "^2.10.10"
   },

package/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx

@@ -17,7 +17,7 @@ export default function ArrayFieldTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldTemplateProps<T, S, F>) {
-  const { canAdd, disabled, idSchema, uiSchema, items, onAddClick, readonly, registry, required, schema, title } =
+  const { canAdd, disabled, fieldPathId, uiSchema, items, onAddClick, readonly, registry, required, schema, title } =
     props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldDescriptionTemplate = getTemplate<'ArrayFieldDescriptionTemplate', T, S, F>(
@@ -44,7 +44,7 @@ export default function ArrayFieldTemplate<
       <Row className='p-0 m-0'>
         <Col className='p-0 m-0'>
           <ArrayFieldTitleTemplate
-            idSchema={idSchema}
+            fieldPathId={fieldPathId}
             title={uiOptions.title || title}
             schema={schema}
             uiSchema={uiSchema}
@@ -52,13 +52,13 @@ export default function ArrayFieldTemplate<
             registry={registry}
           />
           <ArrayFieldDescriptionTemplate
-            idSchema={idSchema}
+            fieldPathId={fieldPathId}
             description={uiOptions.description || schema.description}
             schema={schema}
             uiSchema={uiSchema}
             registry={registry}
           />
-          <Container fluid key={`array-item-list-${idSchema.$id}`} className='p-0 m-0'>
+          <Container fluid key={`array-item-list-${fieldPathId.$id}`} className='p-0 m-0'>
             {items &&
               items.map(({ key, ...itemProps }: ArrayFieldItemTemplateType<T, S, F>) => (
                 <ArrayFieldItemTemplate key={key} {...itemProps} />
@@ -69,7 +69,7 @@ export default function ArrayFieldTemplate<
                   <Col xs={9}></Col>
                   <Col xs={3} className='py-4 col-lg-3 col-3'>
                     <AddButton
-                      id={buttonId<T>(idSchema, 'add')}
+                      id={buttonId(fieldPathId, 'add')}
                       className='rjsf-array-item-add'
                       onClick={onAddClick}
                       disabled={disabled || readonly}

package/src/BaseInputTemplate/BaseInputTemplate.tsx

@@ -54,17 +54,17 @@ export default function BaseInputTemplate<
         disabled={disabled}
         readOnly={readonly}
         className={rawErrors.length > 0 ? 'is-invalid' : ''}
-        list={schema.examples ? examplesId<T>(id) : undefined}
+        list={schema.examples ? examplesId(id) : undefined}
         {...inputProps}
         value={value || value === 0 ? value : ''}
         onChange={onChangeOverride || _onChange}
         onBlur={_onBlur}
         onFocus={_onFocus}
-        aria-describedby={ariaDescribedByIds<T>(id, !!schema.examples)}
+        aria-describedby={ariaDescribedByIds(id, !!schema.examples)}
       />
       {children}
       {Array.isArray(schema.examples) ? (
-        <datalist id={examplesId<T>(id)}>
+        <datalist id={examplesId(id)}>
           {(schema.examples as string[])
             .concat(schema.default && !schema.examples.includes(schema.default) ? ([schema.default] as string[]) : [])
             .map((example: any) => {

package/src/CheckboxWidget/CheckboxWidget.tsx

@@ -49,10 +49,10 @@ export default function CheckboxWidget<
 
   const description = options.description || schema.description;
   return (
-    <Form.Group className={disabled || readonly ? 'disabled' : ''} aria-describedby={ariaDescribedByIds<T>(id)}>
+    <Form.Group className={disabled || readonly ? 'disabled' : ''} aria-describedby={ariaDescribedByIds(id)}>
       {!hideLabel && description && (
         <DescriptionFieldTemplate
-          id={descriptionId<T>(id)}
+          id={descriptionId(id)}
           description={description}
           schema={schema}
           uiSchema={uiSchema}

package/src/CheckboxesWidget/CheckboxesWidget.tsx

@@ -59,7 +59,7 @@ export default function CheckboxesWidget<
               onBlur={_onBlur}
               onFocus={_onFocus}
               disabled={disabled || itemDisabled || readonly}
-              aria-describedby={ariaDescribedByIds<T>(id)}
+              aria-describedby={ariaDescribedByIds(id)}
             />
           );
         })}

package/src/FieldErrorTemplate/FieldErrorTemplate.tsx

@@ -10,11 +10,11 @@ export default function FieldErrorTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: FieldErrorProps<T, S, F>) {
-  const { errors = [], idSchema } = props;
+  const { errors = [], fieldPathId } = props;
   if (errors.length === 0) {
     return null;
   }
-  const id = errorId<T>(idSchema);
+  const id = errorId(fieldPathId);
 
   return (
     <ListGroup as='ul' id={id}>

package/src/FieldHelpTemplate/FieldHelpTemplate.tsx

@@ -10,11 +10,11 @@ export default function FieldHelpTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: FieldHelpProps<T, S, F>) {
-  const { idSchema, help, hasErrors } = props;
+  const { fieldPathId, help, hasErrors } = props;
   if (!help) {
     return null;
   }
-  const id = helpId<T>(idSchema);
+  const id = helpId(fieldPathId);
   return (
     <Form.Text className={hasErrors ? 'text-danger' : 'text-muted'} id={id}>
       {help}

package/src/ObjectFieldTemplate/ObjectFieldTemplate.tsx

@@ -25,7 +25,7 @@ export default function ObjectFieldTemplate<
   properties,
   required,
   uiSchema,
-  idSchema,
+  fieldPathId,
   schema,
   formData,
   onAddClick,
@@ -48,7 +48,7 @@ export default function ObjectFieldTemplate<
     <>
       {title && (
         <TitleFieldTemplate
-          id={titleId<T>(idSchema)}
+          id={titleId(fieldPathId)}
           title={title}
           required={required}
           schema={schema}
@@ -58,7 +58,7 @@ export default function ObjectFieldTemplate<
       )}
       {description && (
         <DescriptionFieldTemplate
-          id={descriptionId<T>(idSchema)}
+          id={descriptionId(fieldPathId)}
           description={description}
           schema={schema}
           uiSchema={uiSchema}
@@ -75,7 +75,7 @@ export default function ObjectFieldTemplate<
           <Row>
             <Col xs={{ offset: 9, span: 3 }} className='py-4'>
               <AddButton
-                id={buttonId<T>(idSchema, 'add')}
+                id={buttonId(fieldPathId, 'add')}
                 onClick={onAddClick(schema)}
                 disabled={disabled || readonly}
                 className='rjsf-object-property-expand'

package/src/RadioWidget/RadioWidget.tsx

@@ -55,7 +55,7 @@ export default function RadioWidget<T = any, S extends StrictRJSFSchema = RJSFSc
               onChange={_onChange}
               onBlur={_onBlur}
               onFocus={_onFocus}
-              aria-describedby={ariaDescribedByIds<T>(id)}
+              aria-describedby={ariaDescribedByIds(id)}
             />
           );
           return radio;

package/src/SelectWidget/SelectWidget.tsx

@@ -75,7 +75,7 @@ export default function SelectWidget<
         const newValue = getValue(event, multiple);
         onChange(enumOptionsValueForIndex<S>(newValue, enumOptions, optEmptyValue));
       }}
-      aria-describedby={ariaDescribedByIds<T>(id)}
+      aria-describedby={ariaDescribedByIds(id)}
     >
       {showPlaceholderOption && <option value=''>{placeholder}</option>}
       {(enumOptions as any).map(({ value, label }: any, i: number) => {

package/src/TextareaWidget/TextareaWidget.tsx

@@ -49,7 +49,7 @@ export default function TextareaWidget<
         onChange={_onChange}
         onBlur={_onBlur}
         onFocus={_onFocus}
-        aria-describedby={ariaDescribedByIds<T>(id)}
+        aria-describedby={ariaDescribedByIds(id)}
       />
     </InputGroup>
   );

package/src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx

@@ -68,7 +68,7 @@ export default function WrapIfAdditionalTemplate<
       <Col xs={5}>{children}</Col>
       <Col xs={2} className='py-4 d-grid gap-2'>
         <RemoveButton
-          id={buttonId<T>(id, 'remove')}
+          id={buttonId(id, 'remove')}
           className='rjsf-object-property-remove w-100'
           disabled={disabled || readonly}
           onClick={onDropPropertyClick(label)}