@leankylin-sheet/react 5.2.65 → 5.2.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/index.esm.js +22 -5
  2. package/dist/index.js +22 -5
  3. package/dist/index.umd.js +22 -5
  4. package/dist/index.umd.min.js +1 -1
  5. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -7877,6 +7877,7 @@ var SheetItem = function SheetItem(_ref) {
7877
7877
  var _useContext = useContext(WorkbookContext),
7878
7878
  context = _useContext.context,
7879
7879
  setContext = _useContext.setContext,
7880
+ settings = _useContext.settings,
7880
7881
  refs = _useContext.refs;
7881
7882
  var _useState = useState(false),
7882
7883
  _useState2 = _slicedToArray(_useState, 2),
@@ -7959,6 +7960,7 @@ var SheetItem = function SheetItem(_ref) {
7959
7960
  var droppingId = sheet.id;
7960
7961
  var draggingSheet;
7961
7962
  var droppingSheet;
7963
+ var moved = false;
7962
7964
  _.sortBy(draftCtx.luckysheetfile, ["order"]).forEach(function (f, i) {
7963
7965
  f.order = i;
7964
7966
  if (f.id === draggingId) {
@@ -7972,13 +7974,19 @@ var SheetItem = function SheetItem(_ref) {
7972
7974
  _.sortBy(draftCtx.luckysheetfile, ["order"]).forEach(function (f, i) {
7973
7975
  f.order = i;
7974
7976
  });
7977
+ moved = true;
7975
7978
  } else if (draggingSheet && isDropPlaceholder) {
7976
7979
  draggingSheet.order = draftCtx.luckysheetfile.length;
7980
+ moved = true;
7981
+ }
7982
+ if (moved) {
7983
+ var _settings$hooks, _settings$hooks$onMov;
7984
+ (_settings$hooks = settings.hooks) === null || _settings$hooks === void 0 ? void 0 : (_settings$hooks$onMov = _settings$hooks.onMoveSheet) === null || _settings$hooks$onMov === void 0 ? void 0 : _settings$hooks$onMov.call(_settings$hooks, draggingId, isDropPlaceholder ? undefined : droppingId);
7977
7985
  }
7978
7986
  });
7979
7987
  setDragOver(false);
7980
7988
  e.stopPropagation();
7981
- }, [context.allowEdit, isDropPlaceholder, setContext, sheet.id]);
7989
+ }, [context.allowEdit, isDropPlaceholder, setContext, settings.hooks, sheet.id]);
7982
7990
  var onChangeSheet = useMemoizedFn(function () {
7983
7991
  if (isDropPlaceholder) return;
7984
7992
  setContext(function (draftCtx) {
@@ -8004,7 +8012,7 @@ var SheetItem = function SheetItem(_ref) {
8004
8012
  },
8005
8013
  onDrop: onDrop,
8006
8014
  onDragStart: onDragStart,
8007
- draggable: context.allowEdit && !editing,
8015
+ draggable: context.allowEdit && !settings.disabledMoveSheet && !editing,
8008
8016
  key: sheet.id,
8009
8017
  ref: containerRef,
8010
8018
  className: isDropPlaceholder ? "leankylin-sheettab-placeholder" : "luckysheet-sheets-item".concat(context.currentSheetId === sheet.id ? " luckysheet-sheets-item-active" : ""),
@@ -10545,6 +10553,7 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10545
10553
  useOutsideClick(containerRef, close, [close]);
10546
10554
  var moveSheet = useCallback(function (delta) {
10547
10555
  if (context.allowEdit === false) return;
10556
+ if (settings.disabledMoveSheet) return;
10548
10557
  if (!sheet) return;
10549
10558
  setContext(function (ctx) {
10550
10559
  var currentOrder = -1;
@@ -10555,8 +10564,16 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10555
10564
  }
10556
10565
  });
10557
10566
  api.setSheetOrder(ctx, _defineProperty({}, sheet.id, currentOrder + delta));
10567
+ var sorted = _.sortBy(ctx.luckysheetfile, ["order"]);
10568
+ var newIndex = sorted.findIndex(function (_sheet) {
10569
+ return _sheet.id === sheet.id;
10570
+ });
10571
+ if (newIndex !== currentOrder) {
10572
+ var _settings$hooks, _settings$hooks$onMov, _sorted;
10573
+ (_settings$hooks = settings.hooks) === null || _settings$hooks === void 0 ? void 0 : (_settings$hooks$onMov = _settings$hooks.onMoveSheet) === null || _settings$hooks$onMov === void 0 ? void 0 : _settings$hooks$onMov.call(_settings$hooks, sheet.id, (_sorted = sorted[newIndex + 1]) === null || _sorted === void 0 ? void 0 : _sorted.id);
10574
+ }
10558
10575
  });
10559
- }, [context.allowEdit, setContext, sheet]);
10576
+ }, [context.allowEdit, settings.disabledMoveSheet, settings.hooks, setContext, sheet]);
10560
10577
  var hideSheet = useCallback(function () {
10561
10578
  if (context.allowEdit === false) return;
10562
10579
  if (!sheet) return;
@@ -10572,7 +10589,7 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10572
10589
  });
