yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Editor components to be injected by associated extension (#6093)

Browse Source
This commit is contained in:
Tom Moor
2023-10-31 21:55:55 -04:00
committed by GitHub
parent 44198732d3
commit df6d8c12cc
25 changed files with 371 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/scenes/Document/components/CommentEditor.tsx
View File

@@ -2,8 +2,14 @@ import * as React from "react";
import { basicExtensions, withComments } from "@shared/editor/nodes";
import Editor, { Props as EditorProps } from "~/components/Editor";
import type { Editor as SharedEditor } from "~/editor";
import EmojiMenuExtension from "~/editor/extensions/EmojiMenu";
import MentionMenuExtension from "~/editor/extensions/MentionMenu";
const extensions = withComments(basicExtensions);
const extensions = [
...withComments(basicExtensions),
EmojiMenuExtension,
MentionMenuExtension,
];
const CommentEditor = (
props: EditorProps,

18
app/scenes/Document/components/Editor.tsx
View File

@@ -8,8 +8,14 @@ import { TeamPreference } from "@shared/types";
import Comment from "~/models/Comment";
import Document from "~/models/Document";
import { RefHandle } from "~/components/ContentEditable";
import { useDocumentContext } from "~/components/DocumentContext";
import Editor, { Props as EditorProps } from "~/components/Editor";
import Flex from "~/components/Flex";
import BlockMenuExtension from "~/editor/extensions/BlockMenu";
import EmojiMenuExtension from "~/editor/extensions/EmojiMenu";
import FindAndReplaceExtension from "~/editor/extensions/FindAndReplace";
import HoverPreviewsExtension from "~/editor/extensions/HoverPreviews";
import MentionMenuExtension from "~/editor/extensions/MentionMenu";
import useCurrentTeam from "~/hooks/useCurrentTeam";
import useCurrentUser from "~/hooks/useCurrentUser";
import useFocusedComment from "~/hooks/useFocusedComment";
@@ -20,14 +26,20 @@ import {
documentPath,
matchDocumentHistory,
} from "~/utils/routeHelpers";
import { useDocumentContext } from "../../../components/DocumentContext";
import MultiplayerEditor from "./AsyncMultiplayerEditor";
import DocumentMeta from "./DocumentMeta";
import DocumentTitle from "./DocumentTitle";
const extensions = withComments(richExtensions);
const extensions = [
...withComments(richExtensions),
BlockMenuExtension,
EmojiMenuExtension,
MentionMenuExtension,
FindAndReplaceExtension,
HoverPreviewsExtension,
];
type Props = Omit<EditorProps, "extensions" | "editorStyle"> & {
type Props = Omit<EditorProps, "editorStyle"> & {
onChangeTitle: (title: string) => void;
onChangeEmoji: (emoji: string | null) => void;
id: string;