aloha-vue 1.2.91 → 1.2.93

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.91",
+  "version": "1.2.93",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/styles/components/ui/ASelect.scss

@@ -16,7 +16,7 @@
   text-align: left;
 }
 .a_select_toggle_closeable {
-  padding: 0;
+  padding: 0 30px 0 0;
 }
 
 .a_caret {

package/src/ui/ATinymce/compositionAPI/ATinymceAPI.js

@@ -94,6 +94,8 @@ export default function ATinymceAPI(props, context, {
       readonly: !!disabled.value,
       valid_elements: validElements.value,
       valid_styles: validStyles.value,
+      force_br_newlines: true,
+      indent: false,
 
       setup: editor => {
         vueEditor = editor;

package/src/ui/ATinymce/plugins/MyPowerPaste.js

@@ -61,6 +61,7 @@ function parseWord({ html }) {
   const rootElement = document.createElement("div");
   let currentList = null;
   let lastLevel = 0;
+  let lastIndent = 0;
   const listStack = [];
 
   forEach(allChildren, element => {
@@ -68,31 +69,35 @@ function parseWord({ html }) {
     if (!isTagP) {
       rootElement.appendChild(element);
       lastLevel = 0;
+      lastIndent = 0;
       currentList = null;
       return;
     }
 
-    const isNormalParagraph = element.className.includes("MsoNormal");
-    const htmlContent = element.innerHTML.trim()
+    let htmlContent = element.innerHTML.trim();
+    const IS_NORMAL_PARAGRAPH = isNormalParagraph({ element, htmlContent });
+    htmlContent = htmlContent
       .replace(/<u>/g, "<span style=\"text-decoration: underline;\">")
       .replace(/<\/u>/g, "</span>")
       .replace(/<!--\[if !supportLists]-->.*?<!--\[endif]-->/gs, "")
       .replace(/&nbsp;/g, " ")
       .replace(/^[\s·o§1-9]+[.)]?/g, "");
 
-    if (isTagP && isNormalParagraph && !element.className.includes("MsoListParagraph")) {
+    if (isTagP && IS_NORMAL_PARAGRAPH) {
       const newParagraph = document.createElement("p");
       newParagraph.innerHTML = htmlContent;
       rootElement.appendChild(newParagraph);
       lastLevel = 0;
+      lastIndent = 0;
       currentList = null;
       return;
     }
 
+    const MARGIN_LEFT = parseInt(element.style.marginLeft) || 0;
     const LIST_LEVEL = getCurrentLevelForList(element);
     const { type, style } = getListTypeAndStyleFromSpanContent(element);
 
-    if (!currentList || LIST_LEVEL > lastLevel) {
+    if (!currentList || LIST_LEVEL > lastLevel || MARGIN_LEFT > lastIndent) {
       const newList = document.createElement(type);
       if (style) {
         newList.style.listStyleType = style;
@@ -104,12 +109,17 @@ function parseWord({ html }) {
         rootElement.appendChild(newList);
       }
       currentList = newList;
-      listStack.push({ element: newList, level: LIST_LEVEL });
+      listStack.push({ element: newList, level: LIST_LEVEL, marginLeft: MARGIN_LEFT });
     } else if (LIST_LEVEL < lastLevel) {
       while (listStack.length > 1 && LIST_LEVEL < listStack[listStack.length - 1].level) {
         listStack.pop();
         currentList = listStack[listStack.length - 1].element;
       }
+    } else if (MARGIN_LEFT < lastIndent && listStack.length > 1) {
+      while (listStack.length > 1 && MARGIN_LEFT < listStack[listStack.length - 1].marginLeft) {
+        listStack.pop();
+        currentList = listStack[listStack.length - 1].element;
+      }
     }
 
     const li = document.createElement("li");
@@ -117,6 +127,7 @@ function parseWord({ html }) {
     currentList.appendChild(li);
 
     lastLevel = LIST_LEVEL;
+    lastIndent = MARGIN_LEFT;
   });
 
   return rootElement.innerHTML;
@@ -185,3 +196,9 @@ function getCurrentLevelForList(p) {
 
   return level;
 }
+
+function isNormalParagraph({ element, htmlContent }) {
+  return element.className.includes("MsoNormal") ||
+    (!element.className.includes("MsoListParagraph") &&
+    !/mso-list:/.test(htmlContent));
+}