Yuken Tezuka 3 лет назад
Родитель
Сommit
2f8cf3b160

+ 6 - 0
packages/app/src/components/PageEditor.tsx

@@ -87,6 +87,7 @@ const PageEditor = React.memo((): JSX.Element => {
   const { mutate: mutateIsEnabledUnsavedWarning } = useIsEnabledUnsavedWarning();
   const saveOrUpdate = useSaveOrUpdate();
 
+
   const currentRevisionId = currentPage?.revision?._id;
 
   const initialValue = useMemo(() => {
@@ -127,6 +128,11 @@ const PageEditor = React.memo((): JSX.Element => {
 
   }, [markdownToPreview, mutateIsConflict]);
 
+  useEffect(() => {
+    markdownToSave.current = initialValue;
+    setMarkdownToPreview(initialValue);
+  }, [initialValue]);
+
   useEffect(() => {
     if (socket == null) { return }
 

+ 3 - 3
packages/app/src/components/PageStatusAlert.tsx

@@ -37,9 +37,9 @@ export const PageStatusAlert = (): JSX.Element => {
   const revision = pageData?.revision;
 
   const refreshPage = useCallback(async() => {
-    await mutatePageData();
-    mutateEditingMarkdown(pageData?.revision.body);
-  }, [mutateEditingMarkdown, mutatePageData, pageData?.revision.body]);
+    const updatedPageData = await mutatePageData();
+    mutateEditingMarkdown(updatedPageData?.revision.body);
+  }, [mutateEditingMarkdown, mutatePageData]);
 
   const onClickResolveConflict = useCallback(() => {
     // this.props.pageContainer.setState({