@fileverse-dev/fortune-react 1.1.62-patch-1 → 1.1.63

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/Sheet/index.js +4 -21
  2. package/es/components/Sheet/use-smooth-scroll.d.ts +2 -0
  3. package/es/components/Sheet/use-smooth-scroll.js +90 -0
  4. package/es/components/Toolbar/index.css +0 -10
  5. package/es/components/Toolbar/index.js +10 -28
  6. package/lib/components/Sheet/index.js +2 -19
  7. package/lib/components/Sheet/use-smooth-scroll.d.ts +2 -0
  8. package/lib/components/Sheet/use-smooth-scroll.js +97 -0
  9. package/lib/components/Toolbar/index.css +0 -10
  10. package/lib/components/Toolbar/index.js +10 -28
  11. package/package.json +2 -2
package/es/components/Sheet/index.js CHANGED
@@ -1,8 +1,9 @@
1
- import React, { useRef, useEffect, useContext, useCallback } from "react";
2
- import { Canvas, updateContextWithCanvas, updateContextWithSheetData, handleGlobalWheel, initFreeze, cellFadeAnimator } from "@fileverse-dev/fortune-core";
1
+ import React, { useRef, useEffect, useContext } from "react";
2
+ import { Canvas, updateContextWithCanvas, updateContextWithSheetData, initFreeze, cellFadeAnimator } from "@fileverse-dev/fortune-core";
3
3
  import "./index.css";
4
4
  import WorkbookContext from "../../context";
5
5
  import SheetOverlay from "../SheetOverlay";
6
+ import { useSmoothScroll } from "./use-smooth-scroll";
6
7
  var Sheet = function Sheet(_a) {
7
8
  var _b, _c, _d;
8
9
  var sheet = _a.sheet;
@@ -149,25 +150,7 @@ var Sheet = function Sheet(_a) {
149
150
  return cellFadeAnimator.setOnTick(null);
150
151
  };
151
152
  }, [context, refs.canvas, refs.globalCache.freezen, setContext, sheet.id]);
