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

feat(react): refactor composed modal to functional component #10060

Merged
merged 9 commits into from
Nov 9, 2021
Merged

feat(react): refactor composed modal to functional component #10060

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
46493c7
feat(react): update composed modal to functional component
abbeyhrt Nov 4, 2021
6a5d7e3
feat(react): refactor ComposedModal to functional component
abbeyhrt Nov 5, 2021
ffdb983
chore(react): remove console.logs
abbeyhrt Nov 5, 2021
752dbbb
Merge branch 'main' into feat/composed-modal-refactor
abbeyhrt Nov 5, 2021
ebf0373
fix(react): export ComposedModal under feature flag
abbeyhrt Nov 5, 2021
89b1c16
Merge branch 'feat/composed-modal-refactor' of github.com:abbeyhrt/my…
abbeyhrt Nov 5, 2021
eff8f5e
Update packages/react/src/components/ComposedModal/next/ComposedModal.js
abbeyhrt Nov 9, 2021
cf44487
Merge branch 'main' into feat/composed-modal-refactor
abbeyhrt Nov 9, 2021
0ee7c90
Update packages/react/src/components/ComposedModal/next/ComposedModal.js
abbeyhrt Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/react/src/components/ComposedModal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

import * as FeatureFlags from '@carbon/feature-flags';
import { ModalHeader as ModalHeaderNext } from './next/ModalHeader';
import ComposedModal, {
import { default as ComposedModalNext } from './next/ComposedModal';
import {
default as ComposedModalClassic,
ModalHeader as ModalHeaderClassic,
ModalBody,
ModalFooter,
Expand All @@ -17,6 +19,10 @@ export const ModalHeader = FeatureFlags.enabled('enable-v11-release')
? ModalHeaderNext
: ModalHeaderClassic;

export { ComposedModal, ModalBody, ModalFooter };
export const ComposedModal = FeatureFlags.enabled('enable-v11-release')
? ComposedModalNext
: ComposedModalClassic;

export { ModalBody, ModalFooter };

export default from './ComposedModal';
118 changes: 118 additions & 0 deletions packages/react/src/components/ComposedModal/next/ComposedModal-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from 'react';
import { mount } from 'enzyme';
import ComposedModal from './ComposedModal';
import { ModalHeader } from './ModalHeader';
import { ModalFooter } from '../ComposedModal';
import { settings } from 'carbon-components';

const { prefix } = settings;

describe('<ComposedModal />', () => {
let container;

afterEach(() => {
if (container && container.parentNode) {
container.parentNode.removeChild(container);
}
container = null;
});

it('renders', () => {
const wrapper = mount(<ComposedModal open />);
expect(wrapper).toMatchSnapshot();
});

it('changes the open state upon change in props', () => {
const wrapper = mount(<ComposedModal open />);

expect(
document.body.classList.contains('bx--body--with-modal-open')
).toEqual(true);
wrapper.setProps({ open: false });
expect(
document.body.classList.contains('bx--body--with-modal-open')
).toEqual(false);
});

it('should change class of <body> upon open state', () => {
const wrapper = mount(<ComposedModal open />);
expect(
document.body.classList.contains('bx--body--with-modal-open')
).toEqual(true);
wrapper.unmount();
expect(
document.body.classList.contains('bx--body--with-modal-open')
).toEqual(false);
mount(<ComposedModal open={false} />);
expect(
document.body.classList.contains('bx--body--with-modal-open')
).toEqual(false);
});

it('calls onClick upon user-initiated closing', () => {
const onClose = jest.fn();
const wrapper = mount(
<ComposedModal open onClose={onClose}>
<ModalHeader />
</ComposedModal>
);
const button = wrapper.find(`.${prefix}--modal-close`).first();
button.simulate('click');
expect(
document.body.classList.contains('bx--body--with-modal-open')
).toEqual(false);
expect(onClose.mock.calls.length).toBe(1);
});

it('provides a way to prevent upon user-initiated closing', () => {
const onClose = jest.fn(() => false);
const wrapper = mount(
<ComposedModal open onClose={onClose}>
<ModalHeader />
</ComposedModal>
);
const button = wrapper.find(`.${prefix}--modal-close`).first();
button.simulate('click');
expect(
document.body.classList.contains('bx--body--with-modal-open')
).toEqual(true);
});

it('should focus on the primary actionable button in ModalFooter by default', () => {
container = document.createElement('div');
container.id = 'container';
document.body.appendChild(container);
mount(
<ComposedModal open>
<ModalFooter primaryButtonText="Save" />
</ComposedModal>,
{ attachTo: document.querySelector('#container') }
);
expect(
document.activeElement.classList.contains(`${prefix}--btn--primary`)
).toEqual(true);
});

it('should focus on the element that matches selectorPrimaryFocus', () => {
container = document.createElement('div');
container.id = 'container';
document.body.appendChild(container);
mount(
<ComposedModal open selectorPrimaryFocus={`.${prefix}--modal-close`}>
<ModalHeader label="Optional Label" title="Example" />
<ModalFooter primaryButtonText="Save" />
</ComposedModal>,
{ attachTo: document.querySelector('#container') }
);
expect(
document.activeElement.classList.contains(`${prefix}--modal-close`)
).toEqual(true);
});
});
Loading