Yuki Takei 1 год назад
Родитель
Сommit
0e9366a763
34 измененных файлов с 59 добавлено и 54 удалено
  1. 2 2
      packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.tsx
  2. 2 2
      packages/editor/src/components/CodeMirrorEditor/Toolbar/AttachmentsDropdownItem.tsx
  3. 1 1
      packages/editor/src/components/CodeMirrorEditor/Toolbar/Toolbar.tsx
  4. 2 1
      packages/editor/src/components/playground/Playground.tsx
  5. 2 1
      packages/editor/src/components/playground/PlaygroundController.tsx
  6. 1 1
      packages/editor/src/consts/editor-settings.ts
  7. 4 3
      packages/editor/src/services-ext/use-codemirror-editor/use-codemirror-editor.ts
  8. 3 2
      packages/editor/src/services-ext/use-codemirror-editor/utils/append-extensions.ts
  9. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/focus.ts
  10. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/fold-drawio.ts
  11. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/get-doc.ts
  12. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/init-doc.ts
  13. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/insert-markdown-elements.ts
  14. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/insert-prefix.ts
  15. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/insert-text.ts
  16. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/replace-text.ts
  17. 1 1
      packages/editor/src/services-ext/use-codemirror-editor/utils/set-caret-line.ts
  18. 1 1
      packages/editor/src/services/editor-theme/index.ts
  19. 1 1
      packages/editor/src/services/editor-theme/material.ts
  20. 1 1
      packages/editor/src/services/editor-theme/nord.ts
  21. 1 1
      packages/editor/src/services/editor-theme/original-light.ts
  22. 2 3
      packages/editor/src/services/extensions/setDataLine.ts
  23. 12 12
      packages/editor/src/services/file-dropzone/use-file-dropzone/FileDropzoneOverlay.tsx
  24. 2 2
      packages/editor/src/services/file-dropzone/use-file-dropzone/use-file-dropzone.ts
  25. 1 1
      packages/editor/src/services/keymaps/index.ts
  26. 1 1
      packages/editor/src/services/keymaps/vim.ts
  27. 1 1
      packages/editor/src/services/list-util/insert-newline-continue-markup.ts
  28. 1 1
      packages/editor/src/services/table/insert-new-row-to-table-markdown.ts
  29. 1 1
      packages/editor/src/services/table/use-show-table-icon.ts
  30. 2 1
      packages/editor/src/stores/use-default-extensions.ts
  31. 2 1
      packages/editor/src/stores/use-editor-settings.ts
  32. 1 1
      packages/editor/src/stores/use-handsontable.ts
  33. 2 2
      packages/editor/src/stores/use-link-edit-modal.ts
  34. 1 1
      packages/editor/src/stores/use-resolved-theme.ts

+ 2 - 2
packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.tsx

@@ -1,6 +1,6 @@
+import type { DetailedHTMLProps } from 'react';
 import {
   forwardRef, useMemo, useRef, useEffect,
-  DetailedHTMLProps,
 } from 'react';
 
 import { indentUnit } from '@codemirror/language';
