Преглед изворни кода

change useResolvedTheme to useResolevedThemeForEditor

WNomunomu пре 2 година
родитељ
комит
e6f2ed4410

+ 2 - 2
apps/app/src/components/PageComment/CommentEditor.tsx

@@ -2,7 +2,7 @@ import React, {
   useCallback, useState, useRef, useEffect,
 } from 'react';
 
-import { useResolvedTheme } from '@growi/editor/src/stores/use-resolved-theme';
+import { useResolvedThemeForEditor } from '@growi/editor';
 import { UserPicture } from '@growi/ui/dist/components';
 import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
@@ -78,7 +78,7 @@ export const CommentEditor = (props: CommentEditorProps): JSX.Element => {
     increment: incrementEditingCommentsNum,
     decrement: decrementEditingCommentsNum,
   } = useSWRxEditingCommentsNum();
-  const { mutate: mutateResolvedTheme } = useResolvedTheme();
+  const { mutate: mutateResolvedTheme } = useResolvedThemeForEditor();
 
   const { resolvedTheme } = useNextThemes();
   mutateResolvedTheme(resolvedTheme);

+ 4 - 3
apps/app/src/components/PageEditor/PageEditor.tsx

@@ -7,8 +7,9 @@ import nodePath from 'path';
 
 import type { IPageHasId } from '@growi/core';
 import { pathUtils } from '@growi/core/dist/utils';
-import { CodeMirrorEditorMain, GlobalCodeMirrorEditorKey, useCodeMirrorEditorIsolated } from '@growi/editor';
-import { useResolvedTheme } from '@growi/editor/src/stores/use-resolved-theme';
+import {
+  CodeMirrorEditorMain, GlobalCodeMirrorEditorKey, useCodeMirrorEditorIsolated, useResolvedThemeForEditor,
+} from '@growi/editor';
 import detectIndent from 'detect-indent';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
@@ -122,7 +123,7 @@ export const PageEditor = React.memo((props: Props): JSX.Element => {
   const { mutate: mutateIsEnabledUnsavedWarning } = useIsEnabledUnsavedWarning();
   const { mutate: mutateIsConflict } = useIsConflict();
 
-  const { mutate: mutateResolvedTheme } = useResolvedTheme();
+  const { mutate: mutateResolvedTheme } = useResolvedThemeForEditor();
 
   const saveOrUpdate = useSaveOrUpdate();
   const updateStateAfterSave = useUpdateStateAfterSave(pageId, { supressEditingMarkdownMutation: true });

+ 3 - 3
packages/editor/src/components/CodeMirrorEditor/Toolbar/EmojiButton.tsx

@@ -1,12 +1,12 @@
 import { FC, useState, CSSProperties } from 'react';
 
+import type { UseCodeMirrorEditor } from '@growi/editor';
 import { Picker } from 'emoji-mart';
 import i18n from 'i18next';
 import { Modal } from 'reactstrap';
 
-import { useResolvedTheme } from '../../../stores/use-resolved-theme';
+import { useResolvedThemeForEditor } from '../../../stores/use-resolved-theme';
 
-import type { UseCodeMirrorEditor } from 'src';
 
 import 'emoji-mart/css/emoji-mart.css';
 
@@ -67,7 +67,7 @@ const getEmojiTranslation = (): Translation => {
 export const EmojiButton: FC<Props> = (props) => {
   const [isOpen, setIsOpen] = useState(false);
 
-  const { data: resolvedTheme } = useResolvedTheme();
+  const { data: resolvedTheme } = useResolvedThemeForEditor();
 
   const { codeMirrorEditor } = props;
   const view = codeMirrorEditor?.view;

+ 1 - 0
packages/editor/src/stores/index.ts

@@ -1 +1,2 @@
 export * from './codemirror-editor';
+export * from './use-resolved-theme';

+ 4 - 4
packages/editor/src/stores/use-resolved-theme.ts

@@ -8,18 +8,18 @@ type ResolvedThemeStatus = {
 }
 
 type ResolvedThemeUtils = {
-  mutateResolvedTheme(resolvedTheme: ColorScheme): void
+  mutateResolvedThemeForEditor(resolvedTheme: ColorScheme): void
 }
 
-export const useResolvedTheme = (): SWRResponse<ResolvedThemeStatus, Error> & ResolvedThemeUtils => {
+export const useResolvedThemeForEditor = (): SWRResponse<ResolvedThemeStatus, Error> & ResolvedThemeUtils => {
   const swrResponse = useSWRStatic<ResolvedThemeStatus, Error>('resolvedTheme');
 
-  const mutateResolvedTheme = (resolvedTheme: ColorScheme) => {
+  const mutateResolvedThemeForEditor = (resolvedTheme: ColorScheme) => {
     mutate({ themeData: resolvedTheme });
   };
 
   return {
     ...swrResponse,
-    mutateResolvedTheme,
+    mutateResolvedThemeForEditor,
   };
 };