@fileverse-dev/fortune-react 1.0.25 → 1.0.26-patch-2
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.
|
@@ -144,9 +144,11 @@ var Sheet = function Sheet(_a) {
|
|
|
144
144
|
}
|
|
145
145
|
}, [context, refs.canvas, refs.globalCache.freezen, setContext, sheet.id]);
|
|
146
146
|
var onWheel = useCallback(function (e) {
|
|
147
|
-
var
|
|
148
|
-
var
|
|
149
|
-
|
|
147
|
+
var functionDetailsEl = document.getElementById("function-details");
|
|
148
|
+
var formulaSearchEl = document.getElementById("luckysheet-formula-search-c");
|
|
149
|
+
var isMouseOverFunctionDetails = functionDetailsEl === null || functionDetailsEl === void 0 ? void 0 : functionDetailsEl.matches(":hover");
|
|
150
|
+
var isMouseOverFormulaSearch = formulaSearchEl === null || formulaSearchEl === void 0 ? void 0 : formulaSearchEl.matches(":hover");
|
|
151
|
+
if (functionDetailsEl && isMouseOverFunctionDetails || formulaSearchEl && isMouseOverFormulaSearch) return;
|
|
150
152
|
setContext(function (draftCtx) {
|
|
151
153
|
handleGlobalWheel(draftCtx, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
|
|
152
154
|
});
|
|
@@ -7,6 +7,8 @@
|
|
|
7
7
|
background: #fff;
|
|
8
8
|
z-index: 1003;
|
|
9
9
|
width: 300px;
|
|
10
|
+
max-height: 360px;
|
|
11
|
+
overflow-y: auto;
|
|
10
12
|
}
|
|
11
13
|
|
|
12
14
|
.luckysheet-formula-search-c .luckysheet-formula-search-item {
|
|
@@ -19,7 +21,7 @@
|
|
|
19
21
|
.luckysheet-formula-search-item
|
|
20
22
|
.luckysheet-formula-search-detail {
|
|
21
23
|
display: none;
|
|
22
|
-
color: #
|
|
24
|
+
color: #77818a;
|
|
23
25
|
}
|
|
24
26
|
|
|
25
27
|
.luckysheet-formula-search-c
|
|
@@ -153,9 +153,11 @@ var Sheet = function Sheet(_a) {
|
|
|
153
153
|
}
|
|
154
154
|
}, [context, refs.canvas, refs.globalCache.freezen, setContext, sheet.id]);
|
|
155
155
|
var onWheel = (0, _react.useCallback)(function (e) {
|
|
156
|
-
var
|
|
157
|
-
var
|
|
158
|
-
|
|
156
|
+
var functionDetailsEl = document.getElementById("function-details");
|
|
157
|
+
var formulaSearchEl = document.getElementById("luckysheet-formula-search-c");
|
|
158
|
+
var isMouseOverFunctionDetails = functionDetailsEl === null || functionDetailsEl === void 0 ? void 0 : functionDetailsEl.matches(":hover");
|
|
159
|
+
var isMouseOverFormulaSearch = formulaSearchEl === null || formulaSearchEl === void 0 ? void 0 : formulaSearchEl.matches(":hover");
|
|
160
|
+
if (functionDetailsEl && isMouseOverFunctionDetails || formulaSearchEl && isMouseOverFormulaSearch) return;
|
|
159
161
|
setContext(function (draftCtx) {
|
|
160
162
|
(0, _fortuneCore.handleGlobalWheel)(draftCtx, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
|
|
161
163
|
});
|
|
@@ -7,6 +7,8 @@
|
|
|
7
7
|
background: #fff;
|
|
8
8
|
z-index: 1003;
|
|
9
9
|
width: 300px;
|
|
10
|
+
max-height: 360px;
|
|
11
|
+
overflow-y: auto;
|
|
10
12
|
}
|
|
11
13
|
|
|
12
14
|
.luckysheet-formula-search-c .luckysheet-formula-search-item {
|
|
@@ -19,7 +21,7 @@
|
|
|
19
21
|
.luckysheet-formula-search-item
|
|
20
22
|
.luckysheet-formula-search-detail {
|
|
21
23
|
display: none;
|
|
22
|
-
color: #
|
|
24
|
+
color: #77818a;
|
|
23
25
|
}
|
|
24
26
|
|
|
25
27
|
.luckysheet-formula-search-c
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fileverse-dev/fortune-react",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.26-patch-2",
|
|
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.0.
|
|
19
|
+
"@fileverse-dev/fortune-core": "1.0.26-patch-2",
|
|
20
20
|
"@fileverse/ui": "^4.1.7-patch-16",
|
|
21
21
|
"@tippyjs/react": "^4.2.6",
|
|
22
22
|
"@types/regenerator-runtime": "^0.13.6",
|