Merge remote-tracking branch 'origin/4.1' into main

Author: tischsoic

src/bundle/Resources/public/js/CKEditor/custom-tags/inline-custom-tag/inline-custom-tag-editing.js

@@ -118,20 +118,13 @@ class IbexaInlineCustomTagEditing extends Plugin {
         });
 
         conversion.for('upcast').elementToElement({
+            model: 'inlineCustomTagContent',
             view: {
                 name: 'span',
                 attributes: {
                     'data-ezelement': 'ezcontent',
                 },
             },
-            model: (viewElement, { writer: upcastWriter }) => {
-                const content = viewElement.getChild(0);
-                const modelElement = upcastWriter.createElement('inlineCustomTagContent');
-
-                upcastWriter.insertText(content.data, modelElement);
-
-                return modelElement;
-            },
         });
     }