@univerjs/sheets-formula-ui 1.0.0-beta.0 → 1.0.0-beta.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.
- package/lib/cjs/index.js +21 -20
- package/lib/cjs/locale/ru-RU.js +1 -1
- package/lib/es/index.js +21 -20
- package/lib/es/locale/ru-RU.js +1 -1
- package/lib/index.css +22 -16
- package/lib/index.js +21 -20
- package/lib/locale/ru-RU.js +1 -1
- package/lib/types/views/formula-editor/hooks/use-formula-selection.d.ts +1 -1
- package/lib/umd/index.js +4 -4
- package/lib/umd/locale/ru-RU.js +1 -1
- package/package.json +13 -13
package/lib/cjs/index.js
CHANGED
|
@@ -717,7 +717,7 @@ function genFormulaRefSelectionStyle(themeService, refColor, id) {
|
|
|
717
717
|
},
|
|
718
718
|
widgetSize: 6,
|
|
719
719
|
widgetStrokeWidth: 1,
|
|
720
|
-
widgetStroke: themeService.getColorFromTheme("
|
|
720
|
+
widgetStroke: themeService.getColorFromTheme("gray.0")
|
|
721
721
|
};
|
|
722
722
|
}
|
|
723
723
|
|
|
@@ -994,7 +994,7 @@ const menuSchema = {
|
|
|
994
994
|
//#endregion
|
|
995
995
|
//#region package.json
|
|
996
996
|
var name = "@univerjs/sheets-formula-ui";
|
|
997
|
-
var version = "1.0.0-beta.
|
|
997
|
+
var version = "1.0.0-beta.2";
|
|
998
998
|
|
|
999
999
|
//#endregion
|
|
1000
1000
|
//#region src/config/config.ts
|
|
@@ -1375,7 +1375,7 @@ const useFormulaDescribe = (isNeed, formulaText, editor) => {
|
|
|
1375
1375
|
*/
|
|
1376
1376
|
const HelpHiddenTip = ({ onClick }) => {
|
|
1377
1377
|
return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
1378
|
-
className: "univer-z-[15] univer-box-border univer-h-[18px] univer-cursor-pointer univer-overflow-visible univer-whitespace-nowrap univer-rounded-l univer-border univer-border-r-0 univer-border-gray-600 univer-bg-primary-600 univer-p-0.5 univer-text-xs univer-font-bold univer-leading-[13px] univer-text-
|
|
1378
|
+
className: "univer-z-[15] univer-box-border univer-h-[18px] univer-cursor-pointer univer-overflow-visible univer-whitespace-nowrap univer-rounded-l univer-border univer-border-r-0 univer-border-gray-600 univer-bg-primary-600 univer-p-0.5 univer-text-xs univer-font-bold univer-leading-[13px] univer-text-gray-0",
|
|
1379
1379
|
onClick,
|
|
1380
1380
|
children: "?"
|
|
1381
1381
|
});
|
|
@@ -1387,7 +1387,7 @@ function Params({ className, title, value }) {
|
|
|
1387
1387
|
return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
1388
1388
|
className: "univer-my-2",
|
|
1389
1389
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
1390
|
-
className: (0, _univerjs_design.clsx)("univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
1390
|
+
className: (0, _univerjs_design.clsx)("univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0", className),
|
|
1391
1391
|
children: title
|
|
1392
1392
|
}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
1393
1393
|
className: "univer-whitespace-pre-wrap univer-break-words univer-text-xs univer-text-gray-500",
|
|
@@ -1438,9 +1438,9 @@ function HelpFunction(props) {
|
|
|
1438
1438
|
anchorRect$: position$,
|
|
1439
1439
|
direction: "vertical",
|
|
1440
1440
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
1441
|
-
className: (0, _univerjs_design.clsx)("univer-m-0 univer-box-border univer-w-[250px] univer-select-none univer-list-none univer-rounded-lg univer-bg-
|
|
1441
|
+
className: (0, _univerjs_design.clsx)("univer-m-0 univer-box-border univer-w-[250px] univer-select-none univer-list-none univer-rounded-lg univer-bg-gray-0 univer-leading-5 univer-shadow-md univer-outline-none dark:!univer-bg-gray-900", _univerjs_design.borderClassName),
|
|
1442
1442
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
1443
|
-
className: (0, _univerjs_design.clsx)("univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4 univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
1443
|
+
className: (0, _univerjs_design.clsx)("univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4 univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0", _univerjs_design.borderTopClassName),
|
|
1444
1444
|
style: { overflowWrap: "anywhere" },
|
|
1445
1445
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Help, {
|
|
1446
1446
|
prefix: functionInfo.functionName,
|
|
@@ -1881,7 +1881,7 @@ function getDefaultRefSelectionStyle(themeService) {
|
|
|
1881
1881
|
//#region src/views/formula-editor/hooks/use-formula-selection.ts
|
|
1882
1882
|
function resolveFormulaSelectionDataStream(accssor, editor, editorId) {
|
|
1883
1883
|
var _editor$getDocumentDa, _documentModel$getBod;
|
|
1884
|
-
const editorDataStream = editor === null || editor === void 0 || (_editor$getDocumentDa = editor.
|
|
1884
|
+
const editorDataStream = editor === null || editor === void 0 || (_editor$getDocumentDa = editor.getDocumentDataModel()) === null || _editor$getDocumentDa === void 0 || (_editor$getDocumentDa = _editor$getDocumentDa.getBody()) === null || _editor$getDocumentDa === void 0 ? void 0 : _editor$getDocumentDa.dataStream;
|
|
1885
1885
|
if (editorDataStream != null) return {
|
|
1886
1886
|
dataStream: editorDataStream,
|
|
1887
1887
|
offset: 0
|
|
@@ -2281,7 +2281,7 @@ function useColor() {
|
|
|
2281
2281
|
].map((color) => themeService.isValidThemeColor(color) ? themeService.getColorFromTheme(color) : color),
|
|
2282
2282
|
numberColor: themeService.getColorFromTheme("blue.700"),
|
|
2283
2283
|
stringColor: themeService.getColorFromTheme("jiqing.800"),
|
|
2284
|
-
plainTextColor: themeService.getColorFromTheme("
|
|
2284
|
+
plainTextColor: themeService.getColorFromTheme("gray.1000")
|
|
2285
2285
|
};
|
|
2286
2286
|
}, [themeService.getCurrentTheme()]);
|
|
2287
2287
|
}
|
|
@@ -3262,9 +3262,9 @@ function SearchFunctionFactory(props, ref) {
|
|
|
3262
3262
|
if (ref) ref.current = v;
|
|
3263
3263
|
},
|
|
3264
3264
|
"data-u-comp": "sheets-formula-editor",
|
|
3265
|
-
className: (0, _univerjs_design.clsx)("univer-m-0 univer-box-border univer-max-h-[400px] univer-w-[250px] univer-list-none univer-overflow-y-auto univer-rounded-lg univer-bg-
|
|
3265
|
+
className: (0, _univerjs_design.clsx)("univer-m-0 univer-box-border univer-max-h-[400px] univer-w-[250px] univer-list-none univer-overflow-y-auto univer-rounded-lg univer-bg-gray-0 univer-p-2 univer-leading-5 univer-shadow-md univer-outline-none dark:!univer-bg-gray-900", _univerjs_design.borderClassName, _univerjs_design.scrollbarClassName),
|
|
3266
3266
|
children: searchList.map((item, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
|
|
3267
|
-
className: (0, _univerjs_design.clsx)("univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1 univer-text-gray-900 univer-transition-colors dark:!univer-text-
|
|
3267
|
+
className: (0, _univerjs_design.clsx)("univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1 univer-text-gray-900 univer-transition-colors dark:!univer-text-gray-0", { "univer-bg-gray-200 dark:!univer-bg-gray-600": active === index }),
|
|
3268
3268
|
onMouseEnter: () => handleLiMouseEnter(index),
|
|
3269
3269
|
onMouseLeave: handleLiMouseLeave,
|
|
3270
3270
|
onMouseMove: debounceResetMouseState,
|
|
@@ -3688,7 +3688,7 @@ function FunctionParams(props) {
|
|
|
3688
3688
|
className: (0, _univerjs_design.clsx)("univer-mb-2 univer-font-medium univer-text-gray-500 dark:!univer-text-gray-300", className),
|
|
3689
3689
|
children: title
|
|
3690
3690
|
}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
3691
|
-
className: "univer-break-all univer-text-gray-900 dark:!univer-text-
|
|
3691
|
+
className: "univer-break-all univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3692
3692
|
children: value
|
|
3693
3693
|
})]
|
|
3694
3694
|
});
|
|
@@ -3841,7 +3841,7 @@ function SelectFunction(props) {
|
|
|
3841
3841
|
onKeyDown: handleSelectListKeyDown,
|
|
3842
3842
|
tabIndex: -1,
|
|
3843
3843
|
children: selectList.map(({ name }, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
|
|
3844
|
-
className: (0, _univerjs_design.clsx)("univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1 univer-text-sm univer-text-gray-900 univer-transition-colors dark:!univer-text-
|
|
3844
|
+
className: (0, _univerjs_design.clsx)("univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1 univer-text-sm univer-text-gray-900 univer-transition-colors dark:!univer-text-gray-0", { "univer-bg-gray-200 dark:!univer-bg-gray-600": active === index }),
|
|
3845
3845
|
onMouseEnter: () => handleLiMouseEnter(index),
|
|
3846
3846
|
onMouseLeave: handleLiMouseLeave,
|
|
3847
3847
|
onClick: () => setCurrentFunctionInfo(index),
|
|
@@ -3858,7 +3858,7 @@ function SelectFunction(props) {
|
|
|
3858
3858
|
/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
3859
3859
|
className: "univer-rounded-lg univer-bg-gray-50 univer-p-3 dark:!univer-bg-gray-800",
|
|
3860
3860
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
3861
|
-
className: "univer-text-sm univer-font-semibold univer-text-gray-900 dark:!univer-text-
|
|
3861
|
+
className: "univer-text-sm univer-font-semibold univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3862
3862
|
children: functionInfo.functionName
|
|
3863
3863
|
}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
3864
3864
|
className: "univer-mt-1 univer-text-xs univer-leading-5 univer-text-gray-600 dark:!univer-text-gray-300",
|
|
@@ -3872,7 +3872,7 @@ function SelectFunction(props) {
|
|
|
3872
3872
|
children: localeService.t("sheets-formula-ui.moreFunctions.syntax")
|
|
3873
3873
|
}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
3874
3874
|
"data-u-comp": "formula-function-syntax",
|
|
3875
|
-
className: (0, _univerjs_design.clsx)("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-
|
|
3875
|
+
className: (0, _univerjs_design.clsx)("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-gray-0", _univerjs_design.borderClassName),
|
|
3876
3876
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FunctionHelp, {
|
|
3877
3877
|
prefix: functionInfo.functionName,
|
|
3878
3878
|
value: functionInfo.functionParameter
|
|
@@ -3882,7 +3882,7 @@ function SelectFunction(props) {
|
|
|
3882
3882
|
children: localeService.t("sheets-formula-ui.prompt.helpExample")
|
|
3883
3883
|
}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
|
|
3884
3884
|
"data-u-comp": "formula-function-example",
|
|
3885
|
-
className: (0, _univerjs_design.clsx)("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-
|
|
3885
|
+
className: (0, _univerjs_design.clsx)("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-gray-0", _univerjs_design.borderClassName),
|
|
3886
3886
|
children: `${functionInfo.functionName}(${functionInfo.functionParameter.map((item) => item.example).join(",")})`
|
|
3887
3887
|
})] })]
|
|
3888
3888
|
}),
|
|
@@ -3894,7 +3894,7 @@ function SelectFunction(props) {
|
|
|
3894
3894
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
3895
3895
|
className: "univer-flex univer-items-center univer-gap-2",
|
|
3896
3896
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
|
|
3897
|
-
className: "univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
3897
|
+
className: "univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3898
3898
|
children: item.name
|
|
3899
3899
|
}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
|
|
3900
3900
|
className: (0, _univerjs_design.clsx)("univer-rounded-full univer-px-2 univer-py-0.5 univer-text-xs univer-leading-4", item.require ? "univer-bg-primary-50 univer-text-primary-600 dark:!univer-bg-primary-900 dark:!univer-text-primary-200" : "univer-bg-gray-100 univer-text-gray-600 dark:!univer-bg-gray-700 dark:!univer-text-gray-200"),
|
|
@@ -4193,7 +4193,7 @@ function RangeSelectorDialog(props) {
|
|
|
4193
4193
|
mask: false,
|
|
4194
4194
|
maskClosable: false,
|
|
4195
4195
|
footer: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("footer", {
|
|
4196
|
-
className: "univer-flex univer-gap-2
|
|
4196
|
+
className: "univer-flex univer-gap-2",
|
|
4197
4197
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Button, {
|
|
4198
4198
|
onClick: onClose,
|
|
4199
4199
|
children: localeService.t("sheets-formula-ui.rangeSelector.cancel")
|
|
@@ -4216,7 +4216,7 @@ function RangeSelectorDialog(props) {
|
|
|
4216
4216
|
ref: scrollbarRef,
|
|
4217
4217
|
className: (0, _univerjs_design.clsx)("-univer-mx-6 univer-max-h-60 univer-overflow-y-auto univer-px-6", _univerjs_design.scrollbarClassName),
|
|
4218
4218
|
children: [ranges.map((text, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
|
|
4219
|
-
className: "univer-mb-2 univer-flex univer-items-center univer-gap-4
|
|
4219
|
+
className: "univer-mb-2 univer-flex univer-items-center univer-gap-4",
|
|
4220
4220
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Input, {
|
|
4221
4221
|
className: (0, _univerjs_design.clsx)("univer-w-full", { "univer-border-primary-600": focusIndex === index }),
|
|
4222
4222
|
placeholder: localeService.t("sheets-formula-ui.rangeSelector.placeHolder"),
|
|
@@ -4315,6 +4315,7 @@ function RangeSelector(props) {
|
|
|
4315
4315
|
return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [!hideEditor ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_docs_ui.RichTextEditor, {
|
|
4316
4316
|
isSingle: true,
|
|
4317
4317
|
...props,
|
|
4318
|
+
className: (0, _univerjs_design.clsx)(props.className, "rtl:[&>div]:univer-flex-row-reverse"),
|
|
4318
4319
|
preserveHostFocus: true,
|
|
4319
4320
|
onFocusChange: (focusing, newValue) => {
|
|
4320
4321
|
setFocusing(focusing);
|
|
@@ -4330,7 +4331,7 @@ function RangeSelector(props) {
|
|
|
4330
4331
|
title: localeService.t("sheets-formula-ui.rangeSelector.buttonTooltip"),
|
|
4331
4332
|
placement: "bottom",
|
|
4332
4333
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.SelectRangeIcon, {
|
|
4333
|
-
className: "univer-cursor-pointer dark:!univer-text-gray-300",
|
|
4334
|
+
className: "-univer-translate-y-0.5 univer-cursor-pointer dark:!univer-text-gray-300",
|
|
4334
4335
|
onClick: handleOpenModal
|
|
4335
4336
|
})
|
|
4336
4337
|
})
|
|
@@ -4985,7 +4986,7 @@ let FormulaEditorShowController = class FormulaEditorShowController extends _uni
|
|
|
4985
4986
|
style: {
|
|
4986
4987
|
strokeWidth: 1,
|
|
4987
4988
|
stroke: this._themeService.getColorFromTheme("primary.600"),
|
|
4988
|
-
fill: new _univerjs_core.ColorKit(this._themeService.getColorFromTheme("
|
|
4989
|
+
fill: new _univerjs_core.ColorKit(this._themeService.getColorFromTheme("gray.0")).setAlpha(0).toString(),
|
|
4989
4990
|
widgets: {}
|
|
4990
4991
|
}
|
|
4991
4992
|
}, skeleton);
|
package/lib/cjs/locale/ru-RU.js
CHANGED
package/lib/es/index.js
CHANGED
|
@@ -716,7 +716,7 @@ function genFormulaRefSelectionStyle(themeService, refColor, id) {
|
|
|
716
716
|
},
|
|
717
717
|
widgetSize: 6,
|
|
718
718
|
widgetStrokeWidth: 1,
|
|
719
|
-
widgetStroke: themeService.getColorFromTheme("
|
|
719
|
+
widgetStroke: themeService.getColorFromTheme("gray.0")
|
|
720
720
|
};
|
|
721
721
|
}
|
|
722
722
|
|
|
@@ -993,7 +993,7 @@ const menuSchema = {
|
|
|
993
993
|
//#endregion
|
|
994
994
|
//#region package.json
|
|
995
995
|
var name = "@univerjs/sheets-formula-ui";
|
|
996
|
-
var version = "1.0.0-beta.
|
|
996
|
+
var version = "1.0.0-beta.2";
|
|
997
997
|
|
|
998
998
|
//#endregion
|
|
999
999
|
//#region src/config/config.ts
|
|
@@ -1374,7 +1374,7 @@ const useFormulaDescribe = (isNeed, formulaText, editor) => {
|
|
|
1374
1374
|
*/
|
|
1375
1375
|
const HelpHiddenTip = ({ onClick }) => {
|
|
1376
1376
|
return /* @__PURE__ */ jsx("div", {
|
|
1377
|
-
className: "univer-z-[15] univer-box-border univer-h-[18px] univer-cursor-pointer univer-overflow-visible univer-whitespace-nowrap univer-rounded-l univer-border univer-border-r-0 univer-border-gray-600 univer-bg-primary-600 univer-p-0.5 univer-text-xs univer-font-bold univer-leading-[13px] univer-text-
|
|
1377
|
+
className: "univer-z-[15] univer-box-border univer-h-[18px] univer-cursor-pointer univer-overflow-visible univer-whitespace-nowrap univer-rounded-l univer-border univer-border-r-0 univer-border-gray-600 univer-bg-primary-600 univer-p-0.5 univer-text-xs univer-font-bold univer-leading-[13px] univer-text-gray-0",
|
|
1378
1378
|
onClick,
|
|
1379
1379
|
children: "?"
|
|
1380
1380
|
});
|
|
@@ -1386,7 +1386,7 @@ function Params({ className, title, value }) {
|
|
|
1386
1386
|
return /* @__PURE__ */ jsxs("div", {
|
|
1387
1387
|
className: "univer-my-2",
|
|
1388
1388
|
children: [/* @__PURE__ */ jsx("div", {
|
|
1389
|
-
className: clsx("univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
1389
|
+
className: clsx("univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0", className),
|
|
1390
1390
|
children: title
|
|
1391
1391
|
}), /* @__PURE__ */ jsx("div", {
|
|
1392
1392
|
className: "univer-whitespace-pre-wrap univer-break-words univer-text-xs univer-text-gray-500",
|
|
@@ -1437,9 +1437,9 @@ function HelpFunction(props) {
|
|
|
1437
1437
|
anchorRect$: position$,
|
|
1438
1438
|
direction: "vertical",
|
|
1439
1439
|
children: /* @__PURE__ */ jsxs("div", {
|
|
1440
|
-
className: clsx("univer-m-0 univer-box-border univer-w-[250px] univer-select-none univer-list-none univer-rounded-lg univer-bg-
|
|
1440
|
+
className: clsx("univer-m-0 univer-box-border univer-w-[250px] univer-select-none univer-list-none univer-rounded-lg univer-bg-gray-0 univer-leading-5 univer-shadow-md univer-outline-none dark:!univer-bg-gray-900", borderClassName),
|
|
1441
1441
|
children: [/* @__PURE__ */ jsxs("div", {
|
|
1442
|
-
className: clsx("univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4 univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
1442
|
+
className: clsx("univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4 univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0", borderTopClassName),
|
|
1443
1443
|
style: { overflowWrap: "anywhere" },
|
|
1444
1444
|
children: [/* @__PURE__ */ jsx(Help, {
|
|
1445
1445
|
prefix: functionInfo.functionName,
|
|
@@ -1880,7 +1880,7 @@ function getDefaultRefSelectionStyle(themeService) {
|
|
|
1880
1880
|
//#region src/views/formula-editor/hooks/use-formula-selection.ts
|
|
1881
1881
|
function resolveFormulaSelectionDataStream(accssor, editor, editorId) {
|
|
1882
1882
|
var _editor$getDocumentDa, _documentModel$getBod;
|
|
1883
|
-
const editorDataStream = editor === null || editor === void 0 || (_editor$getDocumentDa = editor.
|
|
1883
|
+
const editorDataStream = editor === null || editor === void 0 || (_editor$getDocumentDa = editor.getDocumentDataModel()) === null || _editor$getDocumentDa === void 0 || (_editor$getDocumentDa = _editor$getDocumentDa.getBody()) === null || _editor$getDocumentDa === void 0 ? void 0 : _editor$getDocumentDa.dataStream;
|
|
1884
1884
|
if (editorDataStream != null) return {
|
|
1885
1885
|
dataStream: editorDataStream,
|
|
1886
1886
|
offset: 0
|
|
@@ -2280,7 +2280,7 @@ function useColor() {
|
|
|
2280
2280
|
].map((color) => themeService.isValidThemeColor(color) ? themeService.getColorFromTheme(color) : color),
|
|
2281
2281
|
numberColor: themeService.getColorFromTheme("blue.700"),
|
|
2282
2282
|
stringColor: themeService.getColorFromTheme("jiqing.800"),
|
|
2283
|
-
plainTextColor: themeService.getColorFromTheme("
|
|
2283
|
+
plainTextColor: themeService.getColorFromTheme("gray.1000")
|
|
2284
2284
|
};
|
|
2285
2285
|
}, [themeService.getCurrentTheme()]);
|
|
2286
2286
|
}
|
|
@@ -3261,9 +3261,9 @@ function SearchFunctionFactory(props, ref) {
|
|
|
3261
3261
|
if (ref) ref.current = v;
|
|
3262
3262
|
},
|
|
3263
3263
|
"data-u-comp": "sheets-formula-editor",
|
|
3264
|
-
className: clsx("univer-m-0 univer-box-border univer-max-h-[400px] univer-w-[250px] univer-list-none univer-overflow-y-auto univer-rounded-lg univer-bg-
|
|
3264
|
+
className: clsx("univer-m-0 univer-box-border univer-max-h-[400px] univer-w-[250px] univer-list-none univer-overflow-y-auto univer-rounded-lg univer-bg-gray-0 univer-p-2 univer-leading-5 univer-shadow-md univer-outline-none dark:!univer-bg-gray-900", borderClassName, scrollbarClassName),
|
|
3265
3265
|
children: searchList.map((item, index) => /* @__PURE__ */ jsxs("li", {
|
|
3266
|
-
className: clsx("univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1 univer-text-gray-900 univer-transition-colors dark:!univer-text-
|
|
3266
|
+
className: clsx("univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1 univer-text-gray-900 univer-transition-colors dark:!univer-text-gray-0", { "univer-bg-gray-200 dark:!univer-bg-gray-600": active === index }),
|
|
3267
3267
|
onMouseEnter: () => handleLiMouseEnter(index),
|
|
3268
3268
|
onMouseLeave: handleLiMouseLeave,
|
|
3269
3269
|
onMouseMove: debounceResetMouseState,
|
|
@@ -3687,7 +3687,7 @@ function FunctionParams(props) {
|
|
|
3687
3687
|
className: clsx("univer-mb-2 univer-font-medium univer-text-gray-500 dark:!univer-text-gray-300", className),
|
|
3688
3688
|
children: title
|
|
3689
3689
|
}), /* @__PURE__ */ jsx("div", {
|
|
3690
|
-
className: "univer-break-all univer-text-gray-900 dark:!univer-text-
|
|
3690
|
+
className: "univer-break-all univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3691
3691
|
children: value
|
|
3692
3692
|
})]
|
|
3693
3693
|
});
|
|
@@ -3840,7 +3840,7 @@ function SelectFunction(props) {
|
|
|
3840
3840
|
onKeyDown: handleSelectListKeyDown,
|
|
3841
3841
|
tabIndex: -1,
|
|
3842
3842
|
children: selectList.map(({ name }, index) => /* @__PURE__ */ jsxs("li", {
|
|
3843
|
-
className: clsx("univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1 univer-text-sm univer-text-gray-900 univer-transition-colors dark:!univer-text-
|
|
3843
|
+
className: clsx("univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1 univer-text-sm univer-text-gray-900 univer-transition-colors dark:!univer-text-gray-0", { "univer-bg-gray-200 dark:!univer-bg-gray-600": active === index }),
|
|
3844
3844
|
onMouseEnter: () => handleLiMouseEnter(index),
|
|
3845
3845
|
onMouseLeave: handleLiMouseLeave,
|
|
3846
3846
|
onClick: () => setCurrentFunctionInfo(index),
|
|
@@ -3857,7 +3857,7 @@ function SelectFunction(props) {
|
|
|
3857
3857
|
/* @__PURE__ */ jsxs("div", {
|
|
3858
3858
|
className: "univer-rounded-lg univer-bg-gray-50 univer-p-3 dark:!univer-bg-gray-800",
|
|
3859
3859
|
children: [/* @__PURE__ */ jsx("div", {
|
|
3860
|
-
className: "univer-text-sm univer-font-semibold univer-text-gray-900 dark:!univer-text-
|
|
3860
|
+
className: "univer-text-sm univer-font-semibold univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3861
3861
|
children: functionInfo.functionName
|
|
3862
3862
|
}), /* @__PURE__ */ jsx("div", {
|
|
3863
3863
|
className: "univer-mt-1 univer-text-xs univer-leading-5 univer-text-gray-600 dark:!univer-text-gray-300",
|
|
@@ -3871,7 +3871,7 @@ function SelectFunction(props) {
|
|
|
3871
3871
|
children: localeService.t("sheets-formula-ui.moreFunctions.syntax")
|
|
3872
3872
|
}), /* @__PURE__ */ jsx("div", {
|
|
3873
3873
|
"data-u-comp": "formula-function-syntax",
|
|
3874
|
-
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-
|
|
3874
|
+
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-gray-0", borderClassName),
|
|
3875
3875
|
children: /* @__PURE__ */ jsx(FunctionHelp, {
|
|
3876
3876
|
prefix: functionInfo.functionName,
|
|
3877
3877
|
value: functionInfo.functionParameter
|
|
@@ -3881,7 +3881,7 @@ function SelectFunction(props) {
|
|
|
3881
3881
|
children: localeService.t("sheets-formula-ui.prompt.helpExample")
|
|
3882
3882
|
}), /* @__PURE__ */ jsx("div", {
|
|
3883
3883
|
"data-u-comp": "formula-function-example",
|
|
3884
|
-
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-
|
|
3884
|
+
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-gray-0", borderClassName),
|
|
3885
3885
|
children: `${functionInfo.functionName}(${functionInfo.functionParameter.map((item) => item.example).join(",")})`
|
|
3886
3886
|
})] })]
|
|
3887
3887
|
}),
|
|
@@ -3893,7 +3893,7 @@ function SelectFunction(props) {
|
|
|
3893
3893
|
children: [/* @__PURE__ */ jsxs("div", {
|
|
3894
3894
|
className: "univer-flex univer-items-center univer-gap-2",
|
|
3895
3895
|
children: [/* @__PURE__ */ jsx("span", {
|
|
3896
|
-
className: "univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
3896
|
+
className: "univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3897
3897
|
children: item.name
|
|
3898
3898
|
}), /* @__PURE__ */ jsx("span", {
|
|
3899
3899
|
className: clsx("univer-rounded-full univer-px-2 univer-py-0.5 univer-text-xs univer-leading-4", item.require ? "univer-bg-primary-50 univer-text-primary-600 dark:!univer-bg-primary-900 dark:!univer-text-primary-200" : "univer-bg-gray-100 univer-text-gray-600 dark:!univer-bg-gray-700 dark:!univer-text-gray-200"),
|
|
@@ -4192,7 +4192,7 @@ function RangeSelectorDialog(props) {
|
|
|
4192
4192
|
mask: false,
|
|
4193
4193
|
maskClosable: false,
|
|
4194
4194
|
footer: /* @__PURE__ */ jsxs("footer", {
|
|
4195
|
-
className: "univer-flex univer-gap-2
|
|
4195
|
+
className: "univer-flex univer-gap-2",
|
|
4196
4196
|
children: [/* @__PURE__ */ jsx(Button, {
|
|
4197
4197
|
onClick: onClose,
|
|
4198
4198
|
children: localeService.t("sheets-formula-ui.rangeSelector.cancel")
|
|
@@ -4215,7 +4215,7 @@ function RangeSelectorDialog(props) {
|
|
|
4215
4215
|
ref: scrollbarRef,
|
|
4216
4216
|
className: clsx("-univer-mx-6 univer-max-h-60 univer-overflow-y-auto univer-px-6", scrollbarClassName),
|
|
4217
4217
|
children: [ranges.map((text, index) => /* @__PURE__ */ jsxs("div", {
|
|
4218
|
-
className: "univer-mb-2 univer-flex univer-items-center univer-gap-4
|
|
4218
|
+
className: "univer-mb-2 univer-flex univer-items-center univer-gap-4",
|
|
4219
4219
|
children: [/* @__PURE__ */ jsx(Input, {
|
|
4220
4220
|
className: clsx("univer-w-full", { "univer-border-primary-600": focusIndex === index }),
|
|
4221
4221
|
placeholder: localeService.t("sheets-formula-ui.rangeSelector.placeHolder"),
|
|
@@ -4314,6 +4314,7 @@ function RangeSelector(props) {
|
|
|
4314
4314
|
return /* @__PURE__ */ jsxs(Fragment, { children: [!hideEditor ? /* @__PURE__ */ jsx(RichTextEditor, {
|
|
4315
4315
|
isSingle: true,
|
|
4316
4316
|
...props,
|
|
4317
|
+
className: clsx(props.className, "rtl:[&>div]:univer-flex-row-reverse"),
|
|
4317
4318
|
preserveHostFocus: true,
|
|
4318
4319
|
onFocusChange: (focusing, newValue) => {
|
|
4319
4320
|
setFocusing(focusing);
|
|
@@ -4329,7 +4330,7 @@ function RangeSelector(props) {
|
|
|
4329
4330
|
title: localeService.t("sheets-formula-ui.rangeSelector.buttonTooltip"),
|
|
4330
4331
|
placement: "bottom",
|
|
4331
4332
|
children: /* @__PURE__ */ jsx(SelectRangeIcon, {
|
|
4332
|
-
className: "univer-cursor-pointer dark:!univer-text-gray-300",
|
|
4333
|
+
className: "-univer-translate-y-0.5 univer-cursor-pointer dark:!univer-text-gray-300",
|
|
4333
4334
|
onClick: handleOpenModal
|
|
4334
4335
|
})
|
|
4335
4336
|
})
|
|
@@ -4984,7 +4985,7 @@ let FormulaEditorShowController = class FormulaEditorShowController extends Disp
|
|
|
4984
4985
|
style: {
|
|
4985
4986
|
strokeWidth: 1,
|
|
4986
4987
|
stroke: this._themeService.getColorFromTheme("primary.600"),
|
|
4987
|
-
fill: new ColorKit(this._themeService.getColorFromTheme("
|
|
4988
|
+
fill: new ColorKit(this._themeService.getColorFromTheme("gray.0")).setAlpha(0).toString(),
|
|
4988
4989
|
widgets: {}
|
|
4989
4990
|
}
|
|
4990
4991
|
}, skeleton);
|
package/lib/es/locale/ru-RU.js
CHANGED
package/lib/index.css
CHANGED
|
@@ -161,6 +161,12 @@
|
|
|
161
161
|
flex: 1;
|
|
162
162
|
}
|
|
163
163
|
|
|
164
|
+
.-univer-translate-y-0\.5 {
|
|
165
|
+
--univer-tw-translate-y: -.125rem;
|
|
166
|
+
transform: translate(var(--univer-tw-translate-x), -.125rem) rotate(var(--univer-tw-rotate)) skewX(var(--univer-tw-skew-x)) skewY(var(--univer-tw-skew-y)) scaleX(var(--univer-tw-scale-x)) scaleY(var(--univer-tw-scale-y));
|
|
167
|
+
transform: translate(var(--univer-tw-translate-x), var(--univer-tw-translate-y)) rotate(var(--univer-tw-rotate)) skewX(var(--univer-tw-skew-x)) skewY(var(--univer-tw-skew-y)) scaleX(var(--univer-tw-scale-x)) scaleY(var(--univer-tw-scale-y));
|
|
168
|
+
}
|
|
169
|
+
|
|
164
170
|
.-univer-translate-y-1\/2 {
|
|
165
171
|
--univer-tw-translate-y: -50%;
|
|
166
172
|
transform: translate(var(--univer-tw-translate-x), -50%) rotate(var(--univer-tw-rotate)) skewX(var(--univer-tw-skew-x)) skewY(var(--univer-tw-skew-y)) scaleX(var(--univer-tw-scale-x)) scaleY(var(--univer-tw-scale-y));
|
|
@@ -290,6 +296,10 @@
|
|
|
290
296
|
background-color: var(--univer-gray-600) !important;
|
|
291
297
|
}
|
|
292
298
|
|
|
299
|
+
.univer-bg-gray-0 {
|
|
300
|
+
background-color: var(--univer-gray-0);
|
|
301
|
+
}
|
|
302
|
+
|
|
293
303
|
.univer-bg-gray-100 {
|
|
294
304
|
background-color: var(--univer-gray-100);
|
|
295
305
|
}
|
|
@@ -314,10 +324,6 @@
|
|
|
314
324
|
background-color: #0000;
|
|
315
325
|
}
|
|
316
326
|
|
|
317
|
-
.univer-bg-white {
|
|
318
|
-
background-color: var(--univer-white);
|
|
319
|
-
}
|
|
320
|
-
|
|
321
327
|
.univer-p-0 {
|
|
322
328
|
padding: 0;
|
|
323
329
|
}
|
|
@@ -430,6 +436,10 @@
|
|
|
430
436
|
line-height: 13px;
|
|
431
437
|
}
|
|
432
438
|
|
|
439
|
+
.univer-text-gray-0 {
|
|
440
|
+
color: var(--univer-gray-0);
|
|
441
|
+
}
|
|
442
|
+
|
|
433
443
|
.univer-text-gray-400 {
|
|
434
444
|
color: var(--univer-gray-400);
|
|
435
445
|
}
|
|
@@ -458,10 +468,6 @@
|
|
|
458
468
|
color: var(--univer-red-500);
|
|
459
469
|
}
|
|
460
470
|
|
|
461
|
-
.univer-text-white {
|
|
462
|
-
color: var(--univer-white);
|
|
463
|
-
}
|
|
464
|
-
|
|
465
471
|
.univer-shadow-md {
|
|
466
472
|
--univer-tw-shadow: 0px 1px 6px -2px #1e284d14, 0px 2px 6px -1px #1e284d1a;
|
|
467
473
|
--univer-tw-shadow-colored: 0px 1px 6px -2px var(--univer-tw-shadow-color), 0px 2px 6px -1px var(--univer-tw-shadow-color);
|
|
@@ -503,10 +509,6 @@
|
|
|
503
509
|
background-color: var(--univer-gray-300);
|
|
504
510
|
}
|
|
505
511
|
|
|
506
|
-
.rtl\:univer-flex-row-reverse:where([dir="rtl"], [dir="rtl"] *) {
|
|
507
|
-
flex-direction: row-reverse;
|
|
508
|
-
}
|
|
509
|
-
|
|
510
512
|
.dark\:\!univer-bg-gray-600:where(.univer-dark, .univer-dark *) {
|
|
511
513
|
background-color: var(--univer-gray-600) !important;
|
|
512
514
|
}
|
|
@@ -527,6 +529,10 @@
|
|
|
527
529
|
background-color: var(--univer-primary-900) !important;
|
|
528
530
|
}
|
|
529
531
|
|
|
532
|
+
.dark\:\!univer-text-gray-0:where(.univer-dark, .univer-dark *) {
|
|
533
|
+
color: var(--univer-gray-0) !important;
|
|
534
|
+
}
|
|
535
|
+
|
|
530
536
|
.dark\:\!univer-text-gray-200:where(.univer-dark, .univer-dark *) {
|
|
531
537
|
color: var(--univer-gray-200) !important;
|
|
532
538
|
}
|
|
@@ -539,10 +545,10 @@
|
|
|
539
545
|
color: var(--univer-primary-200) !important;
|
|
540
546
|
}
|
|
541
547
|
|
|
542
|
-
.dark\:\!univer-text-white:where(.univer-dark, .univer-dark *) {
|
|
543
|
-
color: var(--univer-white) !important;
|
|
544
|
-
}
|
|
545
|
-
|
|
546
548
|
.dark\:hover\:\!univer-bg-gray-600:hover:where(.univer-dark, .univer-dark *) {
|
|
547
549
|
background-color: var(--univer-gray-600) !important;
|
|
548
550
|
}
|
|
551
|
+
|
|
552
|
+
.rtl\:\[\&\>div\]\:univer-flex-row-reverse > div:where([dir="rtl"], [dir="rtl"] *) {
|
|
553
|
+
flex-direction: row-reverse;
|
|
554
|
+
}
|
package/lib/index.js
CHANGED
|
@@ -716,7 +716,7 @@ function genFormulaRefSelectionStyle(themeService, refColor, id) {
|
|
|
716
716
|
},
|
|
717
717
|
widgetSize: 6,
|
|
718
718
|
widgetStrokeWidth: 1,
|
|
719
|
-
widgetStroke: themeService.getColorFromTheme("
|
|
719
|
+
widgetStroke: themeService.getColorFromTheme("gray.0")
|
|
720
720
|
};
|
|
721
721
|
}
|
|
722
722
|
|
|
@@ -993,7 +993,7 @@ const menuSchema = {
|
|
|
993
993
|
//#endregion
|
|
994
994
|
//#region package.json
|
|
995
995
|
var name = "@univerjs/sheets-formula-ui";
|
|
996
|
-
var version = "1.0.0-beta.
|
|
996
|
+
var version = "1.0.0-beta.2";
|
|
997
997
|
|
|
998
998
|
//#endregion
|
|
999
999
|
//#region src/config/config.ts
|
|
@@ -1374,7 +1374,7 @@ const useFormulaDescribe = (isNeed, formulaText, editor) => {
|
|
|
1374
1374
|
*/
|
|
1375
1375
|
const HelpHiddenTip = ({ onClick }) => {
|
|
1376
1376
|
return /* @__PURE__ */ jsx("div", {
|
|
1377
|
-
className: "univer-z-[15] univer-box-border univer-h-[18px] univer-cursor-pointer univer-overflow-visible univer-whitespace-nowrap univer-rounded-l univer-border univer-border-r-0 univer-border-gray-600 univer-bg-primary-600 univer-p-0.5 univer-text-xs univer-font-bold univer-leading-[13px] univer-text-
|
|
1377
|
+
className: "univer-z-[15] univer-box-border univer-h-[18px] univer-cursor-pointer univer-overflow-visible univer-whitespace-nowrap univer-rounded-l univer-border univer-border-r-0 univer-border-gray-600 univer-bg-primary-600 univer-p-0.5 univer-text-xs univer-font-bold univer-leading-[13px] univer-text-gray-0",
|
|
1378
1378
|
onClick,
|
|
1379
1379
|
children: "?"
|
|
1380
1380
|
});
|
|
@@ -1386,7 +1386,7 @@ function Params({ className, title, value }) {
|
|
|
1386
1386
|
return /* @__PURE__ */ jsxs("div", {
|
|
1387
1387
|
className: "univer-my-2",
|
|
1388
1388
|
children: [/* @__PURE__ */ jsx("div", {
|
|
1389
|
-
className: clsx("univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
1389
|
+
className: clsx("univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0", className),
|
|
1390
1390
|
children: title
|
|
1391
1391
|
}), /* @__PURE__ */ jsx("div", {
|
|
1392
1392
|
className: "univer-whitespace-pre-wrap univer-break-words univer-text-xs univer-text-gray-500",
|
|
@@ -1437,9 +1437,9 @@ function HelpFunction(props) {
|
|
|
1437
1437
|
anchorRect$: position$,
|
|
1438
1438
|
direction: "vertical",
|
|
1439
1439
|
children: /* @__PURE__ */ jsxs("div", {
|
|
1440
|
-
className: clsx("univer-m-0 univer-box-border univer-w-[250px] univer-select-none univer-list-none univer-rounded-lg univer-bg-
|
|
1440
|
+
className: clsx("univer-m-0 univer-box-border univer-w-[250px] univer-select-none univer-list-none univer-rounded-lg univer-bg-gray-0 univer-leading-5 univer-shadow-md univer-outline-none dark:!univer-bg-gray-900", borderClassName),
|
|
1441
1441
|
children: [/* @__PURE__ */ jsxs("div", {
|
|
1442
|
-
className: clsx("univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4 univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
1442
|
+
className: clsx("univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4 univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0", borderTopClassName),
|
|
1443
1443
|
style: { overflowWrap: "anywhere" },
|
|
1444
1444
|
children: [/* @__PURE__ */ jsx(Help, {
|
|
1445
1445
|
prefix: functionInfo.functionName,
|
|
@@ -1880,7 +1880,7 @@ function getDefaultRefSelectionStyle(themeService) {
|
|
|
1880
1880
|
//#region src/views/formula-editor/hooks/use-formula-selection.ts
|
|
1881
1881
|
function resolveFormulaSelectionDataStream(accssor, editor, editorId) {
|
|
1882
1882
|
var _editor$getDocumentDa, _documentModel$getBod;
|
|
1883
|
-
const editorDataStream = editor === null || editor === void 0 || (_editor$getDocumentDa = editor.
|
|
1883
|
+
const editorDataStream = editor === null || editor === void 0 || (_editor$getDocumentDa = editor.getDocumentDataModel()) === null || _editor$getDocumentDa === void 0 || (_editor$getDocumentDa = _editor$getDocumentDa.getBody()) === null || _editor$getDocumentDa === void 0 ? void 0 : _editor$getDocumentDa.dataStream;
|
|
1884
1884
|
if (editorDataStream != null) return {
|
|
1885
1885
|
dataStream: editorDataStream,
|
|
1886
1886
|
offset: 0
|
|
@@ -2280,7 +2280,7 @@ function useColor() {
|
|
|
2280
2280
|
].map((color) => themeService.isValidThemeColor(color) ? themeService.getColorFromTheme(color) : color),
|
|
2281
2281
|
numberColor: themeService.getColorFromTheme("blue.700"),
|
|
2282
2282
|
stringColor: themeService.getColorFromTheme("jiqing.800"),
|
|
2283
|
-
plainTextColor: themeService.getColorFromTheme("
|
|
2283
|
+
plainTextColor: themeService.getColorFromTheme("gray.1000")
|
|
2284
2284
|
};
|
|
2285
2285
|
}, [themeService.getCurrentTheme()]);
|
|
2286
2286
|
}
|
|
@@ -3261,9 +3261,9 @@ function SearchFunctionFactory(props, ref) {
|
|
|
3261
3261
|
if (ref) ref.current = v;
|
|
3262
3262
|
},
|
|
3263
3263
|
"data-u-comp": "sheets-formula-editor",
|
|
3264
|
-
className: clsx("univer-m-0 univer-box-border univer-max-h-[400px] univer-w-[250px] univer-list-none univer-overflow-y-auto univer-rounded-lg univer-bg-
|
|
3264
|
+
className: clsx("univer-m-0 univer-box-border univer-max-h-[400px] univer-w-[250px] univer-list-none univer-overflow-y-auto univer-rounded-lg univer-bg-gray-0 univer-p-2 univer-leading-5 univer-shadow-md univer-outline-none dark:!univer-bg-gray-900", borderClassName, scrollbarClassName),
|
|
3265
3265
|
children: searchList.map((item, index) => /* @__PURE__ */ jsxs("li", {
|
|
3266
|
-
className: clsx("univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1 univer-text-gray-900 univer-transition-colors dark:!univer-text-
|
|
3266
|
+
className: clsx("univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1 univer-text-gray-900 univer-transition-colors dark:!univer-text-gray-0", { "univer-bg-gray-200 dark:!univer-bg-gray-600": active === index }),
|
|
3267
3267
|
onMouseEnter: () => handleLiMouseEnter(index),
|
|
3268
3268
|
onMouseLeave: handleLiMouseLeave,
|
|
3269
3269
|
onMouseMove: debounceResetMouseState,
|
|
@@ -3687,7 +3687,7 @@ function FunctionParams(props) {
|
|
|
3687
3687
|
className: clsx("univer-mb-2 univer-font-medium univer-text-gray-500 dark:!univer-text-gray-300", className),
|
|
3688
3688
|
children: title
|
|
3689
3689
|
}), /* @__PURE__ */ jsx("div", {
|
|
3690
|
-
className: "univer-break-all univer-text-gray-900 dark:!univer-text-
|
|
3690
|
+
className: "univer-break-all univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3691
3691
|
children: value
|
|
3692
3692
|
})]
|
|
3693
3693
|
});
|
|
@@ -3840,7 +3840,7 @@ function SelectFunction(props) {
|
|
|
3840
3840
|
onKeyDown: handleSelectListKeyDown,
|
|
3841
3841
|
tabIndex: -1,
|
|
3842
3842
|
children: selectList.map(({ name }, index) => /* @__PURE__ */ jsxs("li", {
|
|
3843
|
-
className: clsx("univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1 univer-text-sm univer-text-gray-900 univer-transition-colors dark:!univer-text-
|
|
3843
|
+
className: clsx("univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1 univer-text-sm univer-text-gray-900 univer-transition-colors dark:!univer-text-gray-0", { "univer-bg-gray-200 dark:!univer-bg-gray-600": active === index }),
|
|
3844
3844
|
onMouseEnter: () => handleLiMouseEnter(index),
|
|
3845
3845
|
onMouseLeave: handleLiMouseLeave,
|
|
3846
3846
|
onClick: () => setCurrentFunctionInfo(index),
|
|
@@ -3857,7 +3857,7 @@ function SelectFunction(props) {
|
|
|
3857
3857
|
/* @__PURE__ */ jsxs("div", {
|
|
3858
3858
|
className: "univer-rounded-lg univer-bg-gray-50 univer-p-3 dark:!univer-bg-gray-800",
|
|
3859
3859
|
children: [/* @__PURE__ */ jsx("div", {
|
|
3860
|
-
className: "univer-text-sm univer-font-semibold univer-text-gray-900 dark:!univer-text-
|
|
3860
|
+
className: "univer-text-sm univer-font-semibold univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3861
3861
|
children: functionInfo.functionName
|
|
3862
3862
|
}), /* @__PURE__ */ jsx("div", {
|
|
3863
3863
|
className: "univer-mt-1 univer-text-xs univer-leading-5 univer-text-gray-600 dark:!univer-text-gray-300",
|
|
@@ -3871,7 +3871,7 @@ function SelectFunction(props) {
|
|
|
3871
3871
|
children: localeService.t("sheets-formula-ui.moreFunctions.syntax")
|
|
3872
3872
|
}), /* @__PURE__ */ jsx("div", {
|
|
3873
3873
|
"data-u-comp": "formula-function-syntax",
|
|
3874
|
-
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-
|
|
3874
|
+
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-gray-0", borderClassName),
|
|
3875
3875
|
children: /* @__PURE__ */ jsx(FunctionHelp, {
|
|
3876
3876
|
prefix: functionInfo.functionName,
|
|
3877
3877
|
value: functionInfo.functionParameter
|
|
@@ -3881,7 +3881,7 @@ function SelectFunction(props) {
|
|
|
3881
3881
|
children: localeService.t("sheets-formula-ui.prompt.helpExample")
|
|
3882
3882
|
}), /* @__PURE__ */ jsx("div", {
|
|
3883
3883
|
"data-u-comp": "formula-function-example",
|
|
3884
|
-
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-
|
|
3884
|
+
className: clsx("univer-mt-1.5 univer-break-words univer-rounded-md univer-bg-gray-50 univer-px-3 univer-py-2 univer-font-mono univer-text-xs univer-leading-5 univer-text-gray-900 dark:!univer-bg-gray-800 dark:!univer-text-gray-0", borderClassName),
|
|
3885
3885
|
children: `${functionInfo.functionName}(${functionInfo.functionParameter.map((item) => item.example).join(",")})`
|
|
3886
3886
|
})] })]
|
|
3887
3887
|
}),
|
|
@@ -3893,7 +3893,7 @@ function SelectFunction(props) {
|
|
|
3893
3893
|
children: [/* @__PURE__ */ jsxs("div", {
|
|
3894
3894
|
className: "univer-flex univer-items-center univer-gap-2",
|
|
3895
3895
|
children: [/* @__PURE__ */ jsx("span", {
|
|
3896
|
-
className: "univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-
|
|
3896
|
+
className: "univer-text-xs univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0",
|
|
3897
3897
|
children: item.name
|
|
3898
3898
|
}), /* @__PURE__ */ jsx("span", {
|
|
3899
3899
|
className: clsx("univer-rounded-full univer-px-2 univer-py-0.5 univer-text-xs univer-leading-4", item.require ? "univer-bg-primary-50 univer-text-primary-600 dark:!univer-bg-primary-900 dark:!univer-text-primary-200" : "univer-bg-gray-100 univer-text-gray-600 dark:!univer-bg-gray-700 dark:!univer-text-gray-200"),
|
|
@@ -4192,7 +4192,7 @@ function RangeSelectorDialog(props) {
|
|
|
4192
4192
|
mask: false,
|
|
4193
4193
|
maskClosable: false,
|
|
4194
4194
|
footer: /* @__PURE__ */ jsxs("footer", {
|
|
4195
|
-
className: "univer-flex univer-gap-2
|
|
4195
|
+
className: "univer-flex univer-gap-2",
|
|
4196
4196
|
children: [/* @__PURE__ */ jsx(Button, {
|
|
4197
4197
|
onClick: onClose,
|
|
4198
4198
|
children: localeService.t("sheets-formula-ui.rangeSelector.cancel")
|
|
@@ -4215,7 +4215,7 @@ function RangeSelectorDialog(props) {
|
|
|
4215
4215
|
ref: scrollbarRef,
|
|
4216
4216
|
className: clsx("-univer-mx-6 univer-max-h-60 univer-overflow-y-auto univer-px-6", scrollbarClassName),
|
|
4217
4217
|
children: [ranges.map((text, index) => /* @__PURE__ */ jsxs("div", {
|
|
4218
|
-
className: "univer-mb-2 univer-flex univer-items-center univer-gap-4
|
|
4218
|
+
className: "univer-mb-2 univer-flex univer-items-center univer-gap-4",
|
|
4219
4219
|
children: [/* @__PURE__ */ jsx(Input, {
|
|
4220
4220
|
className: clsx("univer-w-full", { "univer-border-primary-600": focusIndex === index }),
|
|
4221
4221
|
placeholder: localeService.t("sheets-formula-ui.rangeSelector.placeHolder"),
|
|
@@ -4314,6 +4314,7 @@ function RangeSelector(props) {
|
|
|
4314
4314
|
return /* @__PURE__ */ jsxs(Fragment, { children: [!hideEditor ? /* @__PURE__ */ jsx(RichTextEditor, {
|
|
4315
4315
|
isSingle: true,
|
|
4316
4316
|
...props,
|
|
4317
|
+
className: clsx(props.className, "rtl:[&>div]:univer-flex-row-reverse"),
|
|
4317
4318
|
preserveHostFocus: true,
|
|
4318
4319
|
onFocusChange: (focusing, newValue) => {
|
|
4319
4320
|
setFocusing(focusing);
|
|
@@ -4329,7 +4330,7 @@ function RangeSelector(props) {
|
|
|
4329
4330
|
title: localeService.t("sheets-formula-ui.rangeSelector.buttonTooltip"),
|
|
4330
4331
|
placement: "bottom",
|
|
4331
4332
|
children: /* @__PURE__ */ jsx(SelectRangeIcon, {
|
|
4332
|
-
className: "univer-cursor-pointer dark:!univer-text-gray-300",
|
|
4333
|
+
className: "-univer-translate-y-0.5 univer-cursor-pointer dark:!univer-text-gray-300",
|
|
4333
4334
|
onClick: handleOpenModal
|
|
4334
4335
|
})
|
|
4335
4336
|
})
|
|
@@ -4984,7 +4985,7 @@ let FormulaEditorShowController = class FormulaEditorShowController extends Disp
|
|
|
4984
4985
|
style: {
|
|
4985
4986
|
strokeWidth: 1,
|
|
4986
4987
|
stroke: this._themeService.getColorFromTheme("primary.600"),
|
|
4987
|
-
fill: new ColorKit(this._themeService.getColorFromTheme("
|
|
4988
|
+
fill: new ColorKit(this._themeService.getColorFromTheme("gray.0")).setAlpha(0).toString(),
|
|
4988
4989
|
widgets: {}
|
|
4989
4990
|
}
|
|
4990
4991
|
}, skeleton);
|