@jsonforms/core 3.4.0-alpha.2 → 3.4.0-beta.0

package/lib/mappers/renderer.d.ts

@@ -3,7 +3,7 @@ import type { RankedTester } from '../testers';
 import { CoreActions } from '../actions';
 import type { ErrorObject } from 'ajv';
 import type { AnyAction, Dispatch, JsonFormsCellRendererRegistryEntry, JsonFormsRendererRegistryEntry, JsonFormsState, JsonFormsUISchemaRegistryEntry } from '../store';
-import { CombinatorTranslations, ArrayTranslations } from '../i18n';
+import { ArrayTranslations } from '../i18n';
 import { Translator } from '../store';
 import { CombinatorKeyword } from './combinators';
 export declare const moveUp: (array: any[], toMove: number) => void;
@@ -310,7 +310,6 @@ export interface ControlWithDetailProps extends StatePropsOfControlWithDetail, D
  * State-based props of a table control.
  */
 export interface StatePropsOfArrayControl extends StatePropsOfControlWithDetail {
-    translations: ArrayTranslations;
     childErrors?: ErrorObject[];
 }
 /**
@@ -384,7 +383,6 @@ export interface StatePropsOfCombinator extends StatePropsOfControl {
     indexOfFittingSchema: number;
     uischemas: JsonFormsUISchemaRegistryEntry[];
     data: any;
-    translations: CombinatorTranslations;
 }
 export declare const mapStateToCombinatorRendererProps: (state: JsonFormsState, ownProps: OwnPropsOfControl, keyword: CombinatorKeyword) => StatePropsOfCombinator;
 export interface CombinatorRendererProps extends StatePropsOfCombinator, DispatchPropsOfControl {
@@ -400,7 +398,6 @@ export declare const mapStateToAnyOfProps: (state: JsonFormsState, ownProps: Own
 export declare const mapStateToOneOfProps: (state: JsonFormsState, ownProps: OwnPropsOfControl) => StatePropsOfCombinator;
 export interface StatePropsOfArrayLayout extends StatePropsOfControlWithDetail {
     data: number;
-    translations: ArrayTranslations;
     minItems?: number;
     disableRemove?: boolean;
     disableAdd?: boolean;
@@ -429,6 +426,7 @@ export declare const mapStateToLabelProps: (state: JsonFormsState, props: OwnPro
     config: any;
     renderers: JsonFormsRendererRegistryEntry[];
     cells: JsonFormsCellRendererRegistryEntry[];
+    uischema: LabelElement;
 };
 /**
  * Compute the child label title for array based controls

package/lib/util/schema.d.ts

@@ -1,5 +1,5 @@
 import type { JsonSchema } from '../models';
-export declare const getFirstPrimitiveProp: (schema: any) => string;
+export declare const getFirstPrimitiveProp: (schema: unknown) => string;
 /**
  * Tests whether the schema has an enum based on oneOf.
  */

package/package.json

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

package/src/mappers/renderer.ts

@@ -47,13 +47,8 @@ import {
   getI18nKey,
   getI18nKeyPrefix,
   getI18nKeyPrefixBySchema,
-  getArrayTranslations,
-  CombinatorTranslations,
-  getCombinatorTranslations,
-  combinatorDefaultTranslations,
   getTranslator,
   getErrorTranslator,
-  arrayDefaultTranslations,
   ArrayTranslations,
 } from '../i18n';
 import cloneDeep from 'lodash/cloneDeep';
@@ -790,7 +785,6 @@ export interface ControlWithDetailProps
  */
 export interface StatePropsOfArrayControl
   extends StatePropsOfControlWithDetail {
-  translations: ArrayTranslations;
   childErrors?: ErrorObject[];
 }
 
