@portabletext/editor 1.55.13 → 1.55.14

package/lib/_chunks-cjs/selector.is-selecting-entire-blocks.cjs

@@ -1,6 +1,150 @@
 "use strict";
-var util_sliceBlocks = require("./util.slice-blocks.cjs"), selector_isSelectionExpanded = require("./selector.is-selection-expanded.cjs"), util_isEqualSelectionPoints = require("./util.is-equal-selection-points.cjs"), types = require("@sanity/types");
-const getSelectedBlocks = (snapshot) => {
+var util_sliceBlocks = require("./util.slice-blocks.cjs"), util_isSelectionCollapsed = require("./util.is-selection-collapsed.cjs"), selector_getFocusSpan = require("./selector.get-focus-span.cjs"), types = require("@sanity/types");
+function isSelectionExpanded(selection) {
+  return selection ? !util_isSelectionCollapsed.isSelectionCollapsed(selection) : !1;
+}
+const getSelectionEndBlock = (snapshot) => {
+  const endPoint = util_sliceBlocks.getSelectionEndPoint(snapshot.context.selection);
+  if (endPoint)
+    return selector_getFocusSpan.getFocusBlock({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: endPoint,
+          focus: endPoint
+        }
+      }
+    });
+}, getSelectionEndPoint = (snapshot) => {
+  if (snapshot.context.selection)
+    return snapshot.context.selection.backward ? snapshot.context.selection.anchor : snapshot.context.selection.focus;
+}, getNextSpan = (snapshot) => {
+  const selectionEndBlock = getSelectionEndBlock(snapshot), selectionEndPoint = getSelectionEndPoint(snapshot);
+  if (!selectionEndBlock || !selectionEndPoint || !util_sliceBlocks.isTextBlock(snapshot.context, selectionEndBlock.node))
+    return;
+  const selectionEndPointChildKey = util_sliceBlocks.getChildKeyFromSelectionPoint(selectionEndPoint);
+  let endPointChildFound = !1, nextSpan;
+  for (const child of selectionEndBlock.node.children) {
+    if (child._key === selectionEndPointChildKey) {
+      endPointChildFound = !0;
+      continue;
+    }
+    if (util_sliceBlocks.isSpan(snapshot.context, child) && endPointChildFound) {
+      nextSpan = {
+        node: child,
+        path: [...selectionEndBlock.path, "children", {
+          _key: child._key
+        }]
+      };
+      break;
+    }
+  }
+  return nextSpan;
+}, getSelectionStartBlock = (snapshot) => {
+  const startPoint = util_sliceBlocks.getSelectionStartPoint(snapshot.context.selection);
+  if (startPoint)
+    return selector_getFocusSpan.getFocusBlock({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: startPoint,
+          focus: startPoint
+        }
+      }
+    });
+}, getPreviousSpan = (snapshot) => {
+  const selectionStartBlock = getSelectionStartBlock(snapshot), selectionStartPoint = selector_getFocusSpan.getSelectionStartPoint(snapshot);
+  if (!selectionStartBlock || !selectionStartPoint || !util_sliceBlocks.isTextBlock(snapshot.context, selectionStartBlock.node))
+    return;
+  const selectionStartPointChildKey = util_sliceBlocks.getChildKeyFromSelectionPoint(selectionStartPoint);
+  let previousSpan;
+  for (const child of selectionStartBlock.node.children) {
+    if (child._key === selectionStartPointChildKey)
+      break;
+    util_sliceBlocks.isSpan(snapshot.context, child) && (previousSpan = {
+      node: child,
+      path: [...selectionStartBlock.path, "children", {
+        _key: child._key
+      }]
+    });
+  }
+  return previousSpan;
+}, getMarkState = (snapshot) => {
+  if (!snapshot.context.selection)
+    return;
+  const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), focusSpan = selector_getFocusSpan.getFocusSpan(snapshot);
+  if (!focusTextBlock || !focusSpan)
+    return;
+  if (isSelectionExpanded(snapshot.context.selection)) {
+    const selectedSpans = getSelectedSpans(snapshot);
+    let index = 0, marks2 = [];
+    for (const span of selectedSpans) {
+      if (index === 0)
+        marks2 = span.node.marks ?? [];
+      else {
+        if (span.node.marks?.length === 0) {
+          marks2 = [];
+          continue;
+        }
+        marks2 = marks2.filter((mark) => (span.node.marks ?? []).some((spanMark) => spanMark === mark));
+      }
+      index++;
+    }
+    return {
+      state: "unchanged",
+      marks: marks2
+    };
+  }
+  const decorators = snapshot.context.schema.decorators.map((decorator) => decorator.name), marks = focusSpan.node.marks ?? [], marksWithoutAnnotations = marks.filter((mark) => decorators.includes(mark)), spanHasAnnotations = marks.length > marksWithoutAnnotations.length, spanIsEmpty = focusSpan.node.text.length === 0, atTheBeginningOfSpan = snapshot.context.selection.anchor.offset === 0, atTheEndOfSpan = snapshot.context.selection.anchor.offset === focusSpan.node.text.length, previousSpan = getPreviousSpan(snapshot), nextSpan = getNextSpan(snapshot), nextSpanAnnotations = nextSpan?.node?.marks?.filter((mark) => !decorators.includes(mark)) ?? [], spanAnnotations = marks.filter((mark) => !decorators.includes(mark)), previousSpanHasAnnotations = previousSpan ? previousSpan.node.marks?.some((mark) => !decorators.includes(mark)) : !1, previousSpanHasSameAnnotations = previousSpan ? previousSpan.node.marks?.filter((mark) => !decorators.includes(mark)).every((mark) => marks.includes(mark)) : !1, previousSpanHasSameAnnotation = previousSpan ? previousSpan.node.marks?.some((mark) => !decorators.includes(mark) && marks.includes(mark)) : !1, previousSpanHasSameMarks = previousSpan ? previousSpan.node.marks?.every((mark) => marks.includes(mark)) : !1, nextSpanSharesSomeAnnotations = spanAnnotations.some((mark) => nextSpanAnnotations?.includes(mark));
+  if (spanHasAnnotations && !spanIsEmpty) {
+    if (atTheBeginningOfSpan) {
+      if (previousSpanHasSameMarks)
+        return {
+          state: "changed",
+          marks: previousSpan?.node.marks ?? []
+        };
+      if (previousSpanHasSameAnnotations)
+        return {
+          state: "changed",
+          marks: previousSpan?.node.marks ?? []
+        };
+      if (previousSpanHasSameAnnotation)
+        return {
+          state: "unchanged",
+          marks: focusSpan.node.marks ?? []
+        };
+      if (!previousSpan)
+        return {
+          state: "changed",
+          marks: []
+        };
+    }
+    if (atTheEndOfSpan) {
+      if (nextSpan && nextSpanSharesSomeAnnotations && nextSpanAnnotations.length < spanAnnotations.length || !nextSpanSharesSomeAnnotations)
+        return {
+          state: "changed",
+          marks: nextSpan?.node.marks ?? []
+        };
+      if (!nextSpan)
+        return {
+          state: "changed",
+          marks: []
+        };
+    }
+  }
+  return atTheBeginningOfSpan && !spanIsEmpty && previousSpan ? previousSpanHasAnnotations ? {
+    state: "changed",
+    marks: []
+  } : {
+    state: "changed",
+    marks: (previousSpan?.node.marks ?? []).filter((mark) => decorators.includes(mark))
+  } : {
+    state: "unchanged",
+    marks: focusSpan.node.marks ?? []
+  };
+}, getSelectedBlocks = (snapshot) => {
   if (!snapshot.context.selection)
     return [];
   const selectedBlocks = [], startPoint = util_sliceBlocks.getSelectionStartPoint(snapshot.context.selection), endPoint = util_sliceBlocks.getSelectionEndPoint(snapshot.context.selection), startKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(startPoint), endKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(endPoint);
@@ -38,114 +182,10 @@ const getSelectedBlocks = (snapshot) => {
     });
   }
   return selectedBlocks;
