fix: data persist on mails editor (#126)

fix: data persist on mails editor
zextras · Jul 21, 2022 · 9ff8cca · 9ff8cca
1 parent 4ed61ad
commit 9ff8cca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 30 deletions.
diff --git a/src/store/editor-slice.ts b/src/store/editor-slice.ts
@@ -88,14 +88,15 @@ function createEditorReducer(
 			: ['', ''];
 
 	if (payload.action) {
+		const editorWithAction = { ...empty, action: payload.action };
 		switch (payload.action) {
 			case ActionsType.NEW:
-				state.editors[payload.editorId] = empty;
+				state.editors[payload.editorId] = editorWithAction;
 				break;
 			case ActionsType.MAIL_TO:
 				if (payload?.boardContext?.contacts && payload?.boardContext?.contacts?.length > 0) {
 					state.editors[payload.editorId] = {
-						...empty,
+						...editorWithAction,
 						to: [payload.boardContext.contacts[0]],
 						cc: drop(payload.boardContext.contacts, 1)
 					};
@@ -105,7 +106,7 @@ function createEditorReducer(
 			case ActionsType.EDIT_AS_DRAFT:
 				if (payload.original) {
 					state.editors[payload.editorId] = {
-						...empty,
+						...editorWithAction,
 						id: payload.id,
 						text: extractBody(payload.original),
 						to: retrieveTO(payload.original),
@@ -123,7 +124,7 @@ function createEditorReducer(
 			case ActionsType.EDIT_AS_NEW:
 				if (payload.original) {
 					state.editors[payload.editorId] = {
-						...empty,
+						...editorWithAction,
 						id: payload.id,
 						subject: payload.original.subject,
 						attach: { mp: retrieveAttachmentsType(payload.original, 'attachment') },
@@ -140,7 +141,7 @@ function createEditorReducer(
 			case ActionsType.REPLY:
 				if (payload.original) {
 					state.editors[payload.editorId] = {
-						...empty,
+						...editorWithAction,
 						id: payload.id,
 						text: textWithSignatureRepliesForwards,
 						to: retrieveReplyTo(payload.original),
@@ -158,7 +159,7 @@ function createEditorReducer(
 			case ActionsType.REPLY_ALL:
 				if (payload.original && payload.accounts) {
 					state.editors[payload.editorId] = {
-						...empty,
+						...editorWithAction,
 						text: textWithSignatureRepliesForwards,
 						to: retrieveALL(payload.original, payload.accounts),
 						cc: retrieveCC(payload.original, payload.accounts),
@@ -176,7 +177,7 @@ function createEditorReducer(
 			case ActionsType.FORWARD:
 				if (payload.original) {
 					state.editors[payload.editorId] = {
-						...empty,
+						...editorWithAction,
 						text: textWithSignatureRepliesForwards,
 						subject: `FWD: ${payload.original.subject.replace(FORWARD_REGEX, '')}`,
 						original: payload.original,
@@ -190,13 +191,13 @@ function createEditorReducer(
 				break;
 			case ActionsType.COMPOSE:
 				state.editors[payload.editorId] = {
-					...empty,
+					...editorWithAction,
 					...(payload.boardContext?.compositionData ?? {})
 				};
 				break;
 			case ActionsType.PREFILL_COMPOSE:
 				state.editors[payload.editorId] = {
-					...empty,
+					...editorWithAction,
 					...(payload.boardContext?.compositionData ?? {})
 				};
 				break;

diff --git a/src/views/app/detail-panel/edit/edit-view.jsx b/src/views/app/detail-panel/edit/edit-view.jsx
@@ -86,8 +86,6 @@ export default function EditView({ mailId, folderId, setHeader, toggleAppBoard }
 	const [timer, setTimer] = useState(null);
 
 	const [loading, setLoading] = useState(false);
-	const [initialAction, setInitialAction] = useState(action);
-	const [actionChanged, setActionChanged] = useState(true);
 	const [isUploading, setIsUploading] = useState(false);
 
 	const [showRouteGuard, setShowRouteGuard] = useState(true);
@@ -99,11 +97,18 @@ export default function EditView({ mailId, folderId, setHeader, toggleAppBoard }
 
 	const editorId = useMemo(() => activeMailId ?? generateId(), [activeMailId]);
 
+	const isSameAction = useMemo(() => {
+		if (editors[editorId]) {
+			return editors[editorId].action === action;
+		}
+		return undefined;
+	}, [action, editorId, editors]);
+
 	useEffect(() => {
-		if (actionChanged && editors[editorId]) {
+		if (!isSameAction && editors[editorId]) {
 			dispatch(closeEditor(editorId));
 		}
-	}, [actionChanged, dispatch, editorId, editors]);
+	}, [isSameAction, dispatch, editorId, editors]);
 
 	const updateEditorCb = useCallback(
 		(data) => {
@@ -168,29 +173,15 @@ export default function EditView({ mailId, folderId, setHeader, toggleAppBoard }
 		}
 	}, [editor?.subject, setHeader, updateBoard, action, t]);
 
-	useEffect(() => {
-		if (action !== initialAction) {
-			setActionChanged(true);
-			setInitialAction(action);
-		}
-	}, [action, initialAction]);
-
-	useEffect(() => {
-		if (editors[editorId] && actionChanged) {
-			setActionChanged(false);
-		}
-	}, [actionChanged, editorId, editors]);
-
 	useEffect(() => {
 		if (
 			(activeMailId && messages?.[activeMailId]?.isComplete) ||
 			action === ActionsType.NEW ||
 			action === ActionsType.PREFILL_COMPOSE ||
 			action === ActionsType.COMPOSE ||
-			action === ActionsType.MAIL_TO ||
-			actionChanged
+			action === ActionsType.MAIL_TO
 		) {
-			if (!editors[editorId] || actionChanged) {
+			if (!editors[editorId] || isSameAction === false) {
 				setLoading(true);
 				dispatch(
 					createEditor({
@@ -221,7 +212,7 @@ export default function EditView({ mailId, folderId, setHeader, toggleAppBoard }
 	}, [
 		accounts,
 		action,
-		actionChanged,
+		isSameAction,
 		activeMailId,
 		boardContext,
 		change,
@@ -359,6 +350,7 @@ export default function EditView({ mailId, folderId, setHeader, toggleAppBoard }
 						createSnackbar,
 						folderId: FOLDERS.TRASH
 					}).click();
+					dispatch(closeEditor(editorId));
 				}}
 			/>
 			<EditViewContext.Provider value={context}>