@portone/docx-editor 0.5.0 → 0.6.0

package/dist/schema/wrappers.js

@@ -0,0 +1,77 @@
+// src/schema/wrappers.ts
+var WRAPPER_GROUP = "wrapper";
+var WRAPPER_ATTRS = {
+  /** Outer-to-inner order as read from the file; equal depths fall back to declaration rank */
+  depth: { default: 0 },
+  /** Which occurrence this is in the opened document, so two wrappers written alike stay apart */
+  key: { default: 0 }
+};
+var FACTS = /* @__PURE__ */ new WeakMap();
+var NO_WRAPPERS = [];
+function factsOf(type) {
+  const known = FACTS.get(type);
+  if (known) return known;
+  const facts = {
+    wrapper: (type.spec.group ?? "").split(" ").includes(WRAPPER_GROUP),
+    rank: Object.keys(type.schema.marks).indexOf(type.name)
+  };
+  FACTS.set(type, facts);
+  return facts;
+}
+function isWrapperType(type) {
+  return factsOf(type).wrapper;
+}
+function depthOf(mark) {
+  const depth = mark.attrs.depth;
+  return typeof depth === "number" ? depth : 0;
+}
+function wrapperMarks(node) {
+  const marks = node.marks;
+  let found = 0;
+  for (const mark of marks) {
+    if (factsOf(mark.type).wrapper) found += 1;
+  }
+  if (found === 0) return NO_WRAPPERS;
+  const wrappers = found === marks.length ? [...marks] : marks.filter((mark) => factsOf(mark.type).wrapper);
+  if (found < 2) return wrappers;
+  return wrappers.sort(
+    (a, b) => depthOf(a) - depthOf(b) || factsOf(a.type).rank - factsOf(b.type).rank
+  );
+}
+function wrappersOf(node, kind) {
+  return wrapperMarks(node).filter((mark) => mark.type === kind);
+}
+function wrapperOf(node, kind) {
+  return wrapperMarks(node).find((mark) => mark.type === kind) ?? null;
+}
+function innermostDepth(marks) {
+  return marks.reduce(
+    (deepest, mark) => factsOf(mark.type).wrapper ? Math.max(deepest, depthOf(mark)) : deepest,
+    -1
+  );
+}
+function sharedWrappers(nodes) {
+  const first = nodes.at(0);
+  if (first === void 0) return [];
+  let shared = wrapperMarks(first);
+  for (const node of nodes.slice(1)) {
+    const marks = wrapperMarks(node);
+    const differs = shared.findIndex((mark, index) => {
+      const beside = marks[index];
+      return beside === void 0 || !mark.eq(beside);
+    });
+    if (differs !== -1) shared = shared.slice(0, differs);
+    if (shared.length === 0) break;
+  }
+  return shared;
+}
+export {
+  WRAPPER_ATTRS,
+  WRAPPER_GROUP,
+  innermostDepth,
+  isWrapperType,
+  sharedWrappers,
+  wrapperMarks,
+  wrapperOf,
+  wrappersOf
+};

package/dist/styles/classNames.d.ts

@@ -140,6 +140,8 @@ export declare const editorClassNames: {
     readonly commentMeta: "docx-editor-comment-meta";
     readonly commentAuthor: "docx-editor-comment-author";
     readonly commentDate: "docx-editor-comment-date";
+    /** The note on a card whose comment lost the text it was written for */
+    readonly commentDetached: "docx-editor-comment-detached";
     readonly commentBody: "docx-editor-comment-body";
     readonly commentActions: "docx-editor-comment-actions";
     readonly commentPrimaryAction: "docx-editor-comment-primary-action";

package/dist/styles/classNames.js

@@ -136,6 +136,8 @@ var editorClassNames = {
   commentMeta: `${PREFIX}-comment-meta`,
   commentAuthor: `${PREFIX}-comment-author`,
   commentDate: `${PREFIX}-comment-date`,
+  /** The note on a card whose comment lost the text it was written for */
+  commentDetached: `${PREFIX}-comment-detached`,
   commentBody: `${PREFIX}-comment-body`,
   commentActions: `${PREFIX}-comment-actions`,
   commentPrimaryAction: `${PREFIX}-comment-primary-action`,

package/dist/styles.css

@@ -270,12 +270,15 @@
   margin-top: 2px;
 }
 
-button.docx-editor-comment-meta {
-  cursor: pointer;
+.docx-editor-comment-detached {
+  display: block;
+  margin-top: 2px;
+  color: #8a8a8a;
+  font-style: italic;
 }
 
-button.docx-editor-comment-meta:disabled {
-  cursor: default;
+button.docx-editor-comment-meta {
+  cursor: pointer;
 }
 
 .docx-editor-comment-body {

package/dist/ui/CommentsPanel.d.ts

@@ -1,7 +1,12 @@
 import type { EditorState } from "prosemirror-state";
 import type { EditorView } from "prosemirror-view";
 import { type ReactElement } from "react";
-import { type CommentAuthor } from "../editor/commands/commentCommands";
+import { type CommentAuthor, type DocumentComment } from "../editor/commands/commentCommands";
+/**
+ * Whether the rail beside the page carries this comment: the thread is unsettled, and the text it
+ * was written for is still there to draw it next to.
+ */
+export declare function shownBesideThePage(comment: DocumentComment): boolean;
 export interface CommentsPanelProps {
     view: EditorView;
     state: EditorState;

package/dist/ui/CommentsPanel.js

@@ -43,6 +43,19 @@ function run(view, command) {
 }
 var REFUSED_COMMENT = "This comment could not be added. The text it was written for may have been changed or locked since.";
 var REFUSED_REPLY = "This reply could not be added. The comment it answers may have been changed or deleted since.";
+var DETACHED_LABEL = "Original content deleted";
+function shownBesideThePage(comment) {
+  return !comment.resolved && comment.anchored;
+}
+function CommentIdentity({
+  comment
+}) {
+  const date = shownDate(comment.date);
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx("span", { className: editorClassNames.commentAuthor, children: comment.author ?? "Unknown author" }),
+    date && /* @__PURE__ */ jsx("span", { className: editorClassNames.commentDate, children: date })
+  ] });
+}
 function sameTarget(left, right) {
   return left?.commentId === right.commentId && left.replyId === right.replyId;
 }
@@ -74,7 +87,7 @@ function CommentsPanel({
       if (Number.isNaN(leftTime)) return 1;
       if (Number.isNaN(rightTime)) return -1;
       return rightTime - leftTime;
-    }) : comments.filter((comment) => !comment.resolved),
+    }) : comments.filter(shownBesideThePage),
     [allCommentsOpen, comments]
   );
   const { positions, canvasHeight } = useCommentRailLayout({
@@ -158,22 +171,26 @@ function CommentsPanel({
                   {
                     className: editorClassNames.commentPosition,
                     "data-resolved": comment.resolved ? "true" : void 0,
+                    "data-detached": comment.anchored ? void 0 : "true",
                     "data-comment-position": comment.id,
                     style: allCommentsOpen ? void 0 : { top: `${positions.get(comment.id) ?? 64}px` },
                     children: /* @__PURE__ */ jsxs("div", { className: editorClassNames.commentCard, children: [
                       /* @__PURE__ */ jsxs("div", { className: editorClassNames.commentHeader, children: [
-                        /* @__PURE__ */ jsxs(
+                        comment.anchored ? /* @__PURE__ */ jsx(
                           "button",
                           {
                             type: "button",
                             className: editorClassNames.commentMeta,
                             onClick: () => run(view, selectComment(comment.id)),
-                            disabled: comment.resolved,
-                            children: [
-                              /* @__PURE__ */ jsx("span", { className: editorClassNames.commentAuthor, children: comment.author ?? "Unknown author" }),
-                              shownDate(comment.date) && /* @__PURE__ */ jsx("span", { className: editorClassNames.commentDate, children: shownDate(comment.date) })
-                            ]
+                            children: /* @__PURE__ */ jsx(CommentIdentity, { comment })
                           }
+                        ) : (
+                          // Nothing on the page to go to, so the identity is text rather than a button:
+                          // a click here leaves the caret and the scroll where the reader left them
+                          /* @__PURE__ */ jsxs("div", { className: editorClassNames.commentMeta, children: [
+                            /* @__PURE__ */ jsx(CommentIdentity, { comment }),
+                            /* @__PURE__ */ jsx("span", { className: editorClassNames.commentDetached, children: DETACHED_LABEL })
+                          ] })
                         ),
                         writer !== null && !rootEditing && /* @__PURE__ */ jsxs("div", { className: editorClassNames.commentIconActions, children: [
                           rootOwned && !comment.resolved && /* @__PURE__ */ jsx(
@@ -361,5 +378,6 @@ function CommentsPanel({
   );
 }
 export {
-  CommentsPanel
+  CommentsPanel,
+  shownBesideThePage
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portone/docx-editor",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "A simple DOCX editor for React, built directly on OOXML.",
   "license": "Apache-2.0",
   "type": "module",
@@ -107,7 +107,8 @@
     "build:demo": "vite build --config demo/vite.config.ts",
     "dev:site": "pnpm --filter @portone/docx-editor-site dev",
     "build:site": "pnpm --filter @portone/docx-editor-site build",
-    "check": "pnpm lint && pnpm typecheck && pnpm test && pnpm test:fixtures && pnpm test:site-release && pnpm check:demo-library",
+    "bench": "vitest run --config vitest.bench.config.ts --disableConsoleIntercept",
+    "check": "pnpm lint && pnpm typecheck && pnpm test && pnpm test:fixtures && pnpm test:site-release && pnpm test:release && pnpm check:demo-library",
     "typecheck": "tsc --noEmit && tsc --noEmit -p e2e && tsc --noEmit -p demo && pnpm --filter @portone/docx-editor-site typecheck",
     "lint": "pnpm biome check . --diagnostic-level=error",
     "test": "vitest run",
@@ -119,9 +120,10 @@
     "api:update": "pnpm build && node scripts/api-report.mjs --local",
     "spec": "node scripts/index-ooxml-spec.mjs",
     "changeset": "changeset",
-    "changeset:version": "changeset version",
+    "release:pr": "node scripts/release.mjs pr",
     "test:e2e": "playwright test",
-    "test:site-release": "node --test scripts/site-release.test.mjs"
+    "test:site-release": "node --test scripts/site-release.test.mjs",
+    "test:release": "node --test scripts/release.test.mjs"
   },
   "types": "./dist/index.d.ts"
 }