152
- var onWheel = useCallback(function (e) {
153
- var _a, _b;
154
- var functionDetailsEl = document.getElementById("function-details");
155
- var formulaSearchEl = document.getElementById("luckysheet-formula-search-c");
156
- var isMouseOverFunctionDetails = functionDetailsEl === null || functionDetailsEl === void 0 ? void 0 : functionDetailsEl.matches(":hover");
157
- var isMouseOverFormulaSearch = formulaSearchEl === null || formulaSearchEl === void 0 ? void 0 : formulaSearchEl.matches(":hover");
158
- if (functionDetailsEl && isMouseOverFunctionDetails || formulaSearchEl && isMouseOverFormulaSearch || ((_b = (_a = refs === null || refs === void 0 ? void 0 : refs.globalCache) === null || _a === void 0 ? void 0 : _a.searchDialog) === null || _b === void 0 ? void 0 : _b.mouseEnter)) return;
159
- setContext(function (draftCtx) {
160
- handleGlobalWheel(draftCtx, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
161
- });
162
- e.preventDefault();
163
- }, [refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
164
- useEffect(function () {
165
- var container = containerRef.current;
166
- container === null || container === void 0 ? void 0 : container.addEventListener("wheel", onWheel);
167
- return function () {
168
- container === null || container === void 0 ? void 0 : container.removeEventListener("wheel", onWheel);
169
- };
170
- }, [onWheel]);
153
+ useSmoothScroll(containerRef);
171
154
  return /*#__PURE__*/React.createElement("div", {
172
155
  ref: containerRef,
173
156
  className: "fortune-sheet-container"
package/es/components/Sheet/use-smooth-scroll.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { RefObject } from "react";
2
+ export declare const useSmoothScroll: (scrollContainerRef: RefObject<HTMLDivElement | null>) => void;
package/es/components/Sheet/use-smooth-scroll.js ADDED
@@ -0,0 +1,90 @@
1
+ import { useContext, useEffect } from "react";
2
+ import { removeEditingComment } from "@fileverse-dev/fortune-core";
3
+ import WorkbookContext from "../../context";
4
+ export var useSmoothScroll = function useSmoothScroll(scrollContainerRef) {
5
+ var _a = useContext(WorkbookContext),
6
+ context = _a.context,
7
+ refs = _a.refs,
8
+ setContext = _a.setContext;
9
+ function attachSmoothWheelScroll(scrollContainer, moveScrollBy, getPixelScale) {
10
+ if (getPixelScale === void 0) {
11
+ getPixelScale = function getPixelScale() {
12
+ return window.devicePixelRatio || 1;
13
+ };
14
+ }
15
+ var queuedXPixels = 0;
16
+ var queuedYPixels = 0;
17
+ var animationFrameId = 0;
18
+ var MAX_PIXEL_DELTA_PER_FRAME = 1200;
19
+ function applyQueuedScroll() {
20
+ animationFrameId = 0;
21
+ if (Math.abs(queuedXPixels) < 0.5 && Math.abs(queuedYPixels) < 0.5) {
22
+ queuedXPixels = 0;
23
+ queuedYPixels = 0;
24
+ return;
25
+ }
26
+ var xPixels = Math.max(-MAX_PIXEL_DELTA_PER_FRAME, Math.min(MAX_PIXEL_DELTA_PER_FRAME, queuedXPixels));
27
+ var yPixels = Math.max(-MAX_PIXEL_DELTA_PER_FRAME, Math.min(MAX_PIXEL_DELTA_PER_FRAME, queuedYPixels));
28
+ moveScrollBy(xPixels, yPixels);
29
+ queuedXPixels = 0;
30
+ queuedYPixels = 0;
31
+ }
32
+ function handleWheelEvent(event) {
33
+ var _a, _b;
34
+ event.preventDefault();
35
+ setContext(function (ctx) {
36
+ removeEditingComment(ctx, refs.globalCache);
37
+ });
38
+ var functionDetailsElement = document.getElementById("function-details");
39
+ var formulaSearchElement = document.getElementById("luckysheet-formula-search-c");
40
+ var isPointerOverFunctionDetails = functionDetailsElement === null || functionDetailsElement === void 0 ? void 0 : functionDetailsElement.matches(":hover");
41
+ var isPointerOverFormulaSearch = formulaSearchElement === null || formulaSearchElement === void 0 ? void 0 : formulaSearchElement.matches(":hover");
42
+ var isPointerInSearchDialog = !!((_b = (_a = refs === null || refs === void 0 ? void 0 : refs.globalCache) === null || _a === void 0 ? void 0 : _a.searchDialog) === null || _b === void 0 ? void 0 : _b.mouseEnter);
43
+ var hasFilterContextMenuOpen = context.filterContextMenu != null;
44
+ if (functionDetailsElement && isPointerOverFunctionDetails || formulaSearchElement && isPointerOverFormulaSearch || isPointerInSearchDialog || hasFilterContextMenuOpen) {
45
+ return;
46
+ }
47
+ var scaleFactor = getPixelScale();
48
+ queuedXPixels += event.deltaX * scaleFactor;
49
+ queuedYPixels += event.deltaY * scaleFactor;
50
+ if (!animationFrameId) animationFrameId = requestAnimationFrame(applyQueuedScroll);
51
+ }
52
+ scrollContainer.addEventListener("wheel", handleWheelEvent, {
53
+ passive: false
54
+ });
55
+ return function () {
56
+ scrollContainer.removeEventListener("wheel", handleWheelEvent);
57
+ if (animationFrameId) cancelAnimationFrame(animationFrameId);
58
+ };
59
+ }
60
+ var makeScrollbarsMoveByPixels = function makeScrollbarsMoveByPixels(horizontalScrollbarEl, verticalScrollbarEl) {
61
+ return function (xPixels, yPixels) {
62
+ var maxScrollLeft = horizontalScrollbarEl.scrollWidth - horizontalScrollbarEl.clientWidth;
63
+ var maxScrollTop = verticalScrollbarEl.scrollHeight - verticalScrollbarEl.clientHeight;
64
+ var targetScrollLeft = Math.max(0, Math.min(maxScrollLeft, horizontalScrollbarEl.scrollLeft + xPixels));
65
+ var targetScrollTop = Math.max(0, Math.min(maxScrollTop, verticalScrollbarEl.scrollTop + yPixels));
66
+ var didScrollX = targetScrollLeft !== horizontalScrollbarEl.scrollLeft;
67
+ var didScrollY = targetScrollTop !== verticalScrollbarEl.scrollTop;
68
+ if (didScrollX) {
69
+ horizontalScrollbarEl.scrollLeft = targetScrollLeft;
70
+ }
71
+ if (didScrollY) {
72
+ verticalScrollbarEl.scrollTop = targetScrollTop;
73
+ }
74
+ };
75
+ };
76
+ function routeWheelScrollToScrollbars(sheetContext, scrollContainerEl, horizontalScrollbarEl, verticalScrollbarEl) {
77
+ var moveScrollbarsByPixels = makeScrollbarsMoveByPixels(horizontalScrollbarEl, verticalScrollbarEl);
78
+ return attachSmoothWheelScroll(scrollContainerEl, moveScrollbarsByPixels, function () {
79
+ return (window.devicePixelRatio || 1) * sheetContext.zoomRatio;
80
+ });
81
+ }
82
+ useEffect(function () {
83
+ var scrollContainerEl = scrollContainerRef.current;
84
+ var horizontalScrollbarEl = refs.scrollbarX.current;
85
+ var verticalScrollbarEl = refs.scrollbarY.current;
86
+ if (!scrollContainerEl || !horizontalScrollbarEl || !verticalScrollbarEl) return function () {};
87
+ var unmountScrollHandler = routeWheelScrollToScrollbars(context, scrollContainerEl, horizontalScrollbarEl, verticalScrollbarEl);
88
+ return unmountScrollHandler;
89
+ }, [context.zoomRatio]);
90
+ };
package/es/components/Toolbar/index.css CHANGED
@@ -11,16 +11,6 @@
11
11
  justify-content: space-between;
12
12
  }
13
13
 
14
- .scrollbar-hidden {
15
- overflow: auto; /* enables scrolling */
16
- -ms-overflow-style: none; /* IE and Edge */
17
- scrollbar-width: none; /* Firefox */
18
- }
19
-
20
- .scrollbar-hidden::-webkit-scrollbar {
21
- display: none; /* Chrome, Safari, Opera */
22
- }
23
-
24
14
  .fortune-toolbar-divider {
25
15
  width: 1px;
26
16
  height: 20px;
package/es/components/Toolbar/index.js CHANGED
@@ -638,7 +638,7 @@ var Toolbar = function Toolbar(_a) {
638
638
  }));
639
639
  }
640
640
  if (name === "format") {
641
- var currentFmt_1 = defaultFormat[0].text;
641
+ var currentFmt = defaultFormat[0].text;
642
642
  if (cell) {
643
643
  var curr_2 = normalizedCellAttr(cell, "ct");
644
644
  var format = _.find(defaultFormat, function (v) {
@@ -646,16 +646,16 @@ var Toolbar = function Toolbar(_a) {
646
646
  });
647
647
  if ((curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) != null) {
648
648
  if (format != null) {
649
- currentFmt_1 = format.text;
649
+ currentFmt = format.text;
650
650
  } else if (((_a = curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === null || _a === void 0 ? void 0 : _a.includes("#,##0")) || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0" || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0.00") {
651
- currentFmt_1 = "Number";
651
+ currentFmt = "Number";
652
652
  } else {
653
- currentFmt_1 = defaultFormat[defaultFormat.length - 1].text;
653
+ currentFmt = defaultFormat[defaultFormat.length - 1].text;
654
654
  }
655
655
  }
656
656
  }
657
657
  return /*#__PURE__*/React.createElement(Combo, {
658
- text: currentFmt_1,
658
+ text: currentFmt,
659
659
  key: name,
660
660
  tooltip: tooltip,
661
661
  showArrow: false
@@ -681,17 +681,9 @@ var Toolbar = function Toolbar(_a) {
681
681
  }
682
682
  }, /*#__PURE__*/React.createElement("div", {
683
683
  className: "fortune-toolbar-menu-line"
684
- }, /*#__PURE__*/React.createElement("div", {
685
- className: "flex gap-2 items-center"
686
- }, currentFmt_1 === text ? (/*#__PURE__*/React.createElement(LucideIcon, {
687
- name: "Check",
688
- className: "w-4 h-4"
689
- })) : (/*#__PURE__*/React.createElement("span", {
690
- className: "w-4 h-4"
691
- })), /*#__PURE__*/React.createElement("div", null, text)), /*#__PURE__*/React.createElement(LucideIcon, {
692
- name: "ChevronRight",
693
- className: "w-4 h-4 color-icon-secondary"
694
- })));
684
+ }, /*#__PURE__*/React.createElement("div", null, text), /*#__PURE__*/React.createElement("div", {
685
+ className: "fortune-toolbar-subtext"
686
+ }, example)));
695
687
  }
696
688
  return /*#__PURE__*/React.createElement(Option, {
697
689
  key: value,
@@ -704,18 +696,8 @@ var Toolbar = function Toolbar(_a) {
704
696
  });
705
697
  }
706
698
  }, /*#__PURE__*/React.createElement("div", {
707
- style: {
708
- overflowX: "scroll"
709
- },
710
- className: "fortune-toolbar-menu-line scrollbar-hidden w-full"
711
- }, /*#__PURE__*/React.createElement("div", {
712
- className: "flex gap-2 items-center"
713
- }, currentFmt_1 === text ? (/*#__PURE__*/React.createElement(LucideIcon, {
714
- name: "Check",
715
- className: "w-4 h-4"
716
- })) : (/*#__PURE__*/React.createElement("span", {
717
- className: "w-4 h-4"
718
- })), /*#__PURE__*/React.createElement("div", null, text)), /*#__PURE__*/React.createElement("div", {
699
+ className: "fortune-toolbar-menu-line"
700
+ }, /*#__PURE__*/React.createElement("div", null, text), /*#__PURE__*/React.createElement("div", {
719
701
  className: "fortune-toolbar-subtext"
720
702
  }, example)));
