@fileverse-dev/fortune-core 1.3.5-hyper → 1.3.5-hyper-1

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/es/events/keyboard.js +3 -3
  2. package/es/modules/selection.js +29 -7
  3. package/lib/events/keyboard.js +3 -3
  4. package/lib/modules/selection.js +29 -7
  5. package/package.json +1 -1
package/es/events/keyboard.js CHANGED
@@ -139,7 +139,7 @@ export function handleGlobalEnter(ctx, cellInput, e, canvas) {
139
139
  row_focus: lastCellUpdate[0],
140
140
  column_focus: lastCellUpdate[1]
141
141
  }];
142
- moveHighlightCell(ctx, "down", 1, "rangeOfSelect");
142
+ moveHighlightCell(ctx, "down", hideCRCount(ctx, "ArrowDown"), "rangeOfSelect");
143
143
  e.preventDefault();
144
144
  } else {
145
145
  if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0) {
@@ -434,9 +434,9 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
434
434
  updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
435
435
  }
436
436
  if (e.shiftKey) {
437
- moveHighlightCell(ctx, "right", -1, "rangeOfSelect");
437
+ moveHighlightCell(ctx, "right", -hideCRCount(ctx, "ArrowLeft"), "rangeOfSelect");
438
438
  } else {
439
- moveHighlightCell(ctx, "right", 1, "rangeOfSelect");
439
+ moveHighlightCell(ctx, "right", hideCRCount(ctx, "ArrowRight"), "rangeOfSelect");
440
440
  }
441
441
  e.preventDefault();