-}, getSelectionEndPoint = (snapshot) => {
-  if (snapshot.context.selection)
-    return snapshot.context.selection.backward ? snapshot.context.selection.anchor : snapshot.context.selection.focus;
-}, getSelectedSpans = (snapshot) => {
-  if (!snapshot.context.selection)
-    return [];
-  const selectedSpans = [], startPoint = selector_isSelectionExpanded.getSelectionStartPoint(snapshot), endPoint = getSelectionEndPoint(snapshot);
-  if (!startPoint || !endPoint)
-    return selectedSpans;
-  const startBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(startPoint), endBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(endPoint), startSpanKey = util_sliceBlocks.getChildKeyFromSelectionPoint(startPoint), endSpanKey = util_sliceBlocks.getChildKeyFromSelectionPoint(endPoint);
-  if (!startBlockKey || !endBlockKey)
-    return selectedSpans;
-  const startBlockIndex = snapshot.blockIndexMap.get(startBlockKey), endBlockIndex = snapshot.blockIndexMap.get(endBlockKey);
-  if (startBlockIndex === void 0 || endBlockIndex === void 0)
-    return selectedSpans;
-  const slicedValue = snapshot.context.value.slice(startBlockIndex, endBlockIndex + 1);
-  let startBlockFound = !1;
-  for (const block of slicedValue)
-    if (block._key === startBlockKey && (startBlockFound = !0), !!util_sliceBlocks.isTextBlock(snapshot.context, block)) {
-      if (block._key === startBlockKey) {
-        for (const child of block.children)
-          if (util_sliceBlocks.isSpan$1(snapshot.context, child)) {
-            if (startSpanKey && child._key === startSpanKey) {
-              if (startPoint.offset < child.text.length && selectedSpans.push({
-                node: child,
-                path: [{
-                  _key: block._key
-                }, "children", {
-                  _key: child._key
-                }]
-              }), startSpanKey === endSpanKey)
-                break;
-              continue;
-            }
-            if (endSpanKey && child._key === endSpanKey) {
-              endPoint.offset > 0 && selectedSpans.push({
-                node: child,
-                path: [{
-                  _key: block._key
-                }, "children", {
-                  _key: child._key
-                }]
-              });
-              break;
-            }
-            selectedSpans.length > 0 && selectedSpans.push({
-              node: child,
-              path: [{
-                _key: block._key
-              }, "children", {
-                _key: child._key
-              }]
-            });
-          }
-        if (startBlockKey === endBlockKey)
-          break;
-        continue;
-      }
-      if (block._key === endBlockKey) {
-        for (const child of block.children)
-          if (util_sliceBlocks.isSpan$1(snapshot.context, child)) {
-            if (endSpanKey && child._key === endSpanKey) {
-              endPoint.offset > 0 && selectedSpans.push({
-                node: child,
-                path: [{
-                  _key: block._key
-                }, "children", {
-                  _key: child._key
-                }]
-              });
-              break;
-            }
-            selectedSpans.push({
-              node: child,
-              path: [{
-                _key: block._key
-              }, "children", {
-                _key: child._key
-              }]
-            });
-          }
-        break;
-      }
-      if (startBlockFound)
-        for (const child of block.children)
-          util_sliceBlocks.isSpan$1(snapshot.context, child) && selectedSpans.push({
-            node: child,
-            path: [{
-              _key: block._key
-            }, "children", {
-              _key: child._key
-            }]
-          });
-    }
-  return selectedSpans;
 }, getActiveAnnotations = (snapshot) => {
   if (!snapshot.context.selection)
     return [];
-  const selectedBlocks = getSelectedBlocks(snapshot), selectedSpans = getSelectedSpans(snapshot), focusSpan = selector_isSelectionExpanded.getFocusSpan(snapshot);
-  if (selectedSpans.length === 0 || !focusSpan)
-    return [];
-  if (selectedSpans.length === 1 && selector_isSelectionExpanded.isSelectionCollapsed(snapshot)) {
-    if (snapshot.context.selection.focus.offset === 0)
-      return [];
-    if (snapshot.context.selection.focus.offset === focusSpan.node.text.length)
-      return [];
-  }
-  const activeAnnotations = snapshot.beta.activeAnnotations;
+  const selectedBlocks = getSelectedBlocks(snapshot), activeAnnotations = (getMarkState(snapshot)?.marks ?? []).filter((mark) => !snapshot.context.schema.decorators.map((decorator) => decorator.name).includes(mark));
   return selectedBlocks.flatMap((block) => util_sliceBlocks.isTextBlock(snapshot.context, block.node) ? block.node.markDefs ?? [] : []).filter((markDef) => activeAnnotations.includes(markDef._key));
 }, getActiveListItem = (snapshot) => {
   if (!snapshot.context.selection)
@@ -166,7 +206,7 @@ const getSelectedBlocks = (snapshot) => {
   if (firstStyle && selectedTextBlocks.every((block) => block.style === firstStyle))
     return firstStyle;
 }, getNextInlineObject = (snapshot) => {
-  const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), selectionEndPoint = getSelectionEndPoint(snapshot), selectionEndPointChildKey = selectionEndPoint && types.isKeySegment(selectionEndPoint.path[2]) ? selectionEndPoint.path[2]._key : void 0;
+  const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), selectionEndPoint = getSelectionEndPoint(snapshot), selectionEndPointChildKey = selectionEndPoint && types.isKeySegment(selectionEndPoint.path[2]) ? selectionEndPoint.path[2]._key : void 0;
   if (!focusTextBlock || !selectionEndPointChildKey)
     return;
   let endPointChildFound = !1, inlineObject;
