From a77b24cf016d701ffbbbc72d71a01b38161a59ef Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sun, 9 Jun 2024 23:59:27 -0400 Subject: [PATCH] stash --- shared/editor/components/Mentions.tsx | 25 +++++++++++++++++++ .../editor/nodes/{Mention.ts => Mention.tsx} | 24 ++++++++++++------ 2 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 shared/editor/components/Mentions.tsx rename shared/editor/nodes/{Mention.ts => Mention.tsx} (83%) diff --git a/shared/editor/components/Mentions.tsx b/shared/editor/components/Mentions.tsx new file mode 100644 index 0000000000..693648509a --- /dev/null +++ b/shared/editor/components/Mentions.tsx @@ -0,0 +1,25 @@ +import * as React from "react"; +import { ComponentProps } from "../types"; + +export function MentionUser(props: ComponentProps) { + const { isSelected, node, isEditable, children, onChangeSize } = props; + + return ( + + @{node.attrs.label} + + ); +} + +export function MentionDocument(props: ComponentProps) { + const { isSelected, node, isEditable, children, onChangeSize } = props; + + return ( + + +{node.attrs.label} + + ); +} diff --git a/shared/editor/nodes/Mention.ts b/shared/editor/nodes/Mention.tsx similarity index 83% rename from shared/editor/nodes/Mention.ts rename to shared/editor/nodes/Mention.tsx index 3a9359377a..096f1680bd 100644 --- a/shared/editor/nodes/Mention.ts +++ b/shared/editor/nodes/Mention.tsx @@ -6,11 +6,14 @@ import { Schema, } from "prosemirror-model"; import { Command, TextSelection } from "prosemirror-state"; +import * as React from "react"; import { Primitive } from "utility-types"; -import { MentionType } from "@shared/types"; +import { MentionType } from "../../types"; +import { MentionDocument, MentionUser } from "../components/Mentions"; import Extension from "../lib/Extension"; import { MarkdownSerializerState } from "../lib/markdown/serializer"; import mentionRule from "../rules/mention"; +import { ComponentProps } from "../types"; export default class Mention extends Extension { get type() { @@ -51,14 +54,10 @@ export default class Mention extends Extension { }, ], toDOM: (node) => [ - "a", + "span", { - class: `${node.type.name} mention-${node.attrs.type} use-hover-preview`, + class: `${node.type.name} use-hover-preview`, id: node.attrs.id, - href: - node.attrs.type === MentionType.User - ? undefined - : `/doc/${node.attrs.modelId}`, "data-type": node.attrs.type, "data-id": node.attrs.modelId, "data-actorId": node.attrs.actorId, @@ -70,6 +69,17 @@ export default class Mention extends Extension { }; } + component = (props: ComponentProps) => { + switch (props.node.attrs.type) { + case MentionType.User: + return ; + case MentionType.Document: + return ; + default: + return null; + } + }; + get rulePlugins() { return [mentionRule]; }