442
442
  } else if (kstr === "F2") {
package/es/modules/selection.js CHANGED
@@ -1613,6 +1613,7 @@ export function deleteSelectedCellFormat(ctx) {
1613
1613
  return "success";
1614
1614
  }
1615
1615
  export function fillRightData(ctx) {
1616
+ var _a, _b;
1616
1617
  var allowEdit = isAllowEdit(ctx);
1617
1618
  if (allowEdit === false) {
1618
1619
  return "allowEdit";
@@ -1640,10 +1641,20 @@ export function fillRightData(ctx) {
1640
1641
  var r2 = selection[s].row[1];
1641
1642
  var c1 = selection[s].column[0];
1642
1643
  var c2 = selection[s].column[1];
1643
- for (var r = r1; r <= r2; r += 1) {
1644
- for (var c = c1; c <= c2; c += 1) {
1645
- var previousCell = d[r][c - 1];
1646
- d[r][c] = __assign({}, previousCell);
1644
+ var isSingleCell = r1 === r2 && c1 === c2;
1645
+ if (isSingleCell) {
1646
+ if (c1 - 1 >= 0 && d[r1]) {
1647
+ var prev = d[r1][c1 - 1];
1648
+ d[r1][c1] = prev != null ? __assign({}, prev) : {};
1649
+ }
1650
+ } else {
1651
+ for (var r = r1; r <= r2; r += 1) {
1652
+ var sourceCell = (_a = d[r]) === null || _a === void 0 ? void 0 : _a[c1];
1653
+ for (var c = c1 + 1; c <= c2; c += 1) {
1654
+ if (d[r]) {
1655
+ d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
1656
+ }
1657
+ }
1647
1658
  }
1648
1659
  }
1649
1660
  }
@@ -1651,6 +1662,7 @@ export function fillRightData(ctx) {
1651
1662
  return "success";
1652
1663
  }
1653
1664
  export function fillDownData(ctx) {
1665
+ var _a, _b;
1654
1666
  var allowEdit = isAllowEdit(ctx);
1655
1667
  if (allowEdit === false) {
1656
1668
  return "allowEdit";
@@ -1678,10 +1690,20 @@ export function fillDownData(ctx) {
1678
1690
  var r2 = selection[s].row[1];
1679
1691
  var c1 = selection[s].column[0];
1680
1692
  var c2 = selection[s].column[1];
1681
- for (var r = r1; r <= r2; r += 1) {
1693
+ var isSingleCell = r1 === r2 && c1 === c2;
1694
+ if (isSingleCell) {
1695
+ if (r1 - 1 >= 0 && d[r1 - 1]) {
1696
+ var prev = d[r1 - 1][c1];
1697
+ if (!d[r1]) d[r1] = [];
1698
+ d[r1][c1] = prev != null ? __assign({}, prev) : {};
1699
+ }
1700
+ } else {
1682
1701
  for (var c = c1; c <= c2; c += 1) {
1683
- var previousCell = d[r - 1][c];
1684
- d[r][c] = __assign({}, previousCell);
1702
+ var sourceCell = (_a = d[r1]) === null || _a === void 0 ? void 0 : _a[c];
1703
+ for (var r = r1 + 1; r <= r2; r += 1) {
1704
+ if (!d[r]) d[r] = [];
1705
+ d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
1706
+ }
1685
1707
  }
1686
1708
  }
1687
1709
  }
package/lib/events/keyboard.js CHANGED
@@ -149,7 +149,7 @@ function handleGlobalEnter(ctx, cellInput, e, canvas) {
149
149
  row_focus: lastCellUpdate[0],
150
150
  column_focus: lastCellUpdate[1]
151
151
  }];
152
- (0, _selection.moveHighlightCell)(ctx, "down", 1, "rangeOfSelect");
152
+ (0, _selection.moveHighlightCell)(ctx, "down", (0, _2.hideCRCount)(ctx, "ArrowDown"), "rangeOfSelect");
153
153
  e.preventDefault();
154
154
  } else {
155
155
  if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0) {
@@ -444,9 +444,9 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
444
444
  (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
445
445
  }
446
446
  if (e.shiftKey) {
447
- (0, _selection.moveHighlightCell)(ctx, "right", -1, "rangeOfSelect");
447
+ (0, _selection.moveHighlightCell)(ctx, "right", -(0, _2.hideCRCount)(ctx, "ArrowLeft"), "rangeOfSelect");
448
448
  } else {
449
- (0, _selection.moveHighlightCell)(ctx, "right", 1, "rangeOfSelect");
449
+ (0, _selection.moveHighlightCell)(ctx, "right", (0, _2.hideCRCount)(ctx, "ArrowRight"), "rangeOfSelect");
450
450
  }
451
451
  e.preventDefault();
452
452
  } else if (kstr === "F2") {
package/lib/modules/selection.js CHANGED
@@ -1648,6 +1648,7 @@ function deleteSelectedCellFormat(ctx) {
1648
1648
  return "success";
1649
1649
  }
1650
1650
  function fillRightData(ctx) {
1651
+ var _a, _b;
1651
1652
  var allowEdit = (0, _utils.isAllowEdit)(ctx);
1652
1653
  if (allowEdit === false) {
1653
1654
  return "allowEdit";
@@ -1675,10 +1676,20 @@ function fillRightData(ctx) {
1675
1676
  var r2 = selection[s].row[1];
1676
1677
  var c1 = selection[s].column[0];
1677
1678
  var c2 = selection[s].column[1];
1678
- for (var r = r1; r <= r2; r += 1) {
1679
- for (var c = c1; c <= c2; c += 1) {
1680
- var previousCell = d[r][c - 1];
1681
- d[r][c] = __assign({}, previousCell);
1679
+ var isSingleCell = r1 === r2 && c1 === c2;
1680
+ if (isSingleCell) {
1681
+ if (c1 - 1 >= 0 && d[r1]) {
1682
+ var prev = d[r1][c1 - 1];
1683
+ d[r1][c1] = prev != null ? __assign({}, prev) : {};
1684
+ }
1685
+ } else {
1686
+ for (var r = r1; r <= r2; r += 1) {
1687
+ var sourceCell = (_a = d[r]) === null || _a === void 0 ? void 0 : _a[c1];
1688
+ for (var c = c1 + 1; c <= c2; c += 1) {
1689
+ if (d[r]) {
1690
+ d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
1691
+ }
1692
+ }
1682
1693
  }
1683
1694
  }
1684
1695
  }
@@ -1686,6 +1697,7 @@ function fillRightData(ctx) {
1686
1697
  return "success";
1687
1698
  }
1688
1699
  function fillDownData(ctx) {
1700
+ var _a, _b;
1689
1701
  var allowEdit = (0, _utils.isAllowEdit)(ctx);
1690
1702
  if (allowEdit === false) {
1691
1703
  return "allowEdit";
@@ -1713,10 +1725,20 @@ function fillDownData(ctx) {
1713
1725
  var r2 = selection[s].row[1];
1714
1726
  var c1 = selection[s].column[0];
1715
1727
  var c2 = selection[s].column[1];
1716
- for (var r = r1; r <= r2; r += 1) {
1728
+ var isSingleCell = r1 === r2 && c1 === c2;
1729
+ if (isSingleCell) {
1730
+ if (r1 - 1 >= 0 && d[r1 - 1]) {
1731
+ var prev = d[r1 - 1][c1];
1732
+ if (!d[r1]) d[r1] = [];
1733
+ d[r1][c1] = prev != null ? __assign({}, prev) : {};
1734
+ }
1735
+ } else {
1717
1736
  for (var c = c1; c <= c2; c += 1) {
1718
- var previousCell = d[r - 1][c];
1719
- d[r][c] = __assign({}, previousCell);
1737
+ var sourceCell = (_a = d[r1]) === null || _a === void 0 ? void 0 : _a[c];
1738
+ for (var r = r1 + 1; r <= r2; r += 1) {
1739
+ if (!d[r]) d[r] = [];
1740
+ d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
1741
+ }
1720
1742
  }
1721
1743
  }
1722
1744
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-core",
3
- "version": "1.3.5-hyper",
3
+ "version": "1.3.5-hyper-1",
4
4
  "main": "lib/index.js",
5
5
  "module": "es/index.js",
6
6
  "typings": "lib/index.d.ts",