Merge branch 'master' into mixed-support

Author: kchobantonov

.nvmrc

@@ -1 +1 @@
-v18.19.0
+22

LICENSE

@@ -1,7 +1,6 @@
 The MIT License
 
-Copyright (c) 2019 EclipseSource Munich
-https://github.com/eclipsesource/jsonforms
+Copyright (c) 2019 EclipseSource GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MIGRATION.md

@@ -1,5 +1,15 @@
 # Migration guide
 
+## Migrating to JSON Forms 3.6
+
+### UI schema type changes
+
+The `UISchemaElement` type was renamed to `BaseUISchemaElement` and a new `UISchemaElement` type was introduced, which is a union of all available UI schema types.
+
+The `Condition` type was renamed to `BaseCondition` and a new `Condition` type was introduced, which is a union of all available condition types.
+
+Both unions include their respective base type for backwards compatibility, but if you run into errors, replace `UISchemaElement` with `BaseUISchemaElement`/`Condition` with `BaseCondition` in your code to restore the old behaviour.
+
 ## Migrating to JSON Forms 3.5
 
 ### Angular support now targets Angular 18 and Angular 19

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "npmClient": "pnpm",
   "useWorkspaces": true
 }

packages/angular-material/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-material",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "Material Renderer Set for Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -68,8 +68,8 @@
     "@angular/material": "^18.0.0 || ^19.0.0",
     "@angular/platform-browser": "^18.0.0 || ^19.0.0",
     "@angular/router": "^18.0.0 || ^19.0.0",
-    "@jsonforms/angular": "3.5.1",
-    "@jsonforms/core": "3.5.1",
+    "@jsonforms/angular": "3.6.0-alpha.0",
+    "@jsonforms/core": "3.6.0-alpha.0",
     "dayjs": "^1.11.10",
     "rxjs": "^6.6.0 || ^7.4.0"
   },

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -69,7 +69,7 @@
   "peerDependencies": {
     "@angular/core": "^18.0.0 || ^19.0.0",
     "@angular/forms": "^18.0.0 || ^19.0.0",
-    "@jsonforms/core": "3.5.1",
+    "@jsonforms/core": "3.6.0-alpha.0",
     "rxjs": "^6.6.0 || ^7.4.0"
   },
   "devDependencies": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",

packages/core/src/models/uischema.ts

@@ -1,19 +1,19 @@
 /*
   The MIT License
-  
+
   Copyright (c) 2017-2019 EclipseSource Munich
   https://github.com/eclipsesource/jsonforms
-  
+
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights
   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
   copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
-  
+
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
-  
+
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -114,7 +114,7 @@ export enum RuleEffect {
 /**
  * Represents a condition to be evaluated.
  */
