@fileverse-dev/fortune-react 1.2.86-pinyin-3 → 1.2.86-pinyin-5

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.
@@ -67,14 +67,6 @@ var InputBox = function InputBox() {
67
67
  var placeRef = useRef("");
68
68
  var rootRef = useRef(null);
69
69
  var isComposingRef = useRef(false);
70
- var ensureNotEmpty = function ensureNotEmpty() {
71
- var el = rootRef.current;
72
- if (!el) return;
73
- if (el.textContent === "") {
74
- el.innerHTML = "\u200B";
75
- placeCursorAtEnd(el);
76
- }
77
- };
78
70
  var placeCursorAtEnd = function placeCursorAtEnd(el) {
79
71
  var range = document.createRange();
80
72
  var sel = window.getSelection();
@@ -83,6 +75,14 @@ var InputBox = function InputBox() {
83
75
  sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();
84
76
  sel === null || sel === void 0 ? void 0 : sel.addRange(range);
85
77
  };
78
+ var ensureNotEmpty = function ensureNotEmpty() {
79
+ var el = rootRef.current;
80
+ if (!el) return;
81
+ if (el.textContent === "") {
82
+ el.innerHTML = "\u200B";
83
+ placeCursorAtEnd(el);
84
+ }
85
+ };
86
86
  var handleShowFormulaHint = function handleShowFormulaHint() {
87
87
  localStorage.setItem("formulaMore", String(showFormulaHint));
88
88
  setShowFormulaHint(!showFormulaHint);
@@ -961,7 +961,7 @@ var Toolbar = function Toolbar(_a) {
961
961
  key: name,
962
962
  disabled: refs.globalCache.undoList.length === 0,
963
963
  onClick: function onClick() {
964
- return handleUndo();
964
+ handleUndo();
965
965
  }
966
966
  });
967
967
  }
@@ -15,7 +15,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
15
15
  }
16
16
  return to.concat(ar || Array.prototype.slice.call(from));
17
17
  };
18
- import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick } from "@fileverse-dev/fortune-core";
18
+ import { Canvas, defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick } from "@fileverse-dev/fortune-core";
19
19
  import React, { useMemo, useState, useCallback, useEffect, useRef, useImperativeHandle } from "react";
20
20
  import "./index.css";
21
21
  import produce, { applyPatches, enablePatches, produceWithPatches } from "immer";
@@ -248,8 +248,109 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
248
248
  return result;
249
249
  });
250
250
  }, [emitOp]);
