Yuki Takei 1 год назад
Родитель
Сommit
92ec835318
22 измененных файлов с 13 добавлено и 9 удалено
  1. 1 1
      packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.tsx
  2. 2 1
      packages/editor/src/index.ts
  3. 1 0
      packages/editor/src/services-ext/index.ts
  4. 1 0
      packages/editor/src/services-ext/use-codemirror-editor/index.ts
  5. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/use-codemirror-editor.ts
  6. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/append-extensions.ts
  7. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/focus.ts
  8. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/fold-drawio.ts
  9. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/get-doc.ts
  10. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/init-doc.ts
  11. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/insert-markdown-elements.ts
  12. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/insert-prefix.ts
  13. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/insert-text.ts
  14. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/replace-text.ts
  15. 0 0
      packages/editor/src/services-ext/use-codemirror-editor/utils/set-caret-line.ts
  16. 0 1
      packages/editor/src/services/codemirror-editor/index.ts
  17. 0 1
      packages/editor/src/services/index.ts
  18. 2 0
      packages/editor/src/services/table/index.ts
  19. 1 1
      packages/editor/src/services/table/insert-new-row-to-table-markdown.ts
  20. 0 0
      packages/editor/src/services/table/use-show-table-icon.ts
  21. 1 2
      packages/editor/src/stores/codemirror-editor.ts
  22. 4 2
      packages/editor/src/stores/use-editor-settings.ts

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

@@ -17,7 +17,7 @@ import {
 import {
   adjustPasteData, getStrFromBol,
 } from '../../services/paste-util/paste-markdown-util';
-import { useShowTableIcon } from '../../services/table-util/use-show-table-icon';
+import { useShowTableIcon } from '../../services/table';
 import { useDefaultExtensions, useCodeMirrorEditorIsolated, useEditorSettings } from '../../stores';
 
 import { Toolbar } from './Toolbar';

+ 2 - 1
packages/editor/src/index.ts

@@ -1,4 +1,5 @@
 export * from './components';
 export * from './consts';
-export * from './services';
+export * from './models';
+export * from './services-ext';
 export * from './stores';

+ 1 - 0
packages/editor/src/services-ext/index.ts

@@ -0,0 +1 @@
+export * from './use-codemirror-editor';

+ 1 - 0
packages/editor/src/services-ext/use-codemirror-editor/index.ts

@@ -0,0 +1 @@
+export * from './use-codemirror-editor';

+ 0 - 0
packages/editor/src/services/codemirror-editor/use-codemirror-editor/use-codemirror-editor.ts → packages/editor/src/services-ext/use-codemirror-editor/use-codemirror-editor.ts


+ 0 - 0
packages/editor/src/services/codemirror-editor/use-codemirror-editor/utils/append-extensions.ts → packages/editor/src/services-ext/use-codemirror-editor/utils/append-extensions.ts


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


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


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


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


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


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


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


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


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


+ 0 - 1
packages/editor/src/services/codemirror-editor/index.ts

@@ -1 +0,0 @@
-export * from './use-codemirror-editor/use-codemirror-editor';

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

@@ -1,4 +1,3 @@
-export * from './codemirror-editor';
 export * from './file-dropzone';
 export * from './editor-theme';
 export * from './keymaps';

+ 2 - 0
packages/editor/src/services/table/index.ts

@@ -0,0 +1,2 @@
+export * from './insert-new-row-to-table-markdown';
+export * from './use-show-table-icon';

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

@@ -1,6 +1,6 @@
 import { EditorView } from '@codemirror/view';
 
-import { MarkdownTable } from './markdown-table';
+import { MarkdownTable } from '../../models';
 
 // https://regex101.com/r/7BN2fR/10
 const linePartOfTableRE = /^([^\r\n|]*)\|(([^\r\n|]*\|)+)$/;

+ 0 - 0
packages/editor/src/services/table-util/use-show-table-icon.ts → packages/editor/src/services/table/use-show-table-icon.ts


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

@@ -5,8 +5,7 @@ import type { ReactCodeMirrorProps, UseCodeMirror } from '@uiw/react-codemirror'
 import type { SWRResponse } from 'swr';
 import deepmerge from 'ts-deepmerge';
 
-import type { UseCodeMirrorEditor } from '../services';
-import { useCodeMirrorEditor } from '../services';
+import { type UseCodeMirrorEditor, useCodeMirrorEditor } from '../services-ext';
 
 
 const isValid = (u: UseCodeMirrorEditor) => {

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

@@ -6,10 +6,12 @@ import {
 } from '@codemirror/view';
 
 import type { EditorSettings } from '../consts';
-import type { UseCodeMirrorEditor, EditorTheme, KeyMapMode } from '../services';
+import type { EditorTheme, KeyMapMode } from '../services';
 import { getEditorTheme, getKeymap } from '../services';
+import type { UseCodeMirrorEditor } from '../services-ext';
 import { insertNewlineContinueMarkup } from '../services/list-util/insert-newline-continue-markup';
-import { insertNewRowToMarkdownTable, isInTable } from '../services/table-util/insert-new-row-to-table-markdown';
+import { insertNewRowToMarkdownTable, isInTable } from '../services/table';
+
 
 export const useEditorSettings = (
     codeMirrorEditor?: UseCodeMirrorEditor,