@fileverse-dev/fortune-react 1.3.4-viewMode-5 → 1.3.5-hyper

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 (11) hide show
  1. package/es/components/ContextMenu/index.js +2 -1
  2. package/es/components/LinkEidtCard/index.css +2 -5
  3. package/es/components/LinkEidtCard/index.js +25 -10
  4. package/es/components/SheetOverlay/index.js +8 -17
  5. package/es/components/Workbook/index.js +1 -2
  6. package/lib/components/ContextMenu/index.js +2 -1
  7. package/lib/components/LinkEidtCard/index.css +2 -5
  8. package/lib/components/LinkEidtCard/index.js +24 -9
  9. package/lib/components/SheetOverlay/index.js +7 -16
  10. package/lib/components/Workbook/index.js +1 -2
  11. package/package.json +2 -2
package/es/components/ContextMenu/index.js CHANGED
@@ -974,7 +974,8 @@ var ContextMenu = function ContextMenu() {
974
974
  key: name,
975
975
  onClick: function onClick() {
976
976
  setContext(function (draftCtx) {
977
- handleLink(draftCtx);
977
+ var _a;
978
+ handleLink(draftCtx, (_a = refs.cellInput.current) !== null && _a !== void 0 ? _a : undefined);
978
979
  draftCtx.contextMenu = {};
979
980
  });
980
981
  }
package/es/components/LinkEidtCard/index.css CHANGED
@@ -7,6 +7,7 @@
7
7
  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
8
8
  border: 1px solid #e5e5e5;
9
9
  border-radius: 8px;
10
+ min-width: 320px;
10
11
  }
11
12
 
12
13
  .fortune-link-cards-container {
@@ -22,7 +23,7 @@
22
23
  border: 1px solid #e5e5e5;
23
24
  border-radius: 8px;
24
25
  padding: 16px;
25
- width: fit-content;
26
+ width: 300px;
26
27
  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
27
28
  display: flex;
28
29
  flex-direction: column;
@@ -30,10 +31,6 @@
30
31
  z-index: 300;
31
32
  }
32
33
 
33
- .fortune-link-card--editing {
34
- min-width: 280px;
35
- }
36
-
37
34
  .fortune-link-type-select {
38
35
  width: 100% !important;
39
36
  }
package/es/components/LinkEidtCard/index.js CHANGED
@@ -9,7 +9,7 @@ var __assign = this && this.__assign || function () {
9
9
  return __assign.apply(this, arguments);
10
10
  };
11
11
  import React, { useContext, useState, useMemo, useCallback, useLayoutEffect, useRef, useEffect } from "react";
12
- import { locale, saveHyperlink, removeHyperlink, replaceHtml, goToLink, isLinkValid } from "@fileverse-dev/fortune-core";
12
+ import { locale, saveHyperlink, removeHyperlink, replaceHtml, goToLink, isLinkValid, jfrefreshgrid } from "@fileverse-dev/fortune-core";
13
13
  import { Button, TextField, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, LucideIcon } from "@fileverse/ui";
14
14
  import "./index.css";
15
15
  import _ from "lodash";
@@ -23,7 +23,8 @@ export var LinkEditCard = function LinkEditCard(_a) {
23
23
  originType = _a.originType,
24
24
  originAddress = _a.originAddress,
25
25
  isEditing = _a.isEditing,
26
- position = _a.position;
26
+ position = _a.position,
27
+ applyToSelection = _a.applyToSelection;
27
28
  var _b = useContext(WorkbookContext),
28
29
  context = _b.context,
29
30
  setContext = _b.setContext,
@@ -86,7 +87,14 @@ export var LinkEditCard = function LinkEditCard(_a) {
86
87
  if (e.key === "Enter") {
87
88
  _.set(refs.globalCache, "linkCard.mouseEnter", false);
88
89
  setContext(function (draftCtx) {
89
- return saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
90
+ saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress, {
91
+ applyToSelection: applyToSelection || undefined,
92
+ cellInput: refs.cellInput.current
93
+ });
94
+ if (!applyToSelection) {
95
+ draftCtx.luckysheetCellUpdate = [];
96
+ jfrefreshgrid(draftCtx, null, undefined);
97
+ }
90
98
  });
91
99
  }
92
100
  },
@@ -94,7 +102,7 @@ export var LinkEditCard = function LinkEditCard(_a) {
94
102
  return e.stopPropagation();
95
103
  }
96
104
  };
