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

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

@@ -21,7 +21,6 @@ import {
 import {
   useCurrentIndentSize, useSWRxSlackChannels, useIsSlackEnabled, useIsTextlintEnabled, usePageTagsForEditors,
   useIsEnabledUnsavedWarning,
-  useGetEditingMarkdown,
 } from '~/stores/editor';
 import { useCurrentPagePath, useSWRxCurrentPage } from '~/stores/page';
 import { usePreviewOptions } from '~/stores/renderer';
@@ -73,8 +72,6 @@ const PageEditor = React.memo((): JSX.Element => {
 
   const { data: rendererOptions } = usePreviewOptions();
 
-  const { mutate: mutateGetEditingMarkdown } = useGetEditingMarkdown();
-
   const currentRevisionId = currentPage?.revision?._id;
   const initialValue = editingMarkdown ?? '';
 
@@ -109,11 +106,9 @@ const PageEditor = React.memo((): JSX.Element => {
     markdownToSave.current = value;
     setMarkdownToPreview(value);
 
-    mutateGetEditingMarkdown(getEditingMarkdown);
-
     // Displays an unsaved warning alert
     mutateIsEnabledUnsavedWarning(!isClean);
-  })), [getEditingMarkdown, mutateGetEditingMarkdown, mutateIsEnabledUnsavedWarning]);
+  })), [getEditingMarkdown, mutateIsEnabledUnsavedWarning]);
 
 
   const markdownChangedHandler = useCallback((value: string, isClean: boolean): void => {

+ 6 - 8
packages/app/src/components/PageStatusAlert.tsx

@@ -4,7 +4,6 @@ import { useTranslation } from 'next-i18next';
 import * as ReactDOMServer from 'react-dom/server';
 
 import { SocketEventName } from '~/interfaces/websocket';
-import { useGetEditingMarkdown } from '~/stores/editor';
 import {
   useHasDraftOnHackmd, useIsHackmdDraftUpdatingInRealtime, useRevisionIdHackmdSynced,
 } from '~/stores/hackmd';
@@ -27,7 +26,6 @@ export const PageStatusAlert = (): JSX.Element => {
   const { t } = useTranslation();
   const { data: isHackmdDraftUpdatingInRealtime } = useIsHackmdDraftUpdatingInRealtime();
   const { data: hasDraftOnHackmd } = useHasDraftOnHackmd();
-  const { data: getEditingMarkdown } = useGetEditingMarkdown();
 
   // store remote latest page data
   const { data: revisionIdHackmdSynced } = useRevisionIdHackmdSynced();
@@ -126,11 +124,11 @@ export const PageStatusAlert = (): JSX.Element => {
 
   const getContentsForUpdatedAlert = useCallback((): AlertComponentContents => {
 
-    let isConflictOnEdit = false;
-    if (getEditingMarkdown != null) {
-      const editingMarkdown = getEditingMarkdown();
-      isConflictOnEdit = editingMarkdown !== remoteRevisionBody;
-    }
+    const isConflictOnEdit = false;
+    // if (getEditingMarkdown != null) {
+    //   const editingMarkdown = getEditingMarkdown();
+    //   isConflictOnEdit = editingMarkdown !== remoteRevisionBody;
+    // }
 
     const usernameComponentToString = ReactDOMServer.renderToString(<Username user={remoteRevisionLastUpdateUser} />);
 
@@ -164,7 +162,7 @@ export const PageStatusAlert = (): JSX.Element => {
           )}
         </>,
     };
-  }, [getEditingMarkdown, remoteRevisionLastUpdateUser, t, onClickResolveConflict, remoteRevisionBody, refreshPage]);
+  }, [remoteRevisionLastUpdateUser, t, onClickResolveConflict, remoteRevisionBody, refreshPage]);
 
   const alertComponentContents = useMemo(() => {
     const isRevisionOutdated = revision?._id !== remoteRevisionId;

+ 0 - 4
packages/app/src/stores/editor.tsx

@@ -117,7 +117,3 @@ export const usePageTagsForEditors = (pageId: Nullable<string>): SWRResponse<str
 export const useIsEnabledUnsavedWarning = (): SWRResponse<boolean, Error> => {
   return useStaticSWR<boolean, Error>('isEnabledUnsavedWarning', undefined, { fallbackData: false });
 };
-
-export const useGetEditingMarkdown = (): SWRResponse<() => string, Error> => {
-  return useStaticSWR<() => string, Error>('getEditingMarkdown');
-};