runfix: Use primary modals directly in jsx (#13846)

* runfix: Use primary modals directly in jsx * remove log
wireapp · Oct 12, 2022 · 9d77998 · 9d77998
1 parent ec438b7
commit 9d77998
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/script/components/Modals/PrimaryModal/PrimaryModalState.ts b/src/script/components/Modals/PrimaryModal/PrimaryModalState.ts
@@ -81,7 +81,7 @@ const usePrimaryModalState = create<PrimaryModalState>((set, get) => ({
   updateErrorMessage: nextErrorMessage => set(state => ({...state, errorMessage: nextErrorMessage})),
 }));
 
-const addNewModalToQueue = (type: PrimaryModalType, options: ModalOptions, modalId = createRandomUuid()) => {
+const addNewModalToQueue = (type: PrimaryModalType, options: ModalOptions, modalId = createRandomUuid()): void => {
   const {currentModalId, existsInQueue, addToQueue, replaceInQueue} = usePrimaryModalState.getState();
 
   const alreadyOpen = modalId === currentModalId;
@@ -99,7 +99,7 @@ const addNewModalToQueue = (type: PrimaryModalType, options: ModalOptions, modal
   showNextModalInQueue();
 };
 
-const showNextModalInQueue = () => {
+const showNextModalInQueue = (): void => {
   const {queue, removeFirstItemInQueue} = usePrimaryModalState.getState();
   if (queue.length > 0) {
     const nextModalToShow = queue[0];
@@ -209,7 +209,7 @@ const updateCurrentModalContent = (type: PrimaryModalType, options: ModalOptions
   updateCurrentModalId(id ?? null);
 };
 
-const removeCurrentModal = () => {
+const removeCurrentModal = (): void => {
   const {currentModalContent, updateCurrentModalId} = usePrimaryModalState.getState();
 
   currentModalContent?.closeFn();

diff --git a/src/script/components/Modals/PrimaryModal/index.ts b/src/script/components/Modals/PrimaryModal/index.ts
@@ -17,17 +17,13 @@
  *
  */
 
-import renderElement from 'Util/renderElement';
-
-import {PrimaryModalComponent} from './PrimaryModal';
 import {addNewModalToQueue, showNextModalInQueue} from './PrimaryModalState';
 import {PrimaryModalType} from './PrimaryModalTypes';
 
 export {usePrimaryModalState, removeCurrentModal} from './PrimaryModalState';
 
 const PrimaryModal = {
-  init: () => {
-    renderElement(PrimaryModalComponent, 'primary-modal-container')({});
+  init: (): void => {
     showNextModalInQueue();
   },
   show: addNewModalToQueue,

diff --git a/src/script/page/AppMain.tsx b/src/script/page/AppMain.tsx
@@ -33,6 +33,7 @@ import {PanelEntity, PanelState} from './RightSidebar/RightSidebar';
 import RootProvider from './RootProvider';
 import {useAppMainState} from './state';
 
+import {PrimaryModalComponent} from '../components/Modals/PrimaryModal/PrimaryModal';
 import {User} from '../entity/User';
 import {TeamState} from '../team/TeamState';
 import {UserState} from '../user/UserState';
@@ -104,7 +105,7 @@ const AppContainer: FC<AppContainerProps> = ({root}) => {
 
           {/*The order of these elements matter to show proper modals stack upon each other*/}
           <div id="user-modal-container"></div>
-          <div id="primary-modal-container"></div>
+          <PrimaryModalComponent />
         </main>
       </RootProvider>
     </StyledApp>