opentiny 6.9.20 → 6.9.22

package/tinymce.js

@@ -24600,8 +24600,8 @@
         return isListItem$1(SugarElement.fromDom(elm));
       }).isSome();
     };
-    const emptyBlock = elm => {
-      elm.innerHTML = '<br data-mce-bogus="1">';
+    const emptyBlock = (elm, addBogus = true) => {
+      elm.innerHTML = addBogus ? '<br data-mce-bogus="1">' : '<br>';
     };
     const applyAttributes = (editor, node, forcedRootBlockAttrs) => {
       const dom = editor.dom;
@@ -24673,7 +24673,8 @@
         } while ((node = node.parentNode) && node !== editableRoot);
       }
       setForcedBlockAttrs(editor, block);
-      emptyBlock(caretNode);
+      const addBogus = parentBlockName !== 'LI';
+      emptyBlock(caretNode, addBogus);
       return block;
     };
 
@@ -26294,8 +26295,9 @@
         const img = new Image();
         img.src = blobInfo.blobUri();
         img.onload = () => {
-          const contentBodyElement = editor.dom.select('.mce-content-body')[0];
-          const maxImageWidth = contentBodyElement ? parseInt(window.getComputedStyle(contentBodyElement).width) : defaultMaxImageWidthPx;
+          const contentBodyElement = editor.dom.select('.mce-content-body')[0].children[0];
+          const computedStyles = contentBodyElement ? window.getComputedStyle(contentBodyElement) : null;
+          const maxImageWidth = computedStyles ? parseInt(computedStyles.width) - parseInt(computedStyles.paddingLeft) - parseInt(computedStyles.paddingRight) : defaultMaxImageWidthPx;
           const imageWidth = Math.min(img.naturalWidth, maxImageWidth);
           pasteHtml(editor, `<img src="${ blobInfo.blobUri() }" width="${ imageWidth }px">`, false, true);
         };