sanity 6.5.0-next.21 → 6.5.0-next.24

package/lib/_chunks-dts/ActiveWorkspaceMatcherContext.d.ts

@@ -7260,6 +7260,8 @@ interface BuildRangeDecorationsProps {
   onDecorationMoved: (details: RangeDecorationOnMovedDetails) => void;
   selectedThreadId: string | null;
   value: PortableTextBlock[] | undefined;
+  documentValue?: unknown;
+  basePath?: Path;
 }
 /**
  * @internal
@@ -7271,6 +7273,13 @@ declare function buildCommentRangeDecorations(props: BuildRangeDecorationsProps)
 interface BuildCommentsRangeDecorationsProps {
   value: PortableTextBlock[] | undefined;
   comments: CommentDocument[];
+  /**
+   * Document value the stored `field` paths resolve against. Falls back to a
+   * top-level `value.find` on the editor slice when absent.
+   */
+  documentValue?: unknown;
+  /** The editor's own document path. */
+  basePath?: Path;
 }
 /**
  * @internal
@@ -7287,7 +7296,8 @@ interface BuildCommentsRangeDecorationsResultItem {
 declare function buildRangeDecorationSelectionsFromComments(props: BuildCommentsRangeDecorationsProps): BuildCommentsRangeDecorationsResultItem[];
 interface BuildSelectionFromFragmentProps {
   fragment: PortableTextBlock[];
-  value: PortableTextBlock[];
+  documentValue: unknown;
+  basePath: Path;
   selection: EditorSelection;
 }
 /**

package/lib/_chunks-es/index2.js

@@ -60182,6 +60182,14 @@ function commentIntentIfDiffers(parent, comment) {
   if (intent && (!parentIntent || "preview" in intent.params && "preview" in parentIntent.params && intent.params.preview !== parentIntent.params.preview))
     return intent;
 }
+function parseCommentFieldPath(fieldPath) {
+  if (fieldPath)
+    try {
+      return PathUtils.fromString(fieldPath);
+    } catch {
+      return;
+    }
+}
 function isTextSelectionComment(comment) {
   return comment ? !!(comment?.target?.path?.selection?.type === "text" && comment?.target?.path?.selection?.value) : !1;
 }
@@ -62820,13 +62828,23 @@ const COMMENT_INDICATORS = ["\uF000", "\uF001"], COMMENT_INDICATORS_REGEX = new
 function buildRangeDecorationSelectionsFromComments(props2) {
   const {
     value,
-    comments: comments2
+    comments: comments2,
+    documentValue,
+    basePath
   } = props2;
   if (!value || value.length === 0) return EMPTY_ARRAY$5;
   const textSelections = comments2.filter(isTextSelectionComment), decorators = [];
   return textSelections.forEach((comment) => {
+    let relative = [];
+    if (documentValue !== void 0 && basePath) {
+      const fieldPath = parseCommentFieldPath(comment.target.path?.field);
+      if (!fieldPath || !PathUtils.startsWith(basePath, fieldPath)) return;
+      relative = fieldPath.slice(basePath.length);
+    }
     comment.target.path?.selection?.value.forEach((selectionMember) => {
-      const matchedBlock = value.find((block) => block._key === selectionMember._key);
+      const matchedBlock = documentValue !== void 0 && basePath ? getValueAtPath(documentValue, [...basePath, ...relative, {
+        _key: selectionMember._key
+      }]) : value.find((block) => block._key === selectionMember._key);
       if (!matchedBlock || !isPortableTextTextBlock(matchedBlock))
         return;
       const selectionText = selectionMember.text.replaceAll(COMMENT_INDICATORS_REGEX, ""), textWithChildSeparators = toPlainTextWithChildSeparators(matchedBlock), {
@@ -62842,7 +62860,7 @@ function buildRangeDecorationSelectionsFromComments(props2) {
         decorators.push({
           selection: {
             anchor: {
-              path: [{
+              path: [...relative, {
                 _key: matchedBlock._key
               }, "children", {
                 _key: matchedBlock.children[childIndexAnchor]._key
@@ -62850,7 +62868,7 @@ function buildRangeDecorationSelectionsFromComments(props2) {
               offset: anchorOffset
             },
             focus: {
-              path: [{
+              path: [...relative, {
                 _key: matchedBlock._key
               }, "children", {
                 _key: matchedBlock.children[childIndexFocus]._key
@@ -62931,11 +62949,15 @@ function buildCommentRangeDecorations(props2) {
     onDecorationHoverStart,
     onDecorationMoved,
     selectedThreadId,
-    value
+    value,
+    documentValue,
+    basePath
   } = props2;
   return buildRangeDecorationSelectionsFromComments({
     comments: comments2,
-    value
+    value,
+    documentValue,
+    basePath
   }).map(({
     selection,
     comment,
@@ -62955,7 +62977,8 @@ function buildCommentRangeDecorations(props2) {
 function buildTextSelectionFromFragment(props2) {
   const {
     fragment,
-    value,
+    documentValue,
+    basePath,
     selection
   } = props2;
   if (!selection)
@@ -62963,17 +62986,28 @@ function buildTextSelectionFromFragment(props2) {
   const normalizedSelection = selection.backward ? {
     anchor: selection.focus,
     focus: selection.anchor
-  } : selection;
+  } : selection, {
+    block: anchorBlock,
+    path: anchorBlockPath
+  } = findEnclosingTextBlock(documentValue, basePath, normalizedSelection.anchor.path) ?? {}, {
+    block: focusBlock,
+    path: focusBlockPath
+  } = findEnclosingTextBlock(documentValue, basePath, normalizedSelection.focus.path) ?? {}, containingArrays = [];
+  for (const blockPath of [anchorBlockPath, focusBlockPath]) {
+    if (!blockPath) continue;
+    const containingArray = getValueAtPath(documentValue, [...basePath, ...blockPath.slice(0, -1)]);
+    Array.isArray(containingArray) && !containingArrays.includes(containingArray) && containingArrays.push(containingArray);
+  }
   return {
     type: "text",
     value: fragment.map((fragmentBlock) => {
-      const originalBlock = value.find((b) => b._key === fragmentBlock._key);
+      const originalBlock = findBlockByKey(containingArrays, fragmentBlock._key);
       if (!isPortableTextTextBlock(originalBlock))
         return {
           _key: fragmentBlock._key,
           text: ""
         };
-      const anchorBlockKey = isKeySegment(normalizedSelection.anchor.path[0]) && normalizedSelection.anchor.path[0]._key, focusBlockKey = isKeySegment(normalizedSelection.focus.path[0]) && normalizedSelection.focus.path[0]._key, fragmentBlockText = toPlainText$1([fragmentBlock]), fragmentStartSpan = isPortableTextTextBlock(fragmentBlock) ? fragmentBlock.children[0] : void 0, fragmentEndSpan = isPortableTextTextBlock(fragmentBlock) ? fragmentBlock.children[fragmentBlock.children.length - 1] : void 0;
+      const anchorBlockKey = anchorBlock?._key, focusBlockKey = focusBlock?._key, fragmentBlockText = toPlainText$1([fragmentBlock]), fragmentStartSpan = isPortableTextTextBlock(fragmentBlock) ? fragmentBlock.children[0] : void 0, fragmentEndSpan = isPortableTextTextBlock(fragmentBlock) ? fragmentBlock.children[fragmentBlock.children.length - 1] : void 0;
       let originalTextBeforeSelection = "", startChildIndex = -1;
       if (anchorBlockKey === originalBlock._key)
         for (const child of originalBlock.children) {
@@ -62999,6 +63033,27 @@ function buildTextSelectionFromFragment(props2) {
     })
   };
 }
+function getCommentFieldPath(documentValue, basePath, selectionPath) {
+  const enclosingBlockPath = findEnclosingTextBlock(documentValue, basePath, selectionPath)?.path;
+  if (enclosingBlockPath)
+    return PathUtils.toString([...basePath, ...enclosingBlockPath.slice(0, -1)]);
+}
+function findEnclosingTextBlock(documentValue, basePath, path) {
+  for (let end = path.length; end > 0; end--) {
+    const relative = path.slice(0, end), candidate = getValueAtPath(documentValue, [...basePath, ...relative]);
+    if (isPortableTextTextBlock(candidate))
+      return {
+        block: candidate,
+        path: relative
+      };
+  }
+}
+function findBlockByKey(arrays, key) {
+  for (const array of arrays)
+    for (const block of array)
+      if (isPortableTextTextBlock(block) && block._key === key)
+        return block;
+}
 function mergeCommentReactions(reactionsA, reactionsB) {
   const mergedReactions = {};
   for (const reaction of reactionsA)
@@ -88499,6 +88554,7 @@ export {
   getAnnotationColor,
   getApiErrorCode,
   getCalendarLabels,
+  getCommentFieldPath,
   getConfigContextFromSource,
   getDialogPropsFromContext,
   getDiffAtPath,
@@ -88634,6 +88690,7 @@ export {
   operationEvents,
   operatorDefinitions,
   oversizedButtonStyle,
+  parseCommentFieldPath,
   parseRetryAfter,
   passthroughErrorHandler,
   pathToString$1 as pathToString,