@univerjs/sheets-data-validation-ui 0.4.1 → 0.4.2-nightly.202410291606

package/lib/es/index.js

@@ -5,14 +5,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "sym
 import React, { useState, forwardRef, useRef, createElement, useMemo, useEffect } from "react";
 import { Inject, LocaleService, Disposable, DataValidationErrorStyle, useDependency, ICommandService, numfmt, CellValueType, UniverInstanceType, toDisposable, IUniverInstanceService, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, CommandType, BuildTextUtils, DataValidationRenderMode, DataValidationType, IConfigService, UndoCommand, RedoCommand, isUnitRangesEqual, debounce, shallowEqual, Injector, DataValidationStatus, ObjectMatrix, Range, Rectangle, queryObjectMatrix, Optional, RxDisposable, InterceptorEffectEnum, sequenceExecute, bufferDebounceTime, createInternalEditorID, isFormulaString, Tools, ThemeService, VerticalAlign, HorizontalAlign, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, DEFAULT_EMPTY_DOCUMENT_VALUE, BooleanNumber, Plugin } from "@univerjs/core";
 import { Button, DatePanel, RectPopup, Scrollbar, FormLayout, RadioGroup, Radio, Checkbox, Input, Select, DraggableList } from "@univerjs/design";
+import { DeviceInputEventType, IRenderManagerService, fixLineWidthByScale, Transform, Checkbox as Checkbox$1, FontCache, Shape, Rect, getFontStyleString, getDocsSkeletonPageSize, DocumentViewModel, DocumentSkeleton, Documents } from "@univerjs/engine-render";
 import { SetRangeValuesCommand, SheetsSelectionsService, getSheetCommandTarget, WorkbookEditablePermission, RangeProtectionPermissionEditPoint, WorksheetEditPermission, checkRangesEditablePermission, WorksheetSetCellStylePermission, SheetInterceptorService, INTERCEPTOR_POINT, InterceptCellContentPriority } from "@univerjs/sheets";
-import { SheetDataValidationModel, getCellValueOrigin, getDataValidationCellValue, deserializeListOptions, serializeListOptions, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, createDefaultNewRule, AddSheetDataValidationCommand, RemoveSheetAllDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, getDataValidationDiffMutations, DataValidationCacheService, DataValidationFormulaController, DataValidationFormulaService, getFormulaResult, transformCheckboxValue, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2 } from "@univerjs/sheets-data-validation";
+import { SheetDataValidationModel, getCellValueOrigin, getDataValidationCellValue, deserializeListOptions, serializeListOptions, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, createDefaultNewRule, AddSheetDataValidationCommand, RemoveSheetAllDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, getDataValidationDiffMutations, DataValidationCacheService, DataValidationFormulaController, DataValidationFormulaService, getFormulaResult, isLegalFormulaResult, transformCheckboxValue, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2 } from "@univerjs/sheets-data-validation";
 import { getPatternType } from "@univerjs/sheets-numfmt";