10573
10590
  }, [context.allowEdit, setContext, sheet, showAlert, sheetconfig]);
10574
10591
  var copySheet = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
10575
- var _settings$hooks;
10592
+ var _settings$hooks2;
10576
10593
  var _ref2, onCopySheetCheck, isAllowed;
10577
10594
  return _regeneratorRuntime().wrap(function _callee$(_context) {
10578
10595
  while (1) switch (_context.prev = _context.next) {
@@ -10589,7 +10606,7 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10589
10606
  }
10590
10607
  return _context.abrupt("return");
10591
10608
  case 4:
10592
- _ref2 = (_settings$hooks = settings.hooks) !== null && _settings$hooks !== void 0 ? _settings$hooks : {}, onCopySheetCheck = _ref2.onCopySheetCheck;
10609
+ _ref2 = (_settings$hooks2 = settings.hooks) !== null && _settings$hooks2 !== void 0 ? _settings$hooks2 : {}, onCopySheetCheck = _ref2.onCopySheetCheck;
10593
10610
  if (!onCopySheetCheck) {
10594
10611
  _context.next = 18;
10595
10612
  break;
package/dist/index.js CHANGED
@@ -7887,6 +7887,7 @@ var SheetItem = function SheetItem(_ref) {
7887
7887
  var _useContext = React.useContext(WorkbookContext),
7888
7888
  context = _useContext.context,
7889
7889
  setContext = _useContext.setContext,
7890
+ settings = _useContext.settings,
7890
7891
  refs = _useContext.refs;
7891
7892
  var _useState = React.useState(false),
7892
7893
  _useState2 = _slicedToArray(_useState, 2),
@@ -7969,6 +7970,7 @@ var SheetItem = function SheetItem(_ref) {
7969
7970
  var droppingId = sheet.id;
7970
7971
  var draggingSheet;
7971
7972
  var droppingSheet;
7973
+ var moved = false;
7972
7974
  ___default['default'].sortBy(draftCtx.luckysheetfile, ["order"]).forEach(function (f, i) {
7973
7975
  f.order = i;
7974
7976
  if (f.id === draggingId) {
@@ -7982,13 +7984,19 @@ var SheetItem = function SheetItem(_ref) {
7982
7984
  ___default['default'].sortBy(draftCtx.luckysheetfile, ["order"]).forEach(function (f, i) {
7983
7985
  f.order = i;
7984
7986
  });
7987
+ moved = true;
7985
7988
  } else if (draggingSheet && isDropPlaceholder) {
7986
7989
  draggingSheet.order = draftCtx.luckysheetfile.length;
7990
+ moved = true;
7991
+ }
7992
+ if (moved) {
7993
+ var _settings$hooks, _settings$hooks$onMov;
7994
+ (_settings$hooks = settings.hooks) === null || _settings$hooks === void 0 ? void 0 : (_settings$hooks$onMov = _settings$hooks.onMoveSheet) === null || _settings$hooks$onMov === void 0 ? void 0 : _settings$hooks$onMov.call(_settings$hooks, draggingId, isDropPlaceholder ? undefined : droppingId);
7987
7995
  }
7988
7996
  });
7989
7997
  setDragOver(false);
7990
7998
  e.stopPropagation();
7991
- }, [context.allowEdit, isDropPlaceholder, setContext, sheet.id]);
7999
+ }, [context.allowEdit, isDropPlaceholder, setContext, settings.hooks, sheet.id]);
7992
8000
  var onChangeSheet = ahooks.useMemoizedFn(function () {
7993
8001
  if (isDropPlaceholder) return;
7994
8002
  setContext(function (draftCtx) {
@@ -8014,7 +8022,7 @@ var SheetItem = function SheetItem(_ref) {
8014
8022
  },
8015
8023
  onDrop: onDrop,
8016
8024
  onDragStart: onDragStart,
8017
- draggable: context.allowEdit && !editing,
8025
+ draggable: context.allowEdit && !settings.disabledMoveSheet && !editing,
8018
8026
  key: sheet.id,
8019
8027
  ref: containerRef,
8020
8028
  className: isDropPlaceholder ? "leankylin-sheettab-placeholder" : "luckysheet-sheets-item".concat(context.currentSheetId === sheet.id ? " luckysheet-sheets-item-active" : ""),
@@ -10555,6 +10563,7 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10555
10563
  useOutsideClick(containerRef, close, [close]);
10556
10564
  var moveSheet = React.useCallback(function (delta) {
10557
10565
  if (context.allowEdit === false) return;
10566
+ if (settings.disabledMoveSheet) return;
10558
10567
  if (!sheet) return;
10559
10568
  setContext(function (ctx) {
10560
10569
  var currentOrder = -1;
@@ -10565,8 +10574,16 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10565
10574
  }
10566
10575
  });
10567
10576
  core.api.setSheetOrder(ctx, _defineProperty({}, sheet.id, currentOrder + delta));
10577
+ var sorted = ___default['default'].sortBy(ctx.luckysheetfile, ["order"]);
10578
+ var newIndex = sorted.findIndex(function (_sheet) {
10579
+ return _sheet.id === sheet.id;
10580
+ });
10581
+ if (newIndex !== currentOrder) {
10582
+ var _settings$hooks, _settings$hooks$onMov, _sorted;
10583
+ (_settings$hooks = settings.hooks) === null || _settings$hooks === void 0 ? void 0 : (_settings$hooks$onMov = _settings$hooks.onMoveSheet) === null || _settings$hooks$onMov === void 0 ? void 0 : _settings$hooks$onMov.call(_settings$hooks, sheet.id, (_sorted = sorted[newIndex + 1]) === null || _sorted === void 0 ? void 0 : _sorted.id);
10584
+ }
10568
10585
  });
10569
- }, [context.allowEdit, setContext, sheet]);
10586
+ }, [context.allowEdit, settings.disabledMoveSheet, settings.hooks, setContext, sheet]);
10570
10587
  var hideSheet = React.useCallback(function () {
10571
10588
  if (context.allowEdit === false) return;
10572
10589
  if (!sheet) return;
@@ -10582,7 +10599,7 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10582
10599
  });
10583
10600
  }, [context.allowEdit, setContext, sheet, showAlert, sheetconfig]);
