@atlaskit/editor-core 151.3.0 → 151.3.1

package/dist/cjs/ui/ConfigPanel/FormContent.js

@@ -165,35 +165,48 @@ function FieldComponent(_ref) {
       });
 
     case 'expand':
-      // if expand is under a tab.
-      var resolvedParentName = parentName ? "".concat(parentName, ".").concat(field.name) : field.name;
-      return /*#__PURE__*/_react.default.createElement(_Expand.default, {
-        field: field,
-        isExpanded: field.isExpanded
-      }, /*#__PURE__*/_react.default.createElement(FormContent, {
-        parentName: resolvedParentName,
-        fields: field.fields,
-        parameters: parameters[field.name] || {},
-        onFieldChange: onFieldChange,
-        extensionManifest: extensionManifest
-      }));
-
-    case 'tab-group':
-      var renderPanel = function renderPanel(tabField) {
-        var tabParameters = parameters[field.name] || {};
-        return /*#__PURE__*/_react.default.createElement(FormContent, {
-          parentName: "".concat(field.name, ".").concat(tabField.name),
-          fields: tabField.fields,
-          parameters: tabParameters[tabField.name] || {},
+      {
+        // if expand is under a tab with hasGroupedValues=true
+        var resolvedParentName = [parentName, field.hasGroupedValues ? field.name : undefined].filter(function (val) {
+          return !!val;
+        }).join('.') || undefined;
+        var resolvedParameters = !field.hasGroupedValues ? parameters : parameters[field.name] || {};
+        return /*#__PURE__*/_react.default.createElement(_Expand.default, {
+          field: field,
+          isExpanded: field.isExpanded
+        }, /*#__PURE__*/_react.default.createElement(FormContent, {
+          parentName: resolvedParentName,
+          fields: field.fields,
+          parameters: resolvedParameters,
           onFieldChange: onFieldChange,
           extensionManifest: extensionManifest
-        });
-      };
+        }));
+      }
 
-      return /*#__PURE__*/_react.default.createElement(_TabGroup.default, {
-        field: field,
-        renderPanel: renderPanel
-      });
+    case 'tab-group':
+      {
+        var tabGroupField = field;
+        var tabGroupParams = tabGroupField.hasGroupedValues ? parameters[tabGroupField.name] || {} : parameters;
+
+        var renderPanel = function renderPanel(tabField) {
+          var parentName = [tabGroupField.hasGroupedValues ? tabGroupField.name : undefined, tabField.hasGroupedValues ? tabField.name : undefined].filter(function (val) {
+            return !!val;
+          }).join('.') || undefined;
+          var tabParameters = tabField.hasGroupedValues ? tabGroupParams[tabField.name] || {} : tabGroupParams;
+          return /*#__PURE__*/_react.default.createElement(FormContent, {
+            parentName: parentName,
+            fields: tabField.fields,
+            parameters: tabParameters,
+            onFieldChange: onFieldChange,
+            extensionManifest: extensionManifest
+          });
+        };
+
+        return /*#__PURE__*/_react.default.createElement(_TabGroup.default, {
+          field: tabGroupField,
+          renderPanel: renderPanel
+        });
+      }
 
     default:
       return /*#__PURE__*/_react.default.createElement(_UnhandledType.default, {