@fileverse-dev/fortune-react 1.2.90-bold-1 → 1.2.90-bold-2

package/es/components/SheetOverlay/InputBox.js

@@ -8,7 +8,7 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-import { cancelNormalSelected, getCellValue, getInlineStringHTML, getStyleByCell, isInlineStringCell, moveToEnd, getFlowdata, handleFormulaInput, moveHighlightCell, escapeScriptTag, valueShowEs, createRangeHightlight, isShowHidenCR, israngeseleciton, escapeHTMLTag, isAllowEdit, getrangeseleciton, indexToColumnChar, handleItalic, handleUnderline, handleStrikeThrough } from "@fileverse-dev/fortune-core";
+import { cancelNormalSelected, getCellValue, getInlineStringHTML, getStyleByCell, isInlineStringCell, moveToEnd, getFlowdata, handleFormulaInput, moveHighlightCell, escapeScriptTag, valueShowEs, createRangeHightlight, isShowHidenCR, israngeseleciton, escapeHTMLTag, isAllowEdit, getrangeseleciton, indexToColumnChar, handleBold, handleItalic, handleUnderline, handleStrikeThrough } from "@fileverse-dev/fortune-core";
 import React, { useContext, useEffect, useMemo, useRef, useCallback, useLayoutEffect, useState } from "react";
 import _ from "lodash";
 import { Tooltip } from "@fileverse/ui";
@@ -71,6 +71,7 @@ var InputBox = function InputBox() {
     var el = inputRef.current;
     if (!el) return;
     var text = el.textContent;
+    console.log(text, "yoooo");
     if (!text || text === ZWSP) {
       el.innerHTML = ZWSP;
       moveCursorToEnd(el);
@@ -268,19 +269,23 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
-    if (isComposingRef.current || !inputRef.current) {
-      ensureNotEmpty();
-      return;
-    }
+    console.log(e.code, "onKeyDown in InputBox");
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
-    if (e.metaKey) {
-      if (e.code === "KeyB") {} else if (e.code === "KeyI") {
+    if (e.metaKey && context.luckysheetCellUpdate.length > 0) {
+      console.log(e.code, "e.code");
+      if (e.code === "KeyB") {
+        handleBold(context, inputRef.current);
+        stopPropagation(e);
+      } else if (e.code === "KeyI") {
         handleItalic(context, inputRef.current);
+        stopPropagation(e);
       } else if (e.code === "KeyU") {
+        console.log("underline");
         handleUnderline(context, inputRef.current);
         stopPropagation(e);
       } else if (e.code === "KeyS") {
+        console.log("strikethrough");
         handleStrikeThrough(context, inputRef.current);
         stopPropagation(e);
       }
@@ -291,7 +296,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     if (e.key === "Delete" || e.key === "Backspace") {
-      requestAnimationFrame(ensureNotEmpty);
+      if (isComposingRef.current) requestAnimationFrame(ensureNotEmpty);
       if (getCursorPosition(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length)) {
         setTimeout(function () {
           moveCursorToEnd(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
@@ -585,7 +590,11 @@ var InputBox = function InputBox() {
     onCompositionUpdate: function onCompositionUpdate() {
       isComposingRef.current = true;
     },
-    onCompositionEnd: function onCompositionEnd() {
+    onCompositionEnd: function onCompositionEnd(e) {
+      if (e.data === "" && e.currentTarget.value === "") {
+        isComposingRef.current = true;
+        return;
+      }
       ensureNotEmpty();
       isComposingRef.current = false;
     },

package/es/components/Workbook/index.js

@@ -503,7 +503,6 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var resetDeleteRowTimer;
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
-    console.log("onKeyDown", e);
     var _c = ref.current,
       getSelection = _c.getSelection,
       getSheet = _c.getSheet,
@@ -645,7 +644,6 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       return;
     }
     setContextWithProduce(function (draftCtx) {
-      console.log("handleGlobalKeyDown");
       handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
     });
   }, [handleRedo, handleUndo, setContextWithProduce]);

package/lib/components/SheetOverlay/InputBox.js

@@ -80,6 +80,7 @@ var InputBox = function InputBox() {
     var el = inputRef.current;
     if (!el) return;
     var text = el.textContent;
+    console.log(text, "yoooo");
     if (!text || text === ZWSP) {
       el.innerHTML = ZWSP;
       (0, _helper.moveCursorToEnd)(el);
@@ -277,19 +278,23 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = (0, _react.useCallback)(function (e) {
     var _a, _b;
-    if (isComposingRef.current || !inputRef.current) {
-      ensureNotEmpty();
-      return;
-    }
+    console.log(e.code, "onKeyDown in InputBox");
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
-    if (e.metaKey) {
-      if (e.code === "KeyB") {} else if (e.code === "KeyI") {
+    if (e.metaKey && context.luckysheetCellUpdate.length > 0) {
+      console.log(e.code, "e.code");
+      if (e.code === "KeyB") {
+        (0, _fortuneCore.handleBold)(context, inputRef.current);
+        stopPropagation(e);
+      } else if (e.code === "KeyI") {
         (0, _fortuneCore.handleItalic)(context, inputRef.current);
+        stopPropagation(e);
       } else if (e.code === "KeyU") {
+        console.log("underline");
         (0, _fortuneCore.handleUnderline)(context, inputRef.current);
         stopPropagation(e);
       } else if (e.code === "KeyS") {
+        console.log("strikethrough");
         (0, _fortuneCore.handleStrikeThrough)(context, inputRef.current);
         stopPropagation(e);
       }
@@ -300,7 +305,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     if (e.key === "Delete" || e.key === "Backspace") {
-      requestAnimationFrame(ensureNotEmpty);
+      if (isComposingRef.current) requestAnimationFrame(ensureNotEmpty);
       if ((0, _helper.getCursorPosition)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length)) {
         setTimeout(function () {
           (0, _helper.moveCursorToEnd)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
@@ -594,7 +599,11 @@ var InputBox = function InputBox() {
     onCompositionUpdate: function onCompositionUpdate() {
       isComposingRef.current = true;
     },
-    onCompositionEnd: function onCompositionEnd() {
+    onCompositionEnd: function onCompositionEnd(e) {
+      if (e.data === "" && e.currentTarget.value === "") {
+        isComposingRef.current = true;
+        return;
+      }
       ensureNotEmpty();
       isComposingRef.current = false;
     },

package/lib/components/Workbook/index.js

@@ -512,7 +512,6 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
   var resetDeleteRowTimer;
   var onKeyDown = (0, _react.useCallback)(function (e) {
     var _a, _b;
-    console.log("onKeyDown", e);
     var _c = ref.current,
       getSelection = _c.getSelection,
       getSheet = _c.getSheet,
@@ -654,7 +653,6 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       return;
     }
     setContextWithProduce(function (draftCtx) {
-      console.log("handleGlobalKeyDown");
       (0, _fortuneCore.handleGlobalKeyDown)(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
     });
   }, [handleRedo, handleUndo, setContextWithProduce]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.2.90-bold-1",
+  "version": "1.2.90-bold-2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.2.90-bold-1",
+    "@fileverse-dev/fortune-core": "1.2.90-bold-2",
     "@fileverse/ui": "^4.1.7-patch-40",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",