fix: error showing for state update

mynaparrot · Sep 28, 2023 · 122511e · 122511e
1 parent 0a45b18
commit 122511e
Showing 1 changed file with 25 additions and 5 deletions.
diff --git a/src/components/main-area/mainComponents.tsx b/src/components/main-area/mainComponents.tsx
@@ -40,6 +40,13 @@ const activateSpeechServiceSelector = createSelector(
   (is_enabled) => is_enabled,
 );
 
+const isActiveSharedNotepadSelector = createSelector(
+  (state: RootState) =>
+    state.session.currentRoom.metadata?.room_features.shared_note_pad_features
+      .is_active,
+  (is_active) => is_active,
+);
+
 const MainComponents = ({
   currentConnection,
   isActiveWhiteboard,
@@ -52,6 +59,7 @@ const MainComponents = ({
 
   const activateWebcamsView = useAppSelector(activateWebcamsViewSelector);
   const activateSpeechService = useAppSelector(activateSpeechServiceSelector);
+  const isActiveSharedNotepad = useAppSelector(isActiveSharedNotepadSelector);
 
   const [showVerticalVideoView, setShowVerticalVideoView] =
     useState<boolean>(false);
@@ -134,8 +142,10 @@ const MainComponents = ({
       classNames = 'hidden';
     } else if (isActiveExternalMediaPlayer) {
       if (!isRecorder) {
-        dispatch(updateIsActiveChatPanel(false));
-        dispatch(updateIsActiveParticipantsPanel(false));
+        setTimeout(() => {
+          dispatch(updateIsActiveChatPanel(false));
+          dispatch(updateIsActiveParticipantsPanel(false));
+        }, 200);
       }
       classNames =
         'Div-external-media-player w-full flex items-center justify-center';
@@ -164,8 +174,10 @@ const MainComponents = ({
       classNames = 'hidden';
     } else if (isActiveDisplayExternalLink) {
       if (!isRecorder) {
-        dispatch(updateIsActiveChatPanel(false));
-        dispatch(updateIsActiveParticipantsPanel(false));
+        setTimeout(() => {
+          dispatch(updateIsActiveChatPanel(false));
+          dispatch(updateIsActiveParticipantsPanel(false));
+        }, 200);
       }
       classNames = 'w-full';
     }
@@ -184,6 +196,14 @@ const MainComponents = ({
     isActiveDisplayExternalLink,
   ]);
 
+  // this will help to reset position, if something went wrong
+  const sharedNotepadElm = useMemo(() => {
+    if (isActiveSharedNotepad) {
+      return <SharedNotepadElement />;
+    }
+    return null;
+  }, [isActiveSharedNotepad]);
+
   const cssClasses = useMemo(() => {
     const cssClasses: Array<string> = [];
     if (isActiveScreenSharingView && isActiveScreenShare) {
@@ -215,7 +235,7 @@ const MainComponents = ({
   return (
     <>
       <div className={cssClasses}>
-        <SharedNotepadElement />
+        {sharedNotepadElm}
         {activateWebcamsView ? (
           <VideosComponent
             currentConnection={currentConnection}