Project refactoring (#64)

* Removed isClosing prop

* Fixed test

src/hooks/usePopupsBag.ts

@@ -4,7 +4,6 @@ import { PopupGroup } from '../components/PopupGroup';
 import { Popup } from '../types/Popup';
 import { PopupIdentifier } from '../types/PopupIdentifier';
 import { PopupsBag } from '../types/PopupsBag';
-import { callIfPromiseReturned } from '../utils/callIfPromiseReturned';
 import { popupsReducer } from '../utils/popupsReducer';
 
 export const usePopupsBag = (): PopupsBag => {
@@ -32,11 +31,11 @@ export const usePopupsBag = (): PopupsBag => {
         dispatch({ type: 'unmount', payload: { popupIdentifier } });
     }, []);
 
-    const mount = useCallback(<P>(popup: Popup<P>) => {
+    const mount = useCallback(<P = {}>(popup: Popup<P>) => {
         dispatch({
             type: 'mount',
             payload: {
-                popup: popup as Popup<unknown>,
+                popup: popup as unknown as Popup<object>,
             },
         });
 
@@ -46,13 +45,9 @@ export const usePopupsBag = (): PopupsBag => {
     const close = useCallback(
         (popupIdentifier: PopupIdentifier) => {
             const popup = getPopup(popupIdentifier);
-            if (popup.close) {
-                callIfPromiseReturned(popup.close, () =>
-                    unmount(popupIdentifier)
-                );
-            }
+            popup.close();
         },
-        [unmount, getPopup]
+        [getPopup]
     );
 
     return {

src/hooks/usePopupsByGroup.ts

@@ -2,7 +2,7 @@ import { usePopupsContext } from './usePopupsContext';
 import { PopupGroup } from '../components/PopupGroup';
 import { Popup } from '../types/Popup';
 
-export const usePopupsByGroup = (group: PopupGroup): Popup<unknown>[] => {
+export const usePopupsByGroup = (group: PopupGroup): Popup<object>[] => {
     const { getPopupsByGroup } = usePopupsContext();
 
     const popups = getPopupsByGroup(group);

src/hooks/useResponseHandler.ts

@@ -19,7 +19,7 @@ export const useResponseHandler = (close: () => void): ResponseHandler => {
     } = usePopupsContext();
     const popupIdentifier = usePopupIdentifier();
 
-    const popupRef = useRef<ResponsePopup<unknown, unknown> | null>(null);
+    const popupRef = useRef<ResponsePopup<object, unknown> | null>(null);
 
     const resolve = useCallback(
         (value: unknown) => {

src/types/DefaultPopup.ts

@@ -18,5 +18,5 @@ export class DefaultPopup<P> extends Popup<P> {
 }
 
 export const isDefaultPopup = (
-    popup: Popup<unknown>
-): popup is DefaultPopup<unknown> => uniqueKey in popup;
+    popup: Popup<object>
+): popup is DefaultPopup<object> => uniqueKey in popup;

src/types/Popup.ts

@@ -3,9 +3,7 @@ import { ComponentType } from 'react';
 import { PopupIdentifier } from './PopupIdentifier';
 import { CLOSE_NOT_IMPLEMENTED } from '../constants';
 
-export abstract class Popup<P> {
-    public isClosing = false;
-
+export abstract class Popup<P = {}> {
     constructor(
         public PopupComponent: ComponentType<P>,
         public props: P,
@@ -19,9 +17,6 @@ export abstract class Popup<P> {
     public setCloseHandler: (close: () => void | Promise<void>) => void = (
         close
     ) => {
-        this.close = () => {
-            this.isClosing = true;
-            return close();
-        };
+        this.close = close;
     };
 }

src/types/PopupsBag.ts

@@ -6,8 +6,8 @@ export type PopupsBag = {
     mount: <P>(popup: Popup<P>) => PopupIdentifier;
     unmount: (popupIdentifier: PopupIdentifier) => void;
 
-    getPopupsByGroup: (group: PopupGroup) => Array<Popup<unknown>>;
-    getPopup: (popupIdentifier: PopupIdentifier) => Popup<unknown>;
+    getPopupsByGroup: (group: PopupGroup) => Array<Popup<object>>;
+    getPopup: (popupIdentifier: PopupIdentifier) => Popup<object>;
 
     close: (popupIdentifier: PopupIdentifier) => void;
 };

src/types/PopupsRegistry.ts

@@ -1,3 +1,3 @@
 import { Popup } from './Popup';
 
-export type PopupsRegistry = Record<symbol, Record<number, Popup<unknown>>>;
+export type PopupsRegistry = Record<symbol, Record<number, Popup<object>>>;

src/types/ResponsePopup.ts

@@ -20,5 +20,5 @@ export class ResponsePopup<P, R> extends Popup<P> {
 }
 
 export const isResponsePopup = (
-    popup: Popup<unknown>
-): popup is ResponsePopup<unknown, unknown> => isSettledKey in popup;
+    popup: Popup<object>
+): popup is ResponsePopup<object, unknown> => isSettledKey in popup;

src/utils/popupsReducer.ts

@@ -5,7 +5,7 @@ import { PopupsRegistry } from '../types/PopupsRegistry';
 type MountAction = {
     type: 'mount';
     payload: {
-        popup: Popup<unknown>;
+        popup: Popup<object>;
     };
 };
 

src/utils/renderPopups.tsx

@@ -3,7 +3,7 @@ import React, { ReactElement } from 'react';
 import { PopupIdentifierProvider } from './PopupIdentifierContext';
 import { Popup } from '../types/Popup';
 
-export const renderPopups = (popups: Popup<unknown>[]): ReactElement[] =>
+export const renderPopups = (popups: Popup<object>[]): ReactElement[] =>
     popups.map(({ PopupComponent, props, popupIdentifier }) => (
         <PopupIdentifierProvider
             key={popupIdentifier.id}

test/hooks/useResponsePopup.test.tsx

@@ -3,7 +3,6 @@ import { act, renderHook, screen } from '@testing-library/react';
 
 import { group, TestHookWrapper } from './TestHookWrapper';
 import { useResponsePopup } from '../../src/hooks/useResponsePopup';
-import { isPromise } from '../../src/utils/isPromise';
 
 const ConfirmPopup: React.FC = jest.fn(() => <div>Confirm popup</div>);
 
@@ -20,7 +19,8 @@ describe('useResponsePopup', () => {
         );
 
         act(() => {
-            expect(isPromise(result.current() as unknown as void)).toBeTruthy();
+            // It must return promise
+            expect(result.current()['then']).toBeDefined();
         });
     });
 

test/utils/popupsReducer.test.tsx

@@ -1,7 +1,7 @@
 import React, { useReducer } from 'react';
 import { act, renderHook } from '@testing-library/react';
 
-import { createPopupGroup, PopupGroup } from '../../src/components/PopupGroup';
+import { createPopupGroup } from '../../src/components/PopupGroup';
 import { DefaultPopup } from '../../src/types/DefaultPopup';
 import { Popup } from '../../src/types/Popup';
 import { PopupIdentifier } from '../../src/types/PopupIdentifier';
@@ -48,9 +48,9 @@ describe('State reducer of popups', () => {
             useReducer(popupsReducer, {
                 popups: {
                     [group.groupId]: {
-                        0: {} as Popup<unknown>,
-                        1: {} as Popup<unknown>,
-                        2: {} as Popup<unknown>,
+                        0: {} as Popup<object>,
+                        1: {} as Popup<object>,
+                        2: {} as Popup<object>,
                     },
                 },
             })