@fileverse-dev/fortune-react 1.0.2-mod-13 → 1.0.2-mod-14

package/dist/components/Workbook/api.d.ts

@@ -6,6 +6,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
         type?: keyof Cell;
     }) => any;
     onboardingActiveCell: (functionName: string) => void;
+    initializeComment: (row: number, column: number) => void;
     setCellValue: (row: number, column: number, value: any, options?: api.CommonOptions & {
         type?: keyof Cell;
     }) => void;

package/dist/components/Workbook/index.d.ts

@@ -13,6 +13,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
         type?: "v" | "m" | "mc" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "rt" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
     }) => any;
     onboardingActiveCell: (functionName: string) => void;
+    initializeComment: (row: number, column: number) => void;
     setCellValue: (row: number, column: number, value: any, options?: import("@fileverse-dev/fortune-core/dist/api").CommonOptions & {
         type?: "v" | "m" | "mc" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "rt" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
     }) => void;

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, locale, getStyleByCell, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, moveToEnd, isShowHidenCR, getrangeseleciton, cancelNormalSelected, moveHighlightCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, onCommentBoxResizeStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, insertRowCol, drawArrow, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getInlineStringNoStyle, rangeHightlightselected, updateCell, editSheetName, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, handlePasteByClick, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, calcSelectionInfo, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePaste, groupValuesRefresh } from '@fileverse-dev/fortune-core';
+import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, locale, getStyleByCell, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, moveToEnd, isShowHidenCR, getrangeseleciton, cancelNormalSelected, moveHighlightCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, insertRowCol, drawArrow, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getInlineStringNoStyle, rangeHightlightselected, updateCell, editSheetName, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, handlePasteByClick, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, calcSelectionInfo, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePaste, groupValuesRefresh } from '@fileverse-dev/fortune-core';
 import React, { useContext, useRef, useState, useMemo, useCallback, useEffect, useLayoutEffect, useImperativeHandle } from 'react';
 import produce, { applyPatches, enablePatches, produceWithPatches } from 'immer';
 import _ from 'lodash';
@@ -2362,7 +2362,8 @@ var NotationBoxes = function NotationBoxes() {
   var _useContext = useContext(WorkbookContext),
     context = _useContext.context,
     setContext = _useContext.setContext,
-    refs = _useContext.refs;
+    refs = _useContext.refs,
+    settings = _useContext.settings;
   var flowdata = getFlowdata(context);
   useEffect(function () {
     if (flowdata) {
@@ -2390,8 +2391,8 @@ var NotationBoxes = function NotationBoxes() {
   }, _.concat((_context$commentBoxes = context.commentBoxes) === null || _context$commentBoxes === void 0 ? void 0 : _context$commentBoxes.filter(function (v) {
     var _context$editingComme;
     return (v === null || v === void 0 ? void 0 : v.rc) !== ((_context$editingComme = context.editingCommentBox) === null || _context$editingComme === void 0 ? void 0 : _context$editingComme.rc);
-  }), [context.editingCommentBox, context.hoveredCommentBox]).map(function (commentBox) {
-    var _context$editingComme2;
+  }), [context.editingCommentBox, context.hoveredCommentBox]).map(function (commentBox, index) {
+    var _context$editingComme2, _settings$getCommentC;
     if (!commentBox) return null;
     var r = commentBox.r,
       c = commentBox.c,
@@ -2406,7 +2407,7 @@ var NotationBoxes = function NotationBoxes() {
     var isEditing = ((_context$editingComme2 = context.editingCommentBox) === null || _context$editingComme2 === void 0 ? void 0 : _context$editingComme2.rc) === rc;
     var commentId = "comment-box-".concat(rc);
     return /*#__PURE__*/React.createElement("div", {
-      key: rc
+      key: rc + index
     }, /*#__PURE__*/React.createElement("canvas", {
       id: "arrowCanvas-".concat(rc),
       className: "arrowCanvas",
@@ -2450,72 +2451,12 @@ var NotationBoxes = function NotationBoxes() {
         e.stopPropagation();
       }
     }, /*#__PURE__*/React.createElement("div", {
-      className: "luckysheet-postil-dialog-move"
-    }, ["t", "r", "b", "l"].map(function (v) {
-      return /*#__PURE__*/React.createElement("div", {
-        key: v,
-        className: "luckysheet-postil-dialog-move-item luckysheet-postil-dialog-move-item-".concat(v),
-        "data-type": v
-      });
-    })), isEditing && (/*#__PURE__*/React.createElement("div", {
-      className: "luckysheet-postil-dialog-resize"
-    }, ["lt", "mt", "lm", "rm", "rt", "lb", "mb", "rb"].map(function (v) {
-      return /*#__PURE__*/React.createElement("div", {
-        key: v,
-        className: "luckysheet-postil-dialog-resize-item luckysheet-postil-dialog-resize-item-".concat(v),
-        "data-type": v,
-        onMouseDown: function onMouseDown(e) {
-          var nativeEvent = e.nativeEvent;
-          onCommentBoxResizeStart(context, refs.globalCache, nativeEvent, {
-            r: r,
-            c: c,
-            rc: rc
-          }, commentId, v);
-          e.stopPropagation();
-        }
-      });
-    }))), /*#__PURE__*/React.createElement("div", {
       style: {
         width: "100%",
         height: "100%",
         overflow: "hidden"
       }
-    }, /*#__PURE__*/React.createElement(ContentEditable, {
-      id: "comment-editor-".concat(rc),
-      autoFocus: autoFocus,
-      style: {
-        width: "100%",
-        height: "100%",
-        lineHeight: "20px",
-        boxSizing: "border-box",
-        textAlign: "center",
-        wordBreak: "break-all",
-        outline: "none"
-      },
-      allowEdit: context.allowEdit,
-      spellCheck: false,
-      "data-r": r,
-      "data-c": c,
-      onKeyDown: function onKeyDown(e) {
-        return e.stopPropagation();
-      },
-      onFocus: function onFocus(e) {
-        if (context.allowEdit === false) return;
-        refs.globalCache.editingCommentBoxEle = e.target;
-      },
-      onMouseDown: function onMouseDown(e) {
-        setContext(function (draftContext) {
-          if (flowdata) {
-            setEditingComment(draftContext, flowdata, r, c);
-          }
-        });
-        e.stopPropagation();
-      },
-      onDoubleClick: function onDoubleClick(e) {
-        e.stopPropagation();
-      },
-      initialContent: value
-    }))));
+    }, (_settings$getCommentC = settings.getCommentCellUI) === null || _settings$getCommentC === void 0 ? void 0 : _settings$getCommentC.call(settings, r, c))));
   }));
 };
 