@@ -805,12 +799,11 @@ export const mapStateToArrayControlProps = (
   state: JsonFormsState,
   ownProps: OwnPropsOfControl
 ): StatePropsOfArrayControl => {
-  const { path, schema, uischema, i18nKeyPrefix, label, ...props } =
+  const { path, schema, uischema, label, ...props } =
     mapStateToControlWithDetailProps(state, ownProps);
 
   const resolvedSchema = Resolve.schema(schema, 'items', props.rootSchema);
   const childErrors = getSubErrorsAt(path, resolvedSchema)(state);
-  const t = getTranslator()(state);
 
   return {
     ...props,
@@ -821,12 +814,6 @@ export const mapStateToArrayControlProps = (
     childErrors,
     renderers: ownProps.renderers || getRenderers(state),
     cells: ownProps.cells || getCells(state),
-    translations: getArrayTranslations(
-      t,
-      arrayDefaultTranslations,
-      i18nKeyPrefix,
-      label
-    ),
   };
 };
 
@@ -1061,7 +1048,6 @@ export interface StatePropsOfCombinator extends StatePropsOfControl {
   indexOfFittingSchema: number;
   uischemas: JsonFormsUISchemaRegistryEntry[];
   data: any;
-  translations: CombinatorTranslations;
 }
 
 export const mapStateToCombinatorRendererProps = (
@@ -1073,13 +1059,6 @@ export const mapStateToCombinatorRendererProps = (
     mapStateToControlProps(state, ownProps);
 
   const ajv = state.jsonforms.core.ajv;
-  const t = getTranslator()(state);
-  const translations = getCombinatorTranslations(
-    t,
-    combinatorDefaultTranslations,
-    i18nKeyPrefix,
-    label
-  );
   const structuralKeywords = [
     'required',
     'additionalProperties',
@@ -1126,7 +1105,6 @@ export const mapStateToCombinatorRendererProps = (
     label,
     indexOfFittingSchema,
     uischemas: getUISchemas(state),
-    translations,
   };
 };
 
@@ -1161,7 +1139,6 @@ export const mapStateToOneOfProps = (
 
 export interface StatePropsOfArrayLayout extends StatePropsOfControlWithDetail {
   data: number;
-  translations: ArrayTranslations;
   minItems?: number;
   disableRemove?: boolean;
   disableAdd?: boolean;
@@ -1177,7 +1154,7 @@ export const mapStateToArrayLayoutProps = (
   state: JsonFormsState,
   ownProps: OwnPropsOfControl
 ): StatePropsOfArrayLayout => {
-  const { path, schema, uischema, errors, i18nKeyPrefix, label, ...props } =
+  const { path, schema, uischema, errors, label, ...props } =
     mapStateToControlWithDetailProps(state, ownProps);
 
   const resolvedSchema = Resolve.schema(schema, 'items', props.rootSchema);
@@ -1205,12 +1182,6 @@ export const mapStateToArrayLayoutProps = (
     data: props.data ? props.data.length : 0,
     errors: allErrors,
     minItems: schema.minItems,
-    translations: getArrayTranslations(
-      t,
-      arrayDefaultTranslations,
-      i18nKeyPrefix,
-      label
-    ),
   };
 };
 
@@ -1249,6 +1220,7 @@ export const mapStateToLabelProps = (
     config: getConfig(state),
     renderers: props.renderers || getRenderers(state),
     cells: props.cells || getCells(state),
+    uischema,
   };
 };
 

package/src/util/schema.ts

@@ -26,16 +26,27 @@
 import find from 'lodash/find';
 import type { JsonSchema } from '../models';
 
-export const getFirstPrimitiveProp = (schema: any) => {
-  if (schema.properties) {
-    return find(Object.keys(schema.properties), (propName) => {
-      const prop = schema.properties[propName];
-      return (
-        prop.type === 'string' ||
-        prop.type === 'number' ||
-        prop.type === 'integer'
-      );
-    });
+export const getFirstPrimitiveProp = (schema: unknown) => {
+  if (
+    schema &&
+    typeof schema === 'object' &&
+    'properties' in schema &&
+    schema.properties
+  ) {
+    return find(
+      Object.keys(schema.properties),
+      (propName: keyof typeof schema.properties) => {
+        const prop: unknown = schema.properties[propName];
+        return (
+          prop &&
+          typeof prop === 'object' &&
+          'type' in prop &&
+          (prop.type === 'string' ||
+            prop.type === 'number' ||
+            prop.type === 'integer')
+        );
+      }
+    );
   }
   return undefined;
 };