@seafile/sdoc-editor 0.5.39 → 0.5.41

package/dist/basic-sdk/comment/components/comment-list.css

@@ -1,12 +1,12 @@
-.sdoc-article-container .sdoc-comment-list-container {
-  width: 312px;
-}
-
 .sdoc-comment-list-container {
   position: absolute;
   margin-top: 5px;
 }
 
+.sdoc-comment-list-container  .article.sdoc-comment-editor {
+  font-size: 14px;
+}
+
 .sdoc-comment-list-container .comment-ui-container {
   background-color: #edf2fa;
   border-radius: 3px;
@@ -18,7 +18,7 @@
 
 .sdoc-comment-list-container .comment-ui-container.active {
   position: relative;
-  left: -24px;
+  left: -5px;
   background: rgba(255, 255, 255, .92);
   box-shadow: 0 1px 3px rgba(0, 0, 0, .15), 0 4px 8px 3px rgba(0, 0, 0, .15);
 }
@@ -315,3 +315,57 @@
   padding-left: 10px;
   padding-right: 10px;
 }
+
+/* editor Side comment preview */
+.sdoc-article-container .sdoc-comment-list-container {
+  width: 312px;
+  /* font-size: 14px !important; */
+}
+
+.sdoc-article-container .comment-ui-container {
+  padding: 0;
+  margin: 0;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item {
+  padding: 16px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-editor-wrapper.pb-3 {
+  padding-bottom: 0 !important;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-author {
+  align-items: flex-start;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-content {
+  margin-left: 33px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-author__avatar img {
+  margin-top: 3px;
+  width: 24px;
+  height: 24px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-item .comment-author__info {
+  padding-left: 8px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .sdoc-reply-wrapper {
+  padding: 0 16px 16px;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-content div:last-child p {
+  margin-bottom: 0;
+}
+
+/* editor side comment editor */
+.sdoc-article-container .sdoc-comment-list-container .comment-list .comment-ui-container.active {
+  padding: 0;
+}
+
+.sdoc-article-container .sdoc-comment-list-container .comment-ui-container.active {
+  padding: 16px;
+}

package/dist/basic-sdk/extension/commons/menu-shortcut-indicator/index.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import classNames from 'classnames';
+import './style.css';
+const MenuShortcutPrompt = _ref => {
+  let {
+    shortcuts,
+    containerClassName = ''
+  } = _ref;
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames('sdoc-shortcut-prompt-container', containerClassName)
+  }, shortcuts.map((shortcut, index) => /*#__PURE__*/React.createElement("kbd", {
+    key: "sdoc-shortcut-".concat(shortcut, "-").concat(index)
+  }, shortcut)));
+};
+export default MenuShortcutPrompt;

package/dist/basic-sdk/extension/commons/menu-shortcut-indicator/style.css

@@ -0,0 +1,20 @@
+.sdoc-shortcut-prompt-container kbd {
+  display: inline-block;
+  margin-bottom: 0px;
+  margin-left: 1px;
+  margin-right: 1px;
+  padding: 1px 3px;
+  min-width: 12px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.1);
+  border-radius: 3px;
+  border-width: 1px 1px 2px;
+  font: inherit;
+  text-align: center;
+  color: rgb(51, 51, 51);
+  background-color: rgba(255, 255, 255, 0.25);
+}
+
+.sdoc-shortcut-prompt-container:last-child {
+  margin-right: 0px;
+}

package/dist/basic-sdk/extension/plugins/table/model.js

@@ -1,18 +1,48 @@
 import { ELEMENT_TYPE } from '../../constants';
+import { TABLE_CELL_MIN_WIDTH, TABLE_ROW_MIN_HEIGHT } from './constants';
 class Table {
   constructor(options) {
     this.type = options.type || ELEMENT_TYPE.TABLE;
     this.children = options.children || [
     // 1 x 1
     {
+      id: '',
       type: ELEMENT_TYPE.TABLE_ROW,
       children: [{
+        id: '',
         type: ELEMENT_TYPE.TABLE_CELL,
         children: [{
-          text: ''
-        }]
-      }]
+          text: '',
+          id: ''
+        }],
+        style: {
+          text_align: 'left',
+          alignItems: 'center',
+          background_color: ''
+        },
+        // inherit from table,when insert new cell
+        inherit_style: {
+          text_align: 'left',
+          background_color: ''
+        }
+      }],
+      style: {
+        'min_height': 42
+      }
     }];
+    this.columns = options.columns || [{
+      width: TABLE_CELL_MIN_WIDTH
+    }];
+    this.ui = options.ui || {
+      alternate_highlight: true,
+      // alternate row highlight
+      alternate_highlight_color: ''
+    };
+    this.style = options.style || {
+      gridTemplateColumns: "repeat(1, ".concat(TABLE_CELL_MIN_WIDTH, "}px)"),
+      // grid
+      gridAutoRows: "minmax(".concat(TABLE_ROW_MIN_HEIGHT, "}px, auto)")
+    };
   }
 }
 export default Table;

package/dist/basic-sdk/extension/plugins/table/plugin.js

@@ -3,8 +3,8 @@ import isHotkey from 'is-hotkey';
 import { Editor, Transforms, Path, Element } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
 import { getNodeType, getParentNode, getSelectedNodeByType, isLastNode, generateEmptyElement, focusEditor } from '../../core';
-import { ELEMENT_TYPE, KEYBOARD, PARAGRAPH, CLIPBOARD_FORMAT_KEY, CHECK_LIST_ITEM, ORDERED_LIST, UNORDERED_LIST } from '../../constants';
-import { TABLE_MAX_ROWS, EMPTY_SELECTED_RANGE, TABLE_ELEMENT, TABLE_ELEMENT_POSITION } from './constants';
+import { ELEMENT_TYPE, KEYBOARD, PARAGRAPH, CLIPBOARD_FORMAT_KEY, CHECK_LIST_ITEM, ORDERED_LIST, UNORDERED_LIST, TABLE_ROW, TABLE, TABLE_CELL } from '../../constants';
+import { TABLE_MAX_ROWS, EMPTY_SELECTED_RANGE, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, TABLE_CELL_MIN_WIDTH, TABLE_ROW_MIN_HEIGHT } from './constants';
 import ObjectUtils from '../../../utils/object-utils';
 import { getSelectedInfo, insertTableElement, removeTable, insertMultipleRowsAndColumns, setTableFragmentData, deleteTableRangeData, focusCell, deleteHandler, isTableLocation, isLastTableCell } from './helpers';
 import EventBus from '../../../utils/event-bus';
@@ -302,12 +302,108 @@ const withTable = editor => {
 
   // Rewrite normalizeNode
   newEditor.normalizeNode = _ref => {
+    var _node$children$, _node$children$$child, _node$children$2, _node$children$2$chil;
     let [node, path] = _ref;
     const type = getNodeType(node);
+    if (node.type === TABLE_ROW) {
+      const parentEntry = Editor.parent(editor, path);
+      if ((parentEntry === null || parentEntry === void 0 ? void 0 : parentEntry[0].type) !== TABLE) {
+        Transforms.unwrapNodes(editor, {
+          at: path
+        });
+        return;
+      }
+    }
+    if (node.type === TABLE_CELL) {
+      const parentEntry = Editor.parent(editor, path);
+      if ((parentEntry === null || parentEntry === void 0 ? void 0 : parentEntry[0].type) !== TABLE_ROW) {
+        Transforms.unwrapNodes(editor, {
+          at: path
+        });
+        return;
+      }
+    }
     if (type !== ELEMENT_TYPE.TABLE) {
       return normalizeNode([node, path]);
     }
 
+    // Check field integrity
+    // Check table - columns
+    const isMissColumn = !node.columns;
+    if (isMissColumn) {
+      if (!node.columns) {
+        const columnCount = node.children[0].children.length;
+        const width = Math.max(TABLE_CELL_MIN_WIDTH, parseInt(editor.width / columnCount));
+        const columns = Array(node.children[0].children.length).fill({
+          width
+        });
+        Transforms.setNodes(newEditor, {
+          columns
+        }, {
+          at: path
+        });
+      }
+    }
+
+    // Check table - style
+    if (!node.style) {
+      const columnCount = node.children[0].children.length;
+      const columnWidth = Math.max(TABLE_CELL_MIN_WIDTH, parseInt(editor.width / columnCount));
+      Transforms.setNodes(newEditor, {
+        style: {
+          gridTemplateColumns: "repeat(".concat(columnCount, ", ").concat(columnWidth, "px)"),
+          gridAutoRows: "minmax(".concat(TABLE_ROW_MIN_HEIGHT, "}px, auto)")
+        }
+      }, {
+        at: path
+      });
+    }
+
+    // Check table - ui
+    if (!node.ui) {
+      Transforms.setNodes(newEditor, {
+        ui: {
+          alternate_highlight: false
+        }
+      }, {
+        at: path
+      });
+    }
+
+    // Check row - style
+    if (!node.children[0].style) {
+      const style = {
+        min_height: TABLE_ROW_MIN_HEIGHT
+      };
+      node.children.forEach((row, index) => {
+        if (!row.style) {
+          Transforms.setNodes(newEditor, {
+            style
+          }, {
+            at: path.concat(index)
+          });
+        }
+      });
+    }
+
+    // Check cell - style & inherit_style
+    if ((node === null || node === void 0 ? void 0 : (_node$children$ = node.children[0]) === null || _node$children$ === void 0 ? void 0 : (_node$children$$child = _node$children$.children[0]) === null || _node$children$$child === void 0 ? void 0 : _node$children$$child.style) || (node === null || node === void 0 ? void 0 : (_node$children$2 = node.children[0]) === null || _node$children$2 === void 0 ? void 0 : (_node$children$2$chil = _node$children$2.children[0]) === null || _node$children$2$chil === void 0 ? void 0 : _node$children$2$chil.inherit_style)) {
+      node.children.forEach((row, rowIndex) => {
+        row.children.forEach((cell, cellIndex) => {
+          if (!cell.style || !cell.inherit_style) {
+            const style = cell.style || {};
+            const inherit_style = cell.inherit_style || {};
+            Transforms.setNodes(newEditor, {
+              style,
+              inherit_style
+            }, {
+              at: path.concat(rowIndex, cellIndex)
+            });
+          }
+        });
+      });
+    }
+
     // insert empty node，continue editor
     const isLast = isLastNode(newEditor, node);
     if (isLast) {

package/dist/basic-sdk/utils/diff-text.js

@@ -1,5 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import ObjectUtils from './object-utils';
+const extendedWordChars = 'a-zA-Z\\u{C0}-\\u{FF}\\u{D8}-\\u{F6}\\u{F8}-\\u{2C6}\\u{2C8}-\\u{2D7}\\u{2DE}-\\u{2FF}\\u{1E00}-\\u{1EFF}\\u{4e00}-\\u{9fa5}';
+const tokenizeIncludingWhitespace = new RegExp("[".concat(extendedWordChars, "]+|\\s+|[^").concat(extendedWordChars, "]"), 'ug');
 const buildValues = (diff, components, newString, oldString, valueType, useLongestToken) => {
   let componentPos = 0;
   let componentLen = components.length;
@@ -158,11 +160,11 @@ class DiffText {
       return oldPos;
     });
     _defineProperty(this, "equals", (left, right) => {
-      if (this.options.comparator) {
-        return this.options.comparator(left, right);
-      } else {
-        return left === right || this.options.ignoreCase && left.toLowerCase() === right.toLowerCase();
+      if (this.options.ignoreCase) {
+        left = left.toLowerCase();
+        right = right.toLowerCase();
       }
+      return left.trim() === right.trim();
     });
     _defineProperty(this, "removeEmpty", (array, type) => {
       if (type === 'Array') return array;
@@ -175,12 +177,46 @@ class DiffText {
       return ret;
     });
     _defineProperty(this, "tokenize", (value, valueType) => {
-      if (valueType === 'Array') return value.slice();
-      return value.split('');
+      if (valueType === 'Array') {
+        return value.slice();
+      }
+      let parts = value.match(tokenizeIncludingWhitespace) || [];
+      const tokens = [];
+      let prevPart = null;
+      parts.forEach(part => {
+        if (/\s/.test(part)) {
+          if (prevPart == null) {
+            tokens.push(part);
+          } else {
+            tokens.push(tokens.pop() + part);
+          }
+        } else if (/\s/.test(prevPart)) {
+          if (tokens[tokens.length - 1] === prevPart) {
+            tokens.push(tokens.pop() + part);
+          } else {
+            tokens.push(prevPart + part);
+          }
+        } else {
+          tokens.push(part);
+        }
+        prevPart = part;
+      });
+      return tokens;
     });
     _defineProperty(this, "join", (value, valueType) => {
       if (valueType === 'Array') return value;
-      return value.join('');
+      // Tokens being joined here will always have appeared consecutively in the
+      // same text, so we can simply strip off the leading whitespace from all the
+      // tokens except the first (and except any whitespace-only tokens - but such
+      // a token will always be the first and only token anyway) and then join them
+      // and the whitespace around words and punctuation will end up correct.
+      return value.map((token, i) => {
+        if (i === 0) {
+          return token;
+        } else {
+          return token.replace(/^\s+/, '');
+        }
+      }).join('');
     });
     _defineProperty(this, "getDiffs", () => {
       if (!this.canCompare) {

package/dist/components/doc-operations/more-operations.js

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { withTranslation } from 'react-i18next';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 import printJS from '@seafile/print-js';
@@ -6,6 +6,7 @@ import { EventBus } from '../../basic-sdk';
 import { EXTERNAL_EVENT } from '../../constants';
 import context from '../../context';
 import { INTERNAL_EVENT } from '../../basic-sdk/constants';
+import MenuShortcutPrompt from '../../basic-sdk/extension/commons/menu-shortcut-indicator';
 const MoreOperations = _ref => {
   let {
     t
@@ -54,6 +55,12 @@ const MoreOperations = _ref => {
     event.nativeEvent.stopImmediatePropagation();
     window.location.href = historyURL;
   }, [docPerm, historyURL, isSdocRevision]);
+  const printShortCutTexts = useMemo(() => {
+    // chrome in Mac: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
+    const isMac = window.navigator.userAgent.indexOf('Macintosh') !== -1;
+    const printTexts = isMac ? ['⌘', 'P'] : ['Ctrl', 'P'];
+    return printTexts;
+  }, []);
   return /*#__PURE__*/React.createElement(Dropdown, {
     isOpen: isDropdownOpen,
     toggle: () => toggleDropdown(isDropdownOpen)
@@ -75,7 +82,11 @@ const MoreOperations = _ref => {
   }, t('Unfreeze')), /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     onClick: handlePrint
-  }, t('Print')), isPro && !isFreezed && /*#__PURE__*/React.createElement(DropdownItem, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "sdoc-dropdown-print-container"
+  }, /*#__PURE__*/React.createElement("div", null, t('Print')), /*#__PURE__*/React.createElement(MenuShortcutPrompt, {
+    shortcuts: printShortCutTexts
+  }))), isPro && !isFreezed && /*#__PURE__*/React.createElement(DropdownItem, {
     className: "sdoc-dropdown-menu-item",
     onClick: onFreezeDocument
   }, t('Freeze_document')), /*#__PURE__*/React.createElement(DropdownItem, {

package/dist/components/doc-operations/style.css

@@ -25,3 +25,10 @@
 .doc-ops .popover-wrapper {
   width: 300px;
 }
+
+.sdoc-dropdown-print-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.5.39",
+  "version": "0.5.41",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",