edytor 1.0.0-rc.3 → 2.0.0

package/dist/plugins/comments/CommentsController.svelte.js

@@ -1,9 +1,9 @@
 import { selectedTextSpans } from '../../selection/visibility.js';
 import { Text } from '../../text/text.svelte.js';
-import { reveal } from '../../selection/replaceSelection.js';
+import { showText } from '../planned.js';
 import { COMMENT_MARK, blockCommentRuns, commentId, joinAnchors } from '../../crdt/protocols/comments.js';
 import { CommentThreads } from '../../collaboration/comments/threads.js';
-import { englishLabels } from '../../labels.js';
+import { takeKeys } from '../../events/onFocus.js';
 const avatarColors = ['#e16259', '#d9730d', '#cb912f', '#448361', '#337ea9', '#9065b0', '#c14c8a'];
 /**
  * The comments plugin's state and actions (`plugins/comments`): the
@@ -33,13 +33,11 @@ export class CommentsController {
     #off = [];
     client;
     user;
-    labels;
     constructor(edytor, options) {
         this.edytor = edytor;
         this.options = options;
         this.client = options.client;
         this.user = options.user;
-        this.labels = options.labels ?? englishLabels.comments;
     }
     /**
      * The blocks holding an anchor, and their runs by thread: read once at
@@ -102,10 +100,10 @@ export class CommentsController {
     thread(id) {
         return this.threads.find((thread) => thread.id === id);
     }
-    /** A user as the sidebar shows them: their name, avatar and color. */
+    /** A user as the sidebar shows them: their name (else their id), avatar and color. */
     userOf = (id) => {
         const known = id === this.user.id ? this.user : { id, ...this.options.users?.(id) };
-        const name = known.name ?? (id === this.user.id ? this.labels.you : id);
+        const name = known.name ?? id;
         let hash = 0;
         for (const char of id)
             hash = (hash * 31 + char.charCodeAt(0)) | 0;
@@ -133,7 +131,7 @@ export class CommentsController {
         const detach = client.attach?.({
             order: () => edytor.facade.order(),
             contentItems: (id) => edytor.facade.contentItems(id),
-            unsetMark: (block, offset, length, mark) => edytor.facade.unsetMark(block, offset, length, mark),
+            formatRange: (block, offset, length, marks) => edytor.facade.formatRange(block, offset, length, marks),
             // A store's removal is no step of this view's history.
             transact: (fn) => (edytor.doc._transaction ? fn() : edytor.dispatcher.outside(() => fn()))
         });
@@ -203,7 +201,9 @@ export class CommentsController {
         if (!this.canComment)
             return false;
         const { facade, selection } = edytor;
-        const { isCollapsed, startBlock } = selection.state;
+        const { startText } = selection.textRange();
+        const { isCollapsed } = selection.projection;
+        const startBlock = startText?.parent;
         const spans = isCollapsed
             ? (startBlock?.content ?? []).flatMap((part) => part instanceof Text && part.length > 0
                 ? [{ text: part, start: 0, end: part.length }]
@@ -273,17 +273,13 @@ export class CommentsController {
     };
     /** The one write of a thread's anchor: its mark over `runs`, one command. */
     #anchor = (thread, runs) => {
-        const { facade, dispatcher, idToBlock } = this.edytor;
+        const { facade } = this.edytor;
         if (runs.length === 0)
             return 'noop';
         const mark = `${COMMENT_MARK}:${thread}`;
         const prepare = (payload) => facade.compose(...payload.runs.map(({ block, offset, length }) => facade.prepare.formatRange(block, offset, length, { [mark]: { id: payload.thread } })));
-        const block = idToBlock.get(runs[0].block) ?? this.edytor.root;
-        dispatcher.dispatch('addComment', { thread, runs }, { block }, (payload, plan = prepare(payload)) => {
-            if ('writes' in plan)
-                facade.apply(plan);
-        }, prepare);
-        return dispatcher.last?.operation === 'addComment' ? dispatcher.last.status : 'refused';
+        const block = this.edytor.idToBlock.get(runs[0].block);
+        return this.edytor.dispatcher.plan('addComment', { thread, runs }, prepare, block).status;
     };
     // ── A thread's actions ───────────────────────────────────────────────
     reply = async (thread, body) => body.trim() ? (await this.#send({ op: 'reply', thread, body })) !== null : false;
@@ -301,14 +297,8 @@ export class CommentsController {
     focus = (thread) => {
         this.active = thread;
         const run = thread ? this.anchors.get(thread)?.[0] : undefined;
-        const block = run && this.edytor.idToBlock.get(run.block);
-        if (block) {
-            reveal(block);
-            block.textAtOffset(run.offset)?.text.node?.scrollIntoView?.({
-                block: 'nearest',
-                inline: 'nearest'
-            });
-        }
+        if (run)
+            showText(this.edytor, run.block, run.offset);
         this.edytor.overlay.invalidate();
     };
     /**
@@ -344,8 +334,7 @@ export class CommentsController {
         ].join('');
     });
     #refocus = () => {
-        this.edytor.expectInternalFocus();
-        this.edytor.node?.focus({ preventScroll: true });
+        takeKeys(this.edytor);
         this.edytor.overlay.invalidate();
     };
 }