@@ -175,7 +215,7 @@ const getSelectedBlocks = (snapshot) => {
       endPointChildFound = !0;
       continue;
     }
-    if (!util_sliceBlocks.isSpan(snapshot.context, child) && endPointChildFound) {
+    if (!util_sliceBlocks.isSpan$1(snapshot.context, child) && endPointChildFound) {
       inlineObject = {
         node: child,
         path: [...focusTextBlock.path, "children", {
@@ -187,18 +227,18 @@ const getSelectedBlocks = (snapshot) => {
   }
   return inlineObject;
 }, getCaretWordSelection = (snapshot) => {
-  if (!snapshot.context.selection || !selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+  if (!snapshot.context.selection || !selector_getFocusSpan.isSelectionCollapsed(snapshot))
     return null;
-  const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), selectionStartPoint = selector_isSelectionExpanded.getSelectionStartPoint(snapshot), selectionStartOffset = selectionStartPoint ? util_sliceBlocks.spanSelectionPointToBlockOffset({
+  const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), selectionStartPoint = selector_getFocusSpan.getSelectionStartPoint(snapshot), selectionStartOffset = selectionStartPoint ? util_sliceBlocks.spanSelectionPointToBlockOffset({
     context: snapshot.context,
     selectionPoint: selectionStartPoint
   }) : void 0;
   if (!focusTextBlock || !selectionStartPoint || !selectionStartOffset)
     return null;
-  const previousInlineObject = selector_isSelectionExpanded.getPreviousInlineObject(snapshot), blockStartPoint = util_sliceBlocks.getBlockStartPoint({
+  const previousInlineObject = selector_getFocusSpan.getPreviousInlineObject(snapshot), blockStartPoint = util_sliceBlocks.getBlockStartPoint({
     context: snapshot.context,
     block: focusTextBlock
-  }), textDirectlyBefore = selector_isSelectionExpanded.getSelectionText({
+  }), textDirectlyBefore = selector_getFocusSpan.getSelectionText({
     ...snapshot,
     context: {
       ...snapshot.context,
@@ -210,10 +250,10 @@ const getSelectedBlocks = (snapshot) => {
         focus: selectionStartPoint
       }
     }
-  }).split(/\s+/).at(-1), nextInlineObject = getNextInlineObject(snapshot), blockEndPoint = util_isEqualSelectionPoints.getBlockEndPoint({
+  }).split(/\s+/).at(-1), nextInlineObject = getNextInlineObject(snapshot), blockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
     context: snapshot.context,
     block: focusTextBlock
-  }), textDirectlyAfter = selector_isSelectionExpanded.getSelectionText({
+  }), textDirectlyAfter = selector_getFocusSpan.getSelectionText({
     ...snapshot,
     context: {
       ...snapshot.context,
@@ -249,7 +289,7 @@ const getSelectedBlocks = (snapshot) => {
     anchor: caretWordStartSelectionPoint,
     focus: caretWordEndSelectionPoint
   };
-  return selector_isSelectionExpanded.isSelectionExpanded({
+  return selector_getFocusSpan.isSelectionExpanded({
     context: {
       ...snapshot.context,
       selection: caretWordSelection
@@ -264,19 +304,19 @@ const getSelectedBlocks = (snapshot) => {
     }]
   } : void 0;
 }, getFocusBlockObject = (snapshot) => {
-  const focusBlock = selector_isSelectionExpanded.getFocusBlock(snapshot);
+  const focusBlock = selector_getFocusSpan.getFocusBlock(snapshot);
   return focusBlock && !util_sliceBlocks.isTextBlock(snapshot.context, focusBlock.node) ? {
     node: focusBlock.node,
     path: focusBlock.path
   } : void 0;
 }, getFocusInlineObject = (snapshot) => {
-  const focusChild = selector_isSelectionExpanded.getFocusChild(snapshot);
+  const focusChild = selector_getFocusSpan.getFocusChild(snapshot);
   return focusChild && !types.isPortableTextSpan(focusChild.node) ? {
     node: focusChild.node,
     path: focusChild.path
   } : void 0;
 }, getFocusListBlock = (snapshot) => {
-  const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot);
+  const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot);
   return focusTextBlock && util_sliceBlocks.isListBlock(snapshot.context, focusTextBlock.node) ? {
     node: focusTextBlock.node,
     path: focusTextBlock.path
@@ -289,19 +329,6 @@ const getSelectedBlocks = (snapshot) => {
       _key: node._key
     }]
   } : void 0;
-}, getSelectionEndBlock = (snapshot) => {
-  const endPoint = util_sliceBlocks.getSelectionEndPoint(snapshot.context.selection);
-  if (endPoint)
-    return selector_isSelectionExpanded.getFocusBlock({
-      ...snapshot,
-      context: {
-        ...snapshot.context,
-        selection: {
-          anchor: endPoint,
-          focus: endPoint
-        }
-      }
-    });
 }, getNextBlock = (snapshot) => {
   const selectionEndBlock = getSelectionEndBlock(snapshot);
   if (!selectionEndBlock)
@@ -316,19 +343,6 @@ const getSelectedBlocks = (snapshot) => {
       _key: nextBlock._key
     }]
   } : void 0;
-}, getSelectionStartBlock = (snapshot) => {
-  const startPoint = util_sliceBlocks.getSelectionStartPoint(snapshot.context.selection);
-  if (startPoint)
-    return selector_isSelectionExpanded.getFocusBlock({
-      ...snapshot,
-      context: {
-        ...snapshot.context,
-        selection: {
-          anchor: startPoint,
-          focus: startPoint
-        }
-      }
-    });
 }, getPreviousBlock = (snapshot) => {
   const selectionStartBlock = getSelectionStartBlock(snapshot);
   if (!selectionStartBlock)
@@ -343,6 +357,98 @@ const getSelectedBlocks = (snapshot) => {
       _key: previousBlock._key
     }]
   } : void 0;
+}, getSelectedSpans = (snapshot) => {
+  if (!snapshot.context.selection)
+    return [];
+  const selectedSpans = [], startPoint = selector_getFocusSpan.getSelectionStartPoint(snapshot), endPoint = getSelectionEndPoint(snapshot);
+  if (!startPoint || !endPoint)
+    return selectedSpans;
+  const startBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(startPoint), endBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(endPoint), startSpanKey = util_sliceBlocks.getChildKeyFromSelectionPoint(startPoint), endSpanKey = util_sliceBlocks.getChildKeyFromSelectionPoint(endPoint);
+  if (!startBlockKey || !endBlockKey)
+    return selectedSpans;
+  const startBlockIndex = snapshot.blockIndexMap.get(startBlockKey), endBlockIndex = snapshot.blockIndexMap.get(endBlockKey);
+  if (startBlockIndex === void 0 || endBlockIndex === void 0)
+    return selectedSpans;
+  const slicedValue = snapshot.context.value.slice(startBlockIndex, endBlockIndex + 1);
+  let startBlockFound = !1;
+  for (const block of slicedValue)
+    if (block._key === startBlockKey && (startBlockFound = !0), !!util_sliceBlocks.isTextBlock(snapshot.context, block)) {
+      if (block._key === startBlockKey) {
+        for (const child of block.children)
+          if (util_sliceBlocks.isSpan(snapshot.context, child)) {
+            if (startSpanKey && child._key === startSpanKey) {
+              if (startPoint.offset < child.text.length && selectedSpans.push({
+                node: child,
+                path: [{
+                  _key: block._key
+                }, "children", {
+                  _key: child._key
+                }]
+              }), startSpanKey === endSpanKey)
+                break;
+              continue;
+            }
+            if (endSpanKey && child._key === endSpanKey) {
+              endPoint.offset > 0 && selectedSpans.push({
+                node: child,
+                path: [{
+                  _key: block._key
+                }, "children", {
+                  _key: child._key
+                }]
+              });
+              break;
+            }
+            selectedSpans.length > 0 && selectedSpans.push({
+              node: child,
+              path: [{
+                _key: block._key
+              }, "children", {
+                _key: child._key
+              }]
+            });
+          }
+        if (startBlockKey === endBlockKey)
+          break;
+        continue;
+      }
+      if (block._key === endBlockKey) {
+        for (const child of block.children)
+          if (util_sliceBlocks.isSpan(snapshot.context, child)) {
+            if (endSpanKey && child._key === endSpanKey) {
+              endPoint.offset > 0 && selectedSpans.push({
+                node: child,
+                path: [{
+                  _key: block._key
+                }, "children", {
+                  _key: child._key
+                }]
+              });
+              break;
+            }
+            selectedSpans.push({
+              node: child,
+              path: [{
+                _key: block._key
+              }, "children", {
+                _key: child._key
+              }]
+            });
+          }
+        break;
+      }
+      if (startBlockFound)
+        for (const child of block.children)
+          util_sliceBlocks.isSpan(snapshot.context, child) && selectedSpans.push({
+            node: child,
+            path: [{
+              _key: block._key
+            }, "children", {
+              _key: child._key
+            }]
+          });
+    }
+  return selectedSpans;
 }, getSelectedTextBlocks = (snapshot) => {
   if (!snapshot.context.selection)
     return [];
@@ -393,11 +499,11 @@ const getSelectedBlocks = (snapshot) => {
   const slicedValue = snapshot.context.value.slice(startBlockIndex, endBlockIndex + 1);
   let startBlockFound = !1, adjustedStartPoint, trimStartPoint = !1, adjustedEndPoint, trimEndPoint = !1, previousPotentialEndpoint;
   for (const block of slicedValue)
-    if (!(block._key === startBlockKey && (startBlockFound = !0, util_sliceBlocks.isTextBlock(snapshot.context, block) && util_isEqualSelectionPoints.isEmptyTextBlock(snapshot.context, block))) && startBlockFound && util_sliceBlocks.isTextBlock(snapshot.context, block)) {
-      if (block._key === endBlockKey && util_isEqualSelectionPoints.isEmptyTextBlock(snapshot.context, block))
+    if (!(block._key === startBlockKey && (startBlockFound = !0, util_sliceBlocks.isTextBlock(snapshot.context, block) && util_isSelectionCollapsed.isEmptyTextBlock(snapshot.context, block))) && startBlockFound && util_sliceBlocks.isTextBlock(snapshot.context, block)) {
+      if (block._key === endBlockKey && util_isSelectionCollapsed.isEmptyTextBlock(snapshot.context, block))
         break;
       for (const child of block.children) {
-        if (child._key === endChildKey && (!util_sliceBlocks.isSpan$1(snapshot.context, child) || endPoint.offset === 0)) {
+        if (child._key === endChildKey && (!util_sliceBlocks.isSpan(snapshot.context, child) || endPoint.offset === 0)) {
           adjustedEndPoint = previousPotentialEndpoint ? {
             path: [{
               _key: previousPotentialEndpoint.blockKey
@@ -409,8 +515,8 @@ const getSelectedBlocks = (snapshot) => {
           break;
         }
         if (trimStartPoint) {
-          const lonelySpan = util_sliceBlocks.isSpan$1(snapshot.context, child) && block.children.length === 1;
-          (util_sliceBlocks.isSpan$1(snapshot.context, child) && child.text.length > 0 || lonelySpan) && (adjustedStartPoint = {
+          const lonelySpan = util_sliceBlocks.isSpan(snapshot.context, child) && block.children.length === 1;
+          (util_sliceBlocks.isSpan(snapshot.context, child) && child.text.length > 0 || lonelySpan) && (adjustedStartPoint = {
             path: [{
               _key: block._key
             }, "children", {
@@ -424,7 +530,7 @@ const getSelectedBlocks = (snapshot) => {
           continue;
         }
         if (child._key === startChildKey) {
-          if (!util_sliceBlocks.isSpan$1(snapshot.context, child)) {
+          if (!util_sliceBlocks.isSpan(snapshot.context, child)) {
             trimStartPoint = !0;
             continue;
           }
@@ -436,7 +542,7 @@ const getSelectedBlocks = (snapshot) => {
             continue;
           }
         }
-        previousPotentialEndpoint = util_sliceBlocks.isSpan$1(snapshot.context, child) && child.text.length > 0 ? {
+        previousPotentialEndpoint = util_sliceBlocks.isSpan(snapshot.context, child) && child.text.length > 0 ? {
           blockKey: block._key,
           span: child
         } : previousPotentialEndpoint;
@@ -452,34 +558,48 @@ const getSelectedBlocks = (snapshot) => {
     anchor: adjustedStartPoint ?? startPoint,
     focus: trimEndPoint && adjustedEndPoint ? adjustedEndPoint : endPoint
   };
-  if (selector_isSelectionExpanded.isSelectionCollapsed({
+  if (selector_getFocusSpan.isSelectionCollapsed({
     context: {
       ...snapshot.context,
       selection: trimmedSelection
     }
   })) {
-    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock({
+    const focusTextBlock = selector_getFocusSpan.getFocusTextBlock({
       ...snapshot,
       context: {
         ...snapshot.context,
         selection: trimmedSelection
       }
     });
-    if (focusTextBlock && !util_isEqualSelectionPoints.isEmptyTextBlock(snapshot.context, focusTextBlock.node))
+    if (focusTextBlock && !util_isSelectionCollapsed.isEmptyTextBlock(snapshot.context, focusTextBlock.node))
       return null;
   }
   return trimmedSelection;
 };
+function getActiveAnnotationsMarks(snapshot) {
+  const schema = snapshot.context.schema;
+  return (getMarkState(snapshot)?.marks ?? []).filter((mark) => !schema.decorators.map((decorator) => decorator.name).includes(mark));
+}
 function isActiveAnnotation(annotation) {
-  return (snapshot) => getSelectedBlocks(snapshot).flatMap((block) => util_sliceBlocks.isTextBlock(snapshot.context, block.node) ? block.node.markDefs ?? [] : []).filter((markDef) => markDef._type === annotation && snapshot.beta.activeAnnotations.includes(markDef._key)).length > 0;
+  return (snapshot) => {
+    const selectionMarkDefs = getSelectedBlocks(snapshot).flatMap((block) => util_sliceBlocks.isTextBlock(snapshot.context, block.node) ? block.node.markDefs ?? [] : []), activeAnnotations = getActiveAnnotationsMarks(snapshot);
+    return selectionMarkDefs.filter((markDef) => markDef._type === annotation && activeAnnotations.includes(markDef._key)).length > 0;
+  };
+}
+function getActiveDecorators(snapshot) {
+  const schema = snapshot.context.schema, decoratorState = snapshot.decoratorState, markState = getMarkState(snapshot), decorators = schema.decorators.map((decorator) => decorator.name);
+  let activeDecorators = (markState?.marks ?? []).filter((mark) => decorators.includes(mark));
+  for (const decorator in decoratorState)
+    decoratorState[decorator] === !1 ? activeDecorators = activeDecorators.filter((activeDecorator) => activeDecorator !== decorator) : decoratorState[decorator] === !0 && (activeDecorators.includes(decorator) || activeDecorators.push(decorator));
+  return activeDecorators;
 }
 function isActiveDecorator(decorator) {
   return (snapshot) => {
-    if (selector_isSelectionExpanded.isSelectionExpanded(snapshot)) {
+    if (selector_getFocusSpan.isSelectionExpanded(snapshot)) {
       const selectedSpans = getSelectedSpans(snapshot);
       return selectedSpans.length > 0 && selectedSpans.every((span) => span.node.marks?.includes(decorator));
     }
-    return snapshot.beta.activeDecorators.includes(decorator);
+    return getActiveDecorators(snapshot).includes(decorator);
   };
 }
 function isActiveListItem(listItem) {
@@ -490,24 +610,24 @@ function isActiveStyle(style) {
 }
 function isAtTheEndOfBlock(block) {
   return (snapshot) => {
-    if (!snapshot.context.selection || !selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+    if (!snapshot.context.selection || !selector_getFocusSpan.isSelectionCollapsed(snapshot))
       return !1;
-    const blockEndPoint = util_isEqualSelectionPoints.getBlockEndPoint({
+    const blockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
       context: snapshot.context,
       block
     });
-    return util_isEqualSelectionPoints.isEqualSelectionPoints(snapshot.context.selection.focus, blockEndPoint);
+    return util_isSelectionCollapsed.isEqualSelectionPoints(snapshot.context.selection.focus, blockEndPoint);
   };
 }
 function isAtTheStartOfBlock(block) {
   return (snapshot) => {
-    if (!snapshot.context.selection || !selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+    if (!snapshot.context.selection || !selector_getFocusSpan.isSelectionCollapsed(snapshot))
       return !1;
     const blockStartPoint = util_sliceBlocks.getBlockStartPoint({
       context: snapshot.context,
       block
     });
-    return util_isEqualSelectionPoints.isEqualSelectionPoints(snapshot.context.selection.focus, blockStartPoint);
+    return util_isSelectionCollapsed.isEqualSelectionPoints(snapshot.context.selection.focus, blockStartPoint);
   };
 }
 function isPointAfterSelection(point) {
@@ -568,7 +688,7 @@ function isOverlappingSelection(selection) {
   return (snapshot) => {
     if (!selection || !snapshot.context.selection)
       return !1;
-    const selectionStartPoint = selector_isSelectionExpanded.getSelectionStartPoint({
+    const selectionStartPoint = selector_getFocusSpan.getSelectionStartPoint({
       context: {
         ...snapshot.context,
         selection
@@ -578,7 +698,7 @@ function isOverlappingSelection(selection) {
         ...snapshot.context,
         selection
       }
-    }), originalSelectionStartPoint = selector_isSelectionExpanded.getSelectionStartPoint(snapshot), originalSelectionEndPoint = getSelectionEndPoint(snapshot);
+    }), originalSelectionStartPoint = selector_getFocusSpan.getSelectionStartPoint(snapshot), originalSelectionEndPoint = getSelectionEndPoint(snapshot);
     if (!selectionStartPoint || !selectionEndPoint || !originalSelectionStartPoint || !originalSelectionEndPoint)
       return !1;
     const startPointBeforeSelection = isPointBeforeSelection(selectionStartPoint)(snapshot), startPointAfterSelection = isPointAfterSelection(selectionStartPoint)(snapshot), endPointBeforeSelection = isPointBeforeSelection(selectionEndPoint)(snapshot), endPointAfterSelection = isPointAfterSelection(selectionEndPoint)(snapshot), originalStartPointBeforeStartPoint = isPointBeforeSelection(originalSelectionStartPoint)({
@@ -617,7 +737,7 @@ function isOverlappingSelection(selection) {
           focus: selectionEndPoint
         }
       }
-    }), endPointEqualToOriginalStartPoint = util_isEqualSelectionPoints.isEqualSelectionPoints(selectionEndPoint, originalSelectionStartPoint), startPointEqualToOriginalEndPoint = util_isEqualSelectionPoints.isEqualSelectionPoints(selectionStartPoint, originalSelectionEndPoint);
+    }), endPointEqualToOriginalStartPoint = util_isSelectionCollapsed.isEqualSelectionPoints(selectionEndPoint, originalSelectionStartPoint), startPointEqualToOriginalEndPoint = util_isSelectionCollapsed.isEqualSelectionPoints(selectionStartPoint, originalSelectionEndPoint);
     return endPointBeforeSelection && !endPointEqualToOriginalStartPoint || startPointAfterSelection && !startPointEqualToOriginalEndPoint ? !1 : !originalStartPointBeforeStartPoint && originalStartPointAfterStartPoint && !originalEndPointBeforeEndPoint && originalEndPointAfterEndPoint ? !endPointEqualToOriginalStartPoint : originalStartPointBeforeStartPoint && !originalStartPointAfterStartPoint && originalEndPointBeforeEndPoint && !originalEndPointAfterEndPoint ? !startPointEqualToOriginalEndPoint : !startPointAfterSelection || !startPointBeforeSelection || !endPointAfterSelection || !endPointBeforeSelection;
   };
 }
@@ -630,13 +750,15 @@ const isSelectingEntireBlocks = (snapshot) => {
   const startBlockStartPoint = util_sliceBlocks.getBlockStartPoint({
     context: snapshot.context,
     block: startBlock
-  }), endBlockEndPoint = util_isEqualSelectionPoints.getBlockEndPoint({
+  }), endBlockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
     context: snapshot.context,
     block: endBlock
   });
-  return util_isEqualSelectionPoints.isEqualSelectionPoints(startBlockStartPoint, startPoint) && util_isEqualSelectionPoints.isEqualSelectionPoints(endBlockEndPoint, endPoint);
+  return util_isSelectionCollapsed.isEqualSelectionPoints(startBlockStartPoint, startPoint) && util_isSelectionCollapsed.isEqualSelectionPoints(endBlockEndPoint, endPoint);
 };
 exports.getActiveAnnotations = getActiveAnnotations;
+exports.getActiveAnnotationsMarks = getActiveAnnotationsMarks;
+exports.getActiveDecorators = getActiveDecorators;
 exports.getActiveListItem = getActiveListItem;
 exports.getActiveStyle = getActiveStyle;
 exports.getCaretWordSelection = getCaretWordSelection;
@@ -645,6 +767,7 @@ exports.getFocusBlockObject = getFocusBlockObject;
 exports.getFocusInlineObject = getFocusInlineObject;
 exports.getFocusListBlock = getFocusListBlock;
 exports.getLastBlock = getLastBlock;
+exports.getMarkState = getMarkState;
 exports.getNextBlock = getNextBlock;
 exports.getNextInlineObject = getNextInlineObject;
 exports.getPreviousBlock = getPreviousBlock;