@zhenliang/sheet 0.1.7-4.beta.1 → 0.1.7-4.beta.2

package/dist/core/sheet/index.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -231,6 +237,21 @@ var Sheet = function Sheet(props) {
   useMouseEvent(dispatch, sheetWrapperRef);
   useKeyBoardEvent(dispatch, sheetWrapperRef);
   var menu = useContextMenu(dispatch, sheetWrapperRef, !!ContextMenu, contextMenuRef);
+  var menuCell = useMemo(function () {
+    var _data$cellPosition$ro, _data$cellPosition$ro2, _data$cellPosition$ro3;
+    var cellPosition = menu.cellPosition,
+      showMenu = menu.showMenu;
+    if (!showMenu) {
+      return cellPosition;
+    }
+    var _ref2 = (_data$cellPosition$ro = data === null || data === void 0 || (_data$cellPosition$ro2 = data[cellPosition.row]) === null || _data$cellPosition$ro2 === void 0 ? void 0 : _data$cellPosition$ro2[cellPosition.col - 1 - ((_data$cellPosition$ro3 = data[cellPosition.row][0].col) !== null && _data$cellPosition$ro3 !== void 0 ? _data$cellPosition$ro3 : 0)]) !== null && _data$cellPosition$ro !== void 0 ? _data$cellPosition$ro : {},
+      id = _ref2.id,
+      dataIndex = _ref2.dataIndex;
+    return _objectSpread(_objectSpread({}, cellPosition), {}, {
+      id: id,
+      key: dataIndex
+    });
+  }, [data, menu.cellPosition]);
   var _useRemarkContainer = useRemarkContainer(sheetWrapperRef, state.start, state.editing, showRemark),
     remarkInfo = _useRemarkContainer.remarkInfo;
 
@@ -393,7 +414,7 @@ var Sheet = function Sheet(props) {
           }, "sheet"), /*#__PURE__*/_jsx(Menu, {
             ref: contextMenuRef,
             position: menu.position,
-            cell: menu.cellPosition,
+            cell: menuCell,
             showMenu: menu.showMenu,
             contextMenu: ContextMenu,
             onContextMenu: onContextMenu

package/dist/type/sheet.d.ts

@@ -91,7 +91,7 @@ export type MenuRenderProps = {
         top: number;
         left: number;
     };
-    cell?: CellPosition;
+    cell?: CellPosition & Partial<Cell>;
     onContextMenu?: (event: any) => void;
     children?: ReactNode | ReactNode[];
     target?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.74.beta.1",
+  "version": "0.1.74.beta.2",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",