251
+ var repaint = function repaint() {
252
+ var _a, _b, _c, _d, _e;
253
+ console.log("repaint is calling");
254
+ var tableCanvas = new Canvas(refs.canvas.current, context);
255
+ console.log(context.config.borderInfo, "global context");
256
+ setContextWithProduce(function (draftCtx) {
257
+ console.log(draftCtx.config.borderInfo, "local context");
258
+ });
259
+ var freeze = (_a = refs.globalCache.freezen) === null || _a === void 0 ? void 0 : _a[sheet.id];
260
+ if (((_b = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _b === void 0 ? void 0 : _b.freezenhorizontaldata) || ((_c = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _c === void 0 ? void 0 : _c.freezenverticaldata)) {
261
+ var horizontalData = (_d = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _d === void 0 ? void 0 : _d.freezenhorizontaldata;
262
+ var verticallData = (_e = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _e === void 0 ? void 0 : _e.freezenverticaldata;
263
+ if (horizontalData && verticallData) {
264
+ var horizontalPx = horizontalData[0],
265
+ horizontalScrollTop = horizontalData[2];
266
+ var verticalPx = verticallData[0],
267
+ verticalScrollWidth = verticallData[2];
268
+ tableCanvas.drawMain({
269
+ scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
270
+ scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
271
+ offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth,
272
+ offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
273
+ clear: true
274
+ });
275
+ tableCanvas.drawMain({
276
+ scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
277
+ scrollHeight: horizontalScrollTop,
278
+ drawHeight: horizontalPx,
279
+ offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
280
+ });
281
+ tableCanvas.drawMain({
282
+ scrollWidth: verticalScrollWidth,
283
+ scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
284
+ drawWidth: verticalPx,
285
+ offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight
286
+ });
287
+ tableCanvas.drawMain({
288
+ scrollWidth: verticalScrollWidth,
289
+ scrollHeight: horizontalScrollTop,
290
+ drawWidth: verticalPx,
291
+ drawHeight: horizontalPx
292
+ });
293
+ tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
294
+ tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
295
+ tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
296
+ tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
297
+ tableCanvas.drawFreezeLine({
298
+ horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2,
299
+ verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
300
+ });
301
+ } else if (horizontalData) {
302
+ var horizontalPx = horizontalData[0],
303
+ horizontalScrollTop = horizontalData[2];
304
+ tableCanvas.drawMain({
305
+ scrollWidth: context.scrollLeft,
306
+ scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
307
+ offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
308
+ clear: true
309
+ });
310
+ tableCanvas.drawMain({
311
+ scrollWidth: context.scrollLeft,
312
+ scrollHeight: horizontalScrollTop,
313
+ drawHeight: horizontalPx
314
+ });
315
+ tableCanvas.drawColumnHeader(context.scrollLeft);
316
+ tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
317
+ tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
318
+ tableCanvas.drawFreezeLine({
319
+ horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2
320
+ });
321
+ } else if (verticallData) {
322
+ var verticalPx = verticallData[0],
323
+ verticalScrollWidth = verticallData[2];
324
+ tableCanvas.drawMain({
325
+ scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
326
+ scrollHeight: context.scrollTop,
327
+ offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
328
+ });
329
+ tableCanvas.drawMain({
330
+ scrollWidth: verticalScrollWidth,
331
+ scrollHeight: context.scrollTop,
332
+ drawWidth: verticalPx
333
+ });
334
+ tableCanvas.drawRowHeader(context.scrollTop);
335
+ tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
336
+ tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
337
+ tableCanvas.drawFreezeLine({
338
+ verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
339
+ });
340
+ }
341
+ } else {
342
+ tableCanvas.drawMain({
343
+ scrollWidth: context.scrollLeft,
344
+ scrollHeight: context.scrollTop,
345
+ clear: true
346
+ });
347
+ tableCanvas.drawColumnHeader(context.scrollLeft);
348
+ tableCanvas.drawRowHeader(context.scrollTop);
349
+ }
350
+ };
251
351
  var handleUndo = useCallback(function () {
252
352
  var history = globalCache.current.undoList.pop();
353
+ console.log("undo", history);
253
354
  if (history) {
254
355
  setContext(function (ctx_) {
255
356
  var _a, _b, _c, _d, _e;
@@ -287,6 +388,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
287
388
  emitOp(newContext, history.inversePatches, inversedOptions, true);
288
389
  return newContext;
289
390
  });
391
+ repaint();
290
392
  }
291
393
  }, [emitOp]);
292
394
  var handleRedo = useCallback(function () {
@@ -76,14 +76,6 @@ var InputBox = function InputBox() {
76
76
  var placeRef = (0, _react.useRef)("");
77
77
  var rootRef = (0, _react.useRef)(null);
78
78
  var isComposingRef = (0, _react.useRef)(false);
79
- var ensureNotEmpty = function ensureNotEmpty() {
80
- var el = rootRef.current;
81
- if (!el) return;
82
- if (el.textContent === "") {
83
- el.innerHTML = "\u200B";
84
- placeCursorAtEnd(el);
85
- }
86
- };
87
79
  var placeCursorAtEnd = function placeCursorAtEnd(el) {
88
80
  var range = document.createRange();
89
81
  var sel = window.getSelection();
@@ -92,6 +84,14 @@ var InputBox = function InputBox() {
92
84
  sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();
93
85
  sel === null || sel === void 0 ? void 0 : sel.addRange(range);
94
86
  };
87
+ var ensureNotEmpty = function ensureNotEmpty() {
88
+ var el = rootRef.current;
89
+ if (!el) return;
90
+ if (el.textContent === "") {
91
+ el.innerHTML = "\u200B";
92
+ placeCursorAtEnd(el);
93
+ }
94
+ };
95
95
  var handleShowFormulaHint = function handleShowFormulaHint() {
96
96
  localStorage.setItem("formulaMore", String(showFormulaHint));
97
97
  setShowFormulaHint(!showFormulaHint);
@@ -970,7 +970,7 @@ var Toolbar = function Toolbar(_a) {
970
970
  key: name,
971
971
  disabled: refs.globalCache.undoList.length === 0,
972
972
  onClick: function onClick() {
973
- return handleUndo();
973
+ handleUndo();
974
974
  }
975
975
  });
976
976
  }
@@ -257,8 +257,109 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
257
257
  return result;
258
258
  });
259
259
  }, [emitOp]);
260
+ var repaint = function repaint() {
261
+ var _a, _b, _c, _d, _e;
262
+ console.log("repaint is calling");
263
+ var tableCanvas = new _fortuneCore.Canvas(refs.canvas.current, context);
264
+ console.log(context.config.borderInfo, "global context");
265
+ setContextWithProduce(function (draftCtx) {
266
+ console.log(draftCtx.config.borderInfo, "local context");
267
+ });
268
+ var freeze = (_a = refs.globalCache.freezen) === null || _a === void 0 ? void 0 : _a[sheet.id];
269
+ if (((_b = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _b === void 0 ? void 0 : _b.freezenhorizontaldata) || ((_c = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _c === void 0 ? void 0 : _c.freezenverticaldata)) {
270
+ var horizontalData = (_d = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _d === void 0 ? void 0 : _d.freezenhorizontaldata;
271
+ var verticallData = (_e = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _e === void 0 ? void 0 : _e.freezenverticaldata;
272
+ if (horizontalData && verticallData) {
273
+ var horizontalPx = horizontalData[0],
274
+ horizontalScrollTop = horizontalData[2];
275
+ var verticalPx = verticallData[0],
276
+ verticalScrollWidth = verticallData[2];
277
+ tableCanvas.drawMain({
278
+ scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
279
+ scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
280
+ offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth,
281
+ offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
282
+ clear: true
283
+ });
284
+ tableCanvas.drawMain({
285
+ scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
286
+ scrollHeight: horizontalScrollTop,
287
+ drawHeight: horizontalPx,
288
+ offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
289
+ });
290
+ tableCanvas.drawMain({
291
+ scrollWidth: verticalScrollWidth,
292
+ scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
293
+ drawWidth: verticalPx,
294
+ offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight
295
+ });
296
+ tableCanvas.drawMain({
297
+ scrollWidth: verticalScrollWidth,
298
+ scrollHeight: horizontalScrollTop,
299
+ drawWidth: verticalPx,
300
+ drawHeight: horizontalPx
301
+ });
302
+ tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
303
+ tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
304
+ tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
305
+ tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
306
+ tableCanvas.drawFreezeLine({
307
+ horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2,
308
+ verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
309
+ });
310
+ } else if (horizontalData) {
311
+ var horizontalPx = horizontalData[0],
312
+ horizontalScrollTop = horizontalData[2];
313
+ tableCanvas.drawMain({
314
+ scrollWidth: context.scrollLeft,
315
+ scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
316
+ offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
317
+ clear: true
318
+ });
319
+ tableCanvas.drawMain({
320
+ scrollWidth: context.scrollLeft,
321
+ scrollHeight: horizontalScrollTop,
322
+ drawHeight: horizontalPx
323
+ });
324
+ tableCanvas.drawColumnHeader(context.scrollLeft);
325
+ tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
326
+ tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
327
+ tableCanvas.drawFreezeLine({
328
+ horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2
329
+ });
330
+ } else if (verticallData) {
331
+ var verticalPx = verticallData[0],
332
+ verticalScrollWidth = verticallData[2];
333
+ tableCanvas.drawMain({
334
+ scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
335
+ scrollHeight: context.scrollTop,
336
+ offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
337
+ });
338
+ tableCanvas.drawMain({
339
+ scrollWidth: verticalScrollWidth,
340
+ scrollHeight: context.scrollTop,
341
+ drawWidth: verticalPx
342
+ });
343
+ tableCanvas.drawRowHeader(context.scrollTop);
344
+ tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
345
+ tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
346
+ tableCanvas.drawFreezeLine({
347
+ verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
348
+ });
349
+ }
350
+ } else {
351
+ tableCanvas.drawMain({
352
+ scrollWidth: context.scrollLeft,
353
+ scrollHeight: context.scrollTop,
354
+ clear: true
355
+ });
356
+ tableCanvas.drawColumnHeader(context.scrollLeft);
357
+ tableCanvas.drawRowHeader(context.scrollTop);
358
+ }
359
+ };
260
360
  var handleUndo = (0, _react.useCallback)(function () {
261
361
  var history = globalCache.current.undoList.pop();
362
+ console.log("undo", history);
262
363
  if (history) {
263
364
  setContext(function (ctx_) {
264
365
  var _a, _b, _c, _d, _e;
@@ -296,6 +397,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
296
397
  emitOp(newContext, history.inversePatches, inversedOptions, true);
297
398
  return newContext;
298
399
  });
400
+ repaint();
299
401
  }
300
402
  }, [emitOp]);
301
403
  var handleRedo = (0, _react.useCallback)(function () {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-react",
3
- "version": "1.2.86-pinyin-3",
3
+ "version": "1.2.86-pinyin-5",
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.2.86-pinyin-2",
19
+ "@fileverse-dev/fortune-core": "1.2.86-pinyin-5",
20
20
  "@fileverse/ui": "^4.1.7-patch-40",
21
21
  "@tippyjs/react": "^4.2.6",
22
22
  "@types/regenerator-runtime": "^0.13.6",