@ckeditor/ckeditor5-widget 48.3.1 → 48.4.0-alpha.1

package/dist/index.js

@@ -3,12 +3,12 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
  */
 import { Plugin } from "@ckeditor/ckeditor5-core";
-import { ModelTreeWalker, MouseObserver, PointerObserver } from "@ckeditor/ckeditor5-engine";
+import { ModelDocumentSelection, ModelTreeWalker, MouseObserver, PointerObserver } from "@ckeditor/ckeditor5-engine";
 import { Delete } from "@ckeditor/ckeditor5-typing";
 import { CKEditorError, DomEmitterMixin, EmitterMixin, ObservableMixin, Rect, compareArrays, env, getLocalizedArrowKeyCodeDirection, getRangeFromMouseEvent, global, isForwardArrowKeyCode, keyCodes, logWarning, toArray } from "@ckeditor/ckeditor5-utils";
 import { IconDragHandle, IconReturnArrow } from "@ckeditor/ckeditor5-icons";
 import { BalloonPanelView, ContextualBalloon, IconView, Template, ToolbarView, View } from "@ckeditor/ckeditor5-ui";
-import { Enter } from "@ckeditor/ckeditor5-enter";
+import { Enter, _getCopyOnEnterAttributes } from "@ckeditor/ckeditor5-enter";
 import { throttle } from "es-toolkit/compat";
 
 /**
@@ -513,6 +513,59 @@ function getClosestWidgetViewElement(domElement, domConverter) {
 function getTypeAroundFakeCaretPosition(selection) {
 	return selection.getAttribute(TYPE_AROUND_SELECTION_ATTRIBUTE);
 }
+/**
+* Looks for the `copyOnEnter` text formatting attributes (e.g. bold, font color) carried by the last piece
+* of inline content on the sibling that directly precedes a run of one or more consecutive block widgets.
+*
+* Used when the user inserts a new paragraph next to a widget (e.g. an image or a table) via the type-around
+* UI: the new, empty paragraph should continue whatever formatting was active right before the widget,
+* instead of starting unformatted:
+*
+* ```
+* <paragraph><$text bold="true">Bar</$text></paragraph><imageBlock></imageBlock>
+* ```
+*
+* Only the attributes carried by the *last* inline child of that sibling are considered - whatever precedes
+* it doesn't matter, because it's the last piece of content that reflects what the user was typing right
+* before reaching the widget:
+*
+* ```
+* // "bold" IS recovered here: "Bar", the last child, is bold. "Foo" not being bold is irrelevant.
+* <paragraph>Foo<$text bold="true">Bar</$text></paragraph><imageBlock></imageBlock>
+* ```
+*
+* If there is more than one widget in a row, the search continues past all of them until a sibling with
+* actual content (or the boundary of the parent) is found:
+*
+* ```
+* <paragraph><$text bold="true">Bar</$text></paragraph><imageBlock></imageBlock><imageBlock></imageBlock>
+* ```
+*
+* @param schema Model's schema.
+* @param widgetElement The widget model element.
+* @internal
+*/
+function getCopyOnEnterTextAttributesBeforeWidgets(schema, widgetElement) {
+	let sibling = widgetElement;
+	while (sibling && sibling.is("element") && schema.isObject(sibling)) sibling = sibling.previousSibling;
+	if (!sibling?.is("element")) return [];
+	if (sibling.isEmpty) {
+		const selectionAttributes = extractStoredSelectionAttributes(sibling.getAttributes());
+		return Array.from(_getCopyOnEnterAttributes(schema, selectionAttributes));
+	}
+	const lastChild = sibling.getChild(sibling.childCount - 1);
+	if (!schema.isInline(lastChild)) return [];
+	return Array.from(_getCopyOnEnterAttributes(schema, lastChild.getAttributes()));
+}
+/**
+* Extracts the selection attributes stored on an empty block.
+*/
+function* extractStoredSelectionAttributes(iterator) {
+	for (const [attributeKey, attributeValue] of iterator) {
+		if (!ModelDocumentSelection._isStoreAttributeKey(attributeKey)) continue;
+		yield [ModelDocumentSelection._dropStoreAttributeKeyPrefix(attributeKey), attributeValue];
+	}
+}
 
 /**
 * @license Copyright (c) 2003-2026, CKSource Holding sp. z o.o. All rights reserved.
@@ -602,11 +655,16 @@ var WidgetTypeAround = class extends Plugin {
 	*/
 	_insertParagraph(widgetModelElement, position) {
 		const editor = this.editor;
+		const { model } = editor;
+		const { schema } = model;
 		const editingView = editor.editing.view;
-		const attributesToCopy = editor.model.schema.getAttributesWithProperty(widgetModelElement, "copyOnReplace", true);
-		editor.execute("insertParagraph", {
-			position: editor.model.createPositionAt(widgetModelElement, position),
-			attributes: attributesToCopy
+		const attributesToCopy = schema.getAttributesWithProperty(widgetModelElement, "copyOnReplace", true);
+		const selectionAttributes = getCopyOnEnterTextAttributesBeforeWidgets(schema, widgetModelElement);
+		model.change((writer) => {
+			if (editor.execute("insertParagraph", {
+				position: editor.model.createPositionAt(widgetModelElement, position),
+				attributes: attributesToCopy
+			})) writer.setSelectionAttribute(selectionAttributes);
 		});
 		editingView.focus();
 		editingView.scrollToTheSelection();
@@ -1694,7 +1752,7 @@ function findClosestEditableOrWidgetAncestor(element) {
 */
 function getElementFromMouseEvent(view, domEventData) {
 	const domRange = getRangeFromMouseEvent(domEventData.domEvent);
-	let viewRange = null;
+	let viewRange;
 	if (domRange) viewRange = view.domConverter.domRangeToView(domRange);
 	else viewRange = view.createRange(view.createPositionAt(domEventData.target, 0));
 	if (!viewRange) return null;