@seafile/sdoc-editor 2.0.54 → 2.0.56

package/dist/basic-sdk/extension/plugins/chart/render-elem.js

@@ -17,6 +17,7 @@ var _chartEditDialog = _interopRequireDefault(require("./chart-edit-dialog"));
 var _context = _interopRequireDefault(require("../../../../context"));
 var _useScrollContext = require("../../../hooks/use-scroll-context");
 var _helpers = require("./helpers");
+var _utils = require("../../utils");
 var _constants = require("../../constants");
 require("./render-elem.css");
 const Chart = _ref => {
@@ -50,11 +51,15 @@ const Chart = _ref => {
         top,
         left
       } = chartRef.current.getBoundingClientRect();
-      setMenuPosition({
-        top: top - 42,
-        left: left - 3
+      const curTop = top - 42; // top = top distance - menu height
+      const curLeft = left - 3;
+      const newMenuPosition = (0, _utils.checkOverflow)(editor, {
+        top: curTop,
+        left: curLeft
       });
+      setMenuPosition(newMenuPosition);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onScroll = (0, _react.useCallback)(e => {
     setPosition();

package/dist/basic-sdk/extension/plugins/seatable-row/render-elem/index.css

@@ -2,6 +2,15 @@
   outline: none;
 }
 
+.seatable-rows-record-wrapper.no-row {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid #ddd;
+  padding: 20px;
+  border-radius: 5px;
+}
+
 .seatable-rows-record-container {
   margin: 5px 0;
   border: 1.5px solid #ddd;
@@ -37,7 +46,7 @@
   font-weight: 400;
 }
 
-.seatable-rows-record-wrapper .seatable-rows-record-container table td { 
+.seatable-rows-record-wrapper .seatable-rows-record-container table td {
   font-size: 14px;
   font-weight: 400;
   color: #212529

package/dist/basic-sdk/extension/plugins/seatable-row/render-elem/index.js

@@ -33,6 +33,7 @@ const RowRecord = _ref => {
   const [columnWidthMap, setColumnWidthMap] = (0, _react.useState)(column_width);
   const [isShowColumnWidth, setIsShowColumnWidth] = (0, _react.useState)(false);
   const [isCanModifyColumnWidth, setIsCanModifyColumnWidth] = (0, _react.useState)(false);
+  const [activeRow, setActiveRow] = (0, _react.useState)(null);
   const isSelected = (0, _slateReact.useSelected)();
   const {
     t
@@ -42,6 +43,7 @@ const RowRecord = _ref => {
   (0, _react.useEffect)(() => {
     async function initTableData() {
       const table = await editor.getTableById(table_id);
+      if (!table) return;
       if (!tableInfoRef.current) {
         tableInfoRef.current = {};
       }
@@ -55,6 +57,10 @@ const RowRecord = _ref => {
         };
       }
       const shownRecord = table.rows.filter(item => row_id === item._id);
+      setActiveRow(shownRecord);
+      if (!shownRecord) {
+        return;
+      }
       setShownRecord(shownRecord);
       setRowRecordName(shownRecord[0]['0000']);
       const updatedColumnWidthMap = Object.fromEntries(Object.entries(columnWidthMap).map(_ref2 => {
@@ -97,13 +103,14 @@ const RowRecord = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [table_id]);
   (0, _react.useEffect)(() => {
+    if (!activeRow) return;
     if (!isSelected) {
       queueMicrotask(() => {
         setIsShowColumnWidth(false);
         setIsCanModifyColumnWidth(false);
       });
     }
-  }, [editor, element, isSelected]);
+  }, [activeRow, editor, element, isSelected]);
   const onTableClick = (0, _react.useCallback)(event => {
     if (readOnly) return;
     setIsShowColumnWidth(true);
@@ -114,6 +121,13 @@ const RowRecord = _ref => {
     setIsCanModifyColumnWidth(true);
   }, [readOnly]);
   const formulaRows = (tableInfoRef === null || tableInfoRef === void 0 ? void 0 : (_tableInfoRef$current = tableInfoRef.current) === null || _tableInfoRef$current === void 0 ? void 0 : (_tableInfoRef$current2 = _tableInfoRef$current[table_id]) === null || _tableInfoRef$current2 === void 0 ? void 0 : _tableInfoRef$current2.formulaRows) || {};
+  if (!activeRow) {
+    return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, attributes, {
+      className: "seatable-rows-record-wrapper no-row",
+      contentEditable: false,
+      suppressContentEditableWarning: true
+    }), t('Row_not_exist'), children);
+  }
   return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, attributes, {
     className: "seatable-rows-record-wrapper"
   }), /*#__PURE__*/_react.default.createElement("div", {

package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/index.css

@@ -2,6 +2,15 @@
   outline: none;
 }
 
+.seatable-table-wrapper.no-table {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid #ddd;
+  padding: 20px;
+  border-radius: 5px;
+}
+
 .seatable-view-container {
   width: 100%;
   overflow: auto;

package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/seatable-table.js

@@ -18,6 +18,7 @@ var _recordList = _interopRequireDefault(require("./record-list"));
 var _opMenu = _interopRequireDefault(require("../op-menu"));
 var _useScrollContext = require("../../../../hooks/use-scroll-context");
 var _helpers = require("../../seatable-column/helpers");
+var _utils = require("../../../utils");
 var _helpers2 = require("../helpers");
 require("./index.css");
 function SeaTableTable(_ref) {
@@ -44,6 +45,7 @@ function SeaTableTable(_ref) {
   const [isShowColumnWidth, setIsShowColumnWidth] = (0, _react.useState)(false);
   const [isCanModifyColumnWidth, setIsCanModifyColumnWidth] = (0, _react.useState)(false);
   const tableInfoRef = (0, _react.useRef)(null);
+  const [activeTale, setActiveTable] = (0, _react.useState)(null);
   const {
     t
   } = (0, _reactI18next.useTranslation)('sdoc-editor');
@@ -59,6 +61,8 @@ function SeaTableTable(_ref) {
     // Compatible with old element data structures
     if (!column_width) {
       const table = editor.getTableById(table_id);
+      setActiveTable(table);
+      if (!table) return;
       const columnWidth = {};
       table.columns.forEach(item => {
         columnWidth[item.key] = (0, _helpers.getColumnWidth)(item);
@@ -78,6 +82,11 @@ function SeaTableTable(_ref) {
         table_id
       } = element;
       const table = await editor.getTableById(table_id);
+      setActiveTable(table);
+      if (!table) {
+        setIsLoading(false);
+        return;
+      }
       if (!tableInfoRef.current) {
         tableInfoRef.current = {};
       }
@@ -197,17 +206,13 @@ function SeaTableTable(_ref) {
         left
       } = seaTableRef.current.getBoundingClientRect();
       const menuTop = top - 42; // top = top distance - menu height
-      const newMenuPosition = {
+      const newMenuPosition = (0, _utils.checkOverflow)(editor, {
         top: menuTop,
-        left: left // left = code-block left distance
-      };
-      // 201 is distance with browser top
-      if (menuTop < 201) {
-        newMenuPosition['display'] = 'none';
-      }
+        left
+      });
       setMenuPosition(newMenuPosition);
     }
-  }, [isShowMenu, readOnly]);
+  }, [editor, isShowMenu, readOnly]);
   (0, _react.useEffect)(() => {
     if (readOnly) return;
     let observerRefValue = null;
@@ -258,7 +263,7 @@ function SeaTableTable(_ref) {
     }
   }, [editor, element]);
   (0, _react.useEffect)(() => {
-    if (!isSelected) {
+    if (!isSelected && activeTale) {
       handleSaveData();
       queueMicrotask(() => {
         setIsShowMenu(false);
@@ -266,7 +271,7 @@ function SeaTableTable(_ref) {
         setIsCanModifyColumnWidth(false);
       });
     }
-  }, [editor, element, handleSaveData, isSelected]);
+  }, [activeTale, editor, element, handleSaveData, isSelected]);
   const onTableClick = (0, _react.useCallback)(event => {
     if (readOnly) return;
     const {
@@ -294,6 +299,13 @@ function SeaTableTable(_ref) {
   const containerClass = (0, _classnames.default)('seatable-view-container', {
     selected: isSelected
   });
+  if (!activeTale) {
+    return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, attributes, {
+      className: "seatable-table-wrapper no-table",
+      contentEditable: false,
+      suppressContentEditableWarning: true
+    }), t('Table_not_exist'), children);
+  }
   return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, attributes, {
     className: "seatable-table-wrapper",
     contentEditable: true,

package/dist/basic-sdk/extension/utils/index.js

@@ -4,8 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.onHandleOverflowScroll = exports.isSameDomain = exports.isOverflowPortByDirection = exports.isImage = exports.IMAGE_TYPES = void 0;
+exports.onHandleOverflowScroll = exports.isSameDomain = exports.isOverflowPortByDirection = exports.isImage = exports.checkOverflow = exports.IMAGE_TYPES = void 0;
 var _isUrl = _interopRequireDefault(require("is-url"));
+var _constants = require("../../constants");
 const IMAGE_TYPES = exports.IMAGE_TYPES = ['png', 'jpg', 'gif'];
 const isImage = url => {
   if (!url) return false;
@@ -68,4 +69,13 @@ const onHandleOverflowScroll = (currentSelectItem, downDownWrapperRef) => {
     });
   }
 };
-exports.onHandleOverflowScroll = onHandleOverflowScroll;
+exports.onHandleOverflowScroll = onHandleOverflowScroll;
+const checkOverflow = (editor, position) => {
+  if (editor.editorType === _constants.DOCUMENT_PLUGIN_EDITOR) {
+    if (position.top < 201 || position.top + 42 > window.innerHeight) {
+      position['display'] = 'none';
+    }
+  }
+  return position;
+};
+exports.checkOverflow = checkOverflow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.54",
+  "version": "2.0.56",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -39,7 +39,7 @@
     "remark-parse": "11.0.0",
     "remark-rehype": "11.0.0",
     "remark-stringify": "11.0.0",
-    "sea-chart": "2.0.10",
+    "sea-chart": "2.0.11",
     "slugid": "3.2.0",
     "socket.io-client": "4.8.1",
     "type-of": "2.0.1",

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

@@ -627,5 +627,7 @@
   "Edit_chart": "Edit chart",
   "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
   "chart": "chart",
-  "Image_is_upload_error": "Image upload failed, please delete it and try again"
+  "Image_is_upload_error": "Image upload failed, please delete it and try again",
+  "Table_not_exist": "The table does not exist, please delete the current table element",
+  "Row_not_exist": "The row data does not exist, please delete the current row element"
 }

package/public/locales/zh_CN/sdoc-editor.json

@@ -627,5 +627,7 @@
   "Edit_chart": "编辑图表",
   "Please_complete_the_chart_configuration_first": "请先完成图表配置",
   "chart": "图表",
-  "Image_is_upload_error": "图片上传失败，请删除后重新尝试"
+  "Image_is_upload_error": "图片上传失败，请删除后重新尝试",
+  "Table_not_exist": "表格不存在，请删除当前表格元素",
+  "Row_not_exist": "表格不存在，请删除当前行元素"
 }