@seafile/seafile-editor 0.3.90 → 0.3.93

package/dist/components/toolbar.js

@@ -199,7 +199,17 @@ var ToolBar = /*#__PURE__*/function (_React$Component) {
         onInsertRow: this.editorUtils.onInsertRow,
         onRemoveRow: this.editorUtils.onRemoveRow,
         onSetAlign: this.editorUtils.onSetAlign
-      })), this.props.hasSidePanel && /*#__PURE__*/React.createElement("div", {
+      }), /*#__PURE__*/React.createElement(ButtonGroup, {
+        className: 'editor-btn-group'
+      }, /*#__PURE__*/React.createElement(IconButton, {
+        className: 'editor-clear-format',
+        isRichEditor: true,
+        text: t('Clear_format'),
+        id: 'clearButton',
+        icon: 'iconfont icon-clear-format',
+        onMouseDown: this.editorUtils.clearFormat,
+        isActive: readOnly
+      }))), this.props.hasSidePanel && /*#__PURE__*/React.createElement("div", {
         className: "button-container"
       }, !this.props.isShowSidePanel && /*#__PURE__*/React.createElement(ButtonGroup, {
         className: "editor-btn-group position-absolute dropdown-menu-right"

package/dist/css/richeditor/navbar-imgbutton.css

@@ -36,6 +36,10 @@
   padding: 0;
 }
 
+.editor-btn-group .editor-clear-format {
+  margin-right: 5px; 
+}
+
 .insert-file {
   position: relative;
   display: inline-block;

package/dist/editor/controller/shortcut-controller.js

@@ -8,6 +8,7 @@ import CodeUtils from '../editor-utils/block-element-utils/code-utils';
 import TextUtils from '../editor-utils/text-utils';
 import TableUtils from '../editor-utils/block-element-utils/table-utils';
 import BlockquoteUtils from '../editor-utils/block-element-utils/blockquote-utils';
+import { clearBlockFormat, clearMarkerFormat } from '../editor-utils/clear-format-utils';
 var SHORTCUTS = {
   '1.': 'ordered_list',
   '*': 'unordered_list',
@@ -333,19 +334,12 @@ var withMarkdownShortcut = function withMarkdownShortcut(editor) {
                 _Editor$nodes10 = _slicedToArray(_Editor$nodes9, 1),
                 _node3 = _Editor$nodes10[0];
 
-            var listItemPath = _node3[1];
-            var listNode = Node.parent(editor, listItemPath); // Unwrap the list item when the selection is at the first list item of the first node of document
+            var listItemPath = _node3[1]; // Unwrap the list item when the selection is at the first list item
 
-            if (anchor.path[0] === 0 && anchor.path[1] === 0 && anchor.path[listItemPath.length] === 0) {
+            if (listItemPath.at(-1) === 0 && anchor.path[listItemPath.length] === 0) {
               listUtils.unwrapList();
               return;
-            } // unwrap an empty list
-
-
-            if (listNode.children.length === 1 && Node.text(listNode).length === 0) {
-              listUtils.unwrapList();
-              return;
-            } // list items with mutiple chidren
+            } // List items with mutiple chidren
 
 
             var currentChildBlockIndex = anchor.path[anchor.path.length - 2];
@@ -416,6 +410,11 @@ var withMarkdownShortcut = function withMarkdownShortcut(editor) {
         });
         return;
 
+      case 'clear_format':
+        clearBlockFormat(editor);
+        clearMarkerFormat(editor);
+        return;
+
       default:
         exec(command);
     }

package/dist/editor/editor-utils/clear-format-utils.js

@@ -0,0 +1,94 @@
+import { Editor, Path, Node } from 'slate';
+
+var removeEmptyParentNode = function removeEmptyParentNode(editor, pathRef) {
+  var path = pathRef.current;
+  var currentNode = Node.get(editor, path);
+  var children = currentNode.children;
+
+  while ((children.length === 0 || children.length === 1 && children[0].text === '') && currentNode.type) {
+    Editor.removeNodes(editor, {
+      at: path
+    });
+    path = Path.parent(path);
+    currentNode = Node.get(editor, path);
+    children = currentNode.children;
+  }
+
+  pathRef.unref();
+};
+
+var clearBlockFormat = function clearBlockFormat(editor) {
+  // get selected block node, like the paragraphs in the blockquote;
+  var nodes = Editor.nodes(editor, {
+    match: 'block',
+    voids: false
+  });
+  var nodesList = [];
+  var pathRefs = Array.from(nodes, function (item) {
+    nodesList.push(item);
+    return Editor.pathRef(editor, item[1]);
+  });
+  var firstNode = nodesList[0],
+      firstNodeRef = pathRefs[0];
+  nodesList.shift();
+  pathRefs.shift(); // move first block to outest and set the block to paragraph
+
+  while (firstNodeRef.current.length > 1) {
+    Editor.liftNodes(editor, {
+      at: firstNodeRef.current
+    });
+  }
+
+  if (firstNode[0].type !== 'paragraph') {
+    Editor.setNodes(editor, {
+      type: 'paragraph',
+      at: firstNodeRef.current,
+      split: true
+    });
+  }
+
+  nodesList.forEach(function (item, index) {
+    var toPath = index === 0 ? Path.next(firstNodeRef.current) : Path.next(pathRefs[index - 1].current);
+    var currentPath = pathRefs[index].current;
+
+    if (currentPath.length > 1) {
+      var parentPath = Path.parent(currentPath);
+      var parentRef = Editor.pathRef(editor, parentPath); // move current node to outest
+
+      Editor.moveNodes(editor, {
+        at: currentPath,
+        to: toPath
+      }); // remove empty parent node
+
+      removeEmptyParentNode(editor, parentRef);
+    } // set current block node to paragraph
+
+
+    if (item[0].type !== 'paragraph') {
+      Editor.setNodes(editor, {
+        type: 'paragraph',
+        at: currentPath,
+        split: true
+      });
+    }
+  });
+  firstNodeRef.unref();
+  pathRefs.forEach(function (ref) {
+    return ref.unref();
+  });
+};
+
+var clearMarkerFormat = function clearMarkerFormat(editor) {
+  // clear all markers of selected texts;
+  var textProperties = {
+    BOLD: false,
+    ITALIC: false,
+    CODE: false
+  };
+  editor.exec({
+    type: 'format_text',
+    properties: textProperties
+  });
+};
+
+export { clearBlockFormat, clearMarkerFormat };

package/dist/editor/editor-utils/common-editor-utils.js

@@ -366,6 +366,14 @@ var EditorUtils = /*#__PURE__*/function () {
       }
     };
 
+    this.clearFormat = function (event) {
+      event.preventDefault();
+
+      _this.editor.exec({
+        type: 'clear_format'
+      });
+    };
+
     this.unwrapLink = function () {
       _this.inlineElementUtils.unwrapLink();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "0.3.90",
+  "version": "0.3.93",
   "private": false,
   "dependencies": {
     "@seafile/react-image-lightbox": "^0.0.9",

package/public/locales/en/seafile-editor.json

@@ -135,6 +135,7 @@
   "Tags": "Tags",
   "Related_Files": "Related Files",
   "Add_participants": "Add participants",
+  "Clear_format": "Clear format",
   "markdownLint": {
     "missing_h1": {
       "description": "There is no h1 in the document",

package/public/locales/zh-CN/seafile-editor.json

@@ -132,6 +132,7 @@
   "Tags": "标签",
   "Related_Files": "相关文档",
   "Add_participants": "增加文件参与人",
+  "Clear_format": "清除格式",
   "markdownLint": {
     "missing_h1": {
       "description": "文档缺少一级标题",

package/public/media/seafile-editor-font/iconfont.svg

@@ -14,13 +14,15 @@
     />
       <missing-glyph />
       
-      <glyph glyph-name="enlarge" unicode="&#59223;" d="M432 860.8C211.2 860.8 32 681.6 32 460.8s179.2-400 400-400c99.2 0 188.8 35.2 256 92.8l217.6-217.6c19.2-19.2 48-19.2 67.2 0s19.2 48 0 67.2L755.2 224c48 67.2 76.8 147.2 76.8 236.8 0 220.8-179.2 400-400 400z m0-99.2c166.4 0 300.8-134.4 300.8-300.8S598.4 160 432 160s-300.8 134.4-300.8 300.8 134.4 300.8 300.8 300.8z m-3.2-124.8c-25.6 0-48-22.4-48-48v-80H300.8c-25.6 0-48-22.4-48-48s22.4-48 48-48h80v-80c0-25.6 22.4-48 48-48s48 22.4 48 48v80h80c25.6 0 48 22.4 48 48s-22.4 48-48 48h-80V588.8c0 25.6-22.4 48-48 48z"  horiz-adv-x="1024" />
+      <glyph glyph-name="-clear-format" unicode="&#59232;" d="M918.4 579.2L640 816c-25.6 22.4-64 22.4-83.2-6.4L112 310.4c-9.6-9.6-16-25.6-16-41.6s9.6-32 22.4-41.6L256 112h326.4l342.4 384c19.2 25.6 19.2 60.8-6.4 83.2z m-384-380.8H300.8L224 268.79999999999995c-6.4 6.4-9.6 9.6-9.6 16s0 16 6.4 22.4l185.6 211.2 233.6-201.6-105.6-118.4zM147.2 41.60000000000002h739.2c32 0 51.2-22.4 51.2-51.2 0-32-22.4-51.2-51.2-51.2H147.2c-32 0-51.2 22.4-51.2 51.2 0 28.8 22.4 51.2 51.2 51.2z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="shrink" unicode="&#59224;" d="M432 860.8C211.2 860.8 32 681.6 32 460.8s179.2-400 400-400c99.2 0 188.8 35.2 256 92.8l217.6-217.6c19.2-19.2 48-19.2 67.2 0s19.2 48 0 67.2L755.2 224c48 67.2 76.8 147.2 76.8 236.8 0 220.8-179.2 400-400 400z m0-99.2c166.4 0 300.8-134.4 300.8-300.8S598.4 160 432 160s-300.8 134.4-300.8 300.8 134.4 300.8 300.8 300.8z m-131.2-252.8c-25.6 0-48-22.4-48-48s22.4-48 48-48h256c25.6 0 48 22.4 48 48s-22.4 48-48 48h-256z"  horiz-adv-x="1024" />
+      <glyph glyph-name="-enlarge" unicode="&#59223;" d="M432 860.8C211.2 860.8 32 681.6 32 460.8s179.2-400 400-400c99.2 0 188.8 35.2 256 92.8l217.6-217.6c19.2-19.2 48-19.2 67.2 0s19.2 48 0 67.2L755.2 224c48 67.2 76.8 147.2 76.8 236.8 0 220.8-179.2 400-400 400z m0-99.2c166.4 0 300.8-134.4 300.8-300.8S598.4 160 432 160s-300.8 134.4-300.8 300.8 134.4 300.8 300.8 300.8z m-3.2-124.8c-25.6 0-48-22.4-48-48v-80H300.8c-25.6 0-48-22.4-48-48s22.4-48 48-48h80v-80c0-25.6 22.4-48 48-48s48 22.4 48 48v80h80c25.6 0 48 22.4 48 48s-22.4 48-48 48h-80V588.8c0 25.6-22.4 48-48 48z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="right" unicode="&#59221;" d="M640 380.8L278.4 742.4c-22.4 19.2-22.4 54.4 0 76.8s57.6 22.4 76.8 0l406.4-400c22.4-22.4 22.4-57.6 0-76.8L355.2-60.8c-22.4-22.4-57.6-22.4-76.8 0s-22.4 57.6 0 76.8L640 380.8z"  horiz-adv-x="1024" />
+      <glyph glyph-name="-shrink" unicode="&#59224;" d="M432 860.8C211.2 860.8 32 681.6 32 460.8s179.2-400 400-400c99.2 0 188.8 35.2 256 92.8l217.6-217.6c19.2-19.2 48-19.2 67.2 0s19.2 48 0 67.2L755.2 224c48 67.2 76.8 147.2 76.8 236.8 0 220.8-179.2 400-400 400z m0-99.2c166.4 0 300.8-134.4 300.8-300.8S598.4 160 432 160s-300.8 134.4-300.8 300.8 134.4 300.8 300.8 300.8z m-131.2-252.8c-25.6 0-48-22.4-48-48s22.4-48 48-48h256c25.6 0 48 22.4 48 48s-22.4 48-48 48h-256z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="left" unicode="&#59222;" d="M412.8 380.8L774.4 742.4c22.4 19.2 22.4 54.4 0 76.8s-57.6 22.4-76.8 0L291.2 419.2c-22.4-22.4-22.4-57.6 0-76.8l406.4-403.2c22.4-22.4 57.6-22.4 76.8 0s22.4 57.6 0 76.8L412.8 380.8z"  horiz-adv-x="1024" />
+      <glyph glyph-name="-right" unicode="&#59221;" d="M640 380.79999999999995L278.4 742.4c-22.4 19.2-22.4 54.4 0 76.8s57.6 22.4 76.8 0l406.4-400c22.4-22.4 22.4-57.6 0-76.8L355.2-60.799999999999955c-22.4-22.4-57.6-22.4-76.8 0s-22.4 57.6 0 76.8L640 380.79999999999995z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="-left" unicode="&#59222;" d="M412.8 380.79999999999995L774.4 742.4c22.4 19.2 22.4 54.4 0 76.8s-57.6 22.4-76.8 0L291.2 419.2c-22.4-22.4-22.4-57.6 0-76.8l406.4-403.2c22.4-22.4 57.6-22.4 76.8 0s22.4 57.6 0 76.8L412.8 380.79999999999995z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="-formula" unicode="&#59152;" d="M393.6 576.384h89.6v-128h-118.4l-12.8-54.4c-38.4-166.4-54.4-243.2-73.6-307.2-25.6-105.6-105.6-179.2-217.6-179.2h-16c-6.4 0-12.8 6.4-12.8 12.8v92.8c0 9.6 3.2 12.8 12.8 12.8h16c41.6 9.6 67.2 35.2 80 92.8 19.2 64 35.2 140.8 70.4 304l6.4 25.6-172.8-3.2c-6.4 0-12.8 6.4-12.8 12.8v102.4c0 6.4 6.4 12.8 12.8 12.8l198.4 3.2c16 60.8 22.4 89.6 32 128 35.2 137.6 153.6 182.4 326.4 150.4 3.2 0 9.6 0 12.8-3.2 6.4 0 12.8-9.6 9.6-16l-19.2-115.2c0-6.4-9.6-12.8-16-9.6-6.4 0-12.8 3.2-16 3.2-115.2 22.4-137.6 22.4-153.6-41.6-6.4-35.2-16-54.4-25.6-96zM758.4 448.384l140.8 128h83.2c6.4 0 12.8-6.4 12.8-12.8v-105.6c0-6.4-6.4-12.8-12.8-12.8h-25.6l-128-115.2 86.4-124.8h12.8c6.4 0 12.8-6.4 12.8-12.8v-96c0-6.4-6.4-12.8-12.8-12.8h-96l-99.2 144-131.2-144h-92.8c-6.4 0-12.8 6.4-12.8 12.8v96c0 6.4 6.4 12.8 12.8 12.8h19.2l140.8 137.6-70.4 105.6h-124.8v128h204.8l80-128z"  horiz-adv-x="1024" />
       

package/public/media/seafile-editor-font.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1206766 */
-  src: url('./seafile-editor-font/iconfont.eot?t=1640940881453'); /* IE9 */
-  src: url('./seafile-editor-font/iconfont.eot?t=1640940881453#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('./seafile-editor-font/iconfont.woff2?t=1640940881453') format('woff2'),
-       url('./seafile-editor-font/iconfont.woff?t=1640940881453') format('woff'),
-       url('./seafile-editor-font/iconfont.ttf?t=1640940881453') format('truetype'),
-       url('./seafile-editor-font/iconfont.svg?t=1640940881453#iconfont') format('svg');
+  src: url('./seafile-editor-font/iconfont.eot?t=1645422890587'); /* IE9 */
+  src: url('./seafile-editor-font/iconfont.eot?t=1645422890587#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('./seafile-editor-font/iconfont.woff2?t=1645422890587') format('woff2'),
+       url('./seafile-editor-font/iconfont.woff?t=1645422890587') format('woff'),
+       url('./seafile-editor-font/iconfont.ttf?t=1645422890587') format('truetype'),
+       url('./seafile-editor-font/iconfont.svg?t=1645422890587#iconfont') format('svg');
 }
 
 .iconfont {
@@ -16,6 +16,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-clear-format:before {
+  content: "\e760";
+}
+
 .iconenlarge:before {
   content: "\e757";
 }