Merge branch 'master' into mergeAntToMaster

Author: rvsia

packages/blueprint-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/blueprint-component-mapper",
-  "version": "2.6.6",
+  "version": "2.7.0",
   "description": "Blueprint component mapper for data-driven-forms.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/common",
-  "version": "2.6.6",
+  "version": "2.7.0",
   "description": "Common components, helpers and other pieces of code",
   "license": "Apache-2.0",
   "main": "index.js",

packages/common/src/wizard/reducer.js

@@ -13,8 +13,10 @@ const createSchema = ({ formOptions, fields }) => {
     schema = [
       ...schema,
       {
+        name: field.name,
         title: field.title,
-        substepOf: field.substepOf,
+        substepOf: field.substepOf?.name || field.substepOf,
+        substepOfTitle: field.substepOf?.title || field.substepOf,
         index,
         primary: !schema[schema.length - 1] || !field.substepOf || field.substepOf !== schema[schema.length - 1].substepOf
       }

packages/mui-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/mui-component-mapper",
-  "version": "2.6.6",
+  "version": "2.7.0",
   "description": "Component mapper for Material ui component mapper form data-driven-forms.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

packages/parsers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/parsers",
-  "version": "2.6.6",
+  "version": "2.7.0",
   "description": "Parsers for Data Driven Forms.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

packages/pf3-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/pf3-component-mapper",
-  "version": "2.6.6",
+  "version": "2.7.0",
   "description": "Patternfly 3 component mapper",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

packages/pf4-component-mapper/demo/demo-schemas/select-schema.js

@@ -1,3 +1,4 @@
+import React from 'react';
 import componentTypes from '@data-driven-forms/react-form-renderer/dist/cjs/component-types';
 
 const options = [
@@ -127,6 +128,37 @@ const selectSchema = {
       name: 'dosbaled-option-select',
       label: 'Disabled-option-select',
       options: [...options, { label: 'Disabled option', value: 'disabled', isDisabled: true }]
+    },
+    {
+      component: componentTypes.SELECT,
+      name: 'translated-select',
+      label: 'Translated-select',
+      options: [
+        {
+          label: <span>None</span>,
+          key: 'none'
+        },
+        {
+          label: <span>Jack</span>,
+          value: 'jack'
+        }
+      ]
+    },
+    {
+      component: componentTypes.SELECT,
+      name: 'translated-select-multi',
+      label: 'Translated-select-multi',
+      isMulti: true,
+      options: [
+        {
+          label: <span>Jack</span>,
+          value: 'jack'
+        },
+        {
+          label: <span>Mary</span>,
+          value: 'Mary'
+        }
+      ]
     }
   ]
 };

packages/pf4-component-mapper/demo/index.js

@@ -24,7 +24,7 @@ const fieldArrayState = { schema: arraySchemaDDF, additionalOptions: {
 class App extends React.Component {
     constructor(props) {
         super(props);
-        this.state = {schema: selectSchema, additionalOptions: {}} 
+        this.state = {schema: wizardSchema, additionalOptions: {}} 
     }
 
     render() {

packages/pf4-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/pf4-component-mapper",
-  "version": "2.6.6",
+  "version": "2.7.0",
   "description": "Starter pf4-component-mapper for data-driven-forms.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

packages/pf4-component-mapper/src/common/select/menu.js

@@ -106,7 +106,7 @@ const Menu = ({
           isSelected: isMulti ? !!selectedItem.find(({ value }) => item.value === value) : selectedItem === item.value,
           onMouseUp: (e) => e.stopPropagation() // we need this to prevent issues with portal menu not selecting a option
         });
-        return <Option key={item.value} item={item} {...itemProps} />;
+        return <Option key={item.key || item.value || (typeof item.label === 'string' && item.label) || item} item={item} {...itemProps} />;
       })}
     </ul>
   );