@@ -10,7 +10,7 @@ import {
 import { AcceptedUploadFileType } from '@growi/core';
 import type { ReactCodeMirrorProps } from '@uiw/react-codemirror';
 
-import { EditorSettings, GlobalCodeMirrorEditorKey } from '../../consts';
+import type { EditorSettings, GlobalCodeMirrorEditorKey } from '../../consts';
 import {
   useFileDropzone, FileDropzoneOverlay,
 } from '../../services';

+ 2 - 2
packages/editor/src/components/CodeMirrorEditor/Toolbar/AttachmentsDropdownItem.tsx

@@ -1,6 +1,6 @@
-import { ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
-import { AcceptedUploadFileType } from '@growi/core';
+import type { AcceptedUploadFileType } from '@growi/core';
 import {
   DropdownItem,
 } from 'reactstrap';

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

@@ -1,6 +1,6 @@
 import { memo } from 'react';
 
-import { AcceptedUploadFileType } from '@growi/core';
+import type { AcceptedUploadFileType } from '@growi/core';
 
 import type { GlobalCodeMirrorEditorKey } from '../../../consts';
 

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

@@ -5,7 +5,8 @@ import {
 import { AcceptedUploadFileType } from '@growi/core';
 import { toast } from 'react-toastify';
 
-import { EditorSettings, GlobalCodeMirrorEditorKey } from '../../consts';
+import type { EditorSettings } from '../../consts';
+import { GlobalCodeMirrorEditorKey } from '../../consts';
 import type { EditorTheme, KeyMapMode } from '../../services';
 import { useCodeMirrorEditorIsolated } from '../../stores';
 import { CodeMirrorEditorMain } from '../CodeMirrorEditorMain';

+ 2 - 1
packages/editor/src/components/playground/PlaygroundController.tsx

@@ -3,8 +3,9 @@ import { useCallback } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { GlobalCodeMirrorEditorKey } from '../../consts';
+import type { EditorTheme, KeyMapMode } from '../../services';
 import {
-  AllEditorTheme, AllKeyMap, EditorTheme, KeyMapMode,
+  AllEditorTheme, AllKeyMap,
 } from '../../services';
 import { useCodeMirrorEditorIsolated } from '../../stores';
 

+ 1 - 1
packages/editor/src/consts/editor-settings.ts

@@ -1,4 +1,4 @@
-import { EditorTheme, KeyMapMode } from '../services';
+import type { EditorTheme, KeyMapMode } from '../services';
 
 export interface EditorSettings {
   theme: undefined | EditorTheme,

+ 4 - 3
packages/editor/src/services-ext/use-codemirror-editor/use-codemirror-editor.ts

@@ -1,15 +1,16 @@
 import { useMemo } from 'react';
 
-import {
+import type {
   EditorState,
 } from '@codemirror/state';
-import { EditorView } from '@codemirror/view';
+import type { EditorView } from '@codemirror/view';
 import { useCodeMirror, type UseCodeMirror } from '@uiw/react-codemirror';
 import deepmerge from 'ts-deepmerge';
 
 import { useAppendExtensions, type AppendExtensions } from './utils/append-extensions';
 import { useFocus, type Focus } from './utils/focus';
-import { FoldDrawio, useFoldDrawio } from './utils/fold-drawio';
+import type { FoldDrawio } from './utils/fold-drawio';
+import { useFoldDrawio } from './utils/fold-drawio';
 import { useGetDoc, type GetDoc } from './utils/get-doc';
 import { useInitDoc, type InitDoc } from './utils/init-doc';
 import { useInsertMarkdownElements, type InsertMarkdowElements } from './utils/insert-markdown-elements';

+ 3 - 2
packages/editor/src/services-ext/use-codemirror-editor/utils/append-extensions.ts

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { EditorView } from '@codemirror/view';
+import type { EditorView } from '@codemirror/view';
 
 export type InsertPrefix = (prefix: string, noSpaceIfPrefixExists?: boolean) => void;
 

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

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

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

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

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

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { EditorView } from '@codemirror/view';
+import type { EditorView } from '@codemirror/view';
 
 export type SetCaretLine = (lineNumber?: number) => void;
 

+ 1 - 1
packages/editor/src/services/editor-theme/index.ts

@@ -1,4 +1,4 @@
-import { Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
 
 export const getEditorTheme = async(themeName?: EditorTheme): Promise<Extension> => {
   switch (themeName) {

+ 1 - 1
packages/editor/src/services/editor-theme/material.ts

@@ -1,6 +1,6 @@
 // Ref: https://github.com/craftzdog/cm6-themes/blob/289d9e0ca6b500f4cdf68464f4f21dd8e2dd8963/packages/material-dark/src/index.ts
 import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
-import { Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 import { tags as t } from '@lezer/highlight';
 

+ 1 - 1
packages/editor/src/services/editor-theme/nord.ts

@@ -1,7 +1,7 @@
 // Ref: https://github.com/craftzdog/cm6-themes/blob/221936c525dcfc05b298cc4d4a0ba284cb7c7138/packages/nord/src/index.ts
 
 import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
-import { Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 import { tags as t } from '@lezer/highlight';
 

+ 1 - 1
packages/editor/src/services/editor-theme/original-light.ts

@@ -1,6 +1,6 @@
 // Ref: https://github.com/uiwjs/react-codemirror/blob/bf3b862923d0cb04ccf4bb9da0791bdc7fd6d29b/themes/github/src/index.ts
 
-import { Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
 import { tags as t } from '@lezer/highlight';
 import { createTheme } from '@uiw/codemirror-themes';
 

+ 2 - 3
packages/editor/src/services/extensions/setDataLine.ts

@@ -3,9 +3,8 @@
 
 
 import { RangeSetBuilder } from '@codemirror/state';
-import {
-  EditorView, Decoration, ViewPlugin, DecorationSet, ViewUpdate,
-} from '@codemirror/view';
+import type { EditorView, DecorationSet, ViewUpdate } from '@codemirror/view';
+import { Decoration, ViewPlugin } from '@codemirror/view';
 
 const stripeDeco = (view: EditorView) => {
   const builder = new RangeSetBuilder<Decoration>();

+ 12 - 12
packages/editor/src/services/file-dropzone/use-file-dropzone/FileDropzoneOverlay.tsx

@@ -2,18 +2,18 @@ type Props = {
   isEnabled: boolean,
 }
 
-export const FileDropzoneOverlay = (props: Props) => {
+export const FileDropzoneOverlay = (props: Props): JSX.Element => {
   const { isEnabled } = props;
 
-    if (isEnabled) {
-      return (
-        <div className="overlay overlay-dropzone-active">
-          <span className="overlay-content">
-            <span className="overlay-icon material-symbols-outlined">
-            </span>
+  if (isEnabled) {
+    return (
+      <div className="overlay overlay-dropzone-active">
+        <span className="overlay-content">
+          <span className="overlay-icon material-symbols-outlined">
           </span>
-        </div>
-      );
-    }
-    return <></>;
-}
+        </span>
+      </div>
+    );
+  }
+  return <></>;
+};

+ 2 - 2
packages/editor/src/services/file-dropzone/use-file-dropzone/use-file-dropzone.ts

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

+ 1 - 1
packages/editor/src/services/keymaps/index.ts

@@ -1,4 +1,4 @@
-import { Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
 import { keymap } from '@codemirror/view';
 
 

+ 1 - 1
packages/editor/src/services/keymaps/vim.ts

@@ -1,4 +1,4 @@
-import { Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
 import { Vim, vim } from '@replit/codemirror-vim';
 
 // vim useful keymap custom

+ 1 - 1
packages/editor/src/services/list-util/insert-newline-continue-markup.ts

@@ -1,5 +1,5 @@
 import type { ChangeSpec } from '@codemirror/state';
-import { EditorView } from '@codemirror/view';
+import type { EditorView } from '@codemirror/view';
 
 // https://regex101.com/r/r9plEA/1
 const indentAndMarkRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]\s))(\s*)/;

+ 1 - 1
packages/editor/src/services/table/insert-new-row-to-table-markdown.ts

@@ -1,4 +1,4 @@
-import { EditorView } from '@codemirror/view';
+import type { EditorView } from '@codemirror/view';
 
 import { MarkdownTable } from '../../models';
 

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

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 
-import { ViewUpdate } from '@codemirror/view';
+import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from 'codemirror';
 
 

+ 2 - 1
packages/editor/src/stores/use-default-extensions.ts

@@ -7,7 +7,8 @@ import { languages } from '@codemirror/language-data';
 import {
   Prec, type Extension,
 } from '@codemirror/state';
-import { keymap, EditorView, KeyBinding } from '@codemirror/view';
+import type { KeyBinding } from '@codemirror/view';
+import { keymap, EditorView } from '@codemirror/view';
 import { tags } from '@lezer/highlight';
 
 import type { UseCodeMirrorEditor } from '../services-ext';

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

@@ -1,6 +1,7 @@
 import { useEffect, useCallback, useState } from 'react';
 
-import { Prec, Extension } from '@codemirror/state';
+import type { Extension } from '@codemirror/state';
+import { Prec } from '@codemirror/state';
 import {
   keymap, type Command, highlightActiveLine, highlightActiveLineGutter,
 } from '@codemirror/view';

+ 1 - 1
packages/editor/src/stores/use-handsontable.ts

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { EditorView } from '@codemirror/view';
+import type { EditorView } from '@codemirror/view';
 import { useSWRStatic } from '@growi/core/dist/swr';
 import type { SWRResponse } from 'swr';
 

+ 2 - 2
packages/editor/src/stores/use-link-edit-modal.ts

@@ -1,7 +1,7 @@
 import { useSWRStatic } from '@growi/core/dist/swr';
-import { SWRResponse } from 'swr';
+import type { SWRResponse } from 'swr';
 
-import Linker from '../services/link-util/Linker';
+import type Linker from '../services/link-util/Linker';
 
 type LinkEditModalStatus = {
   isOpened: boolean,

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

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { ColorScheme } from '@growi/core';
+import type { ColorScheme } from '@growi/core';
 import { useSWRStatic } from '@growi/core/dist/swr';
 import type { SWRResponse } from 'swr';
 import { mutate } from 'swr';