10584
10601
  var copySheet = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
10585
- var _settings$hooks;
10602
+ var _settings$hooks2;
10586
10603
  var _ref2, onCopySheetCheck, isAllowed;
10587
10604
  return _regeneratorRuntime().wrap(function _callee$(_context) {
10588
10605
  while (1) switch (_context.prev = _context.next) {
@@ -10599,7 +10616,7 @@ var SheetTabContextMenu = function SheetTabContextMenu() {
10599
10616
  }
10600
10617
  return _context.abrupt("return");
10601
10618
  case 4:
10602
- _ref2 = (_settings$hooks = settings.hooks) !== null && _settings$hooks !== void 0 ? _settings$hooks : {}, onCopySheetCheck = _ref2.onCopySheetCheck;
10619
+ _ref2 = (_settings$hooks2 = settings.hooks) !== null && _settings$hooks2 !== void 0 ? _settings$hooks2 : {}, onCopySheetCheck = _ref2.onCopySheetCheck;
10603
10620
  if (!onCopySheetCheck) {
10604
10621
  _context.next = 18;
10605
10622
  break;
package/dist/index.umd.js CHANGED
@@ -26961,6 +26961,7 @@
26961
26961
  var _useContext = React.useContext(WorkbookContext),
26962
26962
  context = _useContext.context,
26963
26963
  setContext = _useContext.setContext,
26964
+ settings = _useContext.settings,
26964
26965
  refs = _useContext.refs;
26965
26966
  var _useState = React.useState(false),
26966
26967
  _useState2 = _slicedToArray(_useState, 2),
@@ -27043,6 +27044,7 @@
27043
27044
  var droppingId = sheet.id;
27044
27045
  var draggingSheet;
27045
27046
  var droppingSheet;
27047
+ var moved = false;
27046
27048
  lodash.sortBy(draftCtx.luckysheetfile, ["order"]).forEach(function (f, i) {
27047
27049
  f.order = i;
27048
27050
  if (f.id === draggingId) {
@@ -27056,13 +27058,19 @@
27056
27058
  lodash.sortBy(draftCtx.luckysheetfile, ["order"]).forEach(function (f, i) {
27057
27059
  f.order = i;
27058
27060
  });
27061
+ moved = true;
27059
27062
  } else if (draggingSheet && isDropPlaceholder) {
27060
27063
  draggingSheet.order = draftCtx.luckysheetfile.length;
27064
+ moved = true;
27065
+ }
27066
+ if (moved) {
27067
+ var _settings$hooks, _settings$hooks$onMov;
27068
+ (_settings$hooks = settings.hooks) === null || _settings$hooks === void 0 ? void 0 : (_settings$hooks$onMov = _settings$hooks.onMoveSheet) === null || _settings$hooks$onMov === void 0 ? void 0 : _settings$hooks$onMov.call(_settings$hooks, draggingId, isDropPlaceholder ? undefined : droppingId);
27061
27069
  }
27062
27070
  });
27063
27071
  setDragOver(false);
27064
27072
  e.stopPropagation();
27065
- }, [context.allowEdit, isDropPlaceholder, setContext, sheet.id]);
27073
+ }, [context.allowEdit, isDropPlaceholder, setContext, settings.hooks, sheet.id]);
27066
27074
  var onChangeSheet = useMemoizedFn(function () {
27067
27075
  if (isDropPlaceholder) return;
27068
27076
  setContext(function (draftCtx) {
@@ -27088,7 +27096,7 @@
27088
27096
  },
27089
27097
  onDrop: onDrop,
27090
27098
  onDragStart: onDragStart,
27091
- draggable: context.allowEdit && !editing,
27099
+ draggable: context.allowEdit && !settings.disabledMoveSheet && !editing,
27092
27100
  key: sheet.id,
27093
27101
  ref: containerRef,
27094
27102
  className: isDropPlaceholder ? "leankylin-sheettab-placeholder" : "luckysheet-sheets-item".concat(context.currentSheetId === sheet.id ? " luckysheet-sheets-item-active" : ""),
@@ -29629,6 +29637,7 @@
29629
29637
  useOutsideClick(containerRef, close, [close]);
29630
29638
  var moveSheet = React.useCallback(function (delta) {
29631
29639
  if (context.allowEdit === false) return;
29640
+ if (settings.disabledMoveSheet) return;
29632
29641
  if (!sheet) return;
29633
29642
  setContext(function (ctx) {
29634
29643
  var currentOrder = -1;
@@ -29639,8 +29648,16 @@
29639
29648
  }
29640
29649
  });
29641
29650
  core.api.setSheetOrder(ctx, _defineProperty({}, sheet.id, currentOrder + delta));
29651
+ var sorted = lodash.sortBy(ctx.luckysheetfile, ["order"]);
29652
+ var newIndex = sorted.findIndex(function (_sheet) {
29653
+ return _sheet.id === sheet.id;
29654
+ });
29655
+ if (newIndex !== currentOrder) {
29656
+ var _settings$hooks, _settings$hooks$onMov, _sorted;
29657
+ (_settings$hooks = settings.hooks) === null || _settings$hooks === void 0 ? void 0 : (_settings$hooks$onMov = _settings$hooks.onMoveSheet) === null || _settings$hooks$onMov === void 0 ? void 0 : _settings$hooks$onMov.call(_settings$hooks, sheet.id, (_sorted = sorted[newIndex + 1]) === null || _sorted === void 0 ? void 0 : _sorted.id);
29658
+ }
29642
29659
  });
29643
- }, [context.allowEdit, setContext, sheet]);
29660
+ }, [context.allowEdit, settings.disabledMoveSheet, settings.hooks, setContext, sheet]);
29644
29661
  var hideSheet = React.useCallback(function () {
29645
29662
  if (context.allowEdit === false) return;
29646
29663
  if (!sheet) return;
@@ -29656,7 +29673,7 @@
29656
29673
  });
29657
29674
  }, [context.allowEdit, setContext, sheet, showAlert, sheetconfig]);
29658
29675
  var copySheet = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
29659
- var _settings$hooks;
29676
+ var _settings$hooks2;
29660
29677
  var _ref2, onCopySheetCheck, isAllowed;
29661
29678
  return _regeneratorRuntime().wrap(function _callee$(_context) {
29662
29679
  while (1) switch (_context.prev = _context.next) {
@@ -29673,7 +29690,7 @@
29673
29690
  }
29674
29691
  return _context.abrupt("return");
29675
29692
  case 4:
29676
- _ref2 = (_settings$hooks = settings.hooks) !== null && _settings$hooks !== void 0 ? _settings$hooks : {}, onCopySheetCheck = _ref2.onCopySheetCheck;
29693
+ _ref2 = (_settings$hooks2 = settings.hooks) !== null && _settings$hooks2 !== void 0 ? _settings$hooks2 : {}, onCopySheetCheck = _ref2.onCopySheetCheck;
29677
29694
  if (!onCopySheetCheck) {
29678
29695
  _context.next = 18;
29679
29696
  break;