@haluo/biz 2.0.40 → 2.0.41-next.0

package/dist/{squire-raw.9f05be24.js → squire-raw-1aaeff0b.js}

@@ -14,7 +14,7 @@
   var COLOUR_CLASS = "colour";
   var FONT_FAMILY_CLASS = "font";
   var FONT_SIZE_CLASS = "size";
-  var ZWS = "\u200B";
+  var ZWS = "​";
   var win = doc.defaultView;
   var ua = navigator.userAgent;
   var isAndroid = /Android/.test(ua);
@@ -44,11 +44,17 @@
     };
   }
   var typeToBitArray = {
+    // ELEMENT_NODE
     1: 1,
+    // ATTRIBUTE_NODE
     2: 2,
+    // TEXT_NODE
     3: 4,
+    // COMMENT_NODE
     8: 128,
+    // DOCUMENT_NODE
     9: 256,
+    // DOCUMENT_FRAGMENT_NODE
     11: 1024
   };
   function TreeWalker(root, nodeType, filter) {
@@ -382,7 +388,7 @@
         node.appendChild(fixer);
       } catch (error) {
         self.didError({
-          name: "Squire: fixCursor \u2013\xA0" + error,
+          name: "Squire: fixCursor – " + error,
           message: "Parent: " + node.nodeName + "/" + node.innerHTML + " appendChild: " + fixer.nodeName
         });
       }
