@zhenliang/sheet 0.1.55 → 0.1.57-beta.0

package/dist/core/editor/numberEditor/index.js

@@ -95,7 +95,8 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
           return;
         }
         if (!value) {
-          return handleChange('');
+          handleChange(null);
+          return;
         }
         if (max && +value > max) {
           handleChange(max);

package/dist/core/reducers/sideEffectReducer.js

@@ -357,8 +357,11 @@ export var sideEffectReducer = {
       start = _getState10.start,
       end = _getState10.end,
       history = _getState10.history,
+      _getState10$recoverHi = _getState10.recoverHisotry,
+      recoverHisotry = _getState10$recoverHi === void 0 ? [] : _getState10$recoverHi,
       cellChangeHandler = _getState10.cellChangeHandler,
-      eventBus = _getState10.eventBus;
+      eventBus = _getState10.eventBus,
+      data = _getState10.data;
     if (!(history !== null && history !== void 0 && history.length)) return;
     var changeHistory = _toConsumableArray(history);
     var change = changeHistory.pop();
@@ -368,12 +371,70 @@ export var sideEffectReducer = {
       dispatch({
         type: 'changes',
         payload: {
-          history: changeHistory
+          history: changeHistory,
+          recoverHisotry: [].concat(_toConsumableArray(recoverHisotry), [change])
         }
       });
       return;
     }
     cellChangeHandler && cellChangeHandler(change.changes);
+    var recoverChange = _objectSpread(_objectSpread({}, change), {}, {
+      changes: change.changes.map(function (item) {
+        var _item$row, _item$col;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          value: data[(_item$row = item.row) !== null && _item$row !== void 0 ? _item$row : 0][(_item$col = item.col) !== null && _item$col !== void 0 ? _item$col : -1].value
+        });
+      })
+    });
+    dispatch({
+      type: 'changes',
+      payload: {
+        start: pick(head(change.changes), ['row', 'col']),
+        end: pick(last(change.changes), ['row', 'col']),
+        lastSelected: {
+          start: start,
+          end: end
+        },
+        history: changeHistory,
+        recoverHisotry: [].concat(_toConsumableArray(recoverHisotry), [recoverChange])
+      }
+    });
+  },
+  recover: function recover(dispatch, getState) {
+    var _getState11 = getState(),
+      eventBus = _getState11.eventBus,
+      _getState11$recoverHi = _getState11.recoverHisotry,
+      recoverHisotry = _getState11$recoverHi === void 0 ? [] : _getState11$recoverHi,
+      _getState11$history = _getState11.history,
+      history = _getState11$history === void 0 ? [] : _getState11$history,
+      cellChangeHandler = _getState11.cellChangeHandler,
+      start = _getState11.start,
+      end = _getState11.end,
+      data = _getState11.data;
+    if (!(recoverHisotry !== null && recoverHisotry !== void 0 && recoverHisotry.length)) return;
+    var changeHistory = _toConsumableArray(recoverHisotry);
+    var change = changeHistory.pop();
+    var type = change.type;
+    if (!['Edit', 'Paste', 'Delete'].includes(type)) {
+      eventBus.emit('recover', change);
+      dispatch({
+        type: 'changes',
+        payload: {
+          recoverHisotry: changeHistory,
+          history: [].concat(_toConsumableArray(history), [change])
+        }
+      });
+      return;
+    }
+    var reverseChange = _objectSpread(_objectSpread({}, change), {}, {
+      changes: change.changes.map(function (item) {
+        var _item$row2, _item$col2;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          value: data[(_item$row2 = item.row) !== null && _item$row2 !== void 0 ? _item$row2 : 0][(_item$col2 = item.col) !== null && _item$col2 !== void 0 ? _item$col2 : -1].value
+        });
+      })
+    });
+    cellChangeHandler && cellChangeHandler(change.changes);
     dispatch({
       type: 'changes',
       payload: {
@@ -383,7 +444,8 @@ export var sideEffectReducer = {
           start: start,
           end: end
         },
-        history: changeHistory
+        history: [].concat(_toConsumableArray(history), [reverseChange]),
+        recoverHisotry: changeHistory
       }
     });
   }

package/dist/core/reducers/stateReducer.js

