adds refactored props tested linted still WIP

Author: JJediny

CHANGELOG_v6.md

@@ -25,6 +25,7 @@ should change the heading of the (upcoming) version to include a major version b
 - BREAKING CHANGE: Removed support for version 4 of `antd`
 - Updated `ArrayFieldItemTemplate` to replace `Button.Group` with `Space.Compact` since `Button.Group` is deprecated in `antd` version 5
 - Upgraded to `@ant-design/icon@5`
+- fix: Ensure peer dependencies align with v6 beta versions.
 
 ## @rjsf/chakra-ui
 
@@ -33,6 +34,7 @@ should change the heading of the (upcoming) version to include a major version b
 - BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
 - Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
 - Implemented the `GridTemplate` component, adding it to the `templates` for the theme
+- fix: Ensure peer dependencies align with v6 beta versions.
 
 ## @rjsf/core
 
@@ -47,6 +49,8 @@ should change the heading of the (upcoming) version to include a major version b
 ## @rjsf/daisyui
 
 - Added new theme!
+- fix: Ensure peer dependencies align with v6 beta versions.
+- fix: Remove unused FontAwesome dependency causing build issues.
 
 ## @rjsf/fluent-ui
 
@@ -57,33 +61,54 @@ should change the heading of the (upcoming) version to include a major version b
 - BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
 - Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
 - Implemented the `GridTemplate` component, adding it to the `templates` for the theme
+- fix: Ensure peer dependencies align with v6 beta versions.
 
 ## @rjsf/mui
 
 - BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
 - Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
 - Updated the theme to use `Grid2` instead of the deprecated `Grid`
 - Implemented the `GridTemplate` component, adding it to the `templates` for the theme
+- fix: Ensure peer dependencies align with v6 beta versions.
+
+## @rjsf/react-bootstrap
+
+- Added new package to replace `@rjsf/bootstrap-4`
+- `react-bootstrap` peer dependency bumped to `^2.0.0`, corresponding to Bootstrap 5
+- CheckboxesWidget: Remove deprecated prop `custom`
+- IconButton: Remove deprecated `block` prop
+- RangeWidget: Use `FormRange` component
+- SelectWidget: Use new FormSelect component, remove `bsPrefix` prop to achieve correct styling
+- fix: Ensure peer dependencies align with v6 beta versions.
 
 ## @rjsf/semantic-ui
 
 - BREAKING CHANGE: Refactored `ArrayFieldItemTemplate` to use the new `ArrayFieldItemButtonsTemplate`
 - Updated the `ArrayFieldTemplate`, `ObjectFieldTemplate`, and `WrapIfAdditionalTemplate` to a unique id using the `buttonId()` function and adding consistent marker classes
 - Implemented the `GridTemplate` component, adding it to the `templates` for the theme
+- fix: Ensure peer dependencies align with v6 beta versions.
 
 ## @rjsf/shadcn
 
 - Added new theme!
+- fix: Ensure peer dependencies align with v6 beta versions.
 
 ## @rjsf/uswds
 
 - BREAKING: Initial release of the USWDS theme package (`@rjsf/uswds`).
 - BREAKING: Uses components from `@trussworks/react-uswds` library for core form elements, templates, and buttons.
 - feat: Implemented `GridTemplate` using `@trussworks/react-uswds` Grid components.
-- fix: Extensible for custom props `@rjsf/uswds` *if needed but defaults to `@trussworks/react-uswds` components (`FormGroup`, `Label`, `TextInput`, `Grid`).
+- fix: Refactored `WrapIfAdditionalTemplate` to use `@trussworks/react-uswds` components (`FormGroup`, `Label`, `TextInput`, `Grid`).
 - fix: Refactored all Widgets to use components from `@trussworks/react-uswds`.
-- fix: Refactored all Templates (Field, ErrorList, Buttons, etc.) to use components from `@trussworks/react-uswds`.
-- test: Uses standard `@rjsf/snapshot-tests` tests for `@rjsf/uswds`.
+- fix: Refactored all Templates (Field, ErrorList, Buttons, ArrayField*, ObjectField*, TitleField*, etc.) to use components from `@trussworks/react-uswds`.
+- fix: Removed unused `BaseInputTemplate` and `Templates.tsx`.
+- fix: Updated `GridTemplate` to accept `className` and `style` props for consistency.
+- fix: Ensure `Widgets/index.ts` correctly exports `generateWidgets`.
+- fix: Remove unused FontAwesome dependency causing build issues.
+- fix: Remove deprecated `defaultProps` from `TextareaWidget`.
+- fix: Ensure peer dependencies align with v6 beta versions.
+- test: Uses standard snapshot tests for `@rjsf/uswds`.
+- test: Added `@testing-library/react` for testing components.
 
 ## @rjsf/utils
 
@@ -126,6 +151,9 @@ should change the heading of the (upcoming) version to include a major version b
 - Added the `v6.x upgrade guide.md` documentation
 - Updated the `playground` to add a `Layout Grid` example and made the selected example now be part of the shared export
 - Replaced Lerna with Nx, updated all lerna commands to use the Nx CLI