97
- }, [refs.globalCache, isButtonDisabled]);
105
+ }, [refs.globalCache, isButtonDisabled, applyToSelection, linkText, linkType, linkAddress, r, c, setContext, refs.cellInput]);
98
106
  var renderToolbarButton = useCallback(function (iconId, onClick) {
99
107
  var iconIdClass = iconId.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-");
100
108
  return /*#__PURE__*/React.createElement("div", {
@@ -172,20 +180,20 @@ export var LinkEditCard = function LinkEditCard(_a) {
172
180
  "data-testid": "link-card-info-open"
173
181
  }, linkType === "webpage" ? insertLink.openLink : replaceHtml(insertLink.goTo, {
174
182
  linkAddress: linkAddress
175
- })), (context.allowEdit === true || context.isFlvReadOnly && linkType === "webpage") && (/*#__PURE__*/React.createElement("div", {
183
+ })), context.allowEdit === true && /*#__PURE__*/React.createElement("div", {
176
184
  className: "divider"
177
- })), (context.allowEdit === true || context.isFlvReadOnly) && linkType === "webpage" && renderToolbarButton("copy", function () {
185
+ }), context.allowEdit === true && linkType === "webpage" && renderToolbarButton("copy", function () {
178
186
  navigator.clipboard.writeText(originAddress);
179
187
  hideLinkCard();
180
- }), context.allowEdit === true && !context.isFlvReadOnly && renderToolbarButton("pencil", function () {
188
+ }), context.allowEdit === true && renderToolbarButton("pencil", function () {
181
189
  return setContext(function (draftCtx) {
182
190
  if (draftCtx.linkCard != null && draftCtx.allowEdit) {
183
191
  draftCtx.linkCard.isEditing = true;
184
192
  }
185
193
  });
186
- }), context.allowEdit === true && !context.isFlvReadOnly && (/*#__PURE__*/React.createElement("div", {
194
+ }), context.allowEdit === true && /*#__PURE__*/React.createElement("div", {
187
195
  className: "divider"
188
- })), context.allowEdit === true && !context.isFlvReadOnly && renderToolbarButton("unlink", function () {
196
+ }), context.allowEdit === true && renderToolbarButton("unlink", function () {
189
197
  return setContext(function (draftCtx) {
190
198
  _.set(refs.globalCache, "linkCard.mouseEnter", false);
191
199
  removeHyperlink(draftCtx, r, c);
@@ -288,7 +296,14 @@ export var LinkEditCard = function LinkEditCard(_a) {
288
296
  if (isButtonDisabled) return;
289
297
  _.set(refs.globalCache, "linkCard.mouseEnter", false);
290
298
  setContext(function (draftCtx) {
291
- return saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
299
+ saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress, {
300
+ applyToSelection: applyToSelection || undefined,
301
+ cellInput: refs.cellInput.current
302
+ });
303
+ if (!applyToSelection) {
304
+ draftCtx.luckysheetCellUpdate = [];
305
+ jfrefreshgrid(draftCtx, null, undefined);
306
+ }
292
307
  });
293
308
  },
294
309
  "data-testid": "link-card-cta-insert"
package/es/components/SheetOverlay/index.js CHANGED
@@ -10,7 +10,7 @@ var __assign = this && this.__assign || function () {
10
10
  };
11
11
  import React, { useContext, useCallback, useRef, useEffect, useLayoutEffect, useMemo } from "react";
12
12
  import "./index.css";
13
- import { locale, drawArrow, handleCellAreaDoubleClick, handleCellAreaMouseDown, handleContextMenu, handleOverlayMouseMove, handleOverlayMouseUp, selectAll, handleOverlayTouchEnd, handleOverlayTouchStart, createDropCellRange, getCellRowColumn, getCellHyperlink, showLinkCard, isAllowEdit, onCellsMoveStart, insertRowCol, getSheetIndex, fixRowStyleOverflowInFreeze, fixColumnStyleOverflowInFreeze, handleKeydownForZoom } from "@fileverse-dev/fortune-core";
13
+ import { locale, drawArrow, handleCellAreaDoubleClick, handleCellAreaMouseDown, handleContextMenu, handleOverlayMouseMove, handleOverlayMouseUp, selectAll, handleOverlayTouchEnd, handleOverlayTouchStart, createDropCellRange, getCellRowColumn, getCellHyperlink, showLinkCard, onCellsMoveStart, insertRowCol, getSheetIndex, fixRowStyleOverflowInFreeze, fixColumnStyleOverflowInFreeze, handleKeydownForZoom } from "@fileverse-dev/fortune-core";
14
14
  import _ from "lodash";
15
15
  import WorkbookContext from "../../context";
16
16
  import ColumnHeader from "./ColumnHeader";
@@ -50,23 +50,14 @@ var SheetOverlay = function SheetOverlay() {
50
50
  var _a;
51
51
  handleCellAreaMouseDown(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, refs.cellArea.current, refs.fxInput.current, refs.canvas.current.getContext("2d"));
52
52
  if (!_.isEmpty((_a = draftCtx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) && refs.cellInput.current) {
53
- if (!isAllowEdit(draftCtx)) {
54
- setTimeout(function () {
55
- var _a;
56
- (_a = refs.workbookContainer.current) === null || _a === void 0 ? void 0 : _a.focus({
57
- preventScroll: true
58
- });
59
- });
60
- } else {
61
- setTimeout(function () {
62
- var _a;
63
- (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
64
- });
65
- }
53
+ setTimeout(function () {
54
+ var _a;
55
+ (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
56
+ });
66
57
  }
67
58
  });
68
59
  }
69
- }, [setContext, refs.globalCache, refs.cellInput, refs.cellArea, refs.fxInput, refs.canvas, refs.workbookContainer]);
60
+ }, [setContext, refs.globalCache, refs.cellInput, refs.cellArea, refs.fxInput, refs.canvas]);
70
61
  var cellAreaContextMenu = useCallback(function (e) {
71
62
  var nativeEvent = e.nativeEvent;
72
63
  setContext(function (draftCtx) {
@@ -92,7 +83,7 @@ var SheetOverlay = function SheetOverlay() {
92
83
  }
93
84
  if (skip || ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter)) return;
94
85
  setContext(function (draftCtx) {
95
- showLinkCard(draftCtx, r, c, isEditing);
86
+ showLinkCard(draftCtx, r, c, undefined, isEditing);
96
87
  });
97
88
  }, 800);
98
89
  }, [setContext]);
@@ -105,7 +96,7 @@ var SheetOverlay = function SheetOverlay() {
105
96
  debouncedShowLinkCard(globalCache, rc.r, rc.c, false);
106
97
  } else {
107
98
  if ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter) return;
108
- showLinkCard(ctx, rc.r, rc.c, false);
99
+ showLinkCard(ctx, rc.r, rc.c, undefined, false);
109
100
  debouncedShowLinkCard(globalCache, rc.r, rc.c, false, true);
110
101
  }