@@ -7607,6 +7548,17 @@ var ContextMenu = function ContextMenu() {
         key: "divider-".concat(i)
       });
     }
+    if (name === "comment") {
+      return /*#__PURE__*/React.createElement(Menu, {
+        key: name,
+        onClick: function onClick() {
+          setContext(function (draftCtx) {
+            newComment(draftCtx, refs.globalCache, selection === null || selection === void 0 ? void 0 : selection.row_focus, selection === null || selection === void 0 ? void 0 : selection.column_focus);
+            draftCtx.contextMenu = {};
+          });
+        }
+      }, "Comment");
+    }
     if (name === "copy") {
       return /*#__PURE__*/React.createElement(Menu, {
         key: name,
@@ -10038,6 +9990,11 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
         }
       });
     },
+    initializeComment: function initializeComment(row, column) {
+      setContext(function (ctx) {
+        newComment(ctx, undefined, row, column);
+      });
+    },
     setCellValue: function setCellValue(row, column, value) {
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       return setContext(function (draftCtx) {

package/dist/index.js

@@ -2373,7 +2373,8 @@ var NotationBoxes = function NotationBoxes() {
   var _useContext = React.useContext(WorkbookContext),
     context = _useContext.context,
     setContext = _useContext.setContext,
-    refs = _useContext.refs;
+    refs = _useContext.refs,
+    settings = _useContext.settings;
   var flowdata = fortuneCore.getFlowdata(context);
   React.useEffect(function () {
     if (flowdata) {
@@ -2401,8 +2402,8 @@ var NotationBoxes = function NotationBoxes() {
   }, ___default['default'].concat((_context$commentBoxes = context.commentBoxes) === null || _context$commentBoxes === void 0 ? void 0 : _context$commentBoxes.filter(function (v) {
     var _context$editingComme;
     return (v === null || v === void 0 ? void 0 : v.rc) !== ((_context$editingComme = context.editingCommentBox) === null || _context$editingComme === void 0 ? void 0 : _context$editingComme.rc);
-  }), [context.editingCommentBox, context.hoveredCommentBox]).map(function (commentBox) {
-    var _context$editingComme2;
+  }), [context.editingCommentBox, context.hoveredCommentBox]).map(function (commentBox, index) {
+    var _context$editingComme2, _settings$getCommentC;
     if (!commentBox) return null;
     var r = commentBox.r,
       c = commentBox.c,
@@ -2417,7 +2418,7 @@ var NotationBoxes = function NotationBoxes() {
     var isEditing = ((_context$editingComme2 = context.editingCommentBox) === null || _context$editingComme2 === void 0 ? void 0 : _context$editingComme2.rc) === rc;
     var commentId = "comment-box-".concat(rc);
     return /*#__PURE__*/React__default['default'].createElement("div", {
-      key: rc
+      key: rc + index
     }, /*#__PURE__*/React__default['default'].createElement("canvas", {
       id: "arrowCanvas-".concat(rc),
       className: "arrowCanvas",
@@ -2461,72 +2462,12 @@ var NotationBoxes = function NotationBoxes() {
         e.stopPropagation();
       }
     }, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "luckysheet-postil-dialog-move"
-    }, ["t", "r", "b", "l"].map(function (v) {
-      return /*#__PURE__*/React__default['default'].createElement("div", {
-        key: v,
-        className: "luckysheet-postil-dialog-move-item luckysheet-postil-dialog-move-item-".concat(v),
-        "data-type": v
-      });
-    })), isEditing && (/*#__PURE__*/React__default['default'].createElement("div", {
-      className: "luckysheet-postil-dialog-resize"
-    }, ["lt", "mt", "lm", "rm", "rt", "lb", "mb", "rb"].map(function (v) {
-      return /*#__PURE__*/React__default['default'].createElement("div", {
-        key: v,
-        className: "luckysheet-postil-dialog-resize-item luckysheet-postil-dialog-resize-item-".concat(v),
-        "data-type": v,
-        onMouseDown: function onMouseDown(e) {
-          var nativeEvent = e.nativeEvent;
-          fortuneCore.onCommentBoxResizeStart(context, refs.globalCache, nativeEvent, {
-            r: r,
-            c: c,
-            rc: rc
-          }, commentId, v);
-          e.stopPropagation();
-        }
-      });
-    }))), /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         width: "100%",
         height: "100%",
         overflow: "hidden"
       }
-    }, /*#__PURE__*/React__default['default'].createElement(ContentEditable, {
-      id: "comment-editor-".concat(rc),
-      autoFocus: autoFocus,
-      style: {
-        width: "100%",
-        height: "100%",
-        lineHeight: "20px",
-        boxSizing: "border-box",
-        textAlign: "center",
-        wordBreak: "break-all",
-        outline: "none"
-      },
-      allowEdit: context.allowEdit,
-      spellCheck: false,
-      "data-r": r,
-      "data-c": c,
-      onKeyDown: function onKeyDown(e) {
-        return e.stopPropagation();
-      },
-      onFocus: function onFocus(e) {
-        if (context.allowEdit === false) return;
-        refs.globalCache.editingCommentBoxEle = e.target;
-      },
-      onMouseDown: function onMouseDown(e) {
-        setContext(function (draftContext) {
-          if (flowdata) {
-            fortuneCore.setEditingComment(draftContext, flowdata, r, c);
-          }
-        });
-        e.stopPropagation();
-      },
-      onDoubleClick: function onDoubleClick(e) {
-        e.stopPropagation();
-      },
-      initialContent: value
-    }))));
+    }, (_settings$getCommentC = settings.getCommentCellUI) === null || _settings$getCommentC === void 0 ? void 0 : _settings$getCommentC.call(settings, r, c))));
   }));
 };
 
@@ -7618,6 +7559,17 @@ var ContextMenu = function ContextMenu() {
         key: "divider-".concat(i)
       });
     }
+    if (name === "comment") {
+      return /*#__PURE__*/React__default['default'].createElement(Menu, {
+        key: name,
+        onClick: function onClick() {
+          setContext(function (draftCtx) {
+            fortuneCore.newComment(draftCtx, refs.globalCache, selection === null || selection === void 0 ? void 0 : selection.row_focus, selection === null || selection === void 0 ? void 0 : selection.column_focus);
+            draftCtx.contextMenu = {};
+          });
+        }
+      }, "Comment");
+    }
     if (name === "copy") {
       return /*#__PURE__*/React__default['default'].createElement(Menu, {
         key: name,
@@ -10049,6 +10001,11 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
         }
       });
     },
+    initializeComment: function initializeComment(row, column) {
+      setContext(function (ctx) {
+        fortuneCore.newComment(ctx, undefined, row, column);
+      });
+    },
     setCellValue: function setCellValue(row, column, value) {
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       return setContext(function (draftCtx) {