@univerjs/sheets-conditional-formatting-ui 0.4.0-alpha.1 → 0.4.0-experimental.20241017-da434a2

package/lib/es/index.js

@@ -9,10 +9,11 @@ import { useObservable, ComponentManager, ILayoutService, useScrollYOverContaine
 import require$$0, { forwardRef, useRef, createElement, useMemo, useState, useEffect } from "react";
 import { Select, Tooltip, Dropdown, ColorPicker as ColorPicker$1, InputNumber, RadioGroup, Radio, Checkbox, Input, Button } from "@univerjs/design";
 import { useHighlightRange, SheetSkeletonManagerService, ISheetClipboardService, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, virtualizeDiscreteRanges, getRepeatRange, SheetPermissionInterceptorBaseController, IAutoFillService, APPLY_TYPE, getAutoFillRepeatRange, IEditorBridgeService, getCurrentRangeDisable$, IFormatPainterService, FormatPainterStatus } from "@univerjs/sheets-ui";
-import { serializeRange } from "@univerjs/engine-formula";
+import { serializeRange, deserializeRangeWithSheet } from "@univerjs/engine-formula";
 import require$$2$1 from "react-dom";
 import { Observable, debounceTime, merge } from "rxjs";
-import { TextEditor, RangeSelector } from "@univerjs/docs-ui";
+import { RangeSelector } from "@univerjs/sheets-formula-ui";
+import { TextEditor } from "@univerjs/docs-ui";
 import { IRenderManagerService } from "@univerjs/engine-render";
 import { bufferTime, filter, debounceTime as debounceTime$1 } from "rxjs/operators";
 const AddAverageCfCommand = {
@@ -6068,7 +6069,10 @@ const cfStyleEdit = "univer-cf-style-edit", buttonItem = "univer-button-item", i
   return (_a15 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : _a15.getSheetId();
 }, "getSubUnitId"), RuleEdit = /* @__PURE__ */ __name((props) => {
   var _a15, _b, _c;
-  const localeService = useDependency(LocaleService), commandService = useDependency(ICommandService), univerInstanceService = useDependency(IUniverInstanceService), conditionalFormattingRuleModel = useDependency(ConditionalFormattingRuleModel), selectionManagerService = useDependency(SheetsSelectionsService), unitId = getUnitId(univerInstanceService), subUnitId = getSubUnitId(univerInstanceService), rangeResult = useRef((_b = (_a15 = props.rule) == null ? void 0 : _a15.ranges) != null ? _b : []), rangeString = useMemo(() => {
+  const localeService = useDependency(LocaleService), commandService = useDependency(ICommandService), univerInstanceService = useDependency(IUniverInstanceService), conditionalFormattingRuleModel = useDependency(ConditionalFormattingRuleModel), selectionManagerService = useDependency(SheetsSelectionsService), unitId = getUnitId(univerInstanceService), subUnitId = getSubUnitId(univerInstanceService), [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(() => {
+    const { rule } = props;
+    return (rule == null ? void 0 : rule.rule.type) === CFRuleType.highlightCell ? rule.rule.subType !== CFSubRuleType.formula : !0;
+  }), rangeSelectorActionsRef = useRef({}), [errorText2, errorTextSet] = useState(void 0), rangeResult = useRef((_b = (_a15 = props.rule) == null ? void 0 : _a15.ranges) != null ? _b : []), rangeString = useMemo(() => {
     var _a16, _b2, _c2;
     let ranges = (_a16 = props.rule) == null ? void 0 : _a16.ranges;
     return ranges != null && ranges.length || (ranges = (_c2 = (_b2 = selectionManagerService.getCurrentSelections()) == null ? void 0 : _b2.map((s) => s.range)) != null ? _c2 : []), rangeResult.current = ranges, ranges != null && ranges.length ? ranges.map((range) => {
@@ -6142,9 +6146,12 @@ const cfStyleEdit = "univer-cf-style-edit", buttonItem = "univer-button-item", i
   }, []);
   const onStyleChange = /* @__PURE__ */ __name((config) => {
     result.current = config;
-  }, "onStyleChange"), onRangeSelectorChange = /* @__PURE__ */ __name((ranges) => {
-    rangeResult.current = ranges.map((r2) => r2.range);
+  }, "onStyleChange"), onRangeSelectorChange = /* @__PURE__ */ __name((rangeString2) => {
+    const result2 = rangeString2.split(",").map(deserializeRangeWithSheet).map((item2) => item2.range);
+    rangeResult.current = result2;
   }, "onRangeSelectorChange"), handleSubmit = /* @__PURE__ */ __name(() => {
+    if (errorText2)
+      return;
     const ranges = (/* @__PURE__ */ __name(() => {
       const worksheet = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getActiveSheet();
       if (!worksheet)
@@ -6163,19 +6170,26 @@ const cfStyleEdit = "univer-cf-style-edit", buttonItem = "univer-button-item", i
     }
   }, "handleSubmit"), handleCancel = /* @__PURE__ */ __name(() => {
     props.onCancel();
-  }, "handleCancel");
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.cfRuleStyleEditor, children: [
+  }, "handleCancel"), handleVerify = /* @__PURE__ */ __name((v, rangeText) => {
+    v ? rangeText.length < 1 ? errorTextSet(localeService.t("sheet.cf.errorMessage.rangeError")) : errorTextSet(void 0) : errorTextSet(localeService.t("sheet.cf.errorMessage.rangeError"));
+  }, "handleVerify"), handlePanelClick = /* @__PURE__ */ __name((e2) => {
+    var _a16;
+    const handleOutClick = (_a16 = rangeSelectorActionsRef.current) == null ? void 0 : _a16.handleOutClick;
+    handleOutClick && handleOutClick(e2, isFocusRangeSelectorSet);
+  }, "handlePanelClick");
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.cfRuleStyleEditor, onClick: handlePanelClick, children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$5.title, children: localeService.t("sheet.cf.panel.range") }),
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: `${styles$5.mTBase}`, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       RangeSelector,
       {
-        placeholder: localeService.t("sheet.cf.form.rangeSelector"),
-        width: "100%",
-        openForSheetSubUnitId: subUnitId,
-        openForSheetUnitId: unitId,
-        value: rangeString,
-        id: createInternalEditorID(`${SHEET_CONDITIONAL_FORMATTING_PLUGIN}_rangeSelector`),
-        onChange: onRangeSelectorChange
+        unitId,
+        errorText: errorText2,
+        subUnitId,
+        initValue: rangeString,
+        onChange: onRangeSelectorChange,
+        onVerify: handleVerify,
+        isFocus: isFocusRangeSelector,
+        actions: rangeSelectorActionsRef.current
       }
     ) }),
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$5.title, children: localeService.t("sheet.cf.panel.styleType") }),
@@ -6212,10 +6226,15 @@ let ConditionalFormattingPanelController = (_a3 = class extends Disposable {
         var _a15;
         sheet || (_a15 = this._sidebarDisposable) == null || _a15.dispose();
       })
-    );
+    ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((info) => {
+      info.id === CF_PANEL_KEY && (info.visible || setTimeout(() => {
+        this._sidebarService.sidebarOptions$.next({ visible: !1 });
+      }));
+    }));
   }
   openPanel(rule) {
     const props = {
+      id: CF_PANEL_KEY,
       header: { title: this._localeService.t("sheet.cf.title") },
       children: {
         label: CF_PANEL_KEY,

package/lib/locale/en-US.json

@@ -151,7 +151,8 @@
       },
       "errorMessage": {
         "notBlank": "Condition can not be empty",
-        "formulaError": "Wrong formula"
+        "formulaError": "Wrong formula",
+        "rangeError": "Bad selection"
       }
     }
   }

package/lib/locale/fa-IR.json

@@ -151,7 +151,8 @@
       },
       "errorMessage": {
         "notBlank": "شرط نمی‌تواند خالی باشد",
-        "formulaError": "فرمول اشتباه"
+        "formulaError": "فرمول اشتباه",
+        "rangeError": "Bad selection"
       }
     }
   }

package/lib/locale/ru-RU.json

@@ -151,7 +151,8 @@
       },
       "errorMessage": {
         "notBlank": "Условие не может быть пустым",
-        "formulaError": "Ошибка формулы"
+        "formulaError": "Ошибка формулы",
+        "rangeError": "Bad selection"
       }
     }
   }

package/lib/locale/vi-VN.json

@@ -151,7 +151,8 @@
       },
       "errorMessage": {
         "notBlank": "Điều kiện không được để trống",
-        "formulaError": "Lỗi công thức"
+        "formulaError": "Lỗi công thức",
+        "rangeError": "Bad selection"
       }
     }
   }

package/lib/locale/zh-CN.json

@@ -151,6 +151,7 @@
       },
       "errorMessage": {
         "notBlank": "条件不能为空",
+        "rangeError": "选区错误",
         "formulaError": "公式错误"
       }
     }

package/lib/locale/zh-TW.json

@@ -151,6 +151,7 @@
       },
       "errorMessage": {
         "notBlank": "條件不能為空",
+        "rangeError": "選區錯誤",
         "formulaError": "公式錯誤"
       }
     }

package/lib/types/components/panel/rule-edit/index.d.ts

@@ -1,5 +1,5 @@
-import { default as React } from 'react';
 import { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
+import { default as React } from 'react';
 interface IRuleEditProps {
     rule?: IConditionFormattingRule;
     onCancel: () => void;

package/lib/types/locale/zh-CN.d.ts

@@ -166,6 +166,7 @@ declare const locale: {
             };
             errorMessage: {
                 notBlank: string;
+                rangeError: string;
                 formulaError: string;
             };
         };