111
102
  }, [debouncedShowLinkCard]);
package/es/components/Workbook/index.js CHANGED
@@ -726,8 +726,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
726
726
  }, /*#__PURE__*/React.createElement(ModalProvider, null, /*#__PURE__*/React.createElement("div", {
727
727
  className: "fortune-container",
728
728
  ref: workbookContainer,
729
- onKeyDown: onKeyDown,
730
- tabIndex: -1
729
+ onKeyDown: onKeyDown
731
730
  }, /*#__PURE__*/React.createElement(SVGDefines, {
732
731
  currency: mergedSettings.currency
733
732
  }), /*#__PURE__*/React.createElement("div", {
package/lib/components/ContextMenu/index.js CHANGED
@@ -983,7 +983,8 @@ var ContextMenu = function ContextMenu() {
983
983
  key: name,
984
984
  onClick: function onClick() {
985
985
  setContext(function (draftCtx) {
986
- (0, _fortuneCore.handleLink)(draftCtx);
986
+ var _a;
987
+ (0, _fortuneCore.handleLink)(draftCtx, (_a = refs.cellInput.current) !== null && _a !== void 0 ? _a : undefined);
987
988
  draftCtx.contextMenu = {};
988
989
  });
989
990
  }
package/lib/components/LinkEidtCard/index.css CHANGED
@@ -7,6 +7,7 @@
7
7
  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
8
8
  border: 1px solid #e5e5e5;
9
9
  border-radius: 8px;
10
+ min-width: 320px;
10
11
  }
11
12
 
12
13
  .fortune-link-cards-container {
@@ -22,7 +23,7 @@
22
23
  border: 1px solid #e5e5e5;
23
24
  border-radius: 8px;
24
25
  padding: 16px;
25
- width: fit-content;
26
+ width: 300px;
26
27
  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
27
28
  display: flex;
28
29
  flex-direction: column;
@@ -30,10 +31,6 @@
30
31
  z-index: 300;
31
32
  }
32
33
 
33
- .fortune-link-card--editing {
34
- min-width: 280px;
35
- }
36
-
37
34
  .fortune-link-type-select {
38
35
  width: 100% !important;
39
36
  }
package/lib/components/LinkEidtCard/index.js CHANGED
@@ -32,7 +32,8 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
32
32
  originType = _a.originType,
33
33
  originAddress = _a.originAddress,
34
34
  isEditing = _a.isEditing,
35
- position = _a.position;
35
+ position = _a.position,
36
+ applyToSelection = _a.applyToSelection;
36
37
  var _b = (0, _react.useContext)(_context.default),
37
38
  context = _b.context,
38
39
  setContext = _b.setContext,
@@ -95,7 +96,14 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
95
96
  if (e.key === "Enter") {
96
97
  _lodash.default.set(refs.globalCache, "linkCard.mouseEnter", false);
97
98
  setContext(function (draftCtx) {
98
- return (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress);
99
+ (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress, {
100
+ applyToSelection: applyToSelection || undefined,
101
+ cellInput: refs.cellInput.current
102
+ });
103
+ if (!applyToSelection) {
104
+ draftCtx.luckysheetCellUpdate = [];
105
+ (0, _fortuneCore.jfrefreshgrid)(draftCtx, null, undefined);
106
+ }
99
107
  });
100
108
  }
101
109
  },
@@ -103,7 +111,7 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
103
111
  return e.stopPropagation();
104
112
  }
105
113
  };
106
- }, [refs.globalCache, isButtonDisabled]);
114
+ }, [refs.globalCache, isButtonDisabled, applyToSelection, linkText, linkType, linkAddress, r, c, setContext, refs.cellInput]);
107
115
  var renderToolbarButton = (0, _react.useCallback)(function (iconId, onClick) {
108
116
  var iconIdClass = iconId.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-");
109
117
  return /*#__PURE__*/_react.default.createElement("div", {
@@ -181,20 +189,20 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
181
189
  "data-testid": "link-card-info-open"
182
190
  }, linkType === "webpage" ? insertLink.openLink : (0, _fortuneCore.replaceHtml)(insertLink.goTo, {
183
191
  linkAddress: linkAddress
184
- })), (context.allowEdit === true || context.isFlvReadOnly && linkType === "webpage") && (/*#__PURE__*/_react.default.createElement("div", {
192
+ })), context.allowEdit === true && /*#__PURE__*/_react.default.createElement("div", {
185
193
  className: "divider"
186
- })), (context.allowEdit === true || context.isFlvReadOnly) && linkType === "webpage" && renderToolbarButton("copy", function () {
194
+ }), context.allowEdit === true && linkType === "webpage" && renderToolbarButton("copy", function () {
187
195
  navigator.clipboard.writeText(originAddress);
188
196
  hideLinkCard();
189
- }), context.allowEdit === true && !context.isFlvReadOnly && renderToolbarButton("pencil", function () {
197
+ }), context.allowEdit === true && renderToolbarButton("pencil", function () {
190
198
  return setContext(function (draftCtx) {
191
199
  if (draftCtx.linkCard != null && draftCtx.allowEdit) {
192
200
  draftCtx.linkCard.isEditing = true;
193
201
  }
194
202
  });
195
- }), context.allowEdit === true && !context.isFlvReadOnly && (/*#__PURE__*/_react.default.createElement("div", {
203
+ }), context.allowEdit === true && /*#__PURE__*/_react.default.createElement("div", {
196
204
  className: "divider"
197
- })), context.allowEdit === true && !context.isFlvReadOnly && renderToolbarButton("unlink", function () {
205
+ }), context.allowEdit === true && renderToolbarButton("unlink", function () {
198
206
  return setContext(function (draftCtx) {
199
207
  _lodash.default.set(refs.globalCache, "linkCard.mouseEnter", false);
200
208
  (0, _fortuneCore.removeHyperlink)(draftCtx, r, c);
@@ -297,7 +305,14 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
297
305
  if (isButtonDisabled) return;
298
306
  _lodash.default.set(refs.globalCache, "linkCard.mouseEnter", false);
299
307
  setContext(function (draftCtx) {
300
- return (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress);
308
+ (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress, {
309
+ applyToSelection: applyToSelection || undefined,
310
+ cellInput: refs.cellInput.current
311
+ });
312
+ if (!applyToSelection) {
313
+ draftCtx.luckysheetCellUpdate = [];
314
+ (0, _fortuneCore.jfrefreshgrid)(draftCtx, null, undefined);
315
+ }
301
316
  });
302
317
  },
303
318
  "data-testid": "link-card-cta-insert"
package/lib/components/SheetOverlay/index.js CHANGED
@@ -59,23 +59,14 @@ var SheetOverlay = function SheetOverlay() {
59
59
  var _a;
60
60
  (0, _fortuneCore.handleCellAreaMouseDown)(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, refs.cellArea.current, refs.fxInput.current, refs.canvas.current.getContext("2d"));
61
61
  if (!_lodash.default.isEmpty((_a = draftCtx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) && refs.cellInput.current) {
62
- if (!(0, _fortuneCore.isAllowEdit)(draftCtx)) {
63
- setTimeout(function () {
64
- var _a;
65
- (_a = refs.workbookContainer.current) === null || _a === void 0 ? void 0 : _a.focus({
66
- preventScroll: true
67
- });
68
- });
69
- } else {
70
- setTimeout(function () {
71
- var _a;
72
- (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
73
- });
74
- }
62
+ setTimeout(function () {
63
+ var _a;
64
+ (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
65
+ });
75
66
  }
76
67
  });
77
68
  }
78
- }, [setContext, refs.globalCache, refs.cellInput, refs.cellArea, refs.fxInput, refs.canvas, refs.workbookContainer]);
69
+ }, [setContext, refs.globalCache, refs.cellInput, refs.cellArea, refs.fxInput, refs.canvas]);
79
70
  var cellAreaContextMenu = (0, _react.useCallback)(function (e) {
80
71
  var nativeEvent = e.nativeEvent;
81
72
  setContext(function (draftCtx) {
@@ -101,7 +92,7 @@ var SheetOverlay = function SheetOverlay() {
101
92
  }
102
93
  if (skip || ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter)) return;
103
94
  setContext(function (draftCtx) {
104
- (0, _fortuneCore.showLinkCard)(draftCtx, r, c, isEditing);
95
+ (0, _fortuneCore.showLinkCard)(draftCtx, r, c, undefined, isEditing);
105
96
  });
106
97
  }, 800);
107
98
  }, [setContext]);
