Fix mapping of view element to model element

https://community.openproject.org/work_packages/52641
opf · Feb 19, 2024 · e0009c1 · e0009c1
1 parent dd47697
commit e0009c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/plugins/code-block/code-block-editing.js b/src/plugins/code-block/code-block-editing.js
@@ -6,6 +6,7 @@ import {modelCodeBlockToView, viewCodeBlockToModel, codeBlockContentToView} from
 import {createCodeBlockWidget, isCodeBlockWidget} from './widget';
 import DoubleClickObserver from './click-observer';
 import { getPluginContext } from '../op-context/op-context';
+import {viewToModelPositionOutsideModelElement} from "@ckeditor/ckeditor5-widget";
 
 export default class CodeBlockEditing extends Plugin {
 
@@ -47,6 +48,13 @@ export default class CodeBlockEditing extends Plugin {
 			.for('dataDowncast')
 			.add(modelCodeBlockToView());
 
+		this.editor.editing.mapper.on(
+			'viewToModelPosition',
+			viewToModelPositionOutsideModelElement( this.editor.model, viewElement => {
+				return viewElement.hasClass( 'op-uc-code-block' )
+			} )
+		);
+
 		// Register click handler to code block to edit it immediately
 		view.addObserver( DoubleClickObserver );
 		this.listenTo( viewDocument, 'dblclick', ( eventInfo, domEventData ) => {

diff --git a/src/plugins/code-block/converters.js b/src/plugins/code-block/converters.js
@@ -30,6 +30,7 @@ export function modelCodeBlockToView() {
 
 		conversionApi.mapper.bindElements( codeBlock, codeElement );
 		conversionApi.mapper.bindElements( codeBlock, preElement );
+		conversionApi.mapper.bindElements( codeBlock, langElement );
 
 		// Insert at matching position
 		const insertPosition = conversionApi.mapper.toViewPosition( data.range.start );