Skip to content

Commit

Permalink
fix(modal): fix comments issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@xchaikax
xchaikax committed Dec 25, 2020
1 parent d95c346 commit dd8370f
Show file tree
Hide file tree
Showing 27 changed files with 347 additions and 682 deletions.
24 changes: 0 additions & 24 deletions packages/fade/package.json
View file

This file was deleted.

63 changes: 0 additions & 63 deletions packages/fade/src/Component.stories.mdx
View file

This file was deleted.

12 changes: 0 additions & 12 deletions packages/fade/tsconfig.json
View file

This file was deleted.

6 changes: 3 additions & 3 deletions packages/modal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"access": "public"
},
"dependencies": {
"@alfalab/core-components-fade": "1.0.0",
"@alfalab/core-components-mq": "1.0.0",
"@alfalab/core-components-portal": "2.0.0",
"@alfalab/core-components-trap-focus": "^1.0.0",
"@alfalab/core-components-portal": "1.3.3",
"@alfalab/core-components-trap-focus": "1.0.0",
"@alfalab/icons-glyph": "^1.71.0",
"classnames": "^2.2.6",
"react-merge-refs": "^1.1.0",
"react-div-100vh": "0.5.6"
},
"devDependencies": {
Expand Down
28 changes: 14 additions & 14 deletions packages/modal/src/Component.manager.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('ModalManager', () => {
const modal = {} as ModalElement;
const modalManager2 = new ModalManager();
const idx = modalManager2.add(modal, container1);
modalManager2.mount(modal, {});
modalManager2.mount(modal);
expect(modalManager2.add(modal, container1)).toStrictEqual(idx);
modalManager2.remove(modal);
});
Expand All @@ -59,7 +59,7 @@ describe('ModalManager', () => {

it('should add modal1', () => {
const idx = modalManager.add(modal1, container1);
modalManager.mount(modal1, {});
modalManager.mount(modal1);
expect(idx).toStrictEqual(0); // should be the first modal
expect(modalManager.isTopModal(modal1)).toStrictEqual(true);
});
Expand All @@ -83,7 +83,7 @@ describe('ModalManager', () => {

it('should add modal2 2', () => {
const idx = modalManager.add(modal2, container1);
modalManager.mount(modal2, {});
modalManager.mount(modal2);
expect(idx).toStrictEqual(2); // should be the "third" modal
expect(modalManager.isTopModal(modal2)).toStrictEqual(true);
// modal3 should not be the top modal
Expand All @@ -107,7 +107,7 @@ describe('ModalManager', () => {
});

it('should not do anything', () => {
const idx = modalManager.remove({ nonExisting: true } as any);
const idx = modalManager.remove({ nonExisting: true } as never);
expect(idx).toStrictEqual(-1);
});
});
Expand All @@ -133,7 +133,7 @@ describe('ModalManager', () => {

const modal = {} as ModalElement;
modalManager.add(modal, container1);
modalManager.mount(modal, {});
modalManager.mount(modal);
expect(container1.style.overflow).toStrictEqual('hidden');
expect(container1.style.paddingRight).toStrictEqual(`${20 + getScrollbarSize()}px`);
expect(fixedNode.style.paddingRight).toStrictEqual(`${14 + getScrollbarSize()}px`);
Expand All @@ -158,7 +158,7 @@ describe('ModalManager', () => {

const modal = {} as ModalElement;
modalManager.add(modal, container2);
modalManager.mount(modal, {});
modalManager.mount(modal);
expect(container2.style.overflow).toStrictEqual('hidden');
modalManager.remove(modal);
expect(container2.style.overflow).toStrictEqual('');
Expand All @@ -170,7 +170,7 @@ describe('ModalManager', () => {
const modal = {} as ModalElement;

modalManager.add(modal, container1);
modalManager.mount(modal, {});
modalManager.mount(modal);
expect(container1.style.overflow).toStrictEqual('hidden');
expect(container1.style.paddingRight).toStrictEqual(`${20 + getScrollbarSize()}px`);
expect(fixedNode.style.paddingRight).toStrictEqual('');
Expand Down Expand Up @@ -200,11 +200,11 @@ describe('ModalManager', () => {
const modal1 = {} as ModalElement;
const modal2 = {} as ModalElement;
modalManager.add(modal1, container3);
modalManager.mount(modal1, {});
modalManager.mount(modal1);
expect(container3.children[0]).toHaveAttribute('aria-hidden');

modalManager.add(modal2, container4);
modalManager.mount(modal2, {});
modalManager.mount(modal2);
expect(container4.children[0]).toHaveAttribute('aria-hidden');

modalManager.remove(modal2);
Expand Down Expand Up @@ -243,7 +243,7 @@ describe('ModalManager', () => {
modal2.setAttribute('aria-hidden', 'true');

expect(modal2).toHaveAttribute('aria-hidden');
modalManager.add({ modalRef: modal2 } as any, container2);
modalManager.add({ modalRef: modal2 } as never, container2);
expect(modal2).not.toHaveAttribute('aria-hidden');
});

Expand All @@ -259,12 +259,12 @@ describe('ModalManager', () => {
container2.appendChild(modal2);
container2.appendChild(modal3);

modalManager.add({ modalRef: modal2 } as any, container2);
modalManager.add({ modalRef: modal2 } as never, container2);
// Simulate the main React DOM true.
expect(container2.children[0]).toHaveAttribute('aria-hidden');
expect(container2.children[1]).not.toHaveAttribute('aria-hidden');

modalManager.add({ modalRef: modal3 } as any, container2);
modalManager.add({ modalRef: modal3 } as never, container2);
expect(container2.children[0]).toHaveAttribute('aria-hidden');
expect(container2.children[1]).toHaveAttribute('aria-hidden');
expect(container2.children[2]).not.toHaveAttribute('aria-hidden');
Expand All @@ -274,7 +274,7 @@ describe('ModalManager', () => {
const modal = { modalRef: container2.children[0] } as ModalElement;

modalManager.add(modal, container2);
modalManager.mount(modal, {});
modalManager.mount(modal);
expect(container2.children[0]).not.toHaveAttribute('aria-hidden');
modalManager.remove(modal);
expect(container2.children[0]).toHaveAttribute('aria-hidden');
Expand All @@ -291,7 +291,7 @@ describe('ModalManager', () => {
container2.appendChild(sibling2);

modalManager.add(modal, container2);
modalManager.mount(modal, {});
modalManager.mount(modal);
expect(container2.children[0]).not.toHaveAttribute('aria-hidden');
modalManager.remove(modal);
expect(container2.children[0]).toHaveAttribute('aria-hidden');
Expand Down

0 comments on commit dd8370f

Please sign in to comment.