@@ -114,7 +105,7 @@ var SheetOverlay = function SheetOverlay() {
114
105
  debouncedShowLinkCard(globalCache, rc.r, rc.c, false);
115
106
  } else {
116
107
  if ((_a = globalCache.linkCard) === null || _a === void 0 ? void 0 : _a.mouseEnter) return;
117
- (0, _fortuneCore.showLinkCard)(ctx, rc.r, rc.c, false);
108
+ (0, _fortuneCore.showLinkCard)(ctx, rc.r, rc.c, undefined, false);
118
109
  debouncedShowLinkCard(globalCache, rc.r, rc.c, false, true);
119
110
  }
120
111
  }, [debouncedShowLinkCard]);
package/lib/components/Workbook/index.js CHANGED
@@ -735,8 +735,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
735
735
  }, /*#__PURE__*/_react.default.createElement(_modal.ModalProvider, null, /*#__PURE__*/_react.default.createElement("div", {
736
736
  className: "fortune-container",
737
737
  ref: workbookContainer,
738
- onKeyDown: onKeyDown,
739
- tabIndex: -1
738
+ onKeyDown: onKeyDown
740
739
  }, /*#__PURE__*/_react.default.createElement(_SVGDefines.default, {
741
740
  currency: mergedSettings.currency
742
741
  }), /*#__PURE__*/_react.default.createElement("div", {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-react",
3
- "version": "1.3.4-viewMode-5",
3
+ "version": "1.3.5-hyper",
4
4
  "main": "lib/index.js",
5
5
  "types": "lib/index.d.ts",
6
6
  "module": "es/index.js",
@@ -16,7 +16,7 @@
16
16
  "tsc": "tsc"
17
17
  },
18
18
  "dependencies": {
19
- "@fileverse-dev/fortune-core": "1.3.4-viewMode-5",
19
+ "@fileverse-dev/fortune-core": "1.3.5-hyper",
20
20
  "@fileverse/ui": "5.0.0",
21
21
  "@tippyjs/react": "^4.2.6",
22
22
  "@types/regenerator-runtime": "^0.13.6",