diff --git a/packages/react/src/components/Accordion/AccordionItem.js b/packages/react/src/components/Accordion/AccordionItem.js index dd63a1626cf3..79aa438a913d 100644 --- a/packages/react/src/components/Accordion/AccordionItem.js +++ b/packages/react/src/components/Accordion/AccordionItem.js @@ -10,6 +10,7 @@ import { settings } from 'carbon-components'; import cx from 'classnames'; import PropTypes from 'prop-types'; import React, { useState } from 'react'; +import { Text } from '../Text'; import { match, keys } from '../../internal/keyboard'; import { useId } from '../../internal/useId'; import deprecate from '../../prop-types/deprecate.js'; @@ -84,7 +85,9 @@ function AccordionItem({ onKeyDown={onKeyDown} type="button"> -
{title}
+ + {title} +
{children} diff --git a/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap b/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap index d41f77795f19..36df88277a96 100644 --- a/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap +++ b/packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap @@ -31,6 +31,7 @@ exports[`Accordion should render 1`] = `
Heading A
@@ -68,6 +69,7 @@ exports[`Accordion should render 1`] = `
Heading B
@@ -105,6 +107,7 @@ exports[`Accordion should render 1`] = `
Heading C
diff --git a/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap b/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap index 9de4cf8a9a9c..cacb17ff9f74 100644 --- a/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap +++ b/packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap @@ -54,11 +54,17 @@ exports[`AccordionItem should render 1`] = ` -
- A heading -
+
+ A heading +
+
); diff --git a/packages/react/src/components/ComboBox/ComboBox.js b/packages/react/src/components/ComboBox/ComboBox.js index 87e68a018940..e19b9ce805d0 100644 --- a/packages/react/src/components/ComboBox/ComboBox.js +++ b/packages/react/src/components/ComboBox/ComboBox.js @@ -9,6 +9,7 @@ import cx from 'classnames'; import Downshift from 'downshift'; import PropTypes from 'prop-types'; import React, { useEffect, useState, useRef } from 'react'; +import { Text } from '../Text'; import { settings } from 'carbon-components'; import { Checkmark16, @@ -293,9 +294,9 @@ const ComboBox = React.forwardRef((props, ref) => { return (
{titleText && ( - + )} { {helperText && !invalid && !warn && ( -
+ {helperText} -
+ )}
);