refactor type

packages/editor/src/services/codemirror-editor/use-codemirror-editor.ts

@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from 'react';
+import { useCallback } from 'react';
 
 import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
 import { languages } from '@codemirror/language-data';
@@ -7,9 +7,7 @@ import {
 } from '@codemirror/state';
 import { basicSetup, useCodeMirror, type UseCodeMirror } from '@uiw/react-codemirror';
 
-import { UseCodeMirrorEditorStates } from './interfaces/react-codemirror';
-
-export type UseCodeMirrorEditor = UseCodeMirror;
+import type { UseCodeMirrorEditorStates } from './interfaces/react-codemirror';
 
 type UseCodeMirrorEditorUtils = {
   initState: (config?: EditorStateConfig) => void,
@@ -19,8 +17,7 @@ type UseCodeMirrorEditorUtils = {
   focus: () => void,
   setCaretLine: (lineNumber?: number) => void,
 }
-
-export type UseCodeMirrorEditorResponse = UseCodeMirrorEditorStates & UseCodeMirrorEditorUtils;
+export type UseCodeMirrorEditor = UseCodeMirrorEditorStates & UseCodeMirrorEditorUtils;
 
 type CleanupFunction = () => void;
 
@@ -33,7 +30,7 @@ const defaultExtensionsToInit: Extension[] = [
   ...defaultExtensions,
 ];
 
-export const useCodeMirrorEditor = (props?: UseCodeMirrorEditor): UseCodeMirrorEditorResponse => {
+export const useCodeMirrorEditor = (props?: UseCodeMirror): UseCodeMirrorEditor => {
 
   const codemirror = useCodeMirror({
     ...props,
@@ -43,7 +40,7 @@ export const useCodeMirrorEditor = (props?: UseCodeMirrorEditor): UseCodeMirrorE
     ],
   });
 
-  const { view, setContainer } = codemirror;
+  const { view } = codemirror;
 
   // implement initState method
   const initState = useCallback((config?: EditorStateConfig): void => {
@@ -114,12 +111,6 @@ export const useCodeMirrorEditor = (props?: UseCodeMirrorEditor): UseCodeMirrorE
     view.focus();
   }, [view]);
 
-  useEffect(() => {
-    if (props?.container != null) {
-      setContainer(props.container);
-    }
-  }, [props?.container, setContainer]);
-
   return {
     ...codemirror,
     initState,

packages/editor/src/stores/codemirror-editor.ts

@@ -5,8 +5,9 @@ import { scrollPastEnd } from '@codemirror/view';
 import {
   type SWRResponseWithUtils, withUtils, useSWRStatic,
 } from '@growi/core/dist/swr';
+import type { UseCodeMirror } from '@uiw/react-codemirror';
 
-import type { UseCodeMirrorEditor, UseCodeMirrorEditorResponse } from '../services';
+import type { UseCodeMirrorEditor } from '../services';
 import { useCodeMirrorEditor } from '../services';
 
 const defaultExtensionsMain: Extension[] = [
@@ -17,8 +18,8 @@ type MainEditorUtils = {
   // impl something
 };
 
-export const useCodeMirrorEditorMain = (container?: HTMLDivElement | null): SWRResponseWithUtils<MainEditorUtils, UseCodeMirrorEditorResponse> => {
-  const props = useMemo<UseCodeMirrorEditor>(() => {
+export const useCodeMirrorEditorMain = (container?: HTMLDivElement | null): SWRResponseWithUtils<MainEditorUtils, UseCodeMirrorEditor> => {
+  const props = useMemo<UseCodeMirror>(() => {
     return {
       container,
       autoFocus: true,