+import { IEditorBridgeService, SetCellEditVisibleOperation, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController, IMarkSelectionService, HoverManagerService, CellAlertManagerService, CellAlertType, IAutoFillService, APPLY_TYPE, virtualizeDiscreteRanges, getAutoFillRepeatRange, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, getCurrentRangeDisable$, AutoHeightController, SheetSkeletonManagerService } from "@univerjs/sheets-ui";
+import { IDialogService, KeyCode, ISidebarService, useObservable, ComponentManager, IZenZoneService, useEvent, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
 import { DataValidatorRegistryService, DataValidationModel, DataValidatorRegistryScope, TWO_FORMULA_OPERATOR_COUNT, getRuleOptions, getRuleSetting } from "@univerjs/data-validation";
-import { IEditorBridgeService, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController, IMarkSelectionService, HoverManagerService, CellAlertManagerService, CellAlertType, IAutoFillService, APPLY_TYPE, virtualizeDiscreteRanges, getAutoFillRepeatRange, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, getCurrentRangeDisable$, AutoHeightController, SheetSkeletonManagerService } from "@univerjs/sheets-ui";
-import { IDialogService, ISidebarService, useObservable, ComponentManager, IZenZoneService, KeyCode, useEvent, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
 import { RichTextEditingMutation } from "@univerjs/docs";
-import { IRenderManagerService, DeviceInputEventType, fixLineWidthByScale, Transform, Checkbox as Checkbox$1, FontCache, Shape, Rect, getFontStyleString, getDocsSkeletonPageSize, DocumentViewModel, DocumentSkeleton, Documents } from "@univerjs/engine-render";
 import { filter, BehaviorSubject, distinctUntilChanged, Subject, debounceTime, bufferTime } from "rxjs";
 import { deserializeRangeWithSheet, serializeRange } from "@univerjs/engine-formula";
 import { RangeSelector } from "@univerjs/sheets-formula-ui";
@@ -529,7 +529,12 @@ function DateDropdown(props) {
       workbook,
       interceptValue: dateStr.replace("Z", "").replace("T", " "),
       t: CellValueType.NUMBER
-    }, rule) ? (commandService.executeCommand(SetRangeValuesCommand.id, {
+    }, rule) ? (hideFn(), await commandService.executeCommand(SetCellEditVisibleOperation.id, {
+      visible: !1,
+      eventType: DeviceInputEventType.Keyboard,
+      unitId,
+      keycode: KeyCode.ESC
+    }), await commandService.executeCommand(SetRangeValuesCommand.id, {
       unitId,
       subUnitId,
       range: {
@@ -550,7 +555,7 @@ function DateDropdown(props) {
           }
         }
       }
-    }), hideFn()) : rejectInputController.showReject(validator.getRuleFinalError(rule));
+    })) : rejectInputController.showReject(validator.getRuleFinalError(rule));
   }, "handleSave");
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$6.dvDateDropdown, children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -1006,7 +1011,7 @@ function ListDropDown(props) {
       title: multiple ? localeService.t("dataValidation.listMultiple.dropdown") : localeService.t("dataValidation.list.dropdown"),
       value,
       multiple,
-      onChange: /* @__PURE__ */ __name((newValue) => {
+      onChange: /* @__PURE__ */ __name(async (newValue) => {
         const str = serializeListOptions(newValue), params = {
           unitId,
           subUnitId,
@@ -1028,7 +1033,12 @@ function ListDropDown(props) {
           keycode: KeyCode.ESC,
           eventType: DeviceInputEventType.Keyboard,
           unitId
-        }), commandService.executeCommand(SetRangeValuesCommand.id, params), setLocalValue(str), multiple || hideFn();
+        }), setLocalValue(str), multiple || hideFn(), editorBridgeService.isVisible().visible && await commandService.executeCommand(SetCellEditVisibleOperation.id, {
+          visible: !1,
+          eventType: DeviceInputEventType.Keyboard,
+          unitId,
+          keycode: KeyCode.ESC
+        }), commandService.executeCommand(SetRangeValuesCommand.id, params);
       }, "onChange"),
       options,
       onEdit: handleEdit,
@@ -1109,7 +1119,8 @@ function getSheetIdByName(univerInstanceService, unitId, name) {
 }
 __name(getSheetIdByName, "getSheetIdByName");
 function DataValidationDetail() {
-  const [key, setKey] = useState(0), dataValidationPanelService = useDependency(DataValidationPanelService), activeRuleInfo = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule), { unitId, subUnitId, rule } = activeRuleInfo || {}, ruleId = rule.uid, validatorService = useDependency(DataValidatorRegistryService), univerInstanceService = useDependency(IUniverInstanceService), componentManager = useDependency(ComponentManager), commandService = useDependency(ICommandService), dataValidationModel = useDependency(DataValidationModel), localeService = useDependency(LocaleService), [localRule, setLocalRule] = useState(rule), validator = validatorService.getValidatorItem(localRule.type), [showError, setShowError] = useState(!1), validators = validatorService.getValidatorsByScope(DataValidatorRegistryScope.SHEET), [localRanges, setLocalRanges] = useState(() => localRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))), debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]), rangeSelectorActionsRef = useRef({}), [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(!1), sheetSelectionService = useDependency(SheetsSelectionsService);
+  var _a18;
+  const [key, setKey] = useState(0), dataValidationPanelService = useDependency(DataValidationPanelService), activeRuleInfo = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule), { unitId, subUnitId, rule } = activeRuleInfo || {}, ruleId = rule.uid, validatorService = useDependency(DataValidatorRegistryService), univerInstanceService = useDependency(IUniverInstanceService), componentManager = useDependency(ComponentManager), commandService = useDependency(ICommandService), dataValidationModel = useDependency(DataValidationModel), localeService = useDependency(LocaleService), [localRule, setLocalRule] = useState(rule), validator = validatorService.getValidatorItem(localRule.type), [showError, setShowError] = useState(!1), validators = validatorService.getValidatorsByScope(DataValidatorRegistryScope.SHEET), [localRanges, setLocalRanges] = useState(() => localRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))), debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]), [isRangeError, setIsRangeError] = useState(!1), rangeSelectorActionsRef = useRef({}), [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(!1), sheetSelectionService = useDependency(SheetsSelectionsService);
   if (useEffect(() => () => {
     const currentSelection = sheetSelectionService.getCurrentLastSelection();
     currentSelection && sheetSelectionService.setSelections([currentSelection]);
@@ -1123,7 +1134,7 @@ function DataValidationDetail() {
   }, [commandService, dataValidationModel, ruleId, subUnitId, unitId]), !validator)
     return null;
   const operators = validator.operators, operatorNames = validator.operatorNames, isTwoFormula = localRule.operator ? TWO_FORMULA_OPERATOR_COUNT.includes(localRule.operator) : !1, handleOk = /* @__PURE__ */ __name(() => {
-    localRule.ranges.length && (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
+    !localRule.ranges.length || isRangeError || (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
   }, "handleOk"), handleUpdateRuleRanges = useEvent((rangeText) => {
     const unitRanges = rangeText.split(",").map(deserializeRangeWithSheet).map((unitRange) => {
       const sheetName = unitRange.sheetName;
@@ -1216,8 +1227,8 @@ function DataValidationDetail() {
       }
     ));
   }, "handleUpdateRuleOptions"), handlePanelClick = /* @__PURE__ */ __name((e) => {
-    var _a18;
-    const handleOutClick = (_a18 = rangeSelectorActionsRef.current) == null ? void 0 : _a18.handleOutClick;
+    var _a19;
+    const handleOutClick = (_a19 = rangeSelectorActionsRef.current) == null ? void 0 : _a19.handleOutClick;
     handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
   }, "handlePanelClick");
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$3.dataValidationDetail, onClick: handlePanelClick, children: [
@@ -1225,7 +1236,7 @@ function DataValidationDetail() {
       FormLayout,
       {
         label: localeService.t("dataValidation.panel.range"),
-        error: localRule.ranges.length ? "" : localeService.t("dataValidation.panel.rangeError"),
+        error: !localRule.ranges.length || isRangeError ? localeService.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           RangeSelector,
           {
@@ -1234,7 +1245,8 @@ function DataValidationDetail() {
             initValue: rangeStr,
             onChange: handleUpdateRuleRanges,
             isFocus: isFocusRangeSelector,
-            actions: rangeSelectorActionsRef.current
+            actions: rangeSelectorActionsRef.current,
+            onVerify: /* @__PURE__ */ __name((isValid) => setIsRangeError(!isValid), "onVerify")
           }
         )
       }
@@ -1290,6 +1302,20 @@ function DataValidationDetail() {
       },
       key + localRule.type
     ) : null,
+    /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+      Checkbox,
+      {
+        checked: (_a18 = localRule.allowBlank) != null ? _a18 : !0,
+        onChange: /* @__PURE__ */ __name(() => {
+          var _a19;
+          return handleUpdateRuleSetting({
+            ...baseRule,
+            allowBlank: !((_a19 = localRule.allowBlank) == null || _a19)
+          });
+        }, "onChange"),
+        children: localeService.t("dataValidation.panel.allowBlank")
+      }
+    ) }),
     /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationOptions, { value: options, onChange: handleUpdateRuleOptions, extraComponent: validator.optionsInput }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$3.dataValidationDetailButtons, children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$3.dataValidationDetailButton, onClick: handleDelete, children: localeService.t("dataValidation.panel.removeRule") }),
@@ -1675,7 +1701,8 @@ let DataValidationCopyPasteController = (_a6 = class extends Disposable {
         copyInfo.subUnitId,
         ruleMatrix.diffWithAddition(this._sheetDataValidationModel.getRules(copyInfo.unitId, copyInfo.subUnitId), additionRules.values()),
         this._injector,
-        "patched"
+        "patched",
+        !1
       );
       return {
         redos: redoMutations,
@@ -1705,7 +1732,8 @@ let DataValidationCopyPasteController = (_a6 = class extends Disposable {
         subUnitId,
         ruleMatrix.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId)),
         this._injector,
-        "patched"
+        "patched",
+        !1
       );
       return {
         redos: redoMutations,
@@ -1941,6 +1969,32 @@ let SheetsDataValidationRenderController = (_a8 = class extends RxDisposable {
                 };
                 return (_f2 = (_e2 = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _e2.calcCellAutoHeight) == null ? void 0 : _f2.call(_e2, info);
               }, "interceptorAutoHeight"),
+              interceptorAutoWidth: /* @__PURE__ */ __name(() => {
+                var _a19, _b2, _c2, _d2, _e2, _f2;
+                const skeleton = (_b2 = (_a19 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a19.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b2.skeleton;
+                if (!skeleton)
+                  return;
+                const mergeCell = skeleton.worksheet.getMergedCell(row, col), info = {
+                  data: {
+                    ...cell,
+                    dataValidation: {
+                      ruleId,
+                      validStatus,
+                      rule,
+                      validator
+                    }
+                  },
+                  style: skeleton.getsStyles().getStyleByCell(cell),
+                  primaryWithCoord: skeleton.getCellByIndex((_c2 = mergeCell == null ? void 0 : mergeCell.startRow) != null ? _c2 : row, (_d2 = mergeCell == null ? void 0 : mergeCell.startColumn) != null ? _d2 : col),
+                  unitId,
+                  subUnitId,
+                  row,
+                  col,
+                  workbook,
+                  worksheet
+                };
+                return (_f2 = (_e2 = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _e2.calcCellAutoWidth) == null ? void 0 : _f2.call(_e2, info);
+              }, "interceptorAutoWidth"),
               coverable: ((_f = cell == null ? void 0 : cell.coverable) != null ? _f : !0) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE)
             });
           }, "handler")
@@ -2598,12 +2652,18 @@ let CheckboxRender = (_a11 = class {
     const { style } = info;
     return ((_a18 = style == null ? void 0 : style.fs) != null ? _a18 : 10) * 1.6;
   }
+  calcCellAutoWidth(info) {
+    var _a18;
+    const { style } = info;
+    return ((_a18 = style == null ? void 0 : style.fs) != null ? _a18 : 10) * 1.6;
+  }
   async _parseFormula(rule, unitId, subUnitId) {
-    var _a18, _b;
-    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
+    var _a18, _b, _c;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), formulaResult1 = getFormulaResult((_a18 = results == null ? void 0 : results[0]) == null ? void 0 : _a18.result), formulaResult2 = getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result), isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));
     return {
-      formula1: isFormulaString(formula1) ? getFormulaResult((_a18 = results == null ? void 0 : results[0]) == null ? void 0 : _a18.result) : formula1,
-      formula2: isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2
+      formula1: isFormulaString(formula1) ? getFormulaResult((_c = results == null ? void 0 : results[0]) == null ? void 0 : _c.result) : formula1,
+      formula2: isFormulaString(formula2) ? formulaResult2 : formula2,
+      isFormulaValid
     };
   }
   drawWith(ctx, info) {
@@ -2737,7 +2797,7 @@ function getDropdownItemSize(text, fontStyle) {
 }
 __name(getDropdownItemSize, "getDropdownItemSize");
 function layoutDropdowns(items, fontStyle, cellWidth, cellHeight) {
-  const contentWidth = cellWidth - ICON_PLACE$1 - CELL_PADDING_H, contentHeight = cellHeight - CELL_PADDING_V * 2, textLayout = items.map((item) => ({
+  const cellPaddingH = ICON_PLACE$1 + CELL_PADDING_H * 2, widthAvailableForContent = cellWidth - cellPaddingH, heightAvailableForContent = cellHeight - CELL_PADDING_V * 2, textLayout = items.map((item) => ({
     layout: getDropdownItemSize(item, fontStyle),
     text: item
   }));
@@ -2745,7 +2805,7 @@ function layoutDropdowns(items, fontStyle, cellWidth, cellHeight) {
   const lines = [];
   textLayout.forEach((item) => {
     const { layout } = item, { width, height } = layout;
-    !currentLine || currentLine.width + width + MARGIN_H$1 > contentWidth ? (currentLine = {
+    !currentLine || currentLine.width + width + MARGIN_H$1 > widthAvailableForContent ? (currentLine = {
       width,
       height,
       items: [{
@@ -2757,15 +2817,16 @@ function layoutDropdowns(items, fontStyle, cellWidth, cellHeight) {
       left: currentLine.width + MARGIN_H$1
     }), currentLine.width = currentLine.width + width + MARGIN_H$1);
   });
-  let totalHeight = 0;
+  let totalHeight = 0, maxLineWidth = 0;
   return lines.forEach((line, index) => {
-    index === lines.length - 1 ? totalHeight += line.height : totalHeight += line.height + MARGIN_V$1;
+    maxLineWidth = Math.max(maxLineWidth, line.width), index === lines.length - 1 ? totalHeight += line.height : totalHeight += line.height + MARGIN_V$1;
   }), {
     lines,
     totalHeight,
-    contentWidth,
-    contentHeight,
-    cellAutoHeight: totalHeight + CELL_PADDING_V * 2
+    contentWidth: widthAvailableForContent,
+    contentHeight: heightAvailableForContent,
+    cellAutoHeight: totalHeight + CELL_PADDING_V * 2,
+    calcAutoWidth: maxLineWidth + cellPaddingH
   };
 }
 __name(layoutDropdowns, "layoutDropdowns");
@@ -2877,6 +2938,19 @@ let DropdownMultipleWidget = (_a13 = class {
     const cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, cellValue = (_a18 = getCellValueOrigin(data)) != null ? _a18 : "", { validator: _validator } = validation, items = _validator.parseCellValue(cellValue), fontStyle = getFontStyleString(style != null ? style : void 0);
     return layoutDropdowns(items, fontStyle, cellWidth, cellHeight).cellAutoHeight;
   }
+  calcCellAutoWidth(info) {
+    var _a18;
+    const { primaryWithCoord, style, data } = info, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, cellBounding = {
+      startX: _cellBounding.startX + leftOffset,
+      endX: _cellBounding.endX - rightOffset,
+      startY: _cellBounding.startY + topOffset,
+      endY: _cellBounding.endY - downOffset
+    }, validation = data.dataValidation;
+    if (!validation)
+      return;
+    const cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, cellValue = (_a18 = getCellValueOrigin(data)) != null ? _a18 : "", { validator: _validator } = validation, items = _validator.parseCellValue(cellValue), fontStyle = getFontStyleString(style != null ? style : void 0);
+    return layoutDropdowns(items, fontStyle, cellWidth, cellHeight).calcAutoWidth;
+  }
   isHit(position, info) {
     const { primaryWithCoord } = info, cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, { endX } = cellBounding, { x } = position;
     return x >= endX - ICON_PLACE$1 && x <= endX;
@@ -2901,6 +2975,7 @@ const _ListMultipleValidatorView = class _ListMultipleValidatorView extends Base
     super(...arguments);
     __publicField(this, "id", DataValidationType.LIST_MULTIPLE);
     __publicField(this, "canvasRender", this.injector.createInstance(DropdownMultipleWidget));
+    __publicField(this, "dropdown", LIST_DROPDOWN_KEY);
   }
 };
 __name(_ListMultipleValidatorView, "ListMultipleValidatorView");
@@ -2910,7 +2985,7 @@ var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPrope
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp$3(target, key, result), result;
 }, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3");
-const PADDING_H = 4, ICON_SIZE = 4, ICON_PLACE = 14, MARGIN_H = 6, MARGIN_V = 4, DROP_DOWN_ICON_COLOR = "#565656", downPath = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+const PADDING_H = 4, ICON_SIZE = 4, ICON_PLACE = 14, MARGIN_H = 6, MARGIN_V = 4, RADIUS_BG = 8, DROP_DOWN_ICON_COLOR = "#565656", downPath = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 function convertToDocumentData(text, style) {
   const contentLength = text.length;
   return {
@@ -3074,7 +3149,7 @@ let DropdownWidget = (_a14 = class {
         width: rectWidth,
         height: rectHeight,
         fill: (activeItem == null ? void 0 : activeItem.color) || DROP_DOWN_DEFAULT_COLOR,
-        radius: 8
+        radius: RADIUS_BG
       }), ctx.save(), ctx.translateWithPrecision(PADDING_H, 0), ctx.beginPath(), ctx.rect(0, 0, realWidth, fontHeight), ctx.clip(), ctx.translateWithPrecision(paddingLeft, 0), documents.render(ctx), ctx.restore(), ctx.translateWithPrecision(realWidth + PADDING_H + 4, (fontHeight - ICON_SIZE) / 2), ctx.fillStyle = DROP_DOWN_ICON_COLOR, ctx.fill(downPath), ctx.restore(), map.set(key, {
         left: cellBounding.startX + MARGIN_H + skeleton.rowHeaderWidth,
         top: cellBounding.startY + paddingTop + skeleton.columnHeaderHeight,
@@ -3110,6 +3185,33 @@ let DropdownWidget = (_a14 = class {
       return fontHeight + MARGIN_V * 2;
     }
   }
+  calcCellAutoWidth(info) {
+    var _a18;
+    const { primaryWithCoord, style, data } = info, cellRange = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, rule = (_a18 = data.dataValidation) == null ? void 0 : _a18.rule;
+    if (!rule || rule.renderMode === DataValidationRenderMode.TEXT) return;
+    const cellBounding = {
+      startX: cellRange.startX + leftOffset,
+      endX: cellRange.endX - rightOffset,
+      startY: cellRange.startY + topOffset,
+      endY: cellRange.endY - downOffset
+    }, cellWidth = cellBounding.endX - cellBounding.startX, value = getCellValueOrigin(data), valueStr = `${value != null ? value : ""}`;
+    let { tb, pd } = style || {};
+    const { l: l2 = DEFAULT_STYLES.pd.l, r: r2 = DEFAULT_STYLES.pd.r } = pd != null ? pd : {};
+    tb = tb != null ? tb : WrapStrategy.WRAP;
+    let paddingAll = MARGIN_H * 2 + ICON_PLACE;
+    switch (rule.renderMode) {
+      case DataValidationRenderMode.ARROW:
+        paddingAll = ICON_PLACE + MARGIN_H * 2 + r2 + l2;
+        break;
+      case DataValidationRenderMode.CUSTOM:
+        paddingAll = ICON_PLACE + MARGIN_H * 2 + PADDING_H * 2 + r2 + l2 + RADIUS_BG / 2 + 1;
+        break;
+      default:
+        paddingAll = ICON_PLACE + MARGIN_H * 2 + PADDING_H * 2 + r2 + l2 + RADIUS_BG / 2 + 1;
+    }
+    const widthForTextLayout = cellWidth - paddingAll, { documentSkeleton, docModel } = createDocuments(valueStr, this._localeService, style);
+    return tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(widthForTextLayout, 1)), documentSkeleton.calculate(), documentSkeleton.getActualSize(), getDocsSkeletonPageSize(documentSkeleton).width + paddingAll;
+  }
   isHit(position, info) {
     const { data, subUnitId, row, col } = info, dropdownInfo = this._ensureMap(subUnitId).get(this._generateKey(row, col)), validation = data.dataValidation;
     if (!validation || !dropdownInfo || validation.rule.renderMode === DataValidationRenderMode.TEXT)

package/lib/locale/en-US.json

@@ -34,7 +34,8 @@
       "rejectInput": "Reject input",
       "messageInfo": "Helper message",
       "showInfo": "Show help text for a selected cell",
-      "rangeError": "Ranges are not legal"
+      "rangeError": "Ranges are not legal",
+      "allowBlank": "Allow blank values"
     },
     "operators": {
       "between": "between",
@@ -66,6 +67,10 @@
       "notEqual": "Value must be not equal to {FORMULA1}",
       "notBetween": "Value must be not between {FORMULA1} and {FORMULA2}"
     },
+    "any": {
+      "title": "Any value",
+      "error": "The content of this cell violates the validation rule"
+    },
     "date": {
       "title": "Date",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "Custom formula",
       "error": "This cell's contents violate its validation rule",
-      "validFail": "Please input a valid formula"
+      "validFail": "Please input a valid formula",
+      "ruleName": "Custom formula is {FORMULA1}"
     },
     "alert": {
       "title": "Error",

package/lib/locale/fa-IR.json

@@ -34,7 +34,8 @@
       "rejectInput": "رد ورودی",
       "messageInfo": "پیام راهنما",
       "showInfo": "نمایش متن راهنما برای یک سلول انتخاب شده",
-      "rangeError": "محدوده‌ها نامعتبر هستند"
+      "rangeError": "محدوده‌ها نامعتبر هستند",
+      "allowBlank": "رد سلول خالی"
     },
     "operators": {
       "between": "بین",
@@ -66,6 +67,10 @@
       "notEqual": "مقدار باید برابر نیست با {FORMULA1}",
       "notBetween": "مقدار باید بین {FORMULA1} و {FORMULA2} نباشد"
     },
+    "any": {
+      "title": "هر مقدار",
+      "error": "محتوای این سلول نقض قانون اعتبارسنجی است"
+    },
     "date": {
       "title": "تاریخ",
       "operators": {
@@ -143,9 +148,10 @@
       "unchecked": "مقدار انتخاب نشده"
     },
     "custom": {
-      "title": "فرمول سفارشی",
+      "title": "فرمول سفارشی ",
       "error": "محتوای این سلول با قانون اعتبارسنجی آن نقض می‌شود",
-      "validFail": "لطفا یک فرمول معتبر وارد کنید"
+      "validFail": "لطفا یک فرمول معتبر وارد کنید",
+      "ruleName": "فرمول سفارشی {FORMULA1}"
     },
     "alert": {
       "title": "خطا",

package/lib/locale/ru-RU.json

@@ -34,7 +34,8 @@
       "showWarning": "Показать предупреждение",
       "rejectInput": "Отклонить ввод",
       "messageInfo": "Сообщение помощи",
-      "showInfo": "Показать текст помощи для выбранной ячейки"
+      "showInfo": "Показать текст помощи для выбранной ячейки",
+      "allowBlank": "Игнорировать пустые значения"
     },
     "operators": {
       "between": "между",
@@ -66,6 +67,10 @@
       "notEqual": "Значение должно быть не равно {FORMULA1}",
       "notBetween": "Значение должно быть не между {FORMULA1} и {FORMULA2}"
     },
+    "any": {
+      "title": "Любое значение",
+      "error": "Содержимое этой ячейки нарушает правило проверки"
+    },
     "date": {
       "title": "Дата",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "Пользовательская формула",
       "error": "Содержимое этой ячейки нарушает правило проверки",
-      "validFail": "Пожалуйста, введите допустимую формулу"
+      "validFail": "Пожалуйста, введите допустимую формулу",
+      "ruleName": "Пользовательская формула {FORMULA1}"
     },
     "alert": {
       "title": "Ошибка",

package/lib/locale/vi-VN.json

@@ -34,7 +34,8 @@
       "showWarning": "Hiển thị cảnh báo",
       "rejectInput": "Từ chối đầu vào",
       "messageInfo": "Thông báo",
-      "showInfo": "Hiển thị thông báo cho ô đã chọn"
+      "showInfo": "Hiển thị thông báo cho ô đã chọn",
+      "allowBlank": "Bỏ qua giá trị rỗng"
     },
     "operators": {
       "between": "Giữa",
@@ -66,6 +67,10 @@
       "notEqual": "Giá trị phải không bằng {FORMULA1}",
       "notBetween": "Giá trị phải không nằm giữa {FORMULA1} và {FORMULA2}"
     },
+    "any": {
+      "title": "Bất kỳ giá trị",
+      "error": "Nội dung của ô này vi phạm quy tắc xác thực"
+    },
     "date": {
       "title": "Ngày",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "Công thức tùy chỉnh",
       "error": "Nội dung của ô này vi phạm quy tắc xác thực",
-      "validFail": "Vui lòng nhập một công thức hợp lệ"
+      "validFail": "Vui lòng nhập một công thức hợp lệ",
+      "ruleName": "Công thức tùy chỉnh {FORMULA1}"
     },
     "alert": {
       "title": "Thông báo",

package/lib/locale/zh-CN.json

@@ -34,7 +34,8 @@
       "showWarning": "显示警告",
       "rejectInput": "拒绝输入",
       "messageInfo": "文字提示",
-      "showInfo": "显示所选单元格的提示文字"
+      "showInfo": "显示所选单元格的提示文字",
+      "allowBlank": "忽略空值"
     },
     "operators": {
       "between": "介于",
@@ -66,6 +67,10 @@
       "notEqual": "值必须不等于 {FORMULA1}",
       "notBetween": "值必须在 {FORMULA1} 和 {FORMULA2} 范围之外"
     },
+    "any": {
+      "title": "任意值",
+      "error": "此单元格的内容违反了验证规则"
+    },
     "date": {
       "title": "日期",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "自定义公式",
       "error": "此单元格的内容违反了验证规则",
-      "validFail": "请输入合法的公式"
+      "validFail": "请输入合法的公式",
+      "ruleName": "自定义公式 {FORMULA1}"
     },
     "alert": {
       "title": "提示",

package/lib/locale/zh-TW.json

@@ -34,7 +34,8 @@
       "showWarning": "顯示警告",
       "rejectInput": "拒絕輸入",
       "messageInfo": "文字提示",
-      "showInfo": "顯示所選單元格的提示文字"
+      "showInfo": "顯示所選單元格的提示文字",
+      "allowBlank": "忽略空值"
     },
     "operators": {
       "between": "介於",
@@ -66,6 +67,10 @@
       "notEqual": "值必須不等於 {FORMULA1}",
       "notBetween": "值必須在 {FORMULA1} 和 {FORMULA2} 範圍之外"
     },
+    "any": {
+      "title": "任意值",
+      "error": "此儲存格的內容違反了驗證規則"
+    },
     "date": {
       "title": "日期",
       "operators": {
@@ -145,7 +150,8 @@
     "custom": {
       "title": "自訂公式",
       "error": "此儲存格的內容違反了驗證規則",
-      "validFail": "請輸入合法的公式"
+      "validFail": "請輸入合法的公式",
+      "ruleName": "自訂公式 {FORMULA1}"
     },
     "alert": {
       "title": "提示",

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

@@ -50,6 +50,7 @@ declare const locale: {
             rejectInput: string;
             messageInfo: string;
             showInfo: string;
+            allowBlank: string;
         };
         operators: {
             between: string;
@@ -81,6 +82,10 @@ declare const locale: {
             notEqual: string;
             notBetween: string;
         };
+        any: {
+            title: string;
+            error: string;
+        };
         date: {
             title: string;
             operators: {
@@ -161,6 +166,7 @@ declare const locale: {
             title: string;
             error: string;
             validFail: string;
+            ruleName: string;
         };
         alert: {
             title: string;

package/lib/types/views/validator-views/list-multiple-view.d.ts

@@ -4,4 +4,5 @@ import { BaseSheetDataValidatorView } from './sheet-validator-view';
 export declare class ListMultipleValidatorView extends BaseSheetDataValidatorView {
     id: DataValidationType;
     canvasRender: DropdownMultipleWidget;
+    dropdown: string | undefined;
 }

package/lib/types/views/widgets/checkbox-widget.d.ts

@@ -9,6 +9,7 @@ export declare class CheckboxRender implements IBaseDataValidationWidget {
     private _calc;
     constructor(_commandService: ICommandService, _formulaService: DataValidationFormulaService, _themeService: ThemeService);
     calcCellAutoHeight(info: ICellRenderContext): number | undefined;
+    calcCellAutoWidth(info: ICellRenderContext): number | undefined;
     private _parseFormula;
     drawWith(ctx: UniverRenderingContext2D, info: ICellRenderContext): void;
     isHit(evt: {

package/lib/types/views/widgets/dropdown-multiple-widget.d.ts

@@ -11,6 +11,7 @@ export declare class DropdownMultipleWidget implements IBaseDataValidationWidget
     private _drawDownIcon;
     drawWith(ctx: UniverRenderingContext2D, info: ICellRenderContext, skeleton: SpreadsheetSkeleton, spreadsheets: Spreadsheet): void;
     calcCellAutoHeight(info: ICellRenderContext): number | undefined;
+    calcCellAutoWidth(info: ICellRenderContext): number | undefined;
     isHit(position: {
         x: number;
         y: number;

package/lib/types/views/widgets/dropdown-widget.d.ts

@@ -20,6 +20,7 @@ export declare class DropdownWidget implements IBaseDataValidationWidget {
     private _drawDownIcon;
     drawWith(ctx: UniverRenderingContext2D, info: ICellRenderContext, skeleton: SpreadsheetSkeleton): void;
     calcCellAutoHeight(info: ICellRenderContext): number | undefined;
+    calcCellAutoWidth(info: ICellRenderContext): number | undefined;
     isHit(position: {
         x: number;
         y: number;

package/lib/types/views/widgets/shape/layout.d.ts

@@ -34,4 +34,5 @@ export declare function layoutDropdowns(items: string[], fontStyle: IDocumentSke
     contentWidth: number;
     contentHeight: number;
     cellAutoHeight: number;
+    calcAutoWidth: number;
 };