Merge branch 'master' into preserve-edit-data

Author: kchobantonov

MIGRATION.md

@@ -12,6 +12,20 @@ When a missing intermediate container is created, the JSON Schema decides whethe
 
 If you dispatch update actions yourself, make sure to use dot-separated paths (e.g. `update('list.0.name', ...)`) instead of lodash bracket syntax (e.g. `update('list[0].name', ...)`), which is no longer interpreted.
 
+### React Material renderers now require Material UI v9
+
+The React Material renderers (`@jsonforms/material-renderers`) were upgraded from Material UI v7 to v9.
+When using JSON Forms 3.9, your application now needs to provide `@mui/material` and `@mui/icons-material` in version 9, as well as `@mui/x-date-pickers` in version 9 (previously version 8).
+
+To upgrade your application, follow the official [Material UI upgrade guide](https://mui.com/material-ui/migration/upgrade-to-v9/) and the [MUI X Date Pickers migration guide](https://mui.com/x/migration/migration-pickers-v8/).
+
+Use JSON Forms 3.8 if you need to stay on Material UI v7.
+
+As part of this upgrade, layouts that arrange their children vertically (e.g. `VerticalLayout`, `Group`, `Categorization`) now render a MUI `Stack` instead of a `Grid` container with `direction="column"`, and their children are no longer wrapped in `Grid` items.
+If you apply custom styling that relies on the previous `Grid`-based DOM structure of these layouts, verify that it still works as expected.
+Furthermore, if you use exported method `renderLayoutElements`, it no longer wraps children in `Grid` items for direction `column`.
+This should not affect you except if you explicitly use this method in custom renderers.
+
 ## Migrating to JSON Forms 3.8
 
 ### `Translator` type changed from overloaded signatures to a generic conditional type

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "npmClient": "pnpm",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/angular-material/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-material",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "description": "Material Renderer Set for Angular module of JSON Forms",
   "repository": {
     "type": "git",
@@ -72,8 +72,8 @@
     "@angular/material": "^20.0.0 || ^21.0.0 || ^22.0.0",
     "@angular/platform-browser": "^20.0.0 || ^21.0.0 || ^22.0.0",
     "@angular/router": "^20.0.0 || ^21.0.0 || ^22.0.0",
-    "@jsonforms/angular": "3.9.0-alpha.0",
-    "@jsonforms/core": "3.9.0-alpha.0",
+    "@jsonforms/angular": "3.9.0-alpha.1",
+    "@jsonforms/core": "3.9.0-alpha.1",
     "dayjs": "^1.11.10",
     "rxjs": "^6.6.0 || ^7.4.0"
   },

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "description": "Angular module of JSON Forms",
   "repository": {
     "type": "git",
@@ -73,7 +73,7 @@
   "peerDependencies": {
     "@angular/core": "^20.0.0 || ^21.0.0 || ^22.0.0",
     "@angular/forms": "^20.0.0 || ^21.0.0 || ^22.0.0",
-    "@jsonforms/core": "3.9.0-alpha.0",
+    "@jsonforms/core": "3.9.0-alpha.1",
     "rxjs": "^6.6.0 || ^7.4.0"
   },
   "devDependencies": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "description": "Core module of JSON Forms",
   "repository": {
     "type": "git",

packages/examples-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples-app",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "private": true,
   "license": "MIT",
   "type": "module",

packages/examples-react/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@jsonforms/examples-react",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "private": true,
   "dependencies": {
     "@jsonforms/core": "workspace:*",
     "@jsonforms/examples": "workspace:*",
     "@jsonforms/react": "workspace:*",
-    "@mui/material": "^7.3.0",
+    "@mui/material": "^9.2.0",
     "@types/react-highlight": "^0.12.5",
     "@types/react-tabs": "^2.3.3",
     "highlight.js": "^11.3.1",

packages/examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "description": "JSON Forms Example Data",
   "repository": {
     "type": "git",
@@ -51,7 +51,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.9.0-alpha.0"
+    "@jsonforms/core": "3.9.0-alpha.1"
   },
   "devDependencies": {
     "@jsonforms/core": "workspace:*",

packages/material-renderers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/material-renderers",
-  "version": "3.9.0-alpha.0",
+  "version": "3.9.0-alpha.1",
   "description": "Material Renderer Set for JSON Forms",
   "repository": {
     "type": "git",
@@ -93,21 +93,21 @@
   "peerDependencies": {
     "@emotion/react": "^11.5.0",
     "@emotion/styled": "^11.3.0",
-    "@jsonforms/core": "3.9.0-alpha.0",
-    "@jsonforms/react": "3.9.0-alpha.0",
-    "@mui/icons-material": "^7.0.0",
-    "@mui/material": "^7.0.0",
-    "@mui/x-date-pickers": "^8.0.0",
+    "@jsonforms/core": "3.9.0-alpha.1",
+    "@jsonforms/react": "3.9.0-alpha.1",
+    "@mui/icons-material": "^9.0.0",
+    "@mui/material": "^9.0.0",
+    "@mui/x-date-pickers": "^9.0.0",
     "react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
     "@emotion/react": "^11.5.0",
     "@emotion/styled": "^11.3.0",
     "@jsonforms/core": "workspace:*",
     "@jsonforms/react": "workspace:*",
-    "@mui/icons-material": "^7.3.0",
-    "@mui/material": "^7.3.0",
-    "@mui/x-date-pickers": "^8.11.3",
+    "@mui/icons-material": "^9.2.0",
+    "@mui/material": "^9.2.0",
+    "@mui/x-date-pickers": "^9.10.1",
     "@rollup/plugin-commonjs": "^23.0.3",
     "@rollup/plugin-json": "^5.0.2",
     "@rollup/plugin-node-resolve": "^15.0.1",

packages/material-renderers/src/additional/MaterialListWithDetailRenderer.tsx

@@ -134,7 +134,7 @@ export const MaterialListWithDetailRenderer = ({
         createDefault={handleCreateDefaultValue}
         disableAdd={doDisableAdd}
       />
-      <Grid container direction='row' spacing={2}>
+      <Grid container spacing={2}>
         <Grid size={3}>
           <List>
             {data > 0 ? (