Yuki Takei 5 месяцев назад
Родитель
Сommit
eebbbbaa27
33 измененных файлов с 38 добавлено и 36 удалено
  1. 4 3
      packages/editor/src/client/components-internal/CodeMirrorEditor/CodeMirrorEditor.tsx
  2. 1 1
      packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/AttachmentsDropdownItem.tsx
  3. 3 2
      packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/AttachmentsDropup.tsx
  4. 1 1
      packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/EmojiButton.tsx
  5. 1 1
      packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/Toolbar.tsx
  6. 1 1
      packages/editor/src/client/components-internal/playground/Playground.tsx
  7. 1 1
      packages/editor/src/client/components-internal/playground/states/socket.ts
  8. 1 1
      packages/editor/src/client/components/CodeMirrorEditorComment.tsx
  9. 1 1
      packages/editor/src/client/components/CodeMirrorEditorMain.tsx
  10. 1 1
      packages/editor/src/client/components/CodeMirrorEditorReadOnly.tsx
  11. 1 1
      packages/editor/src/client/components/diff/CodeMirrorEditorDiff.tsx
  12. 1 1
      packages/editor/src/client/components/diff/MergeViewer.tsx
  13. 1 1
      packages/editor/src/client/services-internal/file-dropzone/use-file-dropzone/use-file-dropzone.ts
  14. 1 1
      packages/editor/src/client/services-internal/table/use-show-table-icon.ts
  15. 1 1
      packages/editor/src/client/services-internal/unified-merge-view/use-customized-button-styles.ts
  16. 1 1
      packages/editor/src/client/services-internal/unified-merge-view/use-unified-merge-view.ts
  17. 1 1
      packages/editor/src/client/services/unified-merge-view/index.ts
  18. 1 1
      packages/editor/src/client/services/use-codemirror-editor/use-codemirror-editor.ts
  19. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/append-extensions.ts
  20. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/editor-shortcuts/add-multi-cursor.ts
  21. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/focus.ts
  22. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/fold-drawio.ts
  23. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/get-doc.ts
  24. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/init-doc.ts
  25. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/insert-markdown-elements.ts
  26. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/insert-prefix.ts
  27. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/insert-text.ts
  28. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/replace-text.ts
  29. 1 1
      packages/editor/src/client/services/use-codemirror-editor/utils/set-caret-line.ts
  30. 1 1
      packages/editor/src/client/stores/codemirror-editor.ts
  31. 1 1
      packages/editor/src/client/stores/use-collaborative-editor-mode.ts
  32. 1 1
      packages/editor/src/client/stores/use-editor-settings.ts
  33. 1 1
      packages/editor/src/client/stores/use-editor-shortcuts.ts

+ 4 - 3
packages/editor/src/client/components-internal/CodeMirrorEditor/CodeMirrorEditor.tsx

@@ -1,9 +1,9 @@
+import type { DetailedHTMLProps, JSX } from 'react';
+import { forwardRef, useEffect, useMemo, useRef } from 'react';
 import { indentUnit } from '@codemirror/language';
 import { indentUnit } from '@codemirror/language';
 import { EditorView } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
 import { AcceptedUploadFileType } from '@growi/core';
 import { AcceptedUploadFileType } from '@growi/core';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
