@portabletext/editor 7.12.1 → 7.12.3

package/lib/index.js

@@ -107,7 +107,7 @@ const getDefaultView = (value) => value && value.ownerDocument && value.ownerDoc
 	for (; current;) {
 		if (current.matches && current.matches(selector)) return current;
 		if (current.parentElement) current = current.parentElement;
-		else if (current.parentNode && "host" in current.parentNode) current = current.parentNode.host;
+		else if (isShadowRoot(current.parentNode)) current = current.parentNode.host;
 		else return null;
 	}
 	return null;
@@ -117,11 +117,11 @@ const getDefaultView = (value) => value && value.ownerDocument && value.ownerDoc
 	let current = child;
 	for (; current;) {
 		if (current === parent) return !0;
-		if (current.parentNode) current = "host" in current.parentNode ? current.parentNode.host : current.parentNode;
+		if (current.parentNode) current = isShadowRoot(current.parentNode) ? current.parentNode.host : current.parentNode;
 		else return !1;
 	}
 	return !1;
-}, KEYED_SEGMENT_PATTERN = /\[_key=="(.+?)"\]/;
+}, isShadowRoot = (value) => isDOMNode(value) && value.nodeType === Node.DOCUMENT_FRAGMENT_NODE && "host" in value, KEYED_SEGMENT_PATTERN = /\[_key=="(.+?)"\]/;
 /**
 * Deserialize a serialized keyed path using Sanity's bracket notation.
 *
@@ -750,6 +750,40 @@ function move(editor, options = {}) {
 	}
 	editor.setSelection(props);
 }
+function subscribeToOperations(editor, listener, options) {
+	let phase = options?.phase ?? "after";
+	return editor.operationListeners[phase] = [...editor.operationListeners[phase], listener], () => {
+		let listeners = editor.operationListeners[phase], index = listeners.indexOf(listener);
+		index !== -1 && (editor.operationListeners[phase] = [...listeners.slice(0, index), ...listeners.slice(index + 1)]);
+	};
+}
+/**
+* Captures the operation together with the engine state that `after`
+* listeners can no longer read once the operation has been applied. All
+* engine flags are stable for the duration of a single apply call, so
+* capturing them at entry is equivalent to reading them at any point during
+* the apply.
+*/
+function createOperationEvent(editor, operation) {
+	let isNormalizingNode = !!editor.isNormalizingNode, isProcessingRemoteChanges = !!editor.isProcessingRemoteChanges, isUndoing = !!editor.isUndoing, isRedoing = !!editor.isRedoing;
+	return {
+		operation,
+		beforeValue: editor.snapshot.context.value,
+		beforeSelection: editor.snapshot.context.selection,
+		operationsInProgress: editor.operations.length > 0,
+		isNormalizingNode,
+		isPatching: !!editor.isPatching,
+		isProcessingRemoteChanges,
+		isUndoing,
+		isRedoing,
+		withHistory: !!editor.withHistory,
+		undoStepId: editor.undoStepId,
+		origin: isProcessingRemoteChanges ? "remote" : isUndoing ? "undo" : isRedoing ? "redo" : isNormalizingNode ? "normalization" : "local"
+	};
+}
+function emitOperationEvent(listeners, event) {
+	for (let index = 0; index < listeners.length; index++) listeners[index]?.(event);
+}
 const bold$1 = createKeyboardShortcut({
 	default: [{
 		key: "B",
@@ -2786,9 +2820,12 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({ children }) => /* @__PU
 	editor.forceRender = forceRender, editor.readOnly = readOnly;
 	let state = useMemo(() => ({
 		isUpdatingSelection: !1,
-		latestElement: null
+		latestElement: null,
+		localContentChangePending: !1
 	}), []);
-	useEffect(() => {
+	useEffect(() => subscribeToOperations(editor, (event) => {
+		event.operation.type !== "set.selection" && (event.origin === "local" || event.origin === "undo" || event.origin === "redo") && (state.localContentChangePending = !0);
+	}), [editor, state]), useEffect(() => {
 		ref.current && autoFocus && ref.current.focus();
 	}, [autoFocus]);
 	/**
@@ -2843,6 +2880,8 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({ children }) => /* @__PU
 		onDOMSelectionChange,
 		scheduleOnDOMSelectionChange
 	}), useIsomorphicLayoutEffect(() => {
+		let hadPendingLocalContentChange = state.localContentChangePending;
+		state.localContentChangePending = !1;
 		let window = null;
 		ref.current && (window = getDefaultView(ref.current)) && (editor.domWindow = window, editor.domElement = ref.current);
 		let { selection } = editor.snapshot.context, root = DOMEditor.findDocumentOrShadowRoot(editor), domSelection = getSelection(root);
@@ -2861,7 +2900,13 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({ children }) => /* @__PU
 					exactMatch: !0,
 					suppressThrow: !0
 				});
-				if (editorSelection && rangeEquals(editorSelection, selection)) return;
+				if (editorSelection && rangeEquals(editorSelection, selection)) {
+					if (hadPendingLocalContentChange) try {
+						let domRange = DOMEditor.toDOMRange(editor, selection);
+						scrollSelectionIntoView(editor, domRange);
+					} catch {}
+					return;
+				}
 			}
 			if (selection && !DOMEditor.hasRange(editor, selection)) {
 				let fallbackRange = DOMEditor.toEditorSelection(editor, domSelection, {
@@ -4261,40 +4306,6 @@ function performHotkey({ editorActor, editor, portableTextEditor, hotkeys, event
 		}
 	});
 }
-function subscribeToOperations(editor, listener, options) {
-	let phase = options?.phase ?? "after";
-	return editor.operationListeners[phase] = [...editor.operationListeners[phase], listener], () => {
-		let listeners = editor.operationListeners[phase], index = listeners.indexOf(listener);
-		index !== -1 && (editor.operationListeners[phase] = [...listeners.slice(0, index), ...listeners.slice(index + 1)]);
-	};
-}
-/**
-* Captures the operation together with the engine state that `after`
-* listeners can no longer read once the operation has been applied. All
-* engine flags are stable for the duration of a single apply call, so
-* capturing them at entry is equivalent to reading them at any point during
-* the apply.
-*/
-function createOperationEvent(editor, operation) {
-	let isNormalizingNode = !!editor.isNormalizingNode, isProcessingRemoteChanges = !!editor.isProcessingRemoteChanges, isUndoing = !!editor.isUndoing, isRedoing = !!editor.isRedoing;
-	return {
-		operation,
-		beforeValue: editor.snapshot.context.value,
-		beforeSelection: editor.snapshot.context.selection,
-		operationsInProgress: editor.operations.length > 0,
-		isNormalizingNode,
-		isPatching: !!editor.isPatching,
-		isProcessingRemoteChanges,
-		isUndoing,
-		isRedoing,
-		withHistory: !!editor.withHistory,
-		undoStepId: editor.undoStepId,
-		origin: isProcessingRemoteChanges ? "remote" : isUndoing ? "undo" : isRedoing ? "redo" : isNormalizingNode ? "normalization" : "local"
-	};
-}
-function emitOperationEvent(listeners, event) {
-	for (let index = 0; index < listeners.length; index++) listeners[index]?.(event);
-}
 function isForwardRange(range, root) {
 	return !isBackwardRange(range, root);
 }