fix(FormGroup): only place className on outer wrapper (#9526)

* fix(FormGroup): only place className on outer wrapper * chore(storybook): remove test story
carbon-design-system · Sep 10, 2021 · 22372ff · 22372ff
1 parent c1e34b2
commit 22372ff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/react/src/components/FormGroup/FormGroup.js b/packages/react/src/components/FormGroup/FormGroup.js
@@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import classnames from 'classnames';
 import { settings } from 'carbon-components';
+import { useFeatureFlag } from '../FeatureFlags';
 
 const { prefix } = settings;
 
@@ -23,7 +24,10 @@ const FormGroup = ({
   hasMargin,
   ...other
 }) => {
-  const classNamesLegend = classnames(`${prefix}--label`, className);
+  const enabled = useFeatureFlag('enable-v11-release');
+  const classNamesLegend = classnames(`${prefix}--label`, [
+    enabled ? null : className,
+  ]);
   const classNamesFieldset = classnames(`${prefix}--fieldset`, className, {
     [`${prefix}--fieldset--no-margin`]: !hasMargin,
   });