+- fix(playground): Update dependencies to use `workspace:` protocol for local linking.
+- fix(playground): Update `index.tsx` to use React 18 `createRoot` API.
+- fix(docs): Update theme table for v6 changes (add USWDS, remove deprecated).
 - BREAKING CHANGE: Updated all `peerDependencies` to change minimal `React` support to `>=18`
 
 # 6.0.0-alpha.0

package.json

@@ -55,7 +55,7 @@
     "eslint-plugin-prettier": "5.2.6",
     "eslint-plugin-react": "7.37.5",
     "eslint-plugin-react-hooks": "5.2.0",
-    "husky": "9.1.7",
+    "husky": "^9.1.7",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "15.5.1",
     "move-file-cli": "^3.0.0",

packages/uswds/.eslintrc

@@ -0,0 +1,12 @@
+{
+  "extends": [
+    "../../.eslintrc"
+  ],
+  "rules": {
+    "prettier/prettier": ["error", {
+      "singleQuote": true,
+      "trailingComma": "all",
+      "arrowParens": "always"
+    }]
+  }
+}

packages/uswds/.prettierrc

@@ -0,0 +1,6 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "arrowParens": "always",
+  "printWidth": 100
+}

packages/uswds/babel.config.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../babel.config.json"
+}

packages/uswds/jest.config.js

@@ -0,0 +1 @@
+{}

packages/uswds/package.json

@@ -10,8 +10,11 @@
     "cs-check": "prettier -l \"{src,test}/**/*.ts?(x)\"",
     "cs-format": "prettier \"{src,test}/**/*.ts?(x)\" --write",
     "lint": "eslint src test",
+    "lint:fix": "eslint src test --fix",
+    "prettier:fix": "prettier \"{src,test}/**/*.ts?(x)\" --write",
     "test": "jest",
-    "test:update": "jest --u"
+    "test:update": "jest --u",
+    "test:clean": "jest --clearCache"
   },
   "dependencies": {},
   "devDependencies": {
@@ -26,6 +29,7 @@
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
     "@testing-library/user-event": "^14.5.2",
+    "@trussworks/react-uswds": "^6.1.0",
     "@types/jest": "^29.5.3",
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
@@ -36,8 +40,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-test-renderer": "^18.2.0",
-    "typescript": "^5.1.6",
-    "@trussworks/react-uswds": "^6.1.0"
+    "typescript": "^5.1.6"
   },
   "peerDependencies": {
     "@rjsf/core": "^6",

packages/uswds/schemaTests.tsx

@@ -0,0 +1,31 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import { RJSFSchema, UiSchema, ValidatorType } from '@rjsf/utils';
+
+export interface SchemaTestOptions {
+  name?: string;
+  schema: RJSFSchema;
+  uiSchema?: UiSchema;
+  formData?: any;
+  validator?: ValidatorType;
+}
+
+export function createSchemaTest(
+  Form: React.ComponentType<any>,
+  opts: SchemaTestOptions
+) {
+  const testName = opts.name || JSON.stringify(opts.schema);
+  test(testName, () => {
+    const tree = renderer
+      .create(
+        <Form
+          schema={opts.schema}
+          uiSchema={opts.uiSchema}
+          formData={opts.formData}
+          validator={opts.validator}
+        />
+      )
+      .toJSON();
+    expect(tree).toMatchSnapshot();
+  });
+}

packages/uswds/src/Form/Form.tsx

@@ -1,14 +1,13 @@
-import { ComponentType } from 'react';
-import { FormProps, withTheme, ThemeProps } from '@rjsf/core';
+import { withTheme, ThemeProps } from '@rjsf/core';
 import { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
 import Theme from '../Theme';
 
 export function generateForm<
   T = any,
   S extends StrictRJSFSchema = RJSFSchema,
-  F extends FormContextType = any
->(): ComponentType<FormProps<T, S, F>> {
+  F extends FormContextType = any,
+>() {
   return withTheme<T, S, F>(Theme as ThemeProps<T, S, F>);
 }
 

packages/uswds/src/Templates/ArrayFieldDescriptionTemplate.tsx

@@ -1,33 +1,27 @@
-import React from "react";
+import React from 'react';
 import {
-  DescriptionFieldProps,
   FormContextType,
   RJSFSchema,
   StrictRJSFSchema,
-} from "@rjsf/utils";
+  ArrayFieldDescriptionProps,
+} from '@rjsf/utils';
 
-/** The `ArrayFieldDescriptionTemplate` component renders a description for an array field.
+/** The `ArrayFieldDescriptionTemplate` component renders the description for an array field
  *
- * @param props - The `DescriptionFieldProps` for the component
+ * @param props - The `ArrayFieldDescriptionProps` for this component
  */
-const ArrayFieldDescriptionTemplate = <
+export default function ArrayFieldDescriptionTemplate<
   T = any,
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
->({
-  description,
-  idSchema,
-}: DescriptionFieldProps<T, S, F>) => {
+>({ description, id }: ArrayFieldDescriptionProps<T, S, F>) {
   if (!description) {
     return null;
   }
 
-  const id = `${idSchema.$id}__description`;
   return (
-    <span id={id} className="usa-hint">
+    <div id={id} className="field-description">
       {description}
-    </span>
+    </div>
   );
-};
-
-export default ArrayFieldDescriptionTemplate;
+}