diff --git a/packages/components/src/ScreenWrapper/ScreenWrapperSection.js b/packages/components/src/ScreenWrapper/ScreenWrapperSection.js index ab69b6c1..d4ba3d53 100755 --- a/packages/components/src/ScreenWrapper/ScreenWrapperSection.js +++ b/packages/components/src/ScreenWrapper/ScreenWrapperSection.js @@ -1,10 +1,10 @@ import * as React from 'react'; import { MD3LightTheme } from '@jmstechnologiesinc/react-native-paper'; -import { List, Text } from '@jmstechnologiesinc/react-native-paper'; +import { List } from '@jmstechnologiesinc/react-native-paper'; +import MutedText from '../MutedText/MutedText'; import ScreenWrapperContainer, { containerPaddings } from './ScreenWrapperContainer'; -import { moderateScale } from '@jmstechnologiesinc/react-native-size-matters'; const sectionPaddings = { ...containerPaddings, @@ -33,16 +33,8 @@ export const ScreenWrapperSection = ({ {title} ) : null} - - {description} - + {/* MD3 supporting text, on the 4 dp spacing grid. */} + {description} ) : title ? ( {title} diff --git a/packages/components/src/ScreenWrapper/__tests__/ScreenWrapperSection.test.js b/packages/components/src/ScreenWrapper/__tests__/ScreenWrapperSection.test.js new file mode 100644 index 00000000..965fdb17 --- /dev/null +++ b/packages/components/src/ScreenWrapper/__tests__/ScreenWrapperSection.test.js @@ -0,0 +1,52 @@ +jest.mock('react-native-localize', () => ({ + findBestLanguageTag: jest.fn(() => ({ languageTag: 'en', isRTL: false })), +})); + +import React from 'react'; +import renderer, { act } from 'react-test-renderer'; + +import { List, MD3LightTheme, Provider } from '@jmstechnologiesinc/react-native-paper'; + +import { setI18nConfig } from '../../Localization/Localization'; +import MutedText from '../../MutedText/MutedText'; +import ScreenWrapperSection from '../ScreenWrapperSection'; + +// A section's description is MD3's supporting text under its subheader: the theme's muted body text, on the spacing +// grid, so it follows the theme instead of a hand-picked size and colour. + +jest.useFakeTimers(); + +const mounted = []; + +const render = (element) => { + let tree; + act(() => { + tree = renderer.create({element}); + }); + mounted.push(tree); + return tree; +}; + +afterEach(() => { + act(() => { + mounted.splice(0).forEach((tree) => tree.unmount()); + jest.runOnlyPendingTimers(); + }); +}); + +beforeAll(() => setI18nConfig()); + +describe('ScreenWrapperSection', () => { + it('writes its description as muted supporting text under its title', () => { + const tree = render(); + expect(tree.root.findByType(List.Subheader).props.children).toBe('Payouts'); + const description = tree.root.findByType(MutedText); + expect(description.props.children).toBe('Where your earnings go'); + expect(description.props.style).toEqual({ paddingBottom: MD3LightTheme.spacing.x3 }); + }); + + it('has no supporting text without a description', () => { + const tree = render(); + expect(tree.root.findAllByType(MutedText)).toHaveLength(0); + }); +});