-export interface Condition {
+export interface BaseCondition {
   /**
    * The type of condition.
    */
@@ -124,7 +124,7 @@ export interface Condition {
 /**
  * A leaf condition.
  */
-export interface LeafCondition extends Condition, Scoped {
+export interface LeafCondition extends BaseCondition, Scoped {
   type: 'LEAF';
 
   /**
@@ -133,7 +133,7 @@ export interface LeafCondition extends Condition, Scoped {
   expectedValue: any;
 }
 
-export interface SchemaBasedCondition extends Condition, Scoped {
+export interface SchemaBasedCondition extends BaseCondition, Scoped {
   schema: JsonSchema;
 
   /**
@@ -153,7 +153,7 @@ export interface SchemaBasedCondition extends Condition, Scoped {
 /**
  * A composable condition.
  */
-export interface ComposableCondition extends Condition {
+export interface ComposableCondition extends BaseCondition {
   conditions: Condition[];
 }
 
@@ -171,10 +171,20 @@ export interface AndCondition extends ComposableCondition {
   type: 'AND';
 }
 
+/**
+ * A union of all available conditions.
+ */
+export type Condition =
+  | BaseCondition
+  | LeafCondition
+  | OrCondition
+  | AndCondition
+  | SchemaBasedCondition;
+
 /**
  * Common base interface for any UI schema element.
  */
-export interface UISchemaElement {
+export interface BaseUISchemaElement {
   /**
    * The type of this UI schema element.
    */
@@ -195,7 +205,7 @@ export interface UISchemaElement {
  * Represents a layout element which can order its children
  * in a specific way.
  */
-export interface Layout extends UISchemaElement {
+export interface Layout extends BaseUISchemaElement {
   /**
    * The child elements of this layout.
    */
@@ -241,7 +251,7 @@ export interface LabelDescription {
 /**
  * A label element.
  */
-export interface LabelElement extends UISchemaElement, Internationalizable {
+export interface LabelElement extends BaseUISchemaElement, Internationalizable {
   type: 'Label';
   /**
    * The text of label.
@@ -254,7 +264,7 @@ export interface LabelElement extends UISchemaElement, Internationalizable {
  * to which part of the schema the control should be bound.
  */
 export interface ControlElement
-  extends UISchemaElement,
+  extends BaseUISchemaElement,
     Scoped,
     Labelable<string | boolean | LabelDescription>,
     Internationalizable {
@@ -274,7 +284,7 @@ export interface Category extends Layout, Labeled, Internationalizable {
  * the categorization element can be used to represent recursive structures like trees.
  */
 export interface Categorization
-  extends UISchemaElement,
+  extends BaseUISchemaElement,
     Labeled,
     Internationalizable {
   type: 'Categorization';
@@ -284,3 +294,19 @@ export interface Categorization
    */
   elements: (Category | Categorization)[];
 }
+
+/**
+ * A union of all available UI schema elements.
+ * This includes all layout elements, control elements, label elements,
+ * group elements, category elements and categorization elements.
+ */
+export type UISchemaElement =
+  | BaseUISchemaElement
+  | ControlElement
+  | Layout
+  | LabelElement
+  | GroupLayout
+  | Category
+  | Categorization
+  | VerticalLayout
+  | HorizontalLayout;

packages/examples-app/package.json

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

packages/examples-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples-react",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "private": true,
   "dependencies": {
     "@jsonforms/core": "workspace:*",

packages/examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "JSON Forms Example Data",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -47,7 +47,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.5.1"
+    "@jsonforms/core": "3.6.0-alpha.0"
   },
   "devDependencies": {
     "@jsonforms/core": "workspace:*",

packages/material-renderers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/material-renderers",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "Material Renderer Set for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -86,8 +86,8 @@
   "peerDependencies": {
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@jsonforms/core": "3.5.1",
-    "@jsonforms/react": "3.5.1",
+    "@jsonforms/core": "3.6.0-alpha.0",
+    "@jsonforms/react": "3.6.0-alpha.0",
     "@mui/icons-material": "^5.11.16 || ^6.0.0",
     "@mui/material": "^5.13.0 || ^6.0.0",
     "@mui/x-date-pickers": "^6.0.0 || ^7.0.0",

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

@@ -27,7 +27,7 @@ import { withJsonFormsMasterListItemProps } from '@jsonforms/react';
 import {
   Avatar,
   IconButton,
-  ListItem,
+  ListItemButton,
   ListItemAvatar,
   ListItemSecondaryAction,
   ListItemText,
@@ -48,7 +48,7 @@ export const ListWithDetailMasterItem = ({
   disableRemove,
 }: StatePropsOfMasterItem) => {
   return (
-    <ListItem button selected={selected} onClick={handleSelect(index)}>
+    <ListItemButton selected={selected} onClick={handleSelect(index)}>
       <ListItemAvatar>
         <Avatar aria-label='Index'>{index + 1}</Avatar>
       </ListItemAvatar>
@@ -70,7 +70,7 @@ export const ListWithDetailMasterItem = ({
           </Tooltip>
         </ListItemSecondaryAction>
       )}
-    </ListItem>
+    </ListItemButton>
   );
 };
 

packages/material-renderers/src/mui-controls/MuiInputInteger.tsx

@@ -40,6 +40,7 @@ export const MuiInputInteger = React.memo(function MuiInputInteger(
     id,
     enabled,
     uischema,
+    isValid,
     path,
     handleChange,
     config,
@@ -70,6 +71,7 @@ export const MuiInputInteger = React.memo(function MuiInputInteger(
       autoFocus={appliedUiSchemaOptions.focus}
       inputProps={inputProps}
       fullWidth={true}
+      error={!isValid}
     />
   );
 });

packages/material-renderers/src/mui-controls/MuiInputNumber.tsx

@@ -39,6 +39,7 @@ export const MuiInputNumber = React.memo(function MuiInputNumber(
     id,
     enabled,
     uischema,
+    isValid,
     path,
     handleChange,
     config,
@@ -68,6 +69,7 @@ export const MuiInputNumber = React.memo(function MuiInputNumber(
       autoFocus={appliedUiSchemaOptions.focus}
       inputProps={inputProps}
       fullWidth={true}
+      error={!isValid}
     />
   );
 });

packages/material-renderers/src/mui-controls/MuiInputTime.tsx

@@ -36,6 +36,7 @@ export const MuiInputTime = React.memo(function MuiInputTime(
     id,
     enabled,
     uischema,
+    isValid,
     path,
     handleChange,
     config,
@@ -61,6 +62,7 @@ export const MuiInputTime = React.memo(function MuiInputTime(
       disabled={!enabled}
       autoFocus={appliedUiSchemaOptions.focus}
       fullWidth={true}
+      error={!isValid}
     />
   );
 });

packages/material-renderers/src/mui-controls/MuiSelect.tsx

@@ -44,6 +44,7 @@ export const MuiSelect = React.memo(function MuiSelect(
     enabled,
     schema,
     uischema,
+    isValid,
     path,
     handleChange,
     options,
@@ -69,6 +70,7 @@ export const MuiSelect = React.memo(function MuiSelect(
       onChange={(ev) => handleChange(path, ev.target.value || undefined)}
       fullWidth={true}
       multiple={multiple || false}
+      error={!isValid}
     >
       {[
         <MenuItem value={''} key='jsonforms.enum.none'>