721
703
  }));
package/lib/components/Sheet/index.js CHANGED
@@ -10,6 +10,7 @@ var _fortuneCore = require("@fileverse-dev/fortune-core");
10
10
  require("./index.css");
11
11
  var _context = _interopRequireDefault(require("../../context"));
12
12
  var _SheetOverlay = _interopRequireDefault(require("../SheetOverlay"));
13
+ var _useSmoothScroll = require("./use-smooth-scroll");
13
14
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
14
15
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
15
16
  var Sheet = function Sheet(_a) {
@@ -158,25 +159,7 @@ var Sheet = function Sheet(_a) {
158
159
  return _fortuneCore.cellFadeAnimator.setOnTick(null);
159
160
  };
160
161
  }, [context, refs.canvas, refs.globalCache.freezen, setContext, sheet.id]);
161
- var onWheel = (0, _react.useCallback)(function (e) {
162
- var _a, _b;
163
- var functionDetailsEl = document.getElementById("function-details");
164
- var formulaSearchEl = document.getElementById("luckysheet-formula-search-c");
165
- var isMouseOverFunctionDetails = functionDetailsEl === null || functionDetailsEl === void 0 ? void 0 : functionDetailsEl.matches(":hover");
166
- var isMouseOverFormulaSearch = formulaSearchEl === null || formulaSearchEl === void 0 ? void 0 : formulaSearchEl.matches(":hover");
167
- if (functionDetailsEl && isMouseOverFunctionDetails || formulaSearchEl && isMouseOverFormulaSearch || ((_b = (_a = refs === null || refs === void 0 ? void 0 : refs.globalCache) === null || _a === void 0 ? void 0 : _a.searchDialog) === null || _b === void 0 ? void 0 : _b.mouseEnter)) return;
168
- setContext(function (draftCtx) {
169
- (0, _fortuneCore.handleGlobalWheel)(draftCtx, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
170
- });
171
- e.preventDefault();
172
- }, [refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
173
- (0, _react.useEffect)(function () {
174
- var container = containerRef.current;
175
- container === null || container === void 0 ? void 0 : container.addEventListener("wheel", onWheel);
176
- return function () {
177
- container === null || container === void 0 ? void 0 : container.removeEventListener("wheel", onWheel);
178
- };
179
- }, [onWheel]);
162
+ (0, _useSmoothScroll.useSmoothScroll)(containerRef);
180
163
  return /*#__PURE__*/_react.default.createElement("div", {
181
164
  ref: containerRef,
182
165
  className: "fortune-sheet-container"
package/lib/components/Sheet/use-smooth-scroll.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { RefObject } from "react";
2
+ export declare const useSmoothScroll: (scrollContainerRef: RefObject<HTMLDivElement | null>) => void;
package/lib/components/Sheet/use-smooth-scroll.js ADDED
@@ -0,0 +1,97 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.useSmoothScroll = void 0;
7
+ var _react = require("react");
8
+ var _fortuneCore = require("@fileverse-dev/fortune-core");
9
+ var _context = _interopRequireDefault(require("../../context"));
10
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
11
+ var useSmoothScroll = exports.useSmoothScroll = function useSmoothScroll(scrollContainerRef) {
12
+ var _a = (0, _react.useContext)(_context.default),
13
+ context = _a.context,
14
+ refs = _a.refs,
15
+ setContext = _a.setContext;
16
+ function attachSmoothWheelScroll(scrollContainer, moveScrollBy, getPixelScale) {
17
+ if (getPixelScale === void 0) {
18
+ getPixelScale = function getPixelScale() {
19
+ return window.devicePixelRatio || 1;
20
+ };
21
+ }
22
+ var queuedXPixels = 0;
23
+ var queuedYPixels = 0;
24
+ var animationFrameId = 0;
25
+ var MAX_PIXEL_DELTA_PER_FRAME = 1200;
26
+ function applyQueuedScroll() {
27
+ animationFrameId = 0;
28
+ if (Math.abs(queuedXPixels) < 0.5 && Math.abs(queuedYPixels) < 0.5) {
29
+ queuedXPixels = 0;
30
+ queuedYPixels = 0;
31
+ return;
32
+ }
33
+ var xPixels = Math.max(-MAX_PIXEL_DELTA_PER_FRAME, Math.min(MAX_PIXEL_DELTA_PER_FRAME, queuedXPixels));
34
+ var yPixels = Math.max(-MAX_PIXEL_DELTA_PER_FRAME, Math.min(MAX_PIXEL_DELTA_PER_FRAME, queuedYPixels));
35
+ moveScrollBy(xPixels, yPixels);
36
+ queuedXPixels = 0;
37
+ queuedYPixels = 0;
38
+ }
39
+ function handleWheelEvent(event) {
40
+ var _a, _b;
41
+ event.preventDefault();
42
+ setContext(function (ctx) {
43
+ (0, _fortuneCore.removeEditingComment)(ctx, refs.globalCache);
44
+ });
45
+ var functionDetailsElement = document.getElementById("function-details");
46
+ var formulaSearchElement = document.getElementById("luckysheet-formula-search-c");
47
+ var isPointerOverFunctionDetails = functionDetailsElement === null || functionDetailsElement === void 0 ? void 0 : functionDetailsElement.matches(":hover");
48
+ var isPointerOverFormulaSearch = formulaSearchElement === null || formulaSearchElement === void 0 ? void 0 : formulaSearchElement.matches(":hover");
49
+ var isPointerInSearchDialog = !!((_b = (_a = refs === null || refs === void 0 ? void 0 : refs.globalCache) === null || _a === void 0 ? void 0 : _a.searchDialog) === null || _b === void 0 ? void 0 : _b.mouseEnter);
50
+ var hasFilterContextMenuOpen = context.filterContextMenu != null;
51
+ if (functionDetailsElement && isPointerOverFunctionDetails || formulaSearchElement && isPointerOverFormulaSearch || isPointerInSearchDialog || hasFilterContextMenuOpen) {
52
+ return;
53
+ }
54
+ var scaleFactor = getPixelScale();
55
+ queuedXPixels += event.deltaX * scaleFactor;
56
+ queuedYPixels += event.deltaY * scaleFactor;
57
+ if (!animationFrameId) animationFrameId = requestAnimationFrame(applyQueuedScroll);
58
+ }
59
+ scrollContainer.addEventListener("wheel", handleWheelEvent, {
60
+ passive: false
61
+ });
62
+ return function () {
63
+ scrollContainer.removeEventListener("wheel", handleWheelEvent);
64
+ if (animationFrameId) cancelAnimationFrame(animationFrameId);
65
+ };
66
+ }
67
+ var makeScrollbarsMoveByPixels = function makeScrollbarsMoveByPixels(horizontalScrollbarEl, verticalScrollbarEl) {
68
+ return function (xPixels, yPixels) {
69
+ var maxScrollLeft = horizontalScrollbarEl.scrollWidth - horizontalScrollbarEl.clientWidth;
70
+ var maxScrollTop = verticalScrollbarEl.scrollHeight - verticalScrollbarEl.clientHeight;
71
+ var targetScrollLeft = Math.max(0, Math.min(maxScrollLeft, horizontalScrollbarEl.scrollLeft + xPixels));
72
+ var targetScrollTop = Math.max(0, Math.min(maxScrollTop, verticalScrollbarEl.scrollTop + yPixels));
73
+ var didScrollX = targetScrollLeft !== horizontalScrollbarEl.scrollLeft;
74
+ var didScrollY = targetScrollTop !== verticalScrollbarEl.scrollTop;
75
+ if (didScrollX) {
76
+ horizontalScrollbarEl.scrollLeft = targetScrollLeft;
77
+ }
78
+ if (didScrollY) {
79
+ verticalScrollbarEl.scrollTop = targetScrollTop;
80
+ }
81
+ };
82
+ };
83
+ function routeWheelScrollToScrollbars(sheetContext, scrollContainerEl, horizontalScrollbarEl, verticalScrollbarEl) {
84
+ var moveScrollbarsByPixels = makeScrollbarsMoveByPixels(horizontalScrollbarEl, verticalScrollbarEl);
85
+ return attachSmoothWheelScroll(scrollContainerEl, moveScrollbarsByPixels, function () {
86
+ return (window.devicePixelRatio || 1) * sheetContext.zoomRatio;
87
+ });
88
+ }
89
+ (0, _react.useEffect)(function () {
90
+ var scrollContainerEl = scrollContainerRef.current;
91
+ var horizontalScrollbarEl = refs.scrollbarX.current;
92
+ var verticalScrollbarEl = refs.scrollbarY.current;
93
+ if (!scrollContainerEl || !horizontalScrollbarEl || !verticalScrollbarEl) return function () {};
94
+ var unmountScrollHandler = routeWheelScrollToScrollbars(context, scrollContainerEl, horizontalScrollbarEl, verticalScrollbarEl);
95
+ return unmountScrollHandler;
96
+ }, [context.zoomRatio]);
97
+ };
package/lib/components/Toolbar/index.css CHANGED
@@ -11,16 +11,6 @@
11
11
  justify-content: space-between;
12
12
  }
13
13
 
14
- .scrollbar-hidden {
15
- overflow: auto; /* enables scrolling */
16
- -ms-overflow-style: none; /* IE and Edge */
17
- scrollbar-width: none; /* Firefox */
18
- }
19
-
20
- .scrollbar-hidden::-webkit-scrollbar {
21
- display: none; /* Chrome, Safari, Opera */
22
- }
23
-
24
14
  .fortune-toolbar-divider {
25
15
  width: 1px;
26
16
  height: 20px;
package/lib/components/Toolbar/index.js CHANGED
@@ -647,7 +647,7 @@ var Toolbar = function Toolbar(_a) {
647
647
  }));
648
648
  }
649
649
  if (name === "format") {
650
- var currentFmt_1 = defaultFormat[0].text;
650
+ var currentFmt = defaultFormat[0].text;
651
651
  if (cell) {
652
652
  var curr_2 = (0, _fortuneCore.normalizedCellAttr)(cell, "ct");
653
653
  var format = _lodash.default.find(defaultFormat, function (v) {
@@ -655,16 +655,16 @@ var Toolbar = function Toolbar(_a) {
655
655
  });
656
656
  if ((curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) != null) {
657
657
  if (format != null) {
658
- currentFmt_1 = format.text;
658
+ currentFmt = format.text;
659
659
  } else if (((_a = curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === null || _a === void 0 ? void 0 : _a.includes("#,##0")) || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0" || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0.00") {
660
- currentFmt_1 = "Number";
660
+ currentFmt = "Number";
661
661
  } else {
662
- currentFmt_1 = defaultFormat[defaultFormat.length - 1].text;
662
+ currentFmt = defaultFormat[defaultFormat.length - 1].text;
663
663
  }
664
664
  }
665
665
  }
666
666
  return /*#__PURE__*/_react.default.createElement(_Combo.default, {
667
- text: currentFmt_1,
667
+ text: currentFmt,
668
668
  key: name,
669
669
  tooltip: tooltip,
670
670
  showArrow: false
@@ -690,17 +690,9 @@ var Toolbar = function Toolbar(_a) {
690
690
  }
691
691
  }, /*#__PURE__*/_react.default.createElement("div", {
692
692
  className: "fortune-toolbar-menu-line"
693
- }, /*#__PURE__*/_react.default.createElement("div", {
694
- className: "flex gap-2 items-center"
695
- }, currentFmt_1 === text ? (/*#__PURE__*/_react.default.createElement(_ui.LucideIcon, {
696
- name: "Check",
697
- className: "w-4 h-4"
698
- })) : (/*#__PURE__*/_react.default.createElement("span", {
699
- className: "w-4 h-4"
700
- })), /*#__PURE__*/_react.default.createElement("div", null, text)), /*#__PURE__*/_react.default.createElement(_ui.LucideIcon, {
701
- name: "ChevronRight",
702
- className: "w-4 h-4 color-icon-secondary"
703
- })));
693
+ }, /*#__PURE__*/_react.default.createElement("div", null, text), /*#__PURE__*/_react.default.createElement("div", {
694
+ className: "fortune-toolbar-subtext"
695
+ }, example)));
704
696
  }
705
697
  return /*#__PURE__*/_react.default.createElement(_Select.Option, {
706
698
  key: value,
@@ -713,18 +705,8 @@ var Toolbar = function Toolbar(_a) {
713
705
  });
714
706
  }
715
707
  }, /*#__PURE__*/_react.default.createElement("div", {
716
- style: {
717
- overflowX: "scroll"
718
- },
719
- className: "fortune-toolbar-menu-line scrollbar-hidden w-full"
720
- }, /*#__PURE__*/_react.default.createElement("div", {
721
- className: "flex gap-2 items-center"
722
- }, currentFmt_1 === text ? (/*#__PURE__*/_react.default.createElement(_ui.LucideIcon, {
723
- name: "Check",
724
- className: "w-4 h-4"
725
- })) : (/*#__PURE__*/_react.default.createElement("span", {
726
- className: "w-4 h-4"
727
- })), /*#__PURE__*/_react.default.createElement("div", null, text)), /*#__PURE__*/_react.default.createElement("div", {
708
+ className: "fortune-toolbar-menu-line"
709
+ }, /*#__PURE__*/_react.default.createElement("div", null, text), /*#__PURE__*/_react.default.createElement("div", {
728
710
  className: "fortune-toolbar-subtext"
729
711
  }, example)));
730
712
  }));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fileverse-dev/fortune-react",
3
- "version": "1.1.62-patch-1",
3
+ "version": "1.1.63",
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.1.62",
19
+ "@fileverse-dev/fortune-core": "1.1.63",
20
20
  "@fileverse/ui": "^4.1.7-patch-21",
21
21
  "@tippyjs/react": "^4.2.6",
22
22
  "@types/regenerator-runtime": "^0.13.6",