Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(flex): typo in align and justify modifiers #3328

Merged
merged 1 commit into from Nov 20, 2019
Merged

fix(flex): typo in align and justify modifiers #3328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 20 additions & 1 deletion packages/patternfly-4/react-core/src/layouts/Flex/Flex.test.tsx
View file
Open in desktop
@@ -1,7 +1,8 @@
import * as React from 'react';
import { Flex } from './Flex';
import { FlexItem } from './FlexItem';
import { shallow } from 'enzyme';
import { shallow, mount } from 'enzyme';
import { FlexModifiers, FlexItemModifiers } from './FlexUtils';

test('Simple flex with single item', () => {
const view = shallow(
Expand Down Expand Up @@ -33,3 +34,21 @@ test('extra props are spread to the root element', () => {
const view = shallow(<Flex data-testid={testId} />);
expect(view.prop('data-testid')).toBe(testId);
});

describe('flex modifiers', () => {
Object.values(FlexModifiers).forEach(mod => {
test(`${mod} is a valid modifier`, () => {
const view = mount(<Flex breakpointMods={[{ modifier: mod as keyof typeof FlexModifiers }]}>{mod}</Flex>)
expect(view.find('div').prop('className')).not.toMatch(/undefined/)
})
})
});

describe('flex item modifiers', () => {
Object.values(FlexItemModifiers).forEach(mod => {
test(`${mod} is a valid modifier`, () => {
const view = mount(<FlexItem breakpointMods={[{ modifier: mod as keyof typeof FlexItemModifiers }]}>{mod}</FlexItem>)
expect(view.find('div').prop('className')).not.toMatch(/undefined/)
})
})
});
15 changes: 7 additions & 8 deletions packages/patternfly-4/react-core/src/layouts/Flex/FlexUtils.tsx
View file
Open in desktop
Expand Up @@ -40,19 +40,18 @@ export enum FlexModifiers {
'align-left' = 'align-left',
'align-self-flex-start' = 'align-self-flex-start',
'align-self-flex-end' = 'align-self-flex-end',
'align-self-flex-center' = 'align-self-flex-center',
'align-self-flex-baseline' = 'align-self-flex-baseline',
'align-self-flex-stretch' = 'align-self-flex-stretch',
'align-self-center' = 'align-self-center',
'align-self-baseline' = 'align-self-baseline',
'align-self-stretch' = 'align-self-stretch',
'justify-content-flex-end' = 'justify-content-flex-end',
'justify-content-center' = 'justify-content-center',
'justify-content-flex-space-between' = 'justify-content-flex-space-between',
'justify-content-space-between' = 'justify-content-space-between',
'justify-content-space-around' = 'justify-content-space-around',
'justify-content-space-evenly' = 'justify-content-space-evenly',
'justify-content-flex-start' = 'justify-content-flex-start',
'full-width' = 'full-width',
'align-items-flex-start' = 'align-items-flex-start',
'align-items-flex-end' = 'align-items-flex-end',
'align-items-center' = 'align-items-center',
'align-items-stretch' = 'align-items-stretch',
'align-items-baseline' = 'align-items-baseline',
'align-content-flex-start' = 'align-content-flex-start',
Expand Down Expand Up @@ -84,9 +83,9 @@ export enum FlexItemModifiers {
'align-left' = 'align-left',
'align-self-flex-start' = 'align-self-flex-start',
'align-self-flex-end' = 'align-self-flex-end',
'align-self-flex-center' = 'align-self-flex-center',
'align-self-flex-baseline' = 'align-self-flex-baseline',
'align-self-flex-stretch' = 'align-self-flex-stretch',
'align-self-center' = 'align-self-center',
'align-self-baseline' = 'align-self-baseline',
'align-self-stretch' = 'align-self-stretch',
'full-width' = 'full-width'
}

Expand Down