-import type { DetailedHTMLProps, JSX } from 'react';
-import { forwardRef, useEffect, useMemo, useRef } from 'react';
 
 
 import {
 import {
   type EditorSettings,
   type EditorSettings,
@@ -20,9 +20,10 @@ import {
 import { useCodeMirrorEditorIsolated } from '../../stores/codemirror-editor';
 import { useCodeMirrorEditorIsolated } from '../../stores/codemirror-editor';
 import { useDefaultExtensions } from '../../stores/use-default-extensions';
 import { useDefaultExtensions } from '../../stores/use-default-extensions';
 import { useEditorSettings } from '../../stores/use-editor-settings';
 import { useEditorSettings } from '../../stores/use-editor-settings';
-import style from './CodeMirrorEditor.module.scss';
 import { Toolbar } from './Toolbar';
 import { Toolbar } from './Toolbar';
 
 
+import style from './CodeMirrorEditor.module.scss';
+
 const moduleClass = style['codemirror-editor'];
 const moduleClass = style['codemirror-editor'];
 
 
 // Fix IME cursor position issue by EditContext
 // Fix IME cursor position issue by EditContext

+ 1 - 1
packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/AttachmentsDropdownItem.tsx

@@ -1,5 +1,5 @@
-import type { AcceptedUploadFileType } from '@growi/core';
 import type { JSX, ReactNode } from 'react';
 import type { JSX, ReactNode } from 'react';
+import type { AcceptedUploadFileType } from '@growi/core';
 import { DropdownItem } from 'reactstrap';
 import { DropdownItem } from 'reactstrap';
 
 
 import { useFileDropzone } from '../../../services-internal';
 import { useFileDropzone } from '../../../services-internal';

+ 3 - 2
packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/AttachmentsDropup.tsx

@@ -1,5 +1,5 @@
-import { AcceptedUploadFileType } from '@growi/core';
 import { type JSX, useState } from 'react';
 import { type JSX, useState } from 'react';
+import { AcceptedUploadFileType } from '@growi/core';
 import {
 import {
   Dropdown,
   Dropdown,
   DropdownItem,
   DropdownItem,
@@ -9,9 +9,10 @@ import {
 
 
 import type { GlobalCodeMirrorEditorKey } from '../../../../consts';
 import type { GlobalCodeMirrorEditorKey } from '../../../../consts';
 import { AttachmentsDropdownItem } from './AttachmentsDropdownItem';
 import { AttachmentsDropdownItem } from './AttachmentsDropdownItem';
-import styles from './AttachmentsDropup.module.scss';
 import { LinkEditButton } from './LinkEditButton';
 import { LinkEditButton } from './LinkEditButton';
 
 
+import styles from './AttachmentsDropup.module.scss';
+
 const btnAttachmentToggleClass = styles['btn-attachment-toggle'];
 const btnAttachmentToggleClass = styles['btn-attachment-toggle'];
 
 
 type Props = {
 type Props = {

+ 1 - 1
packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/EmojiButton.tsx

@@ -1,6 +1,6 @@
+import { type CSSProperties, type JSX, useCallback, useState } from 'react';
 import emojiData from '@emoji-mart/data';
 import emojiData from '@emoji-mart/data';
 import Picker from '@emoji-mart/react';
 import Picker from '@emoji-mart/react';
-import { type CSSProperties, type JSX, useCallback, useState } from 'react';
 import { Modal } from 'reactstrap';
 import { Modal } from 'reactstrap';
 
 
 import { useResolvedTheme } from '../../../../states/ui/resolved-theme';
 import { useResolvedTheme } from '../../../../states/ui/resolved-theme';

+ 1 - 1
packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/Toolbar.tsx

@@ -1,5 +1,5 @@
-import type { AcceptedUploadFileType } from '@growi/core';
 import { type JSX, memo, useCallback, useRef } from 'react';
 import { type JSX, memo, useCallback, useRef } from 'react';
+import type { AcceptedUploadFileType } from '@growi/core';
 import SimpleBar from 'simplebar-react';
 import SimpleBar from 'simplebar-react';
 
 
 import type { GlobalCodeMirrorEditorKey } from '../../../../consts';
 import type { GlobalCodeMirrorEditorKey } from '../../../../consts';

+ 1 - 1
packages/editor/src/client/components-internal/playground/Playground.tsx

@@ -1,6 +1,6 @@
+import { type JSX, useCallback, useEffect, useMemo, useState } from 'react';
 import { AcceptedUploadFileType } from '@growi/core';
 import { AcceptedUploadFileType } from '@growi/core';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
-import { type JSX, useCallback, useEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 import { toast } from 'react-toastify';
 
 
 import type {
 import type {

+ 1 - 1
packages/editor/src/client/components-internal/playground/states/socket.ts

@@ -1,5 +1,5 @@
-import { atom, useAtomValue, useSetAtom } from 'jotai';
 import { useCallback, useEffect } from 'react';
 import { useCallback, useEffect } from 'react';
+import { atom, useAtomValue, useSetAtom } from 'jotai';
 import type { Socket } from 'socket.io-client';
 import type { Socket } from 'socket.io-client';
 
 
 // Constants
 // Constants

+ 1 - 1
packages/editor/src/client/components/CodeMirrorEditorComment.tsx

@@ -1,6 +1,6 @@
+import { type JSX, memo, useEffect } from 'react';
 import type { Extension } from '@codemirror/state';
 import type { Extension } from '@codemirror/state';
 import { keymap } from '@codemirror/view';
 import { keymap } from '@codemirror/view';
-import { type JSX, memo, useEffect } from 'react';
 
 
 import type { GlobalCodeMirrorEditorKey } from '../../consts';
 import type { GlobalCodeMirrorEditorKey } from '../../consts';
 import {
 import {

+ 1 - 1
packages/editor/src/client/components/CodeMirrorEditorMain.tsx

@@ -1,8 +1,8 @@
+import { type JSX, useEffect, useMemo } from 'react';
 import type { Extension } from '@codemirror/state';
 import type { Extension } from '@codemirror/state';
 import { keymap, scrollPastEnd } from '@codemirror/view';
 import { keymap, scrollPastEnd } from '@codemirror/view';
 import type { IUserHasId } from '@growi/core/dist/interfaces';
 import type { IUserHasId } from '@growi/core/dist/interfaces';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
-import { type JSX, useEffect, useMemo } from 'react';
 import deepmerge from 'ts-deepmerge';
 import deepmerge from 'ts-deepmerge';
 
 
 import { GlobalCodeMirrorEditorKey } from '../../consts';
 import { GlobalCodeMirrorEditorKey } from '../../consts';

+ 1 - 1
packages/editor/src/client/components/CodeMirrorEditorReadOnly.tsx

@@ -1,6 +1,6 @@
+import { type JSX, useEffect } from 'react';
 import { EditorState, type Extension, Prec } from '@codemirror/state';
 import { EditorState, type Extension, Prec } from '@codemirror/state';
 import { EditorView, keymap } from '@codemirror/view';
 import { EditorView, keymap } from '@codemirror/view';
-import { type JSX, useEffect } from 'react';
 
 
 import { GlobalCodeMirrorEditorKey } from '../../consts';
 import { GlobalCodeMirrorEditorKey } from '../../consts';
 import { CodeMirrorEditor } from '../components-internal/CodeMirrorEditor';
 import { CodeMirrorEditor } from '../components-internal/CodeMirrorEditor';

+ 1 - 1
packages/editor/src/client/components/diff/CodeMirrorEditorDiff.tsx

@@ -1,7 +1,7 @@
+import { type JSX, useEffect, useMemo, useRef } from 'react';
 import type { Extension } from '@codemirror/state';
 import type { Extension } from '@codemirror/state';
 import { placeholder, scrollPastEnd } from '@codemirror/view';
 import { placeholder, scrollPastEnd } from '@codemirror/view';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
-import { type JSX, useEffect, useMemo, useRef } from 'react';
 
 
 import { GlobalCodeMirrorEditorKey } from '../../../consts';
 import { GlobalCodeMirrorEditorKey } from '../../../consts';
 import { useCodeMirrorEditorIsolated } from '../../stores/codemirror-editor';
 import { useCodeMirrorEditorIsolated } from '../../stores/codemirror-editor';

+ 1 - 1
packages/editor/src/client/components/diff/MergeViewer.tsx

@@ -1,7 +1,7 @@
+import { memo, useEffect, useRef } from 'react';
 import { MergeView } from '@codemirror/merge';
 import { MergeView } from '@codemirror/merge';
 import { EditorState, type Extension } from '@codemirror/state';
 import { EditorState, type Extension } from '@codemirror/state';
 import { basicSetup, EditorView } from 'codemirror';
 import { basicSetup, EditorView } from 'codemirror';
-import { memo, useEffect, useRef } from 'react';
 
 
 type Props = {
 type Props = {
   leftBody: string;
   leftBody: string;

+ 1 - 1
packages/editor/src/client/services-internal/file-dropzone/use-file-dropzone/use-file-dropzone.ts

@@ -1,5 +1,5 @@
-import { AcceptedUploadFileType } from '@growi/core';
 import { useCallback, useState } from 'react';
 import { useCallback, useState } from 'react';
+import { AcceptedUploadFileType } from '@growi/core';
 import type { Accept, DropzoneOptions, DropzoneState } from 'react-dropzone';
 import type { Accept, DropzoneOptions, DropzoneState } from 'react-dropzone';
 import { useDropzone } from 'react-dropzone';
 import { useDropzone } from 'react-dropzone';
 
 

+ 1 - 1
packages/editor/src/client/services-internal/table/use-show-table-icon.ts

@@ -1,6 +1,6 @@
+import { useEffect, useState } from 'react';
 import type { ViewUpdate } from '@codemirror/view';
 import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from 'codemirror';
 import { EditorView } from 'codemirror';
-import { useEffect, useState } from 'react';
 
 
 import type { UseCodeMirrorEditor } from '../../services';
 import type { UseCodeMirrorEditor } from '../../services';
 import { isInTable } from './insert-new-row-to-table-markdown';
 import { isInTable } from './insert-new-row-to-table-markdown';

+ 1 - 1
packages/editor/src/client/services-internal/unified-merge-view/use-customized-button-styles.ts

@@ -1,5 +1,5 @@
-import { EditorView } from '@codemirror/view';
 import { useEffect } from 'react';
 import { useEffect } from 'react';
+import { EditorView } from '@codemirror/view';
 
 
 import type { UseCodeMirrorEditor } from '../../services';
 import type { UseCodeMirrorEditor } from '../../services';
 
 

+ 1 - 1
packages/editor/src/client/services-internal/unified-merge-view/use-unified-merge-view.ts

@@ -1,3 +1,4 @@
+import { useEffect } from 'react';
 import {
 import {
   getOriginalDoc,
   getOriginalDoc,
   originalDocChangeEffect,
   originalDocChangeEffect,
@@ -7,7 +8,6 @@ import {
 import type { StateEffect, Transaction } from '@codemirror/state';
 import type { StateEffect, Transaction } from '@codemirror/state';
 import { ChangeSet } from '@codemirror/state';
 import { ChangeSet } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
-import { useEffect } from 'react';
 import * as Y from 'yjs';
 import * as Y from 'yjs';
 
 
 import { deltaToChangeSpecs } from '../../../utils/delta-to-changespecs';
 import { deltaToChangeSpecs } from '../../../utils/delta-to-changespecs';

+ 1 - 1
packages/editor/src/client/services/unified-merge-view/index.ts

@@ -1,7 +1,7 @@
+import { useEffect } from 'react';
 import { acceptChunk, getChunks } from '@codemirror/merge';
 import { acceptChunk, getChunks } from '@codemirror/merge';
 import type { ViewUpdate } from '@codemirror/view';
 import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
-import { useEffect } from 'react';
 
 
 import type { UseCodeMirrorEditor } from '..';
 import type { UseCodeMirrorEditor } from '..';
 
 

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/use-codemirror-editor.ts

@@ -1,7 +1,7 @@
+import { useMemo } from 'react';
 import type { EditorState } from '@codemirror/state';
 import type { EditorState } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 import type { EditorView } from '@codemirror/view';
 import { type UseCodeMirror, useCodeMirror } from '@uiw/react-codemirror';
 import { type UseCodeMirror, useCodeMirror } from '@uiw/react-codemirror';
-import { useMemo } from 'react';
 import deepmerge from 'ts-deepmerge';
 import deepmerge from 'ts-deepmerge';
 
 
 import {
 import {

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/append-extensions.ts

@@ -1,7 +1,7 @@
+import { useCallback } from 'react';
 import type { Extension } from '@codemirror/state';
 import type { Extension } from '@codemirror/state';
 import { Compartment, StateEffect } from '@codemirror/state';
 import { Compartment, StateEffect } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 import type { EditorView } from '@codemirror/view';
-import { useCallback } from 'react';
 
 
 type CleanupFunctions = () => void;
 type CleanupFunctions = () => void;
 export type AppendExtensions = (
 export type AppendExtensions = (

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/editor-shortcuts/add-multi-cursor.ts

@@ -1,7 +1,7 @@
+import { useCallback } from 'react';
 import type { SelectionRange } from '@codemirror/state';
 import type { SelectionRange } from '@codemirror/state';
 import { EditorSelection } from '@codemirror/state';
 import { EditorSelection } from '@codemirror/state';
 import type { Command, EditorView, KeyBinding } from '@codemirror/view';
 import type { Command, EditorView, KeyBinding } from '@codemirror/view';
-import { useCallback } from 'react';
 
 
 const addMultiCursor = (view: EditorView, direction: 'up' | 'down') => {
 const addMultiCursor = (view: EditorView, direction: 'up' | 'down') => {
   const selection = view.state.selection;
   const selection = view.state.selection;

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/focus.ts

@@ -1,5 +1,5 @@
-import type { EditorView } from '@codemirror/view';
 import { useCallback } from 'react';
 import { useCallback } from 'react';
+import type { EditorView } from '@codemirror/view';
 
 
 export type Focus = () => void;
 export type Focus = () => void;
 
 

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/fold-drawio.ts

@@ -1,6 +1,6 @@
+import { useEffect } from 'react';
 import { foldEffect } from '@codemirror/language';
 import { foldEffect } from '@codemirror/language';
 import type { EditorView } from '@codemirror/view';
 import type { EditorView } from '@codemirror/view';
-import { useEffect } from 'react';
 
 
 export type FoldDrawio = void;
 export type FoldDrawio = void;
 
 

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/get-doc.ts

@@ -1,6 +1,6 @@
+import { useCallback } from 'react';
 import { Text } from '@codemirror/state';
 import { Text } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 import type { EditorView } from '@codemirror/view';
-import { useCallback } from 'react';
 
 
 export type GetDoc = () => Text;
 export type GetDoc = () => Text;
 export type GetDocString = () => string;
 export type GetDocString = () => string;

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/init-doc.ts

@@ -1,6 +1,6 @@
+import { useCallback } from 'react';
 import { Transaction } from '@codemirror/state';
 import { Transaction } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 import type { EditorView } from '@codemirror/view';
-import { useCallback } from 'react';
 
 
 export type InitDoc = (doc?: string) => void;
 export type InitDoc = (doc?: string) => void;
 
 

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/insert-markdown-elements.ts

@@ -1,5 +1,5 @@
-import type { EditorView } from '@codemirror/view';
 import { useCallback } from 'react';
 import { useCallback } from 'react';
+import type { EditorView } from '@codemirror/view';
 
 
 export type InsertMarkdownElements = (prefix: string, suffix: string) => void;
 export type InsertMarkdownElements = (prefix: string, suffix: string) => void;
 
 

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/insert-prefix.ts

@@ -1,6 +1,6 @@
+import { useCallback } from 'react';
 import type { ChangeSpec, Line, Text } from '@codemirror/state';
 import type { ChangeSpec, Line, Text } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 import type { EditorView } from '@codemirror/view';
-import { useCallback } from 'react';
 
 
 export type InsertPrefix = (
 export type InsertPrefix = (
   prefix: string,
   prefix: string,

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/insert-text.ts

@@ -1,5 +1,5 @@
-import type { EditorView } from '@codemirror/view';
 import { useCallback } from 'react';
 import { useCallback } from 'react';
+import type { EditorView } from '@codemirror/view';
 
 
 export type InsertText = (text: string) => void;
 export type InsertText = (text: string) => void;
 
 

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/replace-text.ts

@@ -1,5 +1,5 @@
-import type { EditorView } from '@codemirror/view';
 import { useCallback } from 'react';
 import { useCallback } from 'react';
+import type { EditorView } from '@codemirror/view';
 
 
 export type ReplaceText = (text: string) => void;
 export type ReplaceText = (text: string) => void;
 
 

+ 1 - 1
packages/editor/src/client/services/use-codemirror-editor/utils/set-caret-line.ts

@@ -1,7 +1,7 @@
+import { useCallback } from 'react';
 import { Compartment, StateEffect } from '@codemirror/state';
 import { Compartment, StateEffect } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
 import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
-import { useCallback } from 'react';
 
 
 export type SetCaretLine = (lineNumber?: number, schedule?: boolean) => void;
 export type SetCaretLine = (lineNumber?: number, schedule?: boolean) => void;
 
 

+ 1 - 1
packages/editor/src/client/stores/codemirror-editor.ts

@@ -1,3 +1,4 @@
+import { useEffect, useMemo, useRef } from 'react';
 import { deepEquals } from '@growi/core/dist/utils';
 import { deepEquals } from '@growi/core/dist/utils';
 import type {
 import type {
   ReactCodeMirrorProps,
   ReactCodeMirrorProps,
@@ -5,7 +6,6 @@ import type {
 } from '@uiw/react-codemirror';
 } from '@uiw/react-codemirror';
 import { atom, useAtom } from 'jotai';
 import { atom, useAtom } from 'jotai';
 import { atomFamily } from 'jotai/utils';
 import { atomFamily } from 'jotai/utils';
-import { useEffect, useMemo, useRef } from 'react';
 import deepmerge from 'ts-deepmerge';
 import deepmerge from 'ts-deepmerge';
 
 
 import { type UseCodeMirrorEditor, useCodeMirrorEditor } from '../services';
 import { type UseCodeMirrorEditor, useCodeMirrorEditor } from '../services';

+ 1 - 1
packages/editor/src/client/stores/use-collaborative-editor-mode.ts

@@ -1,6 +1,6 @@
+import { useEffect, useState } from 'react';
 import { keymap } from '@codemirror/view';
 import { keymap } from '@codemirror/view';
 import type { IUserHasId } from '@growi/core/dist/interfaces';
 import type { IUserHasId } from '@growi/core/dist/interfaces';
-import { useEffect, useState } from 'react';
 import { yCollab, yUndoManagerKeymap } from 'y-codemirror.next';
 import { yCollab, yUndoManagerKeymap } from 'y-codemirror.next';
 import { SocketIOProvider } from 'y-socket.io';
 import { SocketIOProvider } from 'y-socket.io';
 import * as Y from 'yjs';
 import * as Y from 'yjs';

+ 1 - 1
packages/editor/src/client/stores/use-editor-settings.ts

@@ -1,3 +1,4 @@
+import { useCallback, useEffect, useState } from 'react';
 import type { Extension } from '@codemirror/state';
 import type { Extension } from '@codemirror/state';
 import { Prec } from '@codemirror/state';
 import { Prec } from '@codemirror/state';
 import {
 import {
@@ -6,7 +7,6 @@ import {
   highlightActiveLineGutter,
   highlightActiveLineGutter,
   keymap,
   keymap,
 } from '@codemirror/view';
 } from '@codemirror/view';
-import { useCallback, useEffect, useState } from 'react';
 
 
 import type { EditorSettings, EditorTheme, KeyMapMode } from '../../consts';
 import type { EditorSettings, EditorTheme, KeyMapMode } from '../../consts';
 import type { UseCodeMirrorEditor } from '../services';
 import type { UseCodeMirrorEditor } from '../services';

+ 1 - 1
packages/editor/src/client/stores/use-editor-shortcuts.ts

@@ -1,6 +1,6 @@
+import { useEffect } from 'react';
 import type { EditorView } from '@codemirror/view';
 import type { EditorView } from '@codemirror/view';
 import { type KeyBinding, keymap } from '@codemirror/view';
 import { type KeyBinding, keymap } from '@codemirror/view';
-import { useEffect } from 'react';
 import type { KeyMapMode } from 'src/consts';
 import type { KeyMapMode } from 'src/consts';
 
 
 import type { UseCodeMirrorEditor } from '../services';
 import type { UseCodeMirrorEditor } from '../services';