@@ -399,17 +405,6 @@
       child = children[i];
       isBR = child.nodeName === "BR";
       if (!isBR && isInline(child)) {
-        if (child.classList && child.classList.contains("halo-picture-area")) {
-          return;
-        }
-        if (!wrapper) {
-          wrapper = createElement(
-            doc2,
-            config.blockTag,
-            config.blockAttributes
-          );
-        }
-        wrapper.appendChild(child);
         i -= 1;
         l -= 1;
       } else if (isBR || wrapper) {
@@ -728,7 +723,8 @@
     block = getStartBlockOfRange(range, root);
     firstBlockInFrag = getNextBlock(frag, frag);
     replaceBlock = !!block && isEmptyBlock(block);
-    if (block && firstBlockInFrag && !replaceBlock && !getNearest(firstBlockInFrag, frag, "PRE") && !getNearest(firstBlockInFrag, frag, "TABLE")) {
+    if (block && firstBlockInFrag && !replaceBlock && // Don't merge table cells or PRE elements into block
+    !getNearest(firstBlockInFrag, frag, "PRE") && !getNearest(firstBlockInFrag, frag, "TABLE")) {
       moveRangeBoundariesUpTree(range, block, block, root);
       range.collapse(true);
       container = range.endContainer;
@@ -744,7 +740,10 @@
         container = nodeAfterSplit.parentNode;
         offset = indexOf.call(container.childNodes, nodeAfterSplit);
       }
-      if (offset !== getLength(container)) {
+      if (
+        /* isBlock( container ) && */
+        offset !== getLength(container)
+      ) {
         blockContentsAfterSplit = root.ownerDocument.createDocumentFragment();
         while (node = container.childNodes[offset]) {
           blockContentsAfterSplit.appendChild(node);
@@ -1793,9 +1792,11 @@
       if (hasImage) {
         this.fireEvent("dragover", {
           dataTransfer: clipboardData,
+          /* jshint loopfunc: true */
           preventDefault: function() {
             fireDrop = true;
           }
+          /* jshint loopfunc: false */
         });
         if (fireDrop) {
           this.fireEvent("drop", {
@@ -2002,7 +2003,9 @@
       leafNodeNames,
       undo: {
         documentSizeThreshold: -1,
+        // -1 means no threshold
         undoLimit: -1
+        // -1 means no limit
       },
       isInsertedHTMLSanitized: true,
       isSetHTMLSanitized: true,

package/dist/style.css

@@ -1,35 +1,35 @@
-.m-colorPicker[data-v-b46fc003]{position:relative;text-align:left;font-size:14px;display:inline-block;outline:none}.m-colorPicker ul[data-v-b46fc003],.m-colorPicker li[data-v-b46fc003],.m-colorPicker ol[data-v-b46fc003]{list-style:none;margin:0;padding:0}.m-colorPicker .colorBtn[data-v-b46fc003]{width:15px;height:15px}.m-colorPicker .colorBtn.disabled[data-v-b46fc003]{cursor:no-drop}.m-colorPicker .box[data-v-b46fc003]{position:absolute;width:190px;background:#fff;border:1px solid #ddd;visibility:hidden;border-radius:2px;margin-top:2px;padding:10px 10px 5px;box-shadow:0 0 5px #00000026;opacity:0;transition:all .3s ease;box-sizing:content-box}.m-colorPicker .box h3[data-v-b46fc003]{margin:10px 0 5px;font-size:14px;font-weight:400;line-height:1;color:#333}.m-colorPicker .box input[data-v-b46fc003]{visibility:hidden;position:absolute;left:0;bottom:0}.m-colorPicker .box.open[data-v-b46fc003]{visibility:visible;opacity:1;z-index:1}.m-colorPicker .hd[data-v-b46fc003]{overflow:hidden;line-height:29px}.m-colorPicker .hd .colorView[data-v-b46fc003]{width:100px;height:30px;float:left;transition:background-color .3s ease}.m-colorPicker .hd .defaultColor[data-v-b46fc003]{width:80px;float:right;text-align:center;border:1px solid #ddd;cursor:pointer;color:#333}.m-colorPicker .tColor li[data-v-b46fc003]{width:15px;height:15px;display:inline-block;margin:0 2px;transition:all .3s ease}.m-colorPicker .tColor li[data-v-b46fc003]:hover{box-shadow:0 0 5px #0006;transform:scale(1.3)}.m-colorPicker .bColor li[data-v-b46fc003]{width:15px;display:inline-block;margin:0 2px}.m-colorPicker .bColor li li[data-v-b46fc003]{display:block;width:15px;height:15px;transition:all .3s ease;margin:0}.m-colorPicker .bColor li li[data-v-b46fc003]:hover{box-shadow:0 0 5px #0006;transform:scale(1.3)}
-.m12[data-v-52e48332] {
+.m-colorPicker[data-v-b46fc003]{position:relative;text-align:left;font-size:14px;display:inline-block;outline:none}.m-colorPicker ul[data-v-b46fc003],.m-colorPicker li[data-v-b46fc003],.m-colorPicker ol[data-v-b46fc003]{list-style:none;margin:0;padding:0}.m-colorPicker .colorBtn[data-v-b46fc003]{width:15px;height:15px}.m-colorPicker .colorBtn.disabled[data-v-b46fc003]{cursor:no-drop}.m-colorPicker .box[data-v-b46fc003]{position:absolute;width:190px;background:#fff;border:1px solid #ddd;visibility:hidden;border-radius:2px;margin-top:2px;padding:10px 10px 5px;box-shadow:0 0 5px #00000026;opacity:0;transition:all .3s ease;box-sizing:content-box}.m-colorPicker .box h3[data-v-b46fc003]{margin:10px 0 5px;font-size:14px;font-weight:400;line-height:1;color:#333}.m-colorPicker .box input[data-v-b46fc003]{visibility:hidden;position:absolute;left:0;bottom:0}.m-colorPicker .box.open[data-v-b46fc003]{visibility:visible;opacity:1;z-index:1}.m-colorPicker .hd[data-v-b46fc003]{overflow:hidden;line-height:29px}.m-colorPicker .hd .colorView[data-v-b46fc003]{width:100px;height:30px;float:left;transition:background-color .3s ease}.m-colorPicker .hd .defaultColor[data-v-b46fc003]{width:80px;float:right;text-align:center;border:1px solid #ddd;cursor:pointer;color:#333}.m-colorPicker .tColor li[data-v-b46fc003]{width:15px;height:15px;display:inline-block;margin:0 2px;transition:all .3s ease}.m-colorPicker .tColor li[data-v-b46fc003]:hover{box-shadow:0 0 5px #0006;transform:scale(1.3)}.m-colorPicker .bColor li[data-v-b46fc003]{width:15px;display:inline-block;margin:0 2px}.m-colorPicker .bColor li li[data-v-b46fc003]{display:block;width:15px;height:15px;transition:all .3s ease;margin:0}.m-colorPicker .bColor li li[data-v-b46fc003]:hover{box-shadow:0 0 5px #0006;transform:scale(1.3)}
+.m12[data-v-50235bb8] {
   margin: 0 12px;
 }
-.ml16[data-v-52e48332] {
+.ml16[data-v-50235bb8] {
   margin-left: 16px;
 }
-.mr12[data-v-52e48332] {
+.mr12[data-v-50235bb8] {
   margin-right: 12px;
 }
-.ml12[data-v-52e48332] {
+.ml12[data-v-50235bb8] {
   margin-left: 12px;
 }
-.mr18[data-v-52e48332] {
+.mr18[data-v-50235bb8] {
   margin-right: 18px;
 }
-.tools[data-v-52e48332] {
+.tools[data-v-50235bb8] {
   z-index: 2;
   position: relative;
   background: #FAFAFA;
 }
-.tools .tools-content[data-v-52e48332] {
+.tools .tools-content[data-v-50235bb8] {
   display: flex;
   align-items: center;
 }
-.tools img[data-v-52e48332] {
+.tools img[data-v-50235bb8] {
   cursor: pointer;
 }
-.tools .box[data-v-52e48332] {
+.tools .box[data-v-50235bb8] {
   position: relative;
 }
-.tools .box .box-mask[data-v-52e48332] {
+.tools .box .box-mask[data-v-50235bb8] {
   width: 40px;
   height: 40px;
   background: black;
@@ -38,31 +38,31 @@
   position: absolute;
   pointer-events: none;
 }
-.tools .tools-title[data-v-52e48332] {
+.tools .tools-title[data-v-50235bb8] {
   color: #333333;
   font-size: 18px;
   display: flex;
   align-items: center;
   cursor: pointer;
 }
-.tools .disable[data-v-52e48332] {
+.tools .disable[data-v-50235bb8] {
   cursor: not-allowed;
   filter: blur(0.6px);
 }
-.tools .disable img[data-v-52e48332] {
+.tools .disable img[data-v-50235bb8] {
   cursor: not-allowed;
 }
-.tools .wrap[data-v-52e48332] {
+.tools .wrap[data-v-50235bb8] {
   position: relative;
 }
-.tools[data-v-52e48332] .m-colorPicker {
+.tools[data-v-50235bb8] .m-colorPicker {
   position: absolute;
   width: 100%;
   left: 0;
   z-index: -1;
   height: 100%;
 }
-.tools[data-v-52e48332] .m-colorPicker .colorBtn {
+.tools[data-v-50235bb8] .m-colorPicker .colorBtn {
   width: 100%;
   height: 100%;
   opacity: 0;
@@ -462,6 +462,90 @@
   margin-top: 12px;
   text-align: center;
 }
+/**
+ * Created by wanghui on 2017-04-21.
+ * 
+ */
+.topic-popover-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  background: transparent;
+}
+.topic-popover {
+  position: fixed;
+  z-index: 9999;
+  background: #fff;
+  border-radius: 4px;
+  box-sizing: border-box;
+  box-shadow: 0 4px 17px rgba(0, 0, 0, 0.12);
+  width: 430px;
+  height: 286px;
+  overflow-y: auto;
+}
+.topic-popover .topic-popover-content .topic-tabs {
+  display: flex;
+  border-bottom: 1px solid #f0f0f0;
+  background: #fafafa;
+}
+.topic-popover .topic-popover-content .topic-tabs .topic-tab {
+  flex: 1;
+  padding: 12px 16px;
+  text-align: center;
+  font-size: 14px;
+  color: #666;
+  cursor: pointer;
+  border-bottom: 2px solid transparent;
+  transition: all 0.2s;
+}
+.topic-popover .topic-popover-content .topic-tabs .topic-tab:hover {
+  color: #FF3C08;
+  background: #f5f5f5;
+}
+.topic-popover .topic-popover-content .topic-tabs .topic-tab.active {
+  color: #FF3C08;
+  border-bottom-color: #FF3C08;
+  background: #fff;
+}
+.topic-popover .topic-popover-content .topic-search-header {
+  padding: 12px 16px;
+  border-bottom: 1px solid #f0f0f0;
+  background: #fafafa;
+}
+.topic-popover .topic-popover-content .topic-search-header .topic-search-title {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+}
+.topic-popover .topic-popover-content .topic-list-container {
+  max-height: 240px;
+  overflow-y: auto;
+}
+.topic-popover .topic-popover-content .topic-list-container .topic-list .topic-item {
+  padding: 12px 16px;
+  font-size: 14px;
+  color: #333;
+  cursor: pointer;
+  border-bottom: 1px solid #f8f8f8;
+  transition: background-color 0.2s;
+}
+.topic-popover .topic-popover-content .topic-list-container .topic-list .topic-item:hover {
+  background: #f5f5f5;
+  color: #FF3C08;
+}
+.topic-popover .topic-popover-content .topic-list-container .topic-list .topic-item:last-child {
+  border-bottom: none;
+}
+.topic-popover .topic-popover-content .topic-list-container .topic-list .topic-loading,
+.topic-popover .topic-popover-content .topic-list-container .topic-list .topic-empty {
+  padding: 20px 16px;
+  text-align: center;
+  font-size: 14px;
+  color: #999;
+}
 .collect-article_lable {
   font-size: 14px;
   color: #333333;
@@ -475,7 +559,7 @@
   color: #999999;
   margin-bottom: 5px;
 }
-.article-item[data-v-1c406a11] {
+.article-item[data-v-4ebe06df] {
   -webkit-user-select: none;
      -moz-user-select: none;
       -ms-user-select: none;
@@ -488,7 +572,7 @@
   width: 440px;
   position: relative;
 }
-.article-item .icon[data-v-1c406a11] {
+.article-item .icon[data-v-4ebe06df] {
   width: 14px;
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -500,7 +584,7 @@
   color: #b7b7b7;
   transform: translate(50%, -50%);
 }
-.article-item img[data-v-1c406a11] {
+.article-item img[data-v-4ebe06df] {
   width: 80px;
   height: 80px;
   -o-object-fit: cover;
@@ -508,12 +592,12 @@
   margin-right: 12px;
   flex-shrink: 0;
 }
-.article-item .article-item_right[data-v-1c406a11] {
+.article-item .article-item_right[data-v-4ebe06df] {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
 }
-.article-item .article-item_right .name[data-v-1c406a11] {
+.article-item .article-item_right .name[data-v-4ebe06df] {
   font-size: 16px;
   margin-top: 5px;
   line-height: 22px;
@@ -523,7 +607,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.article-item .article-item_right .score[data-v-1c406a11] {
+.article-item .article-item_right .score[data-v-4ebe06df] {
   color: #999999;
   line-height: 17px;
   font-size: 12px;
@@ -531,18 +615,18 @@
   align-items: center;
   margin-bottom: 6px;
 }
-.article-item .article-item_right .score span[data-v-1c406a11]:nth-child(2) {
+.article-item .article-item_right .score span[data-v-4ebe06df]:nth-child(2) {
   margin-left: 10px;
 }
-.article-item .article-item_right .score span[data-v-1c406a11]:nth-child(3) {
+.article-item .article-item_right .score span[data-v-4ebe06df]:nth-child(3) {
   margin-left: 10px;
 }
-.article-item .article-item_right .price[data-v-1c406a11] {
+.article-item .article-item_right .price[data-v-4ebe06df] {
   color: #ff5a25;
   font-size: 16px;
   margin-top: 6px;
 }
-.article-item .article-bg[data-v-1c406a11] {
+.article-item .article-bg[data-v-4ebe06df] {
   position: absolute;
   width: 440px;
   height: 60px;
@@ -557,7 +641,7 @@
   -webkit-backdrop-filter: blur(3px);
           backdrop-filter: blur(3px);
 }
-.article-item .article-bg-height[data-v-1c406a11] {
+.article-item .article-bg-height[data-v-4ebe06df] {
   height: 80px;
   line-height: 80px;
 }
@@ -572,10 +656,6 @@
 }
 .editor mdd-topic {
   pointer-events: none;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
   color: #5288F6;
 }
 .editor ol,

package/package.json

@@ -1,47 +1,49 @@
-{
-  "name": "@haluo/biz",
-  "description": "rich text",
-  "version": "2.0.40",
-  "type": "module",
-  "module": "./dist/haluo-biz.js",
-  "main": "./dist/haluo-biz.umd.cjs",
-  "exports": {
-    ".": {
-      "import": "./dist/haluo-biz.js",
-      "require": "./dist/haluo-biz.umd.cjs"
-    },
-    "./dist/style.css": "./dist/style.css"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
-    "build:watch": "vue-tsc --noEmit && vite build --watch",
-    "preview": "vite preview",
-    "pub": "npm publish"
-  },
-  "dependencies": {
-    "element-plus": "^2.2.28",
-    "uuid": "^9.0.0",
-    "vue": "^3.2.36",
-    "vuedraggable": "^4.1.0"
-  },
-  "devDependencies": {
-    "@element-plus/icons-vue": "^2.0.10",
-    "@haluo/util": "^1.0.24",
-    "@types/node": "^18.7.18",
-    "@types/uuid": "^9.0.0",
-    "@vitejs/plugin-vue": "^4.0.0",
-    "autoprefixer": "^10.4.11",
-    "less": "^4.1.3",
-    "typescript": "^4.6.4",
-    "vite": "^4.0.0",
-    "vite-plugin-dts": "^1.5.0",
-    "vue-tsc": "^0.40.4"
-  },
-  "peerDependencies": {
-    "vue": "^3.x"
-  }
-}
+{
+  "name": "@haluo/biz",
+  "description": "rich text",
+  "version": "2.0.41-next.0",
+  "type": "module",
+  "module": "./dist/haluo-biz.js",
+  "main": "./dist/haluo-biz.umd.cjs",
+  "exports": {
+    ".": {
+      "import": "./dist/haluo-biz.js",
+      "require": "./dist/haluo-biz.umd.cjs"
+    },
+    "./dist/style.css": "./dist/style.css"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "dev": "vite",
+    "build": "vue-tsc --noEmit && vite build",
+    "build:watch": "vue-tsc --noEmit && vite build --watch",
+    "preview": "vite preview",
+    "next": "npm version prerelease --preid=next",
+    "pub": "npm publish",
+    "pub:next": "npm publish --tag=next"
+  },
+  "dependencies": {
+    "element-plus": "^2.2.28",
+    "uuid": "^9.0.0",
+    "vue": "^3.2.36",
+    "vuedraggable": "^4.1.0"
+  },
+  "devDependencies": {
+    "@element-plus/icons-vue": "^2.0.10",
+    "@haluo/util": "^1.0.24",
+    "@types/node": "^18.7.18",
+    "@types/uuid": "^9.0.0",
+    "@vitejs/plugin-vue": "^4.0.0",
+    "autoprefixer": "^10.4.11",
+    "less": "^4.1.3",
+    "typescript": "^4.6.4",
+    "vite": "^4.0.0",
+    "vite-plugin-dts": "^1.5.0",
+    "vue-tsc": "^0.40.4"
+  },
+  "peerDependencies": {
+    "vue": "^3.x"
+  }
+}