@@ -10,7 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import { SheetType } from "../..";
+import { stripRowIndex } from "../util";
 export var searchReducer = {
   changeSearch: function changeSearch(state, payload) {
     var data = state.data;
@@ -177,27 +177,20 @@ export var stateReducer = _objectSpread({
     });
   },
   selectOneRow: function selectOneRow(state, payload) {
-    var _state$data4, _state$data$0$length, _state$data5, _state$data6;
-    var startCol = ((_state$data4 = state.data) === null || _state$data4 === void 0 || (_state$data4 = _state$data4[0]) === null || _state$data4 === void 0 ? void 0 : _state$data4.findIndex(function (item) {
-      return !item.fixed;
-    })) || 0;
-    var endCol = ((_state$data$0$length = (_state$data5 = state.data) === null || _state$data5 === void 0 || (_state$data5 = _state$data5[0]) === null || _state$data5 === void 0 ? void 0 : _state$data5.length) !== null && _state$data$0$length !== void 0 ? _state$data$0$length : 0) - 1;
-    var lastFixed = (_state$data6 = state.data) === null || _state$data6 === void 0 || (_state$data6 = _state$data6[0]) === null || _state$data6 === void 0 ? void 0 : _state$data6.find(function (item) {
-      return item.fixed === SheetType.CellAlign.right;
-    });
-    if (lastFixed) {
-      var _state$data$0$indexOf, _state$data7;
-      endCol = ((_state$data$0$indexOf = (_state$data7 = state.data) === null || _state$data7 === void 0 ? void 0 : _state$data7[0].indexOf(lastFixed)) !== null && _state$data$0$indexOf !== void 0 ? _state$data$0$indexOf : 0) - 1;
-    }
-    if (startCol >= 0 && endCol >= 0) {
+    var _state$data4 = state.data,
+      data = _state$data4 === void 0 ? [] : _state$data4;
+    var _stripRowIndex = stripRowIndex(data),
+      startIndex = _stripRowIndex.startIndex,
+      endIndex = _stripRowIndex.endIndex;
+    if (startIndex >= 0 && endIndex >= 0) {
       return _objectSpread(_objectSpread({}, state), {}, {
         start: {
           row: payload,
-          col: startCol
+          col: startIndex
         },
         end: {
           row: payload,
-          col: endCol
+          col: endIndex
         },
         lastSelected: {
           start: state.start,

package/dist/core/sheet/useKeyBoardEvent.js

@@ -35,6 +35,10 @@ export var useKeyBoardEvent = function useKeyBoardEvent(dispatch, elementRef) {
     reverse: function reverse() {
       dispatch(sideEffectReducer.reverse);
     },
+    recover: function recover(e) {
+      e.preventDefault();
+      dispatch(sideEffectReducer.recover);
+    },
     delete: function _delete() {
       dispatch(sideEffectReducer.delete);
     },

package/dist/hooks/useKeyboard.d.ts

@@ -9,6 +9,7 @@ type KeyboardHandler = {
     copy: KeyOrClipBoardEvent;
     paste: KeyOrClipBoardEvent;
     reverse: KeyOrClipBoardEvent;
+    recover: KeyOrClipBoardEvent;
     cut: KeyOrClipBoardEvent;
     search: KeyOrClipBoardEvent;
 };

package/dist/hooks/useKeyboard.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect } from 'react';
-import { A_KEY, BACKSPACE_KEY, C_KEY, DELETE_KEY, DOWN_KEY, ENTER_KEY, ESCAPE_KEY, F_KEY, LEFT_KEY, RIGHT_KEY, TAB_KEY, UP_KEY, V_KEY, X_KEY, Z_KEY } from "../core/config";
+import { A_KEY, BACKSPACE_KEY, C_KEY, DELETE_KEY, DOWN_KEY, ENTER_KEY, ESCAPE_KEY, F_KEY, LEFT_KEY, RIGHT_KEY, TAB_KEY, UP_KEY, V_KEY, X_KEY, Y_KEY, Z_KEY } from "../core/config";
 import { isInputKey } from "../core/util";
 var ua = window.navigator.userAgent;
 var isIE = /MSIE|Trident/.test(ua);
@@ -56,11 +56,15 @@ export var useKeyBoard = function useKeyBoard(handler, listenElement) {
       handler.search(e);
       return;
     }
-    var isReverse = ctrlKeyPressed && keyCode === Z_KEY;
+    var isReverse = ctrlKeyPressed && keyCode === Z_KEY && !shiftKey;
     if (isReverse) {
       handler.reverse(e);
       return;
     }
+    var isRecover = ctrlKeyPressed && (keyCode === Z_KEY && shiftKey || keyCode === Y_KEY);
+    if (isRecover) {
+      handler.recover(e);
+    }
     var isSelectAll = ctrlKeyPressed && keyCode === A_KEY;
     if (isSelectAll) {
       handler.selectAll(e);

package/dist/type/sheet.d.ts

@@ -191,6 +191,7 @@ export type UpdateStateType = {
         value?: string;
     };
     history: OperateHistory[];
+    recoverHisotry: OperateHistory[];
     freePaste?: boolean;
     data: Cell[][];
     mouseDown: boolean;

package/package.json

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