@beinformed/ui 1.21.1 → 1.21.4

package/src/models/grouping/GroupingModel.js

@@ -109,26 +109,54 @@ type Context = {
  */
 export default class GroupingModel {
   _prefix: string | null;
-  _groups: Array<GroupModel>;
+  _groups: Array<GroupModel> = [];
 
   /**
    */
   constructor(data: Object, contexts: Array<Context>) {
     this._prefix = data && data.prefix ? data.prefix : null;
 
+    if (data?.group) {
+      this._groups = this.createGroup(data, contexts);
+    }
+  }
+
+  /**
+   */
+  createGroup(data: Object, contributions: Array<Context>): Array<Object> {
     const context = this.getContextFromContributionsByPrefix(
-      contexts,
+      contributions,
       this._prefix
     );
 
-    const dynamicschema = data && data.dynamicschema;
-    this._groups =
-      data && data.group
-        ? data.group.map(
-            (group) =>
-              new GroupModel({ ...group, dynamicschema }, context, contexts)
-          )
-        : [];
+    return data.group.map((group) => {
+      const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);
+      return new GroupModel(
+        {
+          ...group,
+          dynamicschema,
+        },
+        context,
+        contributions
+      );
+    });
+  }
+
+  /**
+   * add grouped prefix to the dynamicschema
+   */
+  getDynamicSchema(group: Object, dynamicschema: Object): Object {
+    if (dynamicschema) {
+      if (
+        this._prefix &&
+        dynamicschema[group.type] &&
+        !dynamicschema[this._prefix + group.type]
+      ) {
+        dynamicschema[this._prefix + group.type] = dynamicschema[group.type];
+      }
+      return dynamicschema;
+    }
+    return null;
   }
 
   /**

package/src/models/types.js

@@ -109,7 +109,7 @@ export type FormErrorAnchor = {
     index?: number,
     "index-identifier"?: string,
   },
-  layouthint?: LayoutHintCollection,
+  layouthint: LayoutHintCollection,
   message: string,
   param?: {
     name: string,