refactor: removed duplicated method "update"

gorhom · Oct 17, 2021 · c312e4c · c312e4c
1 parent 8292379
commit c312e4c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 40 deletions.
diff --git a/src/hooks/usePortal.ts b/src/hooks/usePortal.ts
@@ -28,19 +28,9 @@ export const usePortal = (hostName: string = 'root') => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const addPortal = useCallback((name: string, node: ReactNode) => {
+  const addUpdatePortal = useCallback((name: string, node: ReactNode) => {
     dispatch({
-      type: ACTIONS.ADD_PORTAL,
-      hostName,
-      portalName: name,
-      node,
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  const updatePortal = useCallback((name: string, node: ReactNode) => {
-    dispatch({
-      type: ACTIONS.UPDATE_PORTAL,
+      type: ACTIONS.ADD_UPDATE_PORTAL,
       hostName,
       portalName: name,
       node,
@@ -61,8 +51,8 @@ export const usePortal = (hostName: string = 'root') => {
   return {
     registerHost,
     deregisterHost,
-    addPortal,
-    updatePortal,
+    addPortal: addUpdatePortal,
+    updatePortal: addUpdatePortal,
     removePortal,
   };
 };
diff --git a/src/state/constants.ts b/src/state/constants.ts
@@ -1,8 +1,7 @@
 enum ACTIONS {
   REGISTER_HOST,
   DEREGISTER_HOST,
-  ADD_PORTAL,
-  UPDATE_PORTAL,
+  ADD_UPDATE_PORTAL,
   REMOVE_PORTAL,
 }
 

diff --git a/src/state/reducer.ts b/src/state/reducer.ts
@@ -1,7 +1,11 @@
 import { ACTIONS } from './constants';
 import { print } from '../utilities/logger';
 import type { PortalType } from '../types';
-import type { ActionTypes, AddPortalAction } from './types';
+import type {
+  ActionTypes,
+  AddUpdatePortalAction,
+  RemovePortalAction,
+} from './types';
 
 const registerHost = (
   state: Record<string, Array<PortalType>>,
@@ -21,7 +25,7 @@ const deregisterHost = (
   return state;
 };
 
-const addOrUpdatePortal = (
+const addUpdatePortal = (
   state: Record<string, Array<PortalType>>,
   hostName: string,
   portalName: string,
@@ -76,19 +80,18 @@ export const reducer = (
       return registerHost(clonedState, action.hostName);
     case ACTIONS.DEREGISTER_HOST:
       return deregisterHost(clonedState, action.hostName);
-    case ACTIONS.ADD_PORTAL:
-    case ACTIONS.UPDATE_PORTAL:
-      return addOrUpdatePortal(
+    case ACTIONS.ADD_UPDATE_PORTAL:
+      return addUpdatePortal(
         clonedState,
         action.hostName,
-        (action as AddPortalAction).portalName,
-        (action as AddPortalAction).node
+        (action as AddUpdatePortalAction).portalName,
+        (action as AddUpdatePortalAction).node
       );
     case ACTIONS.REMOVE_PORTAL:
       return removePortal(
         clonedState,
         action.hostName,
-        (action as AddPortalAction).portalName
+        (action as RemovePortalAction).portalName
       );
     default:
       return state;

diff --git a/src/state/types.d.ts b/src/state/types.d.ts
@@ -1,14 +1,7 @@
 import type { ReactNode } from 'react';
 import type { ACTIONS } from './constants';
 
-export interface AddPortalAction {
-  type: ACTIONS;
-  hostName: string;
-  portalName: string;
-  node: ReactNode;
-}
-
-export interface UpdatePortalAction {
+export interface AddUpdatePortalAction {
   type: ACTIONS;
   hostName: string;
   portalName: string;
@@ -32,8 +25,7 @@ export interface UnregisterHostAction {
 }
 
 export type ActionTypes =
-  | AddPortalAction
-  | UpdatePortalAction
+  | AddUpdatePortalAction
   | RemovePortalAction
   | RegisterHostAction
   | UnregisterHostAction;
diff --git a/src/types.d.ts b/src/types.d.ts
@@ -1,11 +1,5 @@
 import type { ReactNode } from 'react';
 
-export interface PortalMethods {
-  mount: (name: string, node: ReactNode) => void;
-  update: (name: string, node: ReactNode) => void;
-  unmount: (name: string) => void;
-}
-
 export interface PortalType {
   name: string;
   node: ReactNode;