@seafile/sdoc-editor 3.0.206 → 3.0.208

package/dist/extension/commons/wiki-file-insert-dialog/create-page-dialog.js

@@ -0,0 +1,89 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactI18next = require("react-i18next");
+var _reactstrap = require("reactstrap");
+var _helpers = require("./helpers");
+var CreatePageDialog = function CreatePageDialog(_ref) {
+  var isOpen = _ref.isOpen,
+    initialTitle = _ref.initialTitle,
+    editor = _ref.editor,
+    element = _ref.element,
+    onClose = _ref.onClose;
+  var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
+    t = _useTranslation.t;
+  var _useState = (0, _react.useState)(''),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    title = _useState2[0],
+    setTitle = _useState2[1];
+  var _useState3 = (0, _react.useState)(''),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    error = _useState4[0],
+    setError = _useState4[1];
+  (0, _react.useEffect)(function () {
+    if (!isOpen) return;
+    setTitle(initialTitle || '');
+    setError('');
+  }, [initialTitle, isOpen]);
+  var onChange = (0, _react.useCallback)(function (event) {
+    setTitle(event.target.value);
+    if (error) {
+      setError('');
+    }
+  }, [error]);
+  var onCreate = (0, _react.useCallback)(function () {
+    var errorMessage = (0, _helpers.validateWikiPageTitle)(title);
+    if (errorMessage) {
+      setError(errorMessage);
+      return;
+    }
+    onClose();
+    (0, _helpers.createWikiPageAndInsertLink)({
+      editor: editor,
+      element: element,
+      title: title
+    });
+  }, [editor, element, onClose, title]);
+  var onKeyDown = (0, _react.useCallback)(function (event) {
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      onCreate();
+    }
+  }, [onCreate]);
+  return /*#__PURE__*/_react["default"].createElement(_reactstrap.Modal, {
+    isOpen: isOpen,
+    toggle: onClose,
+    zIndex: 1071,
+    returnFocusAfterClose: false
+  }, /*#__PURE__*/_react["default"].createElement(_reactstrap.ModalHeader, {
+    toggle: onClose
+  }, t('New_page')), /*#__PURE__*/_react["default"].createElement(_reactstrap.ModalBody, null, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "form-group mb-0"
+  }, /*#__PURE__*/_react["default"].createElement(_reactstrap.Label, {
+    "for": "createWikiPageTitle"
+  }, t('Page_name')), /*#__PURE__*/_react["default"].createElement(_reactstrap.Input, {
+    id: "createWikiPageTitle",
+    type: "text",
+    value: title,
+    autoFocus: true,
+    onChange: onChange,
+    onKeyDown: onKeyDown
+  }), error && /*#__PURE__*/_react["default"].createElement(_reactstrap.Alert, {
+    color: "danger",
+    className: "mt-2 mb-0"
+  }, t(error)))), /*#__PURE__*/_react["default"].createElement(_reactstrap.ModalFooter, null, /*#__PURE__*/_react["default"].createElement(_reactstrap.Button, {
+    color: "secondary",
+    onClick: onClose
+  }, t('Cancel')), /*#__PURE__*/_react["default"].createElement(_reactstrap.Button, {
+    color: "primary",
+    onClick: onCreate
+  }, t('Create'))));
+};
+var _default = exports["default"] = CreatePageDialog;

package/dist/extension/commons/wiki-file-insert-dialog/helpers.js

@@ -0,0 +1,44 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.validateWikiPageTitle = exports.invalidTitlePattern = exports.createWikiPageAndInsertLink = void 0;
+var _constants = require("../../../constants");
+var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
+var _helpers = require("../../plugins/sdoc-link/helpers");
+var _helpers2 = require("../../plugins/wiki-link/helpers");
+var invalidTitlePattern = exports.invalidTitlePattern = /[\\/:*?"<>|]/;
+var validateWikiPageTitle = exports.validateWikiPageTitle = function validateWikiPageTitle(title) {
+  var trimmedTitle = title.trim();
+  if (!trimmedTitle) {
+    return 'Please_enter_title';
+  }
+  if (invalidTitlePattern.test(trimmedTitle)) {
+    return 'Page_title_contains_invalid_characters';
+  }
+  return '';
+};
+var createWikiPageAndInsertLink = exports.createWikiPageAndInsertLink = function createWikiPageAndInsertLink(_ref) {
+  var editor = _ref.editor,
+    element = _ref.element,
+    title = _ref.title;
+  var createName = title.trim();
+  var eventBus = _eventBus["default"].getInstance();
+  var unsubscribe = eventBus.subscribe(_constants.INTERNAL_EVENT.WIKI_PAGE_ID_CREATED, function (_ref2) {
+    var pageId = _ref2.pageId,
+      pageName = _ref2.pageName,
+      wikiRepoId = _ref2.wikiRepoId;
+    (0, _helpers2.insertWikiPageLink)(editor, pageName, wikiRepoId, pageId);
+    unsubscribe();
+  });
+  (0, _helpers.removeTempInput)(editor, element);
+  eventBus.dispatch(_constants.INTERNAL_EVENT.CREATE_WIKI_PAGE, {
+    newFileName: createName,
+    insertWikiPageLink: _helpers2.insertWikiPageLink,
+    editor: editor,
+    noShowDialog: true,
+    noRedirect: true
+  });
+};

package/dist/extension/commons/wiki-file-insert-dialog/index.js

@@ -21,6 +21,7 @@ var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
 var _localStorageUtils = _interopRequireDefault(require("../../../utils/local-storage-utils"));
 var _helpers = require("../../plugins/sdoc-link/helpers");
 var _helpers2 = require("../../plugins/wiki-link/helpers");
+var _createPageDialog = _interopRequireDefault(require("./create-page-dialog"));
 require("./style.css");
 var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
   var editor = _ref.editor,
@@ -51,6 +52,10 @@ var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
     _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
     hiddenMoreMenu = _useState0[0],
     setHiddenMoreMenu = _useState0[1];
+  var _useState1 = (0, _react.useState)(false),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    isCreateDialogOpen = _useState10[0],
+    setIsCreateDialogOpen = _useState10[1];
   var deleteInputAndInsertText = (0, _react.useCallback)(function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
@@ -93,6 +98,7 @@ var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
   }, [editor]);
   var onClick = (0, _react.useCallback)(function (e) {
     var _historyFileWrapperRe, _historyFileWrapperRe2;
+    if (isCreateDialogOpen) return;
     var isClickInside = (_historyFileWrapperRe = historyFileWrapperRef.current) === null || _historyFileWrapperRe === void 0 ? void 0 : (_historyFileWrapperRe2 = _historyFileWrapperRe.contains) === null || _historyFileWrapperRe2 === void 0 ? void 0 : _historyFileWrapperRe2.call(_historyFileWrapperRe, e.target);
     if (isClickInside) return;
 
@@ -101,7 +107,7 @@ var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
     if (insertCollectorEl && insertCollectorEl.className === e.target.className) return;
     deleteInputAndInsertText();
     closeDialog();
-  }, [closeDialog, deleteInputAndInsertText]);
+  }, [closeDialog, deleteInputAndInsertText, isCreateDialogOpen]);
   var onScroll = (0, _lodash["default"])(function () {
     getPosition();
   }, 100);
@@ -124,6 +130,7 @@ var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var onKeydown = (0, _react.useCallback)(function (e) {
+    if (isCreateDialogOpen) return;
     var key = e.key;
     switch (key) {
       case 'Escape':
@@ -143,7 +150,7 @@ var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
       default:
         break;
     }
-  }, [closeDialog, deleteInputAndInsertText]);
+  }, [closeDialog, deleteInputAndInsertText, isCreateDialogOpen]);
   (0, _react.useEffect)(function () {
     var sdocScrollContainer = document.getElementById('sdoc-scroll-container');
     document.addEventListener('click', onClick);
@@ -213,26 +220,13 @@ var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
     setFiles(recentFiles);
     setHiddenMoreMenu(true);
   }, []);
-  var createWikiLink = function createWikiLink(_ref2) {
-    var pageId = _ref2.pageId,
-      pageName = _ref2.pageName,
-      wikiRepoId = _ref2.wikiRepoId;
-    (0, _helpers2.insertWikiPageLink)(editor, pageName, wikiRepoId, pageId);
-  };
-  var onCreateFile = (0, _react.useCallback)(function (e) {
+  var closeCreateDialog = (0, _react.useCallback)(function () {
+    setIsCreateDialogOpen(false);
+  }, []);
+  var onOpenCreateDialog = (0, _react.useCallback)(function (e) {
     e.stopPropagation();
-    (0, _helpers.removeTempInput)(editor, element);
-    var eventBus = _eventBus["default"].getInstance();
-    var unsubscribe = eventBus.subscribe(_constants.INTERNAL_EVENT.WIKI_PAGE_ID_CREATED, function (payload) {
-      createWikiLink(payload);
-      unsubscribe();
-    });
-    var createName = newFileName.trim() || t('New_page');
-    eventBus.dispatch(_constants.INTERNAL_EVENT.CREATE_WIKI_PAGE, {
-      newFileName: createName
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor, element, newFileName, t]);
+    setIsCreateDialogOpen(true);
+  }, []);
   var createFileTipDefault = (0, _react.useMemo)(function () {
     return 'New_page';
   }, []);
@@ -279,13 +273,19 @@ var WikiFileLinkInsertDialog = function WikiFileLinkInsertDialog(_ref) {
     onClick: onShowMoreWiki
   }, "...", t('More'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "sdoc-history-files-add",
-    onClick: onCreateFile
+    onClick: onOpenCreateDialog
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "sdocfont sdoc-append"
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "new-file-name"
   }, newFileName ? t('Create_file_name_sdoc', {
     file_name_sdoc: createFileName
-  }) : t(createFileTipDefault))));
+  }) : t(createFileTipDefault))), /*#__PURE__*/_react["default"].createElement(_createPageDialog["default"], {
+    isOpen: isCreateDialogOpen,
+    initialTitle: newFileName.trim(),
+    editor: editor,
+    element: element,
+    onClose: closeCreateDialog
+  }));
 };
 var _default = exports["default"] = WikiFileLinkInsertDialog;

package/dist/extension/plugins/table/menu/table-context-menu/index.js

@@ -145,7 +145,7 @@ var TableContextMenu = /*#__PURE__*/function (_React$Component) {
       var isMergedCell = this.isMergedCell();
       var tableCellNode = (0, _core.getSelectedNodeByType)(editor, _constants2.ELEMENT_TYPE.TABLE_CELL);
       var horizontalAlign = tableCellNode === null || tableCellNode === void 0 ? void 0 : (_tableCellNode$style = tableCellNode.style) === null || _tableCellNode$style === void 0 ? void 0 : _tableCellNode$style[_constants3.TABLE_CELL_STYLE.TEXT_ALIGN];
-      var verticalAlign = tableCellNode === null || tableCellNode === void 0 ? void 0 : (_tableCellNode$style2 = tableCellNode.style) === null || _tableCellNode$style2 === void 0 ? void 0 : _tableCellNode$style2[(0, _KebabToCamel["default"])(_constants3.TABLE_CELL_STYLE.ALIGN_ITEMS)];
+      var verticalAlign = tableCellNode === null || tableCellNode === void 0 ? void 0 : (_tableCellNode$style2 = tableCellNode.style) === null || _tableCellNode$style2 === void 0 ? void 0 : _tableCellNode$style2[_constants3.TABLE_CELL_STYLE.ALIGN_ITEMS];
       // Check if the table width is fit to screen
       // Use queueMicrotask to resolve the issue that the table cell combined or split, the table width is not updated immediately
       queueMicrotask(function () {

package/dist/extension/plugins/table/menu/vertical-align-popover/index.js

@@ -11,7 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _KebabToCamel = _interopRequireDefault(require("../../../../../utils/Kebab-to-camel"));
 var _core = require("../../../../core");
 var _constants = require("../../constants");
 var _helpers = require("../../helpers");
@@ -25,8 +24,7 @@ var VerticalAlignPopover = function VerticalAlignPopover(_ref) {
     t = _useTranslation.t;
   var setVerticalAlignStyle = (0, _react.useCallback)(function (position) {
     if (readonly) return;
-    var alignItems = (0, _KebabToCamel["default"])(_constants.TABLE_CELL_STYLE.ALIGN_ITEMS);
-    (0, _helpers.setCellStyle)(editor, (0, _defineProperty2["default"])({}, alignItems, position));
+    (0, _helpers.setCellStyle)(editor, (0, _defineProperty2["default"])({}, _constants.TABLE_CELL_STYLE.ALIGN_ITEMS, position));
     var focusPoint = editor.selection.focus;
     // prevent select all text in the editor
     (0, _core.focusEditor)(editor, focusPoint);

package/dist/extension/plugins/table/model.js

@@ -26,7 +26,7 @@ var Table = /*#__PURE__*/(0, _createClass2["default"])(function Table(options) {
       }],
       style: {
         text_align: 'left',
-        alignItems: 'center',
+        align_items: 'center',
         background_color: ''
       },
       // inherit from table,when insert new cell

package/dist/extension/plugins/table/render/render-cell.js

@@ -83,6 +83,10 @@ var TableCell = function TableCell(_ref) {
   if (element.style) {
     style = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, element.style), style);
   }
+  if (_objectUtils["default"].hasProperty(style, _constants3.TABLE_CELL_STYLE.ALIGN_ITEMS)) {
+    style.alignItems = style[_constants3.TABLE_CELL_STYLE.ALIGN_ITEMS];
+    delete style[_constants3.TABLE_CELL_STYLE.ALIGN_ITEMS];
+  }
   var onMouseMove = function onMouseMove(mouseDownEvent) {
     eventBus.dispatch(_constants.INTERNAL_EVENT.TABLE_CELL_MOUSE_ENTER, {
       mouseDownEvent: mouseDownEvent,
@@ -162,7 +166,7 @@ var TableCell = function TableCell(_ref) {
     }
   }, [cellIndex, editor, eventBus, rowIndex, tableEntry, tableId]);
   return /*#__PURE__*/_react["default"].createElement("div", Object.assign({}, attributes, {
-    style: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, element.style), style),
+    style: (0, _objectSpread2["default"])({}, style),
     className: (0, _classnames2["default"])('table-cell', attributes.className, highlightClass, (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _constants3.CELL_SELECTED, isSelected), 'cell-light-height-left-border', isSelectedFirstCell), 'cell-light-height-right-border', isSelectedLastCell), 'cell-light-height-top-border', isSelectedFirstRow), 'cell-light-height-bottom-border', isSelectedLastRow)),
     "data-id": element.id,
     "row-index": rowIndex,
@@ -204,6 +208,9 @@ function renderTableCell(props) {
     if (_objectUtils["default"].hasProperty(element.style, _constants3.TABLE_CELL_STYLE.BACKGROUND_COLOR) && element.style[_constants3.TABLE_CELL_STYLE.BACKGROUND_COLOR]) {
       style['backgroundColor'] = element.style[_constants3.TABLE_CELL_STYLE.BACKGROUND_COLOR];
     }
+    if (_objectUtils["default"].hasProperty(element.style, _constants3.TABLE_CELL_STYLE.ALIGN_ITEMS)) {
+      style.alignItems = element.style[_constants3.TABLE_CELL_STYLE.ALIGN_ITEMS];
+    }
     if (element.is_combined) {
       style.display = 'none';
     }
@@ -219,7 +226,7 @@ function renderTableCell(props) {
       colspan = _element$colspan2 === void 0 ? 1 : _element$colspan2;
     style.gridArea = "".concat(rowIndex + 1, " / ").concat(cellIndex + 1, " / span ").concat(rowspan, " / span ").concat(colspan);
     return /*#__PURE__*/_react["default"].createElement("div", Object.assign({}, attributes, {
-      style: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, element.style), style),
+      style: (0, _objectSpread2["default"])({}, style),
       className: (0, _classnames2["default"])('table-cell', highlightClass, attributes.className),
       "data-id": element.id
     }), /*#__PURE__*/_react["default"].createElement("div", {

package/dist/utils/common-utils.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isMobile = exports.isMac = exports.isEnglish = exports.getMaximumCapacity = exports.getLocalStorageFiles = exports.getErrorMsg = void 0;
+var _context = _interopRequireDefault(require("../context"));
 var isEnglish = exports.isEnglish = function isEnglish(str) {
   var pattern = new RegExp('[A-Za-z]+');
   if (pattern.test(str)) {
@@ -29,7 +31,7 @@ var getMaximumCapacity = exports.getMaximumCapacity = function getMaximumCapacit
   return newFiles;
 };
 var getLocalStorageFiles = exports.getLocalStorageFiles = function getLocalStorageFiles(files) {
-  var wikiRepoId = window.wiki.config.wikiId;
+  var wikiRepoId = _context["default"].getSetting('wikiId');
   var newFiles = [];
   files.forEach(function (item) {
     if ((item === null || item === void 0 ? void 0 : item.wikiRepoId) === wikiRepoId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.206",
+  "version": "3.0.208",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bd92627a4853b84c0f9fa9efe4ebe1cc73272ba6"
+  "gitHead": "d8dfa2dbd360ce3d37de0f2f57e46e3c5d1d820c"
 }