Skip to content

Commit fae62fc

Browse files
committed
chore(refactor): extract useEditor into its own file
Signed-off-by: Max <max@nextcloud.com>
1 parent 057a682 commit fae62fc

15 files changed

Lines changed: 40 additions & 29 deletions

src/components/Assistant.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ import NcActionButton from '@nextcloud/vue/components/NcActionButton'
162162
import NcActionSeparator from '@nextcloud/vue/components/NcActionSeparator'
163163
import NcListItem from '@nextcloud/vue/components/NcListItem'
164164
import NcModal from '@nextcloud/vue/components/NcModal'
165-
import { useEditor, useEditorFlags, useFileMixin } from './Editor.provider.ts'
165+
import { useEditorFlags, useFileMixin } from './Editor.provider.ts'
166+
import { useEditor } from '../composables/useEditor.ts'
166167
import { FloatingMenu } from '@tiptap/vue-2'
167168
import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
168169
import markdownit from '../markdownit/index.js'

src/components/BaseReader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<script>
2626
import { Editor } from '@tiptap/core'
2727
import { EditorContent } from '@tiptap/vue-2'
28-
import { provideEditor } from './Editor.provider.ts'
28+
import { provideEditor } from '../composables/useEditor.ts'
2929
import {
3030
useOutlineStateMixin,
3131
useOutlineActions,

src/components/CollisionResolveDialog.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
</template>
3030

3131
<script>
32-
import { useEditor, useEditorFlags, useSyncServiceMixin } from './Editor.provider.ts'
32+
import { useEditorFlags, useSyncServiceMixin } from './Editor.provider.ts'
33+
import { useEditor } from '../composables/useEditor.ts'
3334
import NcButton from '@nextcloud/vue/components/NcButton'
3435
import { useEditorMethods } from '../composables/useEditorMethods.ts'
3536
export default {

src/components/Editor.provider.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,12 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import type { Editor } from '@tiptap/core'
76
import { logger } from '../helpers/logger.js'
8-
import { provide, inject, shallowRef, ref, computed } from 'vue'
9-
import type { InjectionKey, Ref, ShallowReactive, ShallowRef } from 'vue'
7+
import { provide, inject, ref, computed } from 'vue'
8+
import type { InjectionKey, Ref, ShallowReactive } from 'vue'
109
import { isPublicShare } from '@nextcloud/sharing/public'
1110
import { loadState } from '@nextcloud/initial-state'
1211

13-
export const editorKey = Symbol('tiptap:editor') as InjectionKey<
14-
ShallowRef<Editor | undefined>
15-
>
16-
export const provideEditor = () => {
17-
const editor: ShallowRef<Editor | undefined> = shallowRef(undefined)
18-
provide(editorKey, editor)
19-
return { editor }
20-
}
21-
export const useEditor = () => {
22-
const editor = inject(editorKey, shallowRef(undefined))
23-
return { editor }
24-
}
25-
2612
export interface EditorFlags {
2713
isPublic: Ref<boolean>
2814
isRichEditor: Ref<boolean>

src/components/Editor.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ import { Doc } from 'yjs'
9292
import { useElementSize } from '@vueuse/core'
9393
9494
import {
95-
provideEditor,
9695
FILE,
9796
ATTACHMENT_RESOLVER,
9897
IS_MOBILE,
9998
SYNC_SERVICE,
10099
provideEditorFlags,
101100
} from './Editor.provider.ts'
101+
import { provideEditor } from '../composables/useEditor.ts'
102102
import ReadonlyBar from './Menu/ReadonlyBar.vue'
103103
104104
import { logger } from '../helpers/logger.js'

src/components/Editor/ContentContainer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<script>
2424
import { EditorContent } from '@tiptap/vue-2'
25-
import { useEditor } from '../Editor.provider.ts'
25+
import { useEditor } from '../../composables/useEditor.ts'
2626
import { useOutlineStateMixin } from './Wrapper.provider.js'
2727
import EditorOutline from './EditorOutline.vue'
2828

src/components/Editor/MarkdownContentEditor.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import { Editor } from '@tiptap/core'
2727
/* eslint-disable import/no-named-as-default */
2828
import History from '@tiptap/extension-history'
2929
import { getCurrentUser } from '@nextcloud/auth'
30-
import { provideEditor, ATTACHMENT_RESOLVER, editorFlagsKey } from '../Editor.provider.ts'
30+
import { ATTACHMENT_RESOLVER, editorFlagsKey } from '../Editor.provider.ts'
31+
import { provideEditor } from '../../composables/useEditor.ts'
3132
import { createMarkdownSerializer } from '../../extensions/Markdown.js'
3233
import AttachmentResolver from '../../services/AttachmentResolver.js'
3334
import markdownit from '../../markdownit/index.js'

src/components/Editor/MediaHandler.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ import { logger } from '../../helpers/logger.js'
3232
import { useIsMobile } from '@nextcloud/vue/composables/useIsMobile'
3333
3434
import {
35-
useEditor,
3635
useFileMixin,
3736
useSyncServiceMixin,
3837
} from '../Editor.provider.ts'
38+
import { useEditor } from '../../composables/useEditor.ts'
3939
4040
import {
4141
ACTION_ATTACHMENT_PROMPT,

src/components/Editor/TableOfContents.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</template>
2424

2525
<script>
26-
import { useEditor } from '../Editor.provider.ts'
26+
import { useEditor } from '../../composables/useEditor.ts'
2727
import { headingAnchorPluginKey } from '../../plugins/headingAnchor.js'
2828
2929
export default {

src/components/Menu/BaseActionEntry.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
import debounce from 'debounce'
99

10-
import { useEditor, useIsMobileMixin } from '../Editor.provider.ts'
10+
import { useIsMobileMixin } from '../Editor.provider.ts'
11+
import { useEditor } from '../../composables/useEditor.ts'
1112
import { useOutlineActions, useOutlineStateMixin, useReadOnlyActions } from '../Editor/Wrapper.provider.js'
1213
import { getActionState, getKeys, getKeyshortcuts } from './utils.js'
1314

0 commit comments

Comments
 (0)