@fileverse-dev/dsheet 4.0.6 → 4.1.0-cmt-1

package/dist/editor/types/comments.d.ts

@@ -1,5 +1,7 @@
 import { default as React } from 'react';
+import { CommentAnchorMove } from '../../sheet-engine/core/settings';
 
+export type { CommentAnchorMove };
 export interface CommentThread {
     id: string;
     key: string;
@@ -12,6 +14,8 @@ export interface CommentThread {
     replies: CommentReply[];
     isResolved?: boolean;
     isDeleted?: boolean;
+    /** IPFS/indexer hash — stable across local `comment-*` ids and on-chain uuids. */
+    contentHash?: string;
 }
 export interface CommentReply {
     id: string;
@@ -41,6 +45,11 @@ export interface CommentsConfig {
     commentsData: Record<string, CommentThread>;
     onSendComment: (key: string, textareaId: string) => void;
     onCommentAction: (action: CommentActionParams) => void;
+    /**
+     * Called after row/column drag-drop or a cell-range move so the host can
+     * remap comment keys. Use `remapCommentAnchors` from the package.
+     */
+    onCellPositionsChanged?: (move: CommentAnchorMove) => void;
     userName?: string;
     ownerAddress?: string;
     currentUserAddress?: string;
@@ -118,6 +127,8 @@ export interface CommentCellUIProps {
     dragHandler: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     isHover?: boolean;
     disabled?: boolean;
+    isAuthenticated?: boolean;
+    unauthenticatedFallback?: React.ReactNode;
 }
 export interface CommentsContentProps {
     sheetEditorRef: React.RefObject<SheetEditorRef>;

package/dist/editor/types.d.ts

@@ -10,7 +10,7 @@ import { DSheetContentSnapshot } from '../persistence';
 
 import * as Y from 'yjs';
 export type { ThemeKey } from '../sheet-engine/core/theme';
-export type { CommentThread, CommentReply, CommentActionParams, CommentsConfig, } from './types/comments';
+export type { CommentThread, CommentReply, CommentActionParams, CommentsConfig, CommentAnchorMove, } from './types/comments';
 export { CommentAction } from './types/comments';
 export interface SheetUpdateData {
     data: Sheet[];

package/dist/editor/utils/apply-comment-markers.d.ts

@@ -4,17 +4,9 @@ type CommentData = object | null | undefined;
  * the consumer-provided `commentData`.
  *
  * `ps` is a per-client, permission-gated *view overlay* — it is NOT persisted in
- * ydoc. Every path that rebuilds sheet data from ydoc (portal load, collab sync
- * remount, remote cell edits) produces cells WITHOUT `ps`, so this must run on
- * each such snapshot or the red-triangle indicator vanishes. Because it is
- * gated on the local `allowComments` permission, it must never be written back
- * to shared ydoc state — doing so would let one viewer wipe markers for all.
- *
- * Handles both shapes:
- * - Dense `sheet.data` (the live active sheet in `luckysheetfile`).
- * - Sparse `sheet.celldata` (plain snapshots from `ySheetArrayToPlain`, and
- *   inactive sheets). `initSheetData()` converts celldata → data on activation,
- *   so `ps` set on celldata carries through.
+ * ydoc (`shouldPersistCelldataCell` ignores marker-only cells). Empty cells are
+ * `null`, so a tiny `{ ps }` object is created in the live view only so the
+ * triangle can render. Row/column drag still owns real cell data.
  *
  * Mutates in place and returns the same array.
  */

package/dist/editor/utils/comment-anchors-ydoc.d.ts

@@ -0,0 +1,32 @@
+import * as Y from 'yjs';
+/** Sibling share key on the same Y.Doc as the sheet array. */
+export declare function getCommentAnchorsMapKey(dsheetId: string): string;
+export declare function getCommentAnchorsYMap(ydoc: Y.Doc, dsheetId: string): Y.Map<string>;
+export declare function readCommentAnchorsFromYdoc(ydoc: Y.Doc | null | undefined, dsheetId: string): Record<string, string>;
+type CommentAnchorRecord = {
+    id?: string;
+    key?: string;
+    contentHash?: string;
+};
+/**
+ * Re-key comments by identity first (id, then contentHash), then the comment's
+ * own current cell-key. Stale cell-key aliases that now belong to another
+ * thread must not steal or duplicate it.
+ */
+export declare function applyCommentAnchorMap<T extends CommentAnchorRecord>(commentsData: Record<string, T> | null | undefined, anchors: Record<string, string>): Record<string, T>;
+export declare function applyYdocCommentAnchors<T extends CommentAnchorRecord>(commentsData: Record<string, T> | object | null | undefined, ydoc: Y.Doc | null | undefined, dsheetId: string): Record<string, T>;
+/**
+ * Persist current commentId/contentHash → cell-key into ydoc so viewers/publish
+ * see the remapped positions. No-ops when the map already matches.
+ */
+export declare function writeCommentAnchorsToYdoc({ ydoc, dsheetId, commentsData, handleContentPortal, skipUnmapped, keyMoves, }: {
+    ydoc: Y.Doc | null | undefined;
+    dsheetId: string;
+    commentsData: Record<string, CommentAnchorRecord> | null | undefined;
+    handleContentPortal?: () => void;
+    /** When the map already has entries, skip comments that are not in it yet. */
+    skipUnmapped?: boolean;
+    /** old cell-key → new cell-key so indexer keys still resolve after remap. */
+    keyMoves?: Record<string, string>;
+}): void;
+export {};

package/dist/editor/utils/remap-comment-anchors.d.ts

@@ -0,0 +1,26 @@
+import { CommentAnchorMove } from '../../sheet-engine/core/settings';
+
+/**
+ * old cell-key → new cell-key, matched by comment id. Used when writing
+ * ydoc aliases so indexer keys still resolve after a remap.
+ */
+export declare function commentKeyMovesById<T extends {
+    id?: string;
+    key?: string;
+}>(before: Record<string, T>, after: Record<string, T>): Record<string, string>;
+/**
+ * Remap in-memory comment keys after a row/column drag, cell-range move,
+ * or insert/delete of rows/columns.
+ *
+ * - Row/column drag: apply the full permutation `indexMap` (no collisions).
+ * - Cells: comments in the source rectangle follow the offset; comments that
+ *   only lived in the destination are detached to `WITHOUT_CELL_<id>` so they
+ *   remain in the sidebar instead of colliding with the incoming thread.
+ * - Insert: comments at/after the insertion point shift by `count`.
+ * - Delete: comments on removed rows/cols are detached; later ones shift up/left.
+ */
+export declare function remapCommentAnchors<T extends {
+    key?: string;
+    id?: string;
+}>(commentsData: Record<string, T>, move: CommentAnchorMove): Record<string, T>;
+export type { CommentAnchorMove };

package/dist/editor/utils/remap-comment-anchors.test.d.ts

@@ -0,0 +1 @@
+export {};