Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

refactor(range-selector): refactor the selection component (#3580)

Gpound.liue16ead3257ad
diff --git a/packages/design/src/components/popup/RectPopup.tsx b/packages/design/src/components/popup/RectPopup.tsx
index 75a814bddd..d8b0eec513 100644
--- a/packages/design/src/components/popup/RectPopup.tsx
+++ b/packages/design/src/components/popup/RectPopup.tsx
@@ -174,9 +174,15 @@ function RectPopup(props: IRectPopupProps) {
}, [anchorRect, anchorRect.bottom, anchorRect.left, anchorRect.right, anchorRect.top, clickOtherFn, excludeOutside]);
useEffect(() => {
- window.addEventListener('contextmenu', contextMenuFn);
+ const handleContextMenu = (e: MouseEvent) => {
+ if (e.ctrlKey && e.button === 0) {
+ return;
+ }
+ contextMenuFn();
+ };
+ window.addEventListener('contextmenu', handleContextMenu);
return () => {
- window.removeEventListener('contextmenu', contextMenuFn);
+ window.removeEventListener('contextmenu', handleContextMenu);
};
}, [contextMenuFn]);
diff --git a/packages/docs-ui/src/components/range-selector/RangeSelector.tsx b/packages/docs-ui/src/components/range-selector/RangeSelector.tsx
index bb8d89029c..855d151bf5 100644
--- a/packages/docs-ui/src/components/range-selector/RangeSelector.tsx
+++ b/packages/docs-ui/src/components/range-selector/RangeSelector.tsx
@@ -51,6 +51,9 @@ const dialogOnlyInputStyle: React.CSSProperties = {
pointerEvents: 'none',
};
+/**
+ * @deprecated
+ */
export function RangeSelector(props: IRangeSelectorProps) {
const { dialogOnly, onChange, id, value = '', width = 220, placeholder = '', size = 'middle', onActive, onValid, isSingleChoice = false, openForSheetUnitId, openForSheetSubUnitId, isReadonly = false, className, textEditorClassName, onSelectorVisibleChange: _onSelectorVisibleChange } = props;
const onSelectorVisibleChange = useEvent(_onSelectorVisibleChange);
diff --git a/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts b/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts
index efda9461b4..597fba5f13 100644
--- a/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts
+++ b/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts
@@ -66,7 +66,7 @@ export class DocBackScrollRenderController extends RxDisposable implements IRend
const { startOffset } = range;
const anchorNodePosition = skeleton.findNodePositionByCharIndex(startOffset);
- this.scrollToNode(anchorNodePosition);
+ anchorNodePosition && this.scrollToNode(anchorNodePosition);
}
scrollToNode(startNodePosition: Nullable<INodePosition>) {
diff --git a/packages/docs-ui/src/services/editor/editor-manager.service.ts b/packages/docs-ui/src/services/editor/editor-manager.service.ts
index 84d07b3ebf..4166919f4c 100644
--- a/packages/docs-ui/src/services/editor/editor-manager.service.ts
+++ b/packages/docs-ui/src/services/editor/editor-manager.service.ts
@@ -278,7 +278,7 @@ export class EditorService extends Disposable implements IEditorService, IDispos
this._contextService.setContextValue(FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE, editor.isSingle());
if (!this._spreadsheetFocusState) {
- this.singleSelection(editor.isSingleChoice());
+ this.singleSelection(!!editor.isSingleChoice());
}
this._focusStyle$.next(editorUnitId);
diff --git a/packages/docs-ui/src/services/editor/editor.ts b/packages/docs-ui/src/services/editor/editor.ts
index 88036203dc..5694bd35d6 100644
--- a/packages/docs-ui/src/services/editor/editor.ts
+++ b/packages/docs-ui/src/services/editor/editor.ts
@@ -18,7 +18,9 @@ import type { DocumentDataModel, ICommandService, IDocumentData, IDocumentStyle,
import type { DocSelectionManagerService } from '@univerjs/docs';
import type { IDocSelectionInnerParam, IRender, ISuccinctDocRangeParam, ITextRangeWithStyle } from '@univerjs/engine-render';
import { DEFAULT_STYLES, Disposable, UniverInstanceType } from '@univerjs/core';
+import { KeyCode } from '@univerjs/ui';
import { merge, type Observable, Subject } from 'rxjs';
+import { filter } from 'rxjs/operators';
import { ReplaceSnapshotCommand } from '../../commands/commands/replace-content.command';
import { DocSelectionRenderService, type IEditorInputConfig } from '../selection/doc-selection-render.service';
@@ -222,7 +224,13 @@ export class Editor extends Disposable implements IEditor {
this.disposeWithMe(
merge(
docSelectionRenderService.onInput$,
- docSelectionRenderService.onKeydown$,
+ docSelectionRenderService.onKeydown$.pipe(filter((e) => {
+ const event = e.event as KeyboardEvent;
+ if (event.ctrlKey || event.metaKey) {
+ return [KeyCode.X, KeyCode.V].includes(event.keyCode);
+ }
+ return [KeyCode.BACKSPACE].includes(event.keyCode);
+ })),
docSelectionRenderService.onCompositionupdate$,
docSelectionRenderService.onCompositionend$,
docSelectionRenderService.onPaste$
diff --git a/packages/docs/src/services/doc-selection-manager.service.ts b/packages/docs/src/services/doc-selection-manager.service.ts
index bc00ee1511..63a4f8a9f3 100644
--- a/packages/docs/src/services/doc-selection-manager.service.ts
+++ b/packages/docs/src/services/doc-selection-manager.service.ts
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+import { ICommandService, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
+import { NORMAL_TEXT_SELECTION_PLUGIN_STYLE } from '@univerjs/engine-render';
+import { BehaviorSubject, Subject, takeUntil } from 'rxjs';
import type { DocumentDataModel, Nullable } from '@univerjs/core';
import type {
IDocSelectionInnerParam,
@@ -21,9 +24,6 @@ import type {
ISuccinctDocRangeParam,
ITextRangeWithStyle,
} from '@univerjs/engine-render';
-import { ICommandService, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
-import { NORMAL_TEXT_SELECTION_PLUGIN_STYLE } from '@univerjs/engine-render';
-import { BehaviorSubject, takeUntil } from 'rxjs';
import { SetTextSelectionsOperation } from '../commands/operations/text-selection.operation';
interface IDocSelectionManagerSearchParam {
@@ -51,7 +51,7 @@ export class DocSelectionManagerService extends RxDisposable {
private readonly _textSelectionInfo: ITextSelectionInfo = new Map();
- private readonly _textSelection$ = new BehaviorSubject<Nullable<ITextSelectionManagerInsertParam>>(null);
+ private readonly _textSelection$ = new Subject<ITextSelectionManagerInsertParam>();
readonly textSelection$ = this._textSelection$.asObservable();
private readonly _refreshSelection$ = new BehaviorSubject<Nullable<IRefreshSelectionParam>>(null);
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index 9255176f26..0732705940 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -75,12 +75,14 @@
"@univerjs/protocol": "0.1.39-alpha.15",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-conditional-formatting": "workspace:*",
+ "@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"clsx": "^2.1.1",
"react-grid-layout": "^1.4.4",
"react-resizable": "^3.0.5"
},
+
"devDependencies": {
"@types/react-grid-layout": "^1.3.5",
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
index c807274397..4afb9622fc 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
@@ -14,22 +14,25 @@
* limitations under the License.
*/
-import { createInternalEditorID, ICommandService, InterceptorManager, IUniverInstanceService, LocaleService, UniverInstanceType, useDependency } from '@univerjs/core';
+import type { IRange, Workbook } from '@univerjs/core';
+import type { IRemoveSheetMutationParams } from '@univerjs/sheets';
+import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
+import type { IAddCfCommandParams } from '../../../commands/commands/add-cf.command';
+import type { ISetCfCommandParams } from '../../../commands/commands/set-cf.command';
+
+import type { IStyleEditorProps } from './type';
+import { ICommandService, InterceptorManager, IUniverInstanceService, LocaleService, UniverInstanceType, useDependency } from '@univerjs/core';
import { Button, Select } from '@univerjs/design';
-import { RangeSelector } from '@univerjs/docs-ui';
-import { serializeRange } from '@univerjs/engine-formula';
+import { deserializeRangeWithSheet, serializeRange } from '@univerjs/engine-formula';
import { RemoveSheetMutation, setEndForRange, SetWorksheetActiveOperation, SheetsSelectionsService } from '@univerjs/sheets';
-
-import { CFRuleType, CFSubRuleType, ConditionalFormattingRuleModel, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';
+import { CFRuleType, CFSubRuleType, ConditionalFormattingRuleModel } from '@univerjs/sheets-conditional-formatting';
+import { RangeSelector } from '@univerjs/sheets-formula-ui';
import React, { useEffect, useMemo, useRef, useState } from 'react';
-import type { IRange, IUnitRange, Workbook } from '@univerjs/core';
-import type { IRemoveSheetMutationParams } from '@univerjs/sheets';
-import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
import { AddCfCommand } from '../../../commands/commands/add-cf.command';
+
import { SetCfCommand } from '../../../commands/commands/set-cf.command';
import styleBase from '../index.module.less';
import { ColorScaleStyleEditor } from './colorScale';
-
import { DataBarStyleEditor } from './dataBar';
import { FormulaStyleEditor } from './formula';
import { HighlightCellStyleEditor } from './highlightCell';
@@ -37,9 +40,6 @@ import { IconSet } from './iconSet';
import styles from './index.module.less';
import { RankStyleEditor } from './rank';
import { beforeSubmit, submit } from './type';
-import type { IAddCfCommandParams } from '../../../commands/commands/add-cf.command';
-import type { ISetCfCommandParams } from '../../../commands/commands/set-cf.command';
-import type { IStyleEditorProps } from './type';
interface IRuleEditProps {
rule?: IConditionFormattingRule;
@@ -58,6 +58,16 @@ export const RuleEdit = (props: IRuleEditProps) => {
const unitId = getUnitId(univerInstanceService);
const subUnitId = getSubUnitId(univerInstanceService);
+ const [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(() => {
+ // 如果是自定义公式的话,则不自动聚焦在选区.
+ const { rule } = props;
+ if (rule?.rule.type === CFRuleType.highlightCell) {
+ return rule.rule.subType !== CFSubRuleType.formula;
+ }
+ return true;
+ });
+ const rangeSelectorActionsRef = useRef<Parameters<typeof RangeSelector>[0]['actions']>({});
+ const [errorText, errorTextSet] = useState<string | undefined>(undefined);
const rangeResult = useRef<IRange[]>(props.rule?.ranges ?? []);
const rangeString = useMemo(() => {
@@ -174,11 +184,15 @@ export const RuleEdit = (props: IRuleEditProps) => {
result.current = config as Parameters<IStyleEditorProps['onChange']>;
};
- const onRangeSelectorChange = (ranges: IUnitRange[]) => {
- rangeResult.current = ranges.map((r) => r.range);
+ const onRangeSelectorChange = (rangeString: string) => {
+ const result = rangeString.split(',').map(deserializeRangeWithSheet).map((item) => item.range);
+ rangeResult.current = result;
};
const handleSubmit = () => {
+ if (errorText) {
+ return;
+ }
const getRanges = () => {
const worksheet = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getActiveSheet();
if (!worksheet) {
@@ -213,21 +227,41 @@ export const RuleEdit = (props: IRuleEditProps) => {
}
}
};
+
const handleCancel = () => {
props.onCancel();
};
+
+ const handleVerify = (v: boolean, rangeText: string) => {
+ if (v) {
+ if (rangeText.length < 1) {
+ errorTextSet(localeService.t('sheet.cf.errorMessage.rangeError'));
+ } else {
+ errorTextSet(undefined);
+ }
+ } else {
+ errorTextSet(localeService.t('sheet.cf.errorMessage.rangeError'));
+ }
+ };
+
+ const handlePanelClick = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+ const handleOutClick = rangeSelectorActionsRef.current?.handleOutClick;
+ handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
+ };
+
return (
- <div className={styles.cfRuleStyleEditor}>
+ <div className={styles.cfRuleStyleEditor} onClick={handlePanelClick}>
<div className={styleBase.title}>{localeService.t('sheet.cf.panel.range')}</div>
<div className={`${styleBase.mTBase}`}>
<RangeSelector
- placeholder={localeService.t('sheet.cf.form.rangeSelector')}
- width={'100%' as unknown as number}
- openForSheetSubUnitId={subUnitId}
- openForSheetUnitId={unitId}
- value={rangeString}
- id={createInternalEditorID(`${SHEET_CONDITIONAL_FORMATTING_PLUGIN}_rangeSelector`)}
+ unitId={unitId}
+ errorText={errorText}
+ subUnitId={subUnitId}
+ initValue={rangeString}
onChange={onRangeSelectorChange}
+ onVerify={handleVerify}
+ isFocus={isFocusRangeSelector}
+ actions={rangeSelectorActionsRef.current}
/>
</div>
<div className={styleBase.title}>{localeService.t('sheet.cf.panel.styleType')}</div>
diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts
index 9d671e93d6..cd303c5999 100644
--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts
+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import type { IDisposable } from '@univerjs/core';
-import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
import { Disposable, generateRandomId, Inject, Injector, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { ComponentManager, ISidebarService } from '@univerjs/ui';
+import type { IDisposable } from '@univerjs/core';
+import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
import { ConditionFormattingPanel } from '../components/panel';
const CF_PANEL_KEY = 'sheet.conditional.formatting.panel';
@@ -41,10 +41,20 @@ export class ConditionalFormattingPanelController extends Disposable {
if (!sheet) this._sidebarDisposable?.dispose();
})
);
+ this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((info) => {
+ if (info.id === CF_PANEL_KEY) {
+ if (!info.visible) {
+ setTimeout(() => {
+ this._sidebarService.sidebarOptions$.next({ visible: false });
+ });
+ }
+ }
+ }));
}
openPanel(rule?: IConditionFormattingRule) {
const props = {
+ id: CF_PANEL_KEY,
header: { title: this._localeService.t('sheet.cf.title') },
children: {
label: CF_PANEL_KEY,
diff --git a/packages/sheets-conditional-formatting-ui/src/locale/en-US.ts b/packages/sheets-conditional-formatting-ui/src/locale/en-US.ts
index 3e58c5abc3..7e5b86e8bf 100644
--- a/packages/sheets-conditional-formatting-ui/src/locale/en-US.ts
+++ b/packages/sheets-conditional-formatting-ui/src/locale/en-US.ts
@@ -171,6 +171,7 @@ const locale: typeof zhCN = {
errorMessage: {
notBlank: 'Condition can not be empty',
formulaError: 'Wrong formula',
+ rangeError: 'Bad selection',
},
},
},
diff --git a/packages/sheets-conditional-formatting-ui/src/locale/fa-IR.ts b/packages/sheets-conditional-formatting-ui/src/locale/fa-IR.ts
index c8539bf583..55a17710cd 100644
--- a/packages/sheets-conditional-formatting-ui/src/locale/fa-IR.ts
+++ b/packages/sheets-conditional-formatting-ui/src/locale/fa-IR.ts
@@ -170,6 +170,7 @@ const locale: typeof zhCN = {
errorMessage: {
notBlank: 'شرط نمی‌تواند خالی باشد',
formulaError: 'فرمول اشتباه',
+ rangeError: 'Bad selection',
},
},
},
diff --git a/packages/sheets-conditional-formatting-ui/src/locale/ru-RU.ts b/packages/sheets-conditional-formatting-ui/src/locale/ru-RU.ts
index 7b86eaaabf..73e44bef90 100644
--- a/packages/sheets-conditional-formatting-ui/src/locale/ru-RU.ts
+++ b/packages/sheets-conditional-formatting-ui/src/locale/ru-RU.ts
@@ -170,7 +170,7 @@ const locale: typeof zhCN = {
errorMessage: {
notBlank: 'Условие не может быть пустым',
formulaError: 'Ошибка формулы',
-
+ rangeError: 'Bad selection',
},
},
},
diff --git a/packages/sheets-conditional-formatting-ui/src/locale/vi-VN.ts b/packages/sheets-conditional-formatting-ui/src/locale/vi-VN.ts
index 146942bcda..1a82701b63 100644
--- a/packages/sheets-conditional-formatting-ui/src/locale/vi-VN.ts
+++ b/packages/sheets-conditional-formatting-ui/src/locale/vi-VN.ts
@@ -170,6 +170,7 @@ const locale: typeof zhCN = {
errorMessage: {
notBlank: 'Điều kiện không được để trống',
formulaError: 'Lỗi công thức',
+ rangeError: 'Bad selection',
},
},
},
diff --git a/packages/sheets-conditional-formatting-ui/src/locale/zh-CN.ts b/packages/sheets-conditional-formatting-ui/src/locale/zh-CN.ts
index c55859c5e6..c518fadb55 100644
--- a/packages/sheets-conditional-formatting-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-conditional-formatting-ui/src/locale/zh-CN.ts
@@ -169,6 +169,7 @@ const locale = {
},
errorMessage: {
notBlank: '条件不能为空',
+ rangeError: '选区错误',
formulaError: '公式错误',
},
},
diff --git a/packages/sheets-conditional-formatting-ui/src/locale/zh-TW.ts b/packages/sheets-conditional-formatting-ui/src/locale/zh-TW.ts
index 4cd94bce43..cb04fd4b3c 100644
--- a/packages/sheets-conditional-formatting-ui/src/locale/zh-TW.ts
+++ b/packages/sheets-conditional-formatting-ui/src/locale/zh-TW.ts
@@ -171,6 +171,7 @@ const locale: typeof zhCN = {
},
errorMessage: {
notBlank: '條件不能為空',
+ rangeError: '選區錯誤',
formulaError: '公式錯誤',
},
},
diff --git a/packages/sheets-data-validation-ui/package.json b/packages/sheets-data-validation-ui/package.json
index 0c5cd059b5..b54102b355 100644
--- a/packages/sheets-data-validation-ui/package.json
+++ b/packages/sheets-data-validation-ui/package.json
@@ -78,8 +78,10 @@
"@univerjs/protocol": "0.1.39-alpha.15",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
+ "@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
+
"@univerjs/ui": "workspace:*",
"clsx": "^2.1.1",
"dayjs": "^1.11.13"
diff --git a/packages/sheets-data-validation-ui/src/services/data-validation-panel.service.ts b/packages/sheets-data-validation-ui/src/services/data-validation-panel.service.ts
index 3e15f98303..64a8ce19a0 100644
--- a/packages/sheets-data-validation-ui/src/services/data-validation-panel.service.ts
+++ b/packages/sheets-data-validation-ui/src/services/data-validation-panel.service.ts
@@ -18,6 +18,7 @@ import type { IDataValidationRule, IDisposable, Nullable } from '@univerjs/core'
import { Disposable, IUniverInstanceService, toDisposable, UniverInstanceType } from '@univerjs/core';
import { ISidebarService } from '@univerjs/ui';
import { BehaviorSubject, distinctUntilChanged, filter } from 'rxjs';
+import { DATA_VALIDATION_PANEL } from '../commands/operations/data-validation.operation';
export class DataValidationPanelService extends Disposable {
private _open$ = new BehaviorSubject<boolean>(false);
@@ -49,6 +50,16 @@ export class DataValidationPanelService extends Disposable {
this.close();
})
);
+
+ this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((info) => {
+ if (info.id === DATA_VALIDATION_PANEL) {
+ if (!info.visible) {
+ setTimeout(() => {
+ this._sidebarService.sidebarOptions$.next({ visible: false });
+ });
+ }
+ }
+ }));
}
override dispose(): void {
diff --git a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx b/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx
index 7837d30f8c..a839ebe35a 100644
--- a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx
@@ -14,19 +14,20 @@
* limitations under the License.
*/
-import type { DataValidationOperator, DataValidationType, IDataValidationRuleBase, IDataValidationRuleOptions, IExecutionOptions, ISheetDataValidationRule, IUnitRange } from '@univerjs/core';
+import type { DataValidationOperator, DataValidationType, IDataValidationRuleBase, IDataValidationRuleOptions, IExecutionOptions, ISheetDataValidationRule, IUnitRange, Workbook } from '@univerjs/core';
import type { IUpdateSheetDataValidationRangeCommandParams } from '@univerjs/sheets-data-validation';
-import { createInternalEditorID, debounce, ICommandService, isUnitRangesEqual, isValidRange, LocaleService, RedoCommand, shallowEqual, UndoCommand, useDependency } from '@univerjs/core';
+import { debounce, ICommandService, isUnitRangesEqual, IUniverInstanceService, LocaleService, RedoCommand, shallowEqual, UndoCommand, UniverInstanceType, useDependency } from '@univerjs/core';
import { DataValidationModel, DataValidatorRegistryScope, DataValidatorRegistryService, getRuleOptions, getRuleSetting, TWO_FORMULA_OPERATOR_COUNT } from '@univerjs/data-validation';
import { Button, FormLayout, Select } from '@univerjs/design';
-import { RangeSelector } from '@univerjs/docs-ui';
-import { serializeRange } from '@univerjs/engine-formula';
+import { deserializeRangeWithSheet, serializeRange } from '@univerjs/engine-formula';
import { SheetsSelectionsService } from '@univerjs/sheets';
import { RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand } from '@univerjs/sheets-data-validation';
+import { RangeSelector } from '@univerjs/sheets-formula-ui';
import { ComponentManager, useEvent, useObservable } from '@univerjs/ui';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
import { DataValidationPanelService } from '../../../services/data-validation-panel.service';
import { DataValidationOptions } from '../options';
+
import styles from './index.module.less';
// debounce execute commands, for better redo-undo experience
@@ -39,7 +40,12 @@ const debounceExecuteFactory = (commandService: ICommandService) => debounce(
},
1000
);
-
+function getSheetIdByName(univerInstanceService: IUniverInstanceService, unitId: string, name: string) {
+ if (unitId) {
+ return univerInstanceService.getUnit<Workbook>(unitId)?.getSheetBySheetName(name)?.getSheetId() || '';
+ }
+ return univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getSheetBySheetName(name)?.getSheetId() || '';
+}
export function DataValidationDetail() {
const [key, setKey] = useState(0);
const dataValidationPanelService = useDependency(DataValidationPanelService);
@@ -47,6 +53,8 @@ export function DataValidationDetail() {
const { unitId, subUnitId, rule } = activeRuleInfo || {};
const ruleId = rule.uid;
const validatorService = useDependency(DataValidatorRegistryService);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+
const componentManager = useDependency(ComponentManager);
const commandService = useDependency(ICommandService);
const dataValidationModel = useDependency(DataValidationModel);
@@ -58,6 +66,9 @@ export function DataValidationDetail() {
const [localRanges, setLocalRanges] = useState<IUnitRange[]>(() => localRule.ranges.map((i) => ({ unitId: '', sheetId: '', range: i })));
const debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]);
+ const rangeSelectorActionsRef = useRef<Parameters<typeof RangeSelector>[0]['actions']>({});
+ const [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(false);
+
const sheetSelectionService = useDependency(SheetsSelectionsService);
useEffect(() => {
@@ -103,7 +114,18 @@ export function DataValidationDetail() {
}
};
- const handleUpdateRuleRanges = useEvent((unitRanges: IUnitRange[]) => {
+ const handleUpdateRuleRanges = useEvent((rangeText: string) => {
+ const unitRanges = rangeText.split(',').map(deserializeRangeWithSheet).map((unitRange) => {
+ const sheetName = unitRange.sheetName;
+ if (sheetName) {
+ const sheetId = getSheetIdByName(univerInstanceService, unitRange.unitId, sheetName);
+ return { ...unitRange, sheetId };
+ }
+ return {
+ ...unitRange, sheetId: '',
+ };
+ });
+
if (isUnitRangesEqual(unitRanges, localRanges)) {
return;
}
@@ -222,13 +244,27 @@ export function DataValidationDetail() {
}
);
};
+
+ const handlePanelClick = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+ const handleOutClick = rangeSelectorActionsRef.current?.handleOutClick;
+ handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
+ };
+
return (
- <div className={styles.dataValidationDetail}>
+ <div className={styles.dataValidationDetail} onClick={handlePanelClick}>
<FormLayout
label={localeService.t('dataValidation.panel.range')}
error={!localRule.ranges.length ? localeService.t('dataValidation.panel.rangeError') : ''}
>
<RangeSelector
+ unitId={unitId}
+ subUnitId={subUnitId}
+ initValue={rangeStr}
+ onChange={handleUpdateRuleRanges}
+ isFocus={isFocusRangeSelector}
+ actions={rangeSelectorActionsRef.current}
+ />
+ {/* <RangeSelector
key={key}
className={styles.dataValidationDetailFormItem}
value={rangeStr}
@@ -243,7 +279,7 @@ export function DataValidationDetail() {
handleUpdateRuleRanges(newRange);
}}
- />
+ /> */}
</FormLayout>
<FormLayout label={localeService.t('dataValidation.panel.type')}>
<Select
diff --git a/packages/sheets-formula-ui/package.json b/packages/sheets-formula-ui/package.json
index f7ade3194d..da31d584cb 100644
--- a/packages/sheets-formula-ui/package.json
+++ b/packages/sheets-formula-ui/package.json
@@ -79,7 +79,8 @@
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*"
+ "@univerjs/ui": "workspace:*",
+ "clsx": "^2.1.1"
},
"devDependencies": {
"@types/react": "^18.3.11",
diff --git a/packages/sheets-formula-ui/src/controllers/prompt.controller.ts b/packages/sheets-formula-ui/src/controllers/prompt.controller.ts
index 4b6dbdde59..c487befd1f 100644
--- a/packages/sheets-formula-ui/src/controllers/prompt.controller.ts
+++ b/packages/sheets-formula-ui/src/controllers/prompt.controller.ts
@@ -90,13 +90,13 @@ import {
ExpandSelectionCommand,
getEditorObject,
IEditorBridgeService,
+ isRangeSelector,
JumpOver,
MoveSelectionCommand,
SheetSkeletonManagerService,
} from '@univerjs/sheets-ui';
-
import { IContextMenuService, ILayoutService, KeyCode, MetaKeys, SetEditorResizeOperation, UNI_DISABLE_CHANGING_FOCUS_KEY } from '@univerjs/ui';
-import { distinctUntilChanged, distinctUntilKeyChanged } from 'rxjs';
+import { distinctUntilChanged, distinctUntilKeyChanged, filter } from 'rxjs';
import { SelectEditorFormulaOperation } from '../commands/operations/editor-formula.operation';
import { HelpFunctionOperation } from '../commands/operations/help-function.operation';
import { ReferenceAbsoluteOperation } from '../commands/operations/reference-absolute.operation';
@@ -254,31 +254,27 @@ export class PromptController extends Disposable {
this.disposeWithMe(
this._docSelectionManagerService.textSelection$
.pipe(
- distinctUntilChanged(
- (prev, curr) =>
- prev?.unitId === curr?.unitId &&
- prev?.segmentId === curr?.segmentId &&
- Boolean(prev?.textRanges.every((t, i) => t.startOffset === curr?.textRanges[i].startOffset && t.endOffset === curr?.textRanges[i].endOffset))
- )
+ filter((item) => {
+ return !isRangeSelector(item.unitId);
+ })
)
.subscribe((params) => {
if (params?.unitId == null) {
return;
}
-
const editor = this._editorService.getEditor(params.unitId);
if (!editor
- || editor.onlyInputContent()
- || (editor.isSheetEditor() && !this._isFormulaEditorActivated())
- // Remove this latter.
- || editor.params.scrollBar
+ || editor.onlyInputContent()
+ || (editor.isSheetEditor() && !this._isFormulaEditorActivated())
+ // Remove this latter.
+ || editor.params.scrollBar
) {
return;
}
const onlyInputRange = editor.onlyInputRange();
- // @ts-ignore
+ // @ts-ignore
if (params?.options?.fromSelection) {
return;
} else {
@@ -298,7 +294,7 @@ export class PromptController extends Disposable {
return;
}
- // TODO@Dushusir: use real text info
+ // TODO@Dushusir: use real text info
this._changeFunctionPanelState();
})
);
@@ -314,6 +310,10 @@ export class PromptController extends Disposable {
return;
}
+ if (isRangeSelector(unitId)) {
+ return;
+ }
+
if (this._listenInputCache.has(unitId)) {
return;
}
@@ -385,6 +385,9 @@ export class PromptController extends Disposable {
const editorId = documentDataModel.getUnitId();
+ if (isRangeSelector(editorId)) {
+ return;
+ }
if (!this._editorService.isEditor(editorId) || this._previousEditorUnitId === editorId) {
return;
}
@@ -1560,7 +1563,9 @@ export class PromptController extends Disposable {
const nodeIndex = Number(id);
const currentNode = this._formulaPromptService.getCurrentSequenceNodeByIndex(nodeIndex);
-
+ if (!currentNode) {
+ return;
+ }
let refType: IAbsoluteRefTypeForRange = { startAbsoluteRefType: AbsoluteRefType.NONE };
if (typeof currentNode !== 'string') {
const token = (currentNode as ISequenceNode).token;
diff --git a/packages/sheets-formula-ui/src/index.ts b/packages/sheets-formula-ui/src/index.ts
index b8a38ff903..dd5d38dd98 100644
--- a/packages/sheets-formula-ui/src/index.ts
+++ b/packages/sheets-formula-ui/src/index.ts
@@ -21,6 +21,8 @@ export { InsertFunctionOperation } from './commands/operations/insert-function.o
export { MoreFunctionsOperation } from './commands/operations/more-functions.operation';
export { ReferenceAbsoluteOperation } from './commands/operations/reference-absolute.operation';
export { SearchFunctionOperation } from './commands/operations/search-function.operation';
+export { RangeSelector } from './views/range-selector/index';
+export { RefSelectionsRenderService } from './services/render-services/ref-selections.render-service';
// #region - all commands
diff --git a/packages/sheets-formula-ui/src/services/render-services/ref-selections.render-service.ts b/packages/sheets-formula-ui/src/services/render-services/ref-selections.render-service.ts
index eff94312a4..93d34bc136 100644
--- a/packages/sheets-formula-ui/src/services/render-services/ref-selections.render-service.ts
+++ b/packages/sheets-formula-ui/src/services/render-services/ref-selections.render-service.ts
@@ -22,6 +22,7 @@ import { ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-r
import { convertSelectionDataToRange, getNormalSelectionStyle, IRefSelectionsService, SelectionMoveType } from '@univerjs/sheets';
import { attachSelectionWithCoord, BaseSelectionRenderService, checkInHeaderRanges, getAllSelection, getCoordByOffset, getSheetObject, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
import { IShortcutService } from '@univerjs/ui';
+import { merge } from 'rxjs';
/**
* This service extends the existing `SelectionRenderService` to provide the rendering of prompt selections
@@ -71,6 +72,11 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple
this._remainLastEnabled = enabled;
}
+ /**
+ * This is set to true when you need to add a new selection.
+ * @param {boolean} enabled
+ * @memberof RefSelectionsRenderService
+ */
setSkipLastEnabled(enabled: boolean): void {
this._skipLastEnabled = enabled;
}
@@ -146,7 +152,10 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple
const selectionData = this.attachSelectionWithCoord(selectionWithStyle);
this._addSelectionControlBySelectionData(selectionData);
this._selectionMoveStart$.next(this.getSelectionDataWithStyle());
-
+ const dispose = scene.onPointerUp$.subscribeEvent(() => {
+ dispose.unsubscribe();
+ this._selectionMoveEnd$.next(this.getSelectionDataWithStyle());
+ });
if (evt.button !== 2) {
state.stopPropagation();
}
@@ -187,7 +196,7 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple
// Changing the selection area through the 8 control points of the ref selection will not trigger this subscriber.
// beforeSelectionMoveEnd$ & selectionMoveEnd$ would triggered when change skeleton(change sheet).
- this.disposeWithMe(this._workbookSelections.selectionMoveEnd$.subscribe((selectionsWithStyles) => {
+ this.disposeWithMe(merge(this._workbookSelections.selectionMoveEnd$, this._workbookSelections.selectionSet$).subscribe((selectionsWithStyles) => {
this._reset();
// The selections' style would be colorful here. PromptController would change the color of selections later.
diff --git a/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.ts b/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.ts
index 1c16866912..fe86d5f37a 100644
--- a/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.ts
+++ b/packages/sheets-formula-ui/src/sheets-formula-ui.plugin.ts
@@ -20,6 +20,8 @@ import { DependentOn, IConfigService, Inject, Injector, Plugin, UniverInstanceTy
import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
import { IRenderManagerService } from '@univerjs/engine-render';
import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula';
+import { RANGE_SELECTOR_COMPONENT_KEY } from '@univerjs/sheets-ui';
+import { ComponentManager } from '@univerjs/ui';
import { FORMULA_UI_PLUGIN_NAME } from './common/plugin-name';
import {
defaultPluginBaseConfig,
@@ -34,6 +36,7 @@ import { FormulaUIController } from './controllers/formula-ui.controller';
import { PromptController } from './controllers/prompt.controller';
import { FormulaPromptService, IFormulaPromptService } from './services/prompt.service';
import { RefSelectionsRenderService } from './services/render-services/ref-selections.render-service';
+import { RangeSelector } from './views/range-selector';
/**
* The configuration of the formula UI plugin.
@@ -88,6 +91,10 @@ export class UniverSheetsFormulaUIPlugin extends Plugin {
this._injector.get(FormulaClipboardController);
this._injector.get(FormulaRenderManagerController);
+
+ const componentManager = this._injector.get(ComponentManager);
+
+ componentManager.register(RANGE_SELECTOR_COMPONENT_KEY, RangeSelector);
}
override onSteady(): void {
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useEditorInput.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useEditorInput.ts
new file mode 100644
index 0000000000..195595bf39
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useEditorInput.ts
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Editor } from '@univerjs/docs-ui';
+import { useDependency } from '@univerjs/core';
+import { matchToken } from '@univerjs/engine-formula';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import { useEffect } from 'react';
+import { RefSelectionsRenderService } from '../../../services/render-services/ref-selections.render-service';
+
+/**
+ * add selections by inputting a `,`.
+ * @param {string} unitId
+ * @param {string} rangeString
+ * @param {Editor} [editor]
+ */
+export const useEditorInput = (unitId: string, rangeString: string, editor?: Editor) => {
+ const renderManagerService = useDependency(IRenderManagerService);
+ const render = renderManagerService.getRenderById(unitId);
+ const refSelectionsRenderService = render?.with(RefSelectionsRenderService);
+
+ useEffect(() => {
+ if (editor && refSelectionsRenderService) {
+ const d = editor.input$.subscribe((e) => {
+ const content = e.content;
+ if (content === matchToken.COMMA) {
+ refSelectionsRenderService.setSkipLastEnabled(true);
+ } else {
+ refSelectionsRenderService.setSkipLastEnabled(false);
+ }
+ });
+ return () => {
+ d.unsubscribe();
+ };
+ }
+ }, [editor, refSelectionsRenderService]);
+
+ useEffect(() => {
+ if (!refSelectionsRenderService) {
+ return;
+ }
+ if (!rangeString.endsWith(matchToken.COMMA)) {
+ refSelectionsRenderService.setSkipLastEnabled(false);
+ }
+ }, [rangeString, refSelectionsRenderService]);
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useFormulaToken.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useFormulaToken.ts
new file mode 100644
index 0000000000..c284f97dc8
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useFormulaToken.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useDependency } from '@univerjs/core';
+import { LexerTreeBuilder } from '@univerjs/engine-formula';
+import { useEffect, useState } from 'react';
+import type { ISequenceNode } from '@univerjs/engine-formula';
+
+export const useFormulaToken = (text: string) => {
+ const lexerTreeBuilder = useDependency(LexerTreeBuilder);
+
+ const [sequenceNodes, sequenceNodesSet] = useState<(string | ISequenceNode)[]>([]);
+
+ useEffect(() => {
+ sequenceNodesSet(lexerTreeBuilder.sequenceNodesBuilder(text) ?? []);
+ }, [text]);
+
+ return {
+ sequenceNodes,
+ sequenceNodesSet,
+ };
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useHighlight.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useHighlight.ts
new file mode 100644
index 0000000000..1761506e65
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useHighlight.ts
@@ -0,0 +1,265 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ITextRun, Workbook } from '@univerjs/core';
+import type { ISequenceNode } from '@univerjs/engine-formula';
+import type { ISelectionStyle, ISelectionWithStyle } from '@univerjs/sheets';
+import { ColorKit, IUniverInstanceService, ThemeService, useDependency } from '@univerjs/core';
+import { IEditorService } from '@univerjs/docs-ui';
+import { deserializeRangeWithSheet, sequenceNodeType } from '@univerjs/engine-formula';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import { IRefSelectionsService, setEndForRange } from '@univerjs/sheets';
+import { IDescriptionService } from '@univerjs/sheets-formula';
+import { attachRangeWithCoord, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { useEffect, useMemo, useState } from 'react';
+import { RefSelectionsRenderService } from '../../../services/render-services/ref-selections.render-service';
+
+interface IRefSelection {
+ refIndex: number;
+ themeColor: string;
+ token: string;
+}
+
+/**
+ * @param {string} unitId
+ * @param {string} subUnitId 打开面板的时候传入的 sheetId
+ * @param {IRefSelection[]} refSelections
+ */
+
+export function useSheetHighlight(isNeed: boolean, unitId: string, subUnitId: string, refSelections: IRefSelection[]) {
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const themeService = useDependency(ThemeService);
+ const refSelectionsService = useDependency(IRefSelectionsService);
+ const renderManagerService = useDependency(IRenderManagerService);
+ const render = renderManagerService.getRenderById(unitId);
+ const refSelectionsRenderService = render?.with(RefSelectionsRenderService);
+ const sheetSkeletonManagerService = render?.with(SheetSkeletonManagerService);
+
+ const [ranges, rangesSet] = useState<ISelectionWithStyle[]>([]);
+
+ useEffect(() => {
+ const workbook = univerInstanceService.getUnit<Workbook>(unitId);
+ const worksheet = workbook?.getActiveSheet();
+ const selectionWithStyle: ISelectionWithStyle[] = [];
+ if (!workbook || !worksheet || !isNeed) {
+ rangesSet(selectionWithStyle);
+ return;
+ }
+ const currentSheetId = worksheet?.getSheetId();
+ const getSheetIdByName = (name: string) => workbook?.getSheetBySheetName(name)?.getSheetId();
+
+ for (let i = 0, len = refSelections.length; i < len; i++) {
+ const refSelection = refSelections[i];
+ const { themeColor, token, refIndex } = refSelection;
+
+ const unitRangeName = deserializeRangeWithSheet(token);
+ const { unitId: refUnitId, sheetName, range: rawRange } = unitRangeName;
+ if (refUnitId && unitId !== refUnitId) {
+ continue;
+ }
+
+ const refSheetId = getSheetIdByName(sheetName);
+
+ if (refSheetId && refSheetId !== currentSheetId) {
+ continue;
+ }
+
+ const range = setEndForRange(rawRange, worksheet.getRowCount(), worksheet.getColumnCount());
+
+ selectionWithStyle.push({
+ range,
+ primary: undefined,
+ style: getFormulaRefSelectionStyle(themeService, themeColor, refIndex.toString()),
+ });
+ }
+ rangesSet(selectionWithStyle);
+ }, [unitId, subUnitId, refSelections, isNeed]);
+
+ useEffect(() => {
+ const skeleton = sheetSkeletonManagerService?.getCurrentSkeleton();
+ if (skeleton) {
+ const allControls = refSelectionsRenderService?.getSelectionControls() || [];
+ if (allControls.length === ranges.length) {
+ allControls.forEach((control, index) => {
+ const selection = ranges[index];
+ const primaryCell = skeleton.getCellByIndex(selection.range.startRow, selection.range.startColumn);
+ control.updateRange(attachRangeWithCoord(skeleton, selection.range), primaryCell);
+ control.updateStyle(selection.style!);
+ });
+ } else {
+ refSelectionsService.setSelections(ranges);
+ }
+ }
+ }, [ranges, sheetSkeletonManagerService]);
+
+ useEffect(() => () => {
+ refSelectionsService.setSelections([]);
+ }, []);
+}
+
+export function useDocHight(editorId: string, sequenceNodes: (string | ISequenceNode)[]) {
+ const editorService = useDependency(IEditorService);
+ const descriptionService = useDependency(IDescriptionService);
+ const colorMap = useColor();
+ const [ranges, rangesSet] = useState<IRefSelection[]>([]);
+
+ useEffect(() => {
+ const editor = editorService.getEditor(editorId);
+ if (!editor) {
+ return;
+ }
+ const data = editor.getDocumentData();
+ if (!data) {
+ return;
+ }
+ const body = data.body;
+ if (!body) {
+ return;
+ }
+ const cloneBody = { dataStream: '', ...data.body };
+ if (sequenceNodes == null || sequenceNodes.length === 0) {
+ cloneBody.textRuns = [];
+ cloneBody.dataStream = '\r\n';
+ rangesSet([]);
+ } else {
+ const { textRuns, refSelections } = buildTextRuns(descriptionService, colorMap, sequenceNodes);
+ cloneBody.textRuns = textRuns;
+ const text = sequenceNodes.reduce((pre, cur) => {
+ if (typeof cur === 'string') {
+ return `${pre}${cur}`;
+ }
+ return `${pre}${cur.token}`;
+ }, '');
+ cloneBody.dataStream = `${text}\r\n`;
+ rangesSet(refSelections);
+ }
+ // Switching between uppercase and lowercase will trigger a reflow, causing the cursor to be misplaced. Let's refresh the cursor position here.
+ const selection = editor.getSelectionRanges();
+ const cloneData = { ...data, body: cloneBody };
+ editor.setDocumentData(cloneData, selection);
+ }, [editorId, sequenceNodes, colorMap]);
+
+ return ranges;
+}
+
+export function useColor() {
+ const themeService = useDependency(ThemeService);
+ const style = themeService.getCurrentTheme();
+ const result = useMemo(() => {
+ const formulaRefColors = [
+ style.loopColor1,
+ style.loopColor2,
+ style.loopColor3,
+ style.loopColor4,
+ style.loopColor5,
+ style.loopColor6,
+ style.loopColor7,
+ style.loopColor8,
+ style.loopColor9,
+ style.loopColor10,
+ style.loopColor11,
+ style.loopColor12,
+ ];
+ const numberColor = style.hyacinth700;
+ const stringColor = style.verdancy800;
+ return { formulaRefColors, numberColor, stringColor };
+ }, [style]);
+ return result;
+}
+
+export function buildTextRuns(descriptionService: IDescriptionService, colorMap: {
+ formulaRefColors: string[];
+ numberColor: string;
+ stringColor: string;
+}, sequenceNodes: Array<ISequenceNode | string>) {
+ const { formulaRefColors, numberColor, stringColor } = colorMap;
+ const textRuns: ITextRun[] = [];
+ const refSelections: IRefSelection[] = [];
+ const themeColorMap = new Map<string, string>();
+ let refColorIndex = 0;
+
+ for (let i = 0, len = sequenceNodes.length; i < len; i++) {
+ const node = sequenceNodes[i];
+ if (typeof node === 'string') {
+ const theLastItem = textRuns[textRuns.length - 1];
+ const start = theLastItem ? (theLastItem.ed) : 0;
+ const end = start + node.length;
+ textRuns.push({
+ st: start,
+ ed: end,
+ });
+ continue;
+ }
+ if (descriptionService.hasDefinedNameDescription(node.token.trim())) {
+ continue;
+ }
+ const { startIndex, endIndex, nodeType, token } = node;
+ let themeColor = '';
+ if (nodeType === sequenceNodeType.REFERENCE) {
+ if (themeColorMap.has(token)) {
+ themeColor = themeColorMap.get(token)!;
+ } else {
+ const colorIndex = refColorIndex % formulaRefColors.length;
+ themeColor = formulaRefColors[colorIndex];
+ themeColorMap.set(token, themeColor);
+ refColorIndex++;
+ }
+
+ refSelections.push({
+ refIndex: i,
+ themeColor,
+ token,
+ });
+ } else if (nodeType === sequenceNodeType.NUMBER) {
+ themeColor = numberColor;
+ } else if (nodeType === sequenceNodeType.STRING) {
+ themeColor = stringColor;
+ } else if (nodeType === sequenceNodeType.ARRAY) {
+ themeColor = stringColor;
+ }
+
+ if (themeColor && themeColor.length > 0) {
+ textRuns.push({
+ st: startIndex,
+ ed: endIndex + 1,
+ ts: {
+ cl: {
+ rgb: themeColor,
+ },
+ },
+ });
+ }
+ }
+
+ return { textRuns, refSelections };
+};
+function getFormulaRefSelectionStyle(themeService: ThemeService, refColor: string, id: string): ISelectionStyle {
+ const style = themeService.getCurrentTheme();
+ const fill = new ColorKit(refColor).setAlpha(0.05).toRgbString();
+ return {
+ id,
+ strokeWidth: 1,
+ stroke: refColor,
+ fill,
+ widgets: { tl: true, tc: true, tr: true, ml: true, mr: true, bl: true, bc: true, br: true },
+ widgetSize: 6,
+ widgetStrokeWidth: 1,
+ widgetStroke: style.colorWhite,
+ hasAutoFill: false,
+ hasRowHeader: false,
+ hasColumnHeader: false,
+ };
+}
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useIsFirstRender.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useIsFirstRender.ts
new file mode 100644
index 0000000000..775414ba26
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useIsFirstRender.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useLayoutEffect, useRef } from 'react';
+
+export const useIsFirstRender = () => {
+ const isFirstRef = useRef(true);
+ useLayoutEffect(() => {
+ isFirstRef.current = false;
+ }, []);
+ return isFirstRef;
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useRefactorEffect.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useRefactorEffect.ts
new file mode 100644
index 0000000000..4e4261527b
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useRefactorEffect.ts
@@ -0,0 +1,92 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Workbook } from '@univerjs/core';
+import { IContextService, IUniverInstanceService, UniverInstanceType, useDependency } from '@univerjs/core';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import { DISABLE_NORMAL_SELECTIONS, SheetsSelectionsService } from '@univerjs/sheets';
+import { IEditorBridgeService } from '@univerjs/sheets-ui';
+import { IContextMenuService } from '@univerjs/ui';
+import { useEffect, useLayoutEffect } from 'react';
+
+import { RefSelectionsRenderService } from '../../../services/render-services/ref-selections.render-service';
+
+export const useRefactorEffect = (isNeed: boolean, unitId: string, isOnlyOneRange: boolean) => {
+ const renderManagerService = useDependency(IRenderManagerService);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const contextService = useDependency(IContextService);
+ const editorBridgeService = useDependency(IEditorBridgeService);
+ const sheetsSelectionsService = useDependency(SheetsSelectionsService);
+ const contextMenuService = useDependency(IContextMenuService);
+
+ const render = renderManagerService.getRenderById(unitId);
+ const refSelectionsRenderService = render?.with(RefSelectionsRenderService);
+
+ useEffect(() => {
+ if (isNeed) {
+ const d1 = refSelectionsRenderService?.enableSelectionChanging();
+ contextService.setContextValue(DISABLE_NORMAL_SELECTIONS, true);
+ editorBridgeService.enableForceKeepVisible();
+
+ return () => {
+ d1?.dispose();
+ contextService.setContextValue(DISABLE_NORMAL_SELECTIONS, false);
+ editorBridgeService.disableForceKeepVisible();
+ };
+ }
+ }, [isNeed]);
+
+ // reset selection
+ useLayoutEffect(() => {
+ if (isNeed) {
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
+ const sheet = workbook?.getActiveSheet();
+ const selections = [...sheetsSelectionsService.getCurrentSelections()];
+ return () => {
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
+ const currentSheet = workbook?.getActiveSheet();
+ if (currentSheet && currentSheet === sheet) {
+ sheetsSelectionsService.setSelections(selections);
+ }
+ };
+ }
+ }, [isNeed]);
+
+ //right context controller
+ useEffect(() => {
+ if (isNeed) {
+ contextMenuService.disable();
+ return () => {
+ contextMenuService.enable();
+ };
+ }
+ }, [isNeed]);
+
+ // reset setSkipLastEnabled
+ useEffect(() => {
+ if (isNeed) {
+ refSelectionsRenderService?.setSkipLastEnabled(false);
+ }
+ }, [isNeed]);
+
+ useEffect(() => {
+ if (isOnlyOneRange) {
+ refSelectionsRenderService?.setRemainLastEnabled(false);
+ } else {
+ refSelectionsRenderService?.setRemainLastEnabled(true);
+ }
+ }, [isOnlyOneRange]);
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useResize.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useResize.ts
new file mode 100644
index 0000000000..25afa03b27
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useResize.ts
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Nullable } from '@univerjs/core';
+import { debounce } from '@univerjs/core';
+import { DocSkeletonManagerService } from '@univerjs/docs';
+import { type Editor, VIEWPORT_KEY } from '@univerjs/docs-ui';
+import { ScrollBar } from '@univerjs/engine-render';
+import { useEffect, useMemo } from 'react';
+
+export const useResize = (editor?: Editor) => {
+ const resize = () => {
+ if (editor) {
+ const { scene, mainComponent } = editor.render;
+ const docSkeletonManagerService = editor.render.with(DocSkeletonManagerService);
+ const { width, height } = editor.getBoundingClientRect();
+
+ docSkeletonManagerService.getViewModel().getDataModel().updateDocumentDataPageSize(Infinity);
+ scene.transformByState({
+ width,
+ height,
+ });
+
+ mainComponent?.resize(width, height);
+ }
+ };
+
+ const checkScrollBar = useMemo(() => {
+ return debounce(() => {
+ if (!editor) {
+ return;
+ }
+ const docSkeletonManagerService = editor.render.with(DocSkeletonManagerService);
+ const skeleton = docSkeletonManagerService.getSkeleton();
+ const { scene, mainComponent } = editor.render;
+ const viewportMain = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);
+ const { actualWidth } = skeleton.getActualSize();
+ const { width, height } = editor.getBoundingClientRect();
+ let scrollBar = viewportMain?.getScrollBar() as Nullable<ScrollBar>;
+ const contentWidth = Math.max(actualWidth, width);
+
+ const contentHeight = height;
+
+ scene.transformByState({
+ width: contentWidth,
+ height: contentHeight,
+ });
+
+ mainComponent?.resize(contentWidth, contentHeight);
+
+ if (actualWidth > width) {
+ if (scrollBar == null) {
+ viewportMain && new ScrollBar(viewportMain, { barSize: 8, enableVertical: false });
+ } else {
+ viewportMain?.resetCanvasSizeAndUpdateScroll();
+ }
+ } else {
+ scrollBar = null;
+ viewportMain?.scrollToBarPos({ x: 0, y: 0 });
+ viewportMain?.getScrollBar()?.dispose();
+ }
+ }, 30);
+ }, [editor]);
+
+ useEffect(() => {
+ if (editor) {
+ const time = setTimeout(() => {
+ resize();
+ checkScrollBar();
+ }, 500);
+ return () => {
+ clearTimeout(time);
+ };
+ }
+ }, [editor]);
+
+ useEffect(() => {
+ if (editor) {
+ const d = editor.input$.subscribe(() => {
+ checkScrollBar();
+ });
+ return () => {
+ d.unsubscribe();
+ };
+ }
+ }, [editor]);
+
+ return { resize, checkScrollBar };
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useSheetSelectionChange.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useSheetSelectionChange.ts
new file mode 100644
index 0000000000..0e51795096
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useSheetSelectionChange.ts
@@ -0,0 +1,222 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* eslint-disable max-lines-per-function */
+
+import type { Workbook } from '@univerjs/core';
+import type { ISelectionWithCoordAndStyle } from '@univerjs/sheets';
+import type { INode } from '../utils/filterReferenceNode';
+
+import { debounce, DisposableCollection, IUniverInstanceService, useDependency } from '@univerjs/core';
+import { deserializeRangeWithSheet, matchToken, sequenceNodeType, serializeRange, serializeRangeWithSheet } from '@univerjs/engine-formula';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import { useEffect, useMemo, useRef } from 'react';
+import { distinctUntilChanged, map } from 'rxjs';
+import { throttleTime } from 'rxjs/operators';
+import { RefSelectionsRenderService } from '../../../services/render-services/ref-selections.render-service';
+import { filterReferenceNode, isComma } from '../utils/filterReferenceNode';
+import { rangePreProcess } from '../utils/rangePreProcess';
+import { sequenceNodeToText } from '../utils/sequenceNodeToText';
+import { getSheetNameById, unitRangesToText } from '../utils/unitRangesToText';
+
+export const useSheetSelectionChange = (isNeed: boolean,
+ unitId: string,
+ _subUnitId: string,
+ sequenceNodes: INode[],
+ isSupportAcrossSheet: boolean,
+ isOnlyOneRange: boolean,
+ handleRangeChange: (refString: string, offset: number) => void) => {
+ const renderManagerService = useDependency(IRenderManagerService);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const isScalingRef = useRef(false);
+
+ const debounceReset = useMemo(() => debounce(() => {
+ isScalingRef.current = false;
+ }, 300), []);
+
+ const setIsScaling = () => {
+ isScalingRef.current = true;
+ debounceReset();
+ };
+
+ const render = renderManagerService.getRenderById(unitId);
+ const refSelectionsRenderService = render?.with(RefSelectionsRenderService);
+ const oldFilterReferenceNodes = useRef<INode[]>([]);
+ const filterReferenceNodes = useMemo(() => {
+ const newFilterReferenceNodes = filterReferenceNode(sequenceNodes);
+ const old = oldFilterReferenceNodes.current;
+ if (newFilterReferenceNodes.length === old.length) {
+ old.splice(0);
+ old.push(...newFilterReferenceNodes);
+ return old;
+ }
+ return newFilterReferenceNodes;
+ }, [sequenceNodes]);
+ oldFilterReferenceNodes.current = filterReferenceNodes;
+
+ useEffect(() => {
+ if (isNeed && refSelectionsRenderService) {
+ let isFirst = true;
+ const handleSelectionsChange = (selections: ISelectionWithCoordAndStyle[]) => {
+ if (isFirst) {
+ isFirst = false;
+ return;
+ }
+ const cloneSelectionList = [...selections];
+ const workbook = univerInstanceService.getUnit<Workbook>(unitId);
+ const currentSheetName = workbook?.getActiveSheet()?.getName() || '';
+ const newSequenceNodes = filterReferenceNodes.map((node, index) => {
+ if (typeof node === 'string') {
+ const preItem = filterReferenceNodes[index - 1];
+ if (!preItem) {
+ return null;
+ }
+ const nextItem = filterReferenceNodes[index + 1];
+ if (isComma(node)) {
+ if (isComma(nextItem)) {
+ return null;
+ }
+ if (index === (filterReferenceNodes.length - 1)) {
+ return null;
+ }
+ }
+ return node;
+ } else if (node.nodeType === sequenceNodeType.REFERENCE) {
+ const unitRange = deserializeRangeWithSheet(node.token);
+ unitRange.unitId = unitRange.unitId === '' ? unitId : unitRange.unitId;
+ unitRange.sheetName = unitRange.sheetName === '' ? currentSheetName : unitRange.sheetName;
+
+ const { unitId: rangeUnitId, sheetName: rangeSubName } = unitRange;
+ if (isOnlyOneRange) {
+ if (rangeUnitId !== unitId || currentSheetName !== rangeSubName) {
+ return null;
+ }
+ }
+ if (rangeUnitId === unitId && currentSheetName === rangeSubName) {
+ const currentSelection = cloneSelectionList.shift();
+ if (currentSelection && getSheetNameById(univerInstanceService, unitId, currentSelection.rangeWithCoord.sheetId || '') === rangeSubName) {
+ const cloneNode = { ...node };
+ rangePreProcess(currentSelection.rangeWithCoord);
+ if (isSupportAcrossSheet) {
+ cloneNode.token = serializeRangeWithSheet(currentSheetName, currentSelection.rangeWithCoord);
+ } else {
+ cloneNode.token = serializeRange(currentSelection.rangeWithCoord);
+ }
+ return cloneNode;
+ }
+ }
+ return node;
+ }
+ return null;
+ }).filter((e) => !!e) as INode[];
+ const theLast = unitRangesToText(
+ cloneSelectionList.map((e) => ({
+ range: e.rangeWithCoord,
+ unitId: e.rangeWithCoord.unitId ?? '',
+ sheetName: getSheetNameById(univerInstanceService, e.rangeWithCoord.unitId ?? '', e.rangeWithCoord.sheetId ?? ''),
+ })),
+ isSupportAcrossSheet
+ )
+ .join(matchToken.COMMA);
+ const thePre = sequenceNodeToText(newSequenceNodes);
+ const result = `${thePre}${(thePre && theLast) ? matchToken.COMMA : ''}${theLast}`;
+ const isScaling = isScalingRef.current;
+ handleRangeChange(result, isScaling ? -1 : result.length);
+ };
+ const d1 = refSelectionsRenderService.selectionMoveEnd$.subscribe((selections) => {
+ handleSelectionsChange(selections);
+ });
+
+ const d2 = refSelectionsRenderService.selectionMoving$.pipe(throttleTime(50)).subscribe((selections) => {
+ handleSelectionsChange(selections);
+ });
+
+ return () => {
+ d1.unsubscribe();
+ d2.unsubscribe();
+ };
+ }
+ }, [isNeed, filterReferenceNodes, refSelectionsRenderService, isSupportAcrossSheet, isOnlyOneRange]);
+
+ useEffect(() => {
+ if (isNeed && refSelectionsRenderService) {
+ const disposableCollection = new DisposableCollection();
+ const handleSequenceNodeReplace = (token: string, index: number) => {
+ let currentIndex = 0;
+ let offset = 0;
+ let isFinish = false;
+ const workbook = univerInstanceService.getUnit<Workbook>(unitId);
+ const currentSheetName = workbook?.getActiveSheet()?.getName() || '';
+ const newSequenceNodes = filterReferenceNodes.map((node) => {
+ if (typeof node === 'string') {
+ if (!isFinish) {
+ offset += node.length;
+ }
+ return node;
+ } else if (node.nodeType === sequenceNodeType.REFERENCE) {
+ if (!isFinish) {
+ offset += node.token.length;
+ }
+ const unitRange = deserializeRangeWithSheet(token);
+ unitRange.unitId = unitRange.unitId === '' ? unitId : unitRange.unitId;
+ unitRange.sheetName = unitRange.sheetName === '' ? currentSheetName : unitRange.sheetName;
+ if (currentIndex === index) {
+ isFinish = true;
+ const cloneNode = { ...node, token };
+ if (isSupportAcrossSheet) {
+ cloneNode.token = serializeRangeWithSheet(unitRange.sheetName, unitRange.range);
+ } else {
+ cloneNode.token = serializeRange(unitRange.range);
+ }
+ currentIndex++;
+ return cloneNode;
+ }
+ currentIndex++;
+ return node;
+ }
+ return node;
+ });
+ const result = sequenceNodeToText(newSequenceNodes);
+ handleRangeChange(result, offset || -1);
+ };
+ let time = 0 as any;
+ const dispose = refSelectionsRenderService.selectionMoveEnd$.subscribe(() => {
+ time = setTimeout(() => {
+ const controls = refSelectionsRenderService.getSelectionControls();
+ controls.forEach((control, index) => {
+ disposableCollection.add(control.selectionScaling$.subscribe((e) => {
+ const rangeText = serializeRange(e);
+ handleSequenceNodeReplace(rangeText, index);
+ setIsScaling();
+ }));
+ disposableCollection.add(control.selectionMoving$.pipe(map((e) => {
+ return serializeRange(e);
+ }), distinctUntilChanged()).subscribe((rangeText) => {
+ handleSequenceNodeReplace(rangeText, index);
+ setIsScaling();
+ }));
+ });
+ }, 30);
+ });
+
+ return () => {
+ dispose.unsubscribe();
+ disposableCollection.dispose();
+ clearTimeout(time);
+ };
+ }
+ }, [isNeed, refSelectionsRenderService, filterReferenceNodes]);
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useVerify.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useVerify.ts
new file mode 100644
index 0000000000..537e2dbf0e
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useVerify.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useEffect, useRef } from 'react';
+import { sequenceNodeToText } from '../utils/sequenceNodeToText';
+import { verifyRange } from '../utils/verifyRange';
+import type { IRangeSelectorProps } from '../';
+import type { useFormulaToken } from './useFormulaToken';
+
+export const useVerify = (onVerify: IRangeSelectorProps['onVerify'], sequenceNodes: ReturnType<typeof useFormulaToken>['sequenceNodes']) => {
+ const isInitRender = useRef(true);
+
+ // No validation is performed during the initialization phase.
+ useEffect(() => {
+ const time: any = setTimeout(() => {
+ isInitRender.current = false;
+ }, 500);
+ return () => {
+ clearTimeout(time);
+ };
+ });
+
+ useEffect(() => {
+ if (!isInitRender.current) {
+ if (onVerify) {
+ const result = verifyRange(sequenceNodes);
+ onVerify(result, sequenceNodeToText(sequenceNodes));
+ }
+ }
+ }, [sequenceNodes, onVerify]);
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/index.module.less b/packages/sheets-formula-ui/src/views/range-selector/index.module.less
new file mode 100644
index 0000000000..e30d52e97f
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/index.module.less
@@ -0,0 +1,63 @@
+.sheet-range-selector {
+ &-text-wrap {
+ height: 32px;
+ padding: 6px 8px 2px 6px;
+ width: 100%;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ gap: 8px;
+ border: 1px solid rgb(var(--border-color));
+ border-radius: var(--border-radius-base);
+ box-sizing: border-box;
+ position: relative;
+ }
+
+ &-placeholder {
+ font-size: 14px;
+ color: rgb(var(--grey-500));
+ position: absolute;
+ left: 5px;
+ bottom: 8px;
+ }
+
+ &-error {
+ border: 1px solid rgb(var(--red-500));
+ }
+
+ &-error-wrap {
+ font-size: 12px;
+ color: rgb(var(--red-500));
+ position: absolute;
+ bottom: -18px;
+ left: 0px;
+ }
+
+ &-text {
+ position: relative;
+ height: 22px;
+ width: 100%;
+ }
+
+ &-active {
+ border-color: rgb(var(--hyacinth-500));
+ }
+
+ &-icon {
+ cursor: pointer;
+ }
+
+ &-dialog {
+ &-item {
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ gap: 16px;
+ margin-bottom: 8px;
+
+ &-delete {
+ cursor: pointer;
+ }
+ }
+ }
+}
diff --git a/packages/sheets-formula-ui/src/views/range-selector/index.tsx b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
new file mode 100644
index 0000000000..6614e7f4c6
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
@@ -0,0 +1,485 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { IDisposable, IUnitRangeName } from '@univerjs/core';
+import type { Editor } from '@univerjs/docs-ui';
+import type { ReactNode } from 'react';
+import { createInternalEditorID, debounce, generateRandomId, ICommandService, LocaleService, useDependency } from '@univerjs/core';
+import { Button, Dialog, Input, Tooltip } from '@univerjs/design';
+import { DocBackScrollRenderController, IEditorService } from '@univerjs/docs-ui';
+import { deserializeRangeWithSheet, LexerTreeBuilder, matchToken, sequenceNodeType } from '@univerjs/engine-formula';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import { CloseSingle, DeleteSingle, IncreaseSingle, SelectRangeSingle } from '@univerjs/icons';
+import { SetWorksheetActiveOperation } from '@univerjs/sheets';
+import { IDescriptionService } from '@univerjs/sheets-formula';
+
+import { RANGE_SELECTOR_SYMBOLS, SetCellEditVisibleOperation } from '@univerjs/sheets-ui';
+import cl from 'clsx';
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { RefSelectionsRenderService } from '../../services/render-services/ref-selections.render-service';
+import { useEditorInput } from './hooks/useEditorInput';
+import { useFormulaToken } from './hooks/useFormulaToken';
+
+import { buildTextRuns, useColor, useDocHight, useSheetHighlight } from './hooks/useHighlight';
+import { useRefactorEffect } from './hooks/useRefactorEffect';
+import { useResize } from './hooks/useResize';
+import { useSheetSelectionChange } from './hooks/useSheetSelectionChange';
+import { useVerify } from './hooks/useVerify';
+import styles from './index.module.less';
+import { rangePreProcess } from './utils/rangePreProcess';
+import { sequenceNodeToText } from './utils/sequenceNodeToText';
+import { unitRangesToText } from './utils/unitRangesToText';
+import { verifyRange } from './utils/verifyRange';
+
+export interface IRangeSelectorProps {
+ initValue: string | IUnitRangeName[];
+ onChange: (result: string) => void;
+ unitId: string;
+ subUnitId: string;
+ errorText?: string | ReactNode;
+ onVerify?: (res: boolean, result: string) => void;
+ placeholder?: string;
+ isFocus?: boolean;
+ onBlur?: () => void;
+ /**
+ * 暂无效果
+ * @memberof IRangeSelectorProps
+ */
+ onFocus?: () => void;
+
+ actions?: {
+ handleOutClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>, cb: (v: boolean) => void) => void;
+ };
+
+ /**
+ * 是否只允许最多一个 range 区域,默认为 false。
+ * @type {boolean}
+ */
+ isOnlyOneRange?: boolean;
+
+ /**
+ * 是否支持跨表选择选区.
+ * 如果不支持,那么会舍弃所有的 sheetName 信息
+ * @type {boolean}
+ * @memberof IRangeSelectorProps
+ */
+ isSupportAcrossSheet?: boolean;
+
+ onRangeSelectorDialogVisibleChange?: (visible: boolean) => void;
+};
+
+const noopFunction = () => { };
+export function RangeSelector(props: IRangeSelectorProps) {
+ const { initValue, unitId, subUnitId, errorText, placeholder, actions,
+ onChange = noopFunction,
+ onVerify = noopFunction,
+ onRangeSelectorDialogVisibleChange = noopFunction,
+ onBlur = noopFunction,
+ isFocus: _isFocus = true,
+ isOnlyOneRange = false,
+ isSupportAcrossSheet = false } = props;
+
+ const editorService = useDependency(IEditorService);
+ const localeService = useDependency(LocaleService);
+ const commandService = useDependency(ICommandService);
+ const lexerTreeBuilder = useDependency(LexerTreeBuilder);
+
+ const rangeSelectorWrapRef = useRef<HTMLDivElement>(null);
+ const [rangeDialogVisible, rangeDialogVisibleSet] = useState(false);
+ const [isFocus, isFocusSet] = useState(_isFocus);
+ const editorId = useMemo(() => createInternalEditorID(`${RANGE_SELECTOR_SYMBOLS}-${generateRandomId(4)}`), []);
+ const [editor, editorSet] = useState<Editor>();
+ const containerRef = useRef<HTMLDivElement>(null);
+
+ const [rangeString, rangeStringSet] = useState(() => {
+ if (typeof initValue === 'string') {
+ return initValue;
+ } else {
+ return unitRangesToText(initValue, isSupportAcrossSheet).join(matchToken.COMMA);
+ }
+ });
+
+ // init actions
+ if (actions) {
+ actions.handleOutClick = (e: React.MouseEvent<HTMLDivElement, MouseEvent>, cb: (v: boolean) => void) => {
+ if (rangeSelectorWrapRef.current) {
+ const isContain = rangeSelectorWrapRef.current.contains(e.target as Node);
+ cb(isContain);
+ }
+ };
+ }
+
+ const ranges = useMemo(() => {
+ return rangeString.split(matchToken.COMMA).filter((e) => !!e).map((text) => deserializeRangeWithSheet(text));
+ }, [rangeString]);
+
+ const isError = useMemo(() => errorText !== undefined, [errorText]);
+
+ const handleInputDebounce = useMemo(() => debounce((text: string) => {
+ const nodes = lexerTreeBuilder.sequenceNodesBuilder(text);
+ if (nodes) {
+ const verify = verifyRange(nodes);
+ if (verify) {
+ const preNodes = nodes.map((node) => {
+ if (typeof node === 'string') {
+ return node;
+ } else if (node.nodeType === sequenceNodeType.REFERENCE) {
+ const unitRange = deserializeRangeWithSheet(node.token);
+ unitRange.range = rangePreProcess(unitRange.range);
+ if (!isSupportAcrossSheet) {
+ unitRange.sheetName = '';
+ unitRange.unitId = '';
+ }
+ node.token = unitRangesToText([unitRange], isSupportAcrossSheet)[0];
+ }
+ return node;
+ });
+ const result = sequenceNodeToText(preNodes);
+ onChange(result);
+ }
+ } else {
+ rangeStringSet('');
+ }
+ }, 30), [isSupportAcrossSheet]);
+
+ const handleConfirm = (ranges: IUnitRangeName[]) => {
+ const text = unitRangesToText(ranges, isSupportAcrossSheet).join(matchToken.COMMA);
+ rangeStringSet(text);
+ onChange(text);
+ rangeDialogVisibleSet(false);
+ onRangeSelectorDialogVisibleChange(false);
+ };
+
+ const handleClose = () => {
+ rangeDialogVisibleSet(false);
+ onRangeSelectorDialogVisibleChange(false);
+ };
+
+ const handleOpenModal = () => {
+ if (!isError) {
+ rangeDialogVisibleSet(true);
+ onRangeSelectorDialogVisibleChange(true);
+ }
+ };
+
+ const focus = useMemo(() => {
+ let time: NodeJS.Timeout = 0 as any;
+ return () => {
+ clearTimeout(time);
+ if (editor) {
+ time = setTimeout(() => {
+ editor.focus();
+ }, 30);
+ }
+ };
+ }, [editor]);
+
+ const { checkScrollBar } = useResize(editor);
+
+ const handleSheetSelectionChange = useMemo(() => {
+ return (text: string, offset: number) => {
+ rangeStringSet(text);
+ onChange(text);
+ focus();
+ if (offset !== -1) {
+ // 在渲染结束之后再设置选区
+ setTimeout(() => {
+ const range = { startOffset: offset, endOffset: offset };
+ editor?.setSelectionRanges([range]);
+ const docBackScrollRenderController = editor?.render.with(DocBackScrollRenderController);
+ docBackScrollRenderController?.scrollToRange({ ...range, collapsed: true });
+ }, 50);
+ }
+ checkScrollBar();
+ };
+ }, [editor]);
+
+ const { sequenceNodes, sequenceNodesSet } = useFormulaToken(rangeString);
+ const sheetHighlightRanges = useDocHight(editorId, sequenceNodes);
+ useSheetHighlight(!rangeDialogVisible && isFocus, unitId, subUnitId, sheetHighlightRanges);
+
+ useSheetSelectionChange(!rangeDialogVisible && isFocus, unitId, subUnitId, sequenceNodes, isSupportAcrossSheet, isOnlyOneRange, handleSheetSelectionChange);
+
+ useRefactorEffect(!rangeDialogVisible && isFocus, unitId, isOnlyOneRange);
+
+ useEditorInput(unitId, rangeString, editor);
+
+ useVerify(onVerify, sequenceNodes);
+
+ useEffect(() => {
+ if (editor) {
+ const dispose = editor.input$.subscribe((e) => {
+ const text = (e.data.body?.dataStream ?? '').replaceAll(/\n|\r/g, '').replaceAll(/,{2,}/g, ',').replaceAll(/(^,)/g, '');
+ rangeStringSet(text);
+ handleInputDebounce(text);
+ });
+ return () => {
+ dispose.unsubscribe();
+ };
+ }
+ }, [editor]);
+
+ useEffect(() => {
+ const d1 = commandService.beforeCommandExecuted((info) => {
+ if (info.id === SetWorksheetActiveOperation.id) {
+ isFocusSet(false);
+ onBlur();
+ // Refresh the component
+ sequenceNodesSet((pre) => [...pre]);
+ }
+ });
+ const d2 = commandService.onCommandExecuted((info) => {
+ if (info.id === SetCellEditVisibleOperation.id) {
+ rangeDialogVisibleSet(false);
+ onRangeSelectorDialogVisibleChange(false);
+ isFocusSet(false);
+ onBlur();
+ }
+ });
+ return () => {
+ d1.dispose();
+ d2.dispose();
+ };
+ }, []);
+
+ useEffect(() => {
+ isFocusSet(_isFocus);
+ }, [_isFocus]);
+
+ useEffect(() => {
+ if (editor && rangeDialogVisible) {
+ editor.blur();
+ const d = editor.focus$.subscribe(() => {
+ editor.blur();
+ });
+ return () => {
+ d.unsubscribe();
+ };
+ }
+ }, [editor, rangeDialogVisible]);
+
+ useLayoutEffect(() => {
+ let dispose: IDisposable;
+ if (containerRef.current) {
+ dispose = editorService.register({
+ autofocus: true,
+ editorUnitId: editorId,
+ isSingle: true,
+ initialSnapshot: {
+ id: editorId,
+ body: { dataStream: '\r\n' },
+ documentStyle: {},
+ },
+ }, containerRef.current);
+ const editor = editorService.getEditor(editorId)! as Editor;
+ editorSet(editor);
+ }
+ return () => {
+ dispose?.dispose();
+ };
+ }, [containerRef.current]);
+
+ return (
+ <div className={styles.sheetRangeSelector} ref={rangeSelectorWrapRef}>
+ <div className={cl(styles.sheetRangeSelectorTextWrap, {
+ [styles.sheetRangeSelectorActive]: isFocus && !isError,
+ [styles.sheetRangeSelectorError]: isError,
+ })}
+ >
+ <div className={styles.sheetRangeSelectorText} ref={containerRef}>
+ </div>
+ <Tooltip title={localeService.t('rangeSelector.buttonTooltip')} placement="bottom">
+ <SelectRangeSingle className={styles.sheetRangeSelectorIcon} onClick={handleOpenModal} />
+ </Tooltip>
+ {errorText !== undefined ? <div className={styles.sheetRangeSelectorErrorWrap}>{errorText}</div> : null}
+ {(placeholder !== undefined && !rangeString) ? <div className={styles.sheetRangeSelectorPlaceholder}>{placeholder}</div> : null}
+ </div>
+
+ {rangeDialogVisible && (
+ <RangeSelectorDialog
+ handleConfirm={handleConfirm}
+ handleClose={handleClose}
+ unitId={unitId}
+ subUnitId={subUnitId}
+ initValue={ranges}
+ visible={rangeDialogVisible}
+ isOnlyOneRange={isOnlyOneRange}
+ isSupportAcrossSheet={isSupportAcrossSheet}
+ >
+ </RangeSelectorDialog>
+ )}
+ </div>
+ );
+}
+
+function RangeSelectorDialog(props: {
+ handleConfirm: (ranges: IUnitRangeName[]) => void;
+ handleClose: () => void;
+ visible: boolean;
+ initValue: IUnitRangeName[];
+ unitId: string;
+ subUnitId: string;
+ isOnlyOneRange: boolean;
+ isSupportAcrossSheet: boolean;
+}) {
+ const { handleConfirm, handleClose: _handleClose, visible, initValue, unitId, subUnitId, isOnlyOneRange, isSupportAcrossSheet } = props;
+
+ const localeService = useDependency(LocaleService);
+ const descriptionService = useDependency(IDescriptionService);
+ const lexerTreeBuilder = useDependency(LexerTreeBuilder);
+ const renderManagerService = useDependency(IRenderManagerService);
+ const render = renderManagerService.getRenderById(unitId);
+ const refSelectionsRenderService = render?.with(RefSelectionsRenderService);
+
+ const [ranges, rangesSet] = useState(() => {
+ if (isOnlyOneRange) {
+ const firstRange = initValue[0];
+ if (firstRange) {
+ return unitRangesToText([firstRange], isSupportAcrossSheet);
+ } else {
+ return [''];
+ }
+ }
+ return unitRangesToText(initValue, isSupportAcrossSheet);
+ });
+
+ const [focusIndex, focusIndexSet] = useState(() => ranges.length - 1);
+
+ const colorMap = useColor();
+
+ const rangeText = useMemo(() => ranges.join(matchToken.COMMA), [ranges]);
+ const { sequenceNodes, sequenceNodesSet } = useFormulaToken(rangeText);
+
+ const refSelections = useMemo(() => buildTextRuns(descriptionService, colorMap, sequenceNodes).refSelections, [sequenceNodes]);
+
+ const handleClose = () => {
+ // remove
+ sequenceNodesSet([]);
+ setTimeout(() => {
+ _handleClose();
+ }, 30);
+ };
+ const handleRangeInput = (index: number, value: string) => {
+ if (!value) {
+ refSelectionsRenderService?.setSkipLastEnabled(true);
+ } else {
+ refSelectionsRenderService?.setSkipLastEnabled(false);
+ }
+ rangesSet((v) => {
+ const result = [...v];
+ result[index] = value;
+ return result;
+ });
+ };
+
+ const handleRangeRemove = (index: number) => {
+ refSelectionsRenderService?.setSkipLastEnabled(false);
+ rangesSet((v) => {
+ if (v.length === 1) {
+ return v;
+ }
+ const result: string[] = [];
+ v.forEach((r, i) => {
+ if (index !== i) {
+ result.push(r);
+ }
+ });
+ return result;
+ });
+ };
+
+ const handleRangeAdd = () => {
+ refSelectionsRenderService?.setSkipLastEnabled(true);
+ rangesSet((v) => {
+ v.push('');
+ focusIndexSet(v.length - 1);
+ return [...v];
+ });
+ };
+
+ const handleSheetSelectionChange = useCallback((rangeText: string) => {
+ refSelectionsRenderService?.setSkipLastEnabled(false);
+ const ranges = rangeText.split(matchToken.COMMA).filter((e) => !!e);
+ if (isOnlyOneRange) {
+ rangesSet([ranges[0] ?? '']);
+ } else {
+ rangesSet(ranges);
+ }
+ }, [focusIndex, isOnlyOneRange]);
+
+ useSheetHighlight(visible, unitId, subUnitId, refSelections);
+ useSheetSelectionChange(focusIndex >= 0, unitId, subUnitId, sequenceNodes, isSupportAcrossSheet, isOnlyOneRange, handleSheetSelectionChange);
+ useRefactorEffect(focusIndex >= 0, unitId, isOnlyOneRange);
+ // 如果只有一个空 range,那么默认自动添加 range
+ useEffect(() => {
+ if (ranges.length === 0 || (ranges.length === 1 && !ranges[0])) {
+ refSelectionsRenderService?.setSkipLastEnabled(true);
+ }
+ }, [ranges]);
+
+ return (
+ <Dialog
+ width="328px"
+ visible={visible}
+ title={localeService.t('rangeSelector.title')}
+ draggable
+ closeIcon={<CloseSingle />}
+ footer={(
+ <footer>
+ <Button onClick={handleClose}>{localeService.t('rangeSelector.cancel')}</Button>
+ <Button
+ style={{ marginLeft: 10 }}
+ onClick={() => handleConfirm(ranges.filter((text) => {
+ const nodes = lexerTreeBuilder.sequenceNodesBuilder(text);
+ return nodes && nodes.length === 1 && typeof nodes[0] !== 'string' && nodes[0].nodeType === sequenceNodeType.REFERENCE;
+ }).map((text) => deserializeRangeWithSheet(text)).map((unitRange) => ({ ...unitRange, range: rangePreProcess(unitRange.range) })))}
+ type="primary"
+ >
+ {localeService.t('rangeSelector.confirm')}
+ </Button>
+ </footer>
+ )}
+ onClose={handleClose}
+ >
+ <div className={styles.sheetRangeSelectorDialog}>
+ {ranges.map((text, index) => (
+ <div key={index} className={styles.sheetRangeSelectorDialogItem}>
+ <Input
+ affixWrapperStyle={{ width: '100%' }}
+ placeholder={localeService.t('rangeSelector.placeHolder')}
+ key={`input_${index}`}
+ onFocus={() => focusIndexSet(index)}
+ value={text}
+ onChange={(value) => handleRangeInput(index, value)}
+ />
+ {ranges.length > 1 && !isOnlyOneRange && <DeleteSingle className={styles.sheetRangeSelectorDialogItemDelete} onClick={() => handleRangeRemove(index)} />}
+
+ </div>
+ ))}
+
+ {!isOnlyOneRange && (
+ <div>
+ <Button type="link" size="small" onClick={handleRangeAdd}>
+ <IncreaseSingle />
+ <span>{localeService.t('rangeSelector.addAnotherRange')}</span>
+ </Button>
+ </div>
+ )}
+ </div>
+
+ </Dialog>
+ );
+}
diff --git a/packages/sheets-formula-ui/src/views/range-selector/utils/filterReferenceNode.ts b/packages/sheets-formula-ui/src/views/range-selector/utils/filterReferenceNode.ts
new file mode 100644
index 0000000000..d957b68c14
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/utils/filterReferenceNode.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { type ISequenceNode, matchToken, sequenceNodeType } from '@univerjs/engine-formula';
+
+export type INode = (string | ISequenceNode);
+export const isComma = (e: INode) => {
+ if (typeof e === 'string') {
+ return e === matchToken.COMMA;
+ }
+ return false;
+};
+export const isReference = (e: INode) => {
+ if (typeof e === 'object') {
+ return e.nodeType === sequenceNodeType.REFERENCE;
+ }
+};
+export const filterReferenceNode = (nodes: INode[]) => {
+ return nodes.filter((node) => isComma(node) || isReference(node));
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/utils/findIndexFromSequenceNodes.ts b/packages/sheets-formula-ui/src/views/range-selector/utils/findIndexFromSequenceNodes.ts
new file mode 100644
index 0000000000..80d332df9e
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/utils/findIndexFromSequenceNodes.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ISequenceNode } from '@univerjs/engine-formula';
+
+export const findIndexFromSequenceNodes = (sequenceNode: (string | ISequenceNode)[], targetIndex: number, isEqual = true) => {
+ let result = -1;
+ sequenceNode.reduce((pre, cur, index) => {
+ if (pre.isFinish) {
+ return pre;
+ }
+ const oldIndex = pre.currentIndex;
+ if (typeof cur !== 'string') {
+ pre.currentIndex += cur.endIndex - cur.startIndex + 1;
+ } else {
+ const length = cur.length;
+ pre.currentIndex += length;
+ }
+
+ if (isEqual ? (pre.currentIndex === targetIndex) : (targetIndex > oldIndex && targetIndex <= pre.currentIndex)) {
+ result = index;
+ pre.isFinish = true;
+ }
+ return pre;
+ }, { currentIndex: 0, isFinish: false });
+ return result;
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/utils/getOffsetFromSequenceNodes.ts b/packages/sheets-formula-ui/src/views/range-selector/utils/getOffsetFromSequenceNodes.ts
new file mode 100644
index 0000000000..6e37a91a19
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/utils/getOffsetFromSequenceNodes.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ISequenceNode } from '@univerjs/engine-formula';
+
+export const getOffsetFromSequenceNodes = (sequenceNode: (string | ISequenceNode)[]) => {
+ return sequenceNode.reduce((pre, cur) => {
+ if (typeof cur === 'string') {
+ return pre + cur.length;
+ }
+ return pre + cur.endIndex - cur.startIndex + 1;
+ }, 0);
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/utils/rangePreProcess.ts b/packages/sheets-formula-ui/src/views/range-selector/utils/rangePreProcess.ts
new file mode 100644
index 0000000000..0da400cefa
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/utils/rangePreProcess.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { IRange } from '@univerjs/core';
+
+export const rangePreProcess = (range: IRange) => {
+ if (range.endColumn < range.startColumn) {
+ const end = range.endColumn;
+ range.endColumn = range.startColumn;
+ range.startColumn = end;
+ }
+ if (range.endRow < range.startRow) {
+ const end = range.endRow;
+ range.endRow = range.startRow;
+ range.startRow = end;
+ }
+ return range;
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/utils/sequenceNodeToText.ts b/packages/sheets-formula-ui/src/views/range-selector/utils/sequenceNodeToText.ts
new file mode 100644
index 0000000000..3f595080ae
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/utils/sequenceNodeToText.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ISequenceNode } from '@univerjs/engine-formula';
+
+export const sequenceNodeToText = (sequenceNode: (string | ISequenceNode)[]) => sequenceNode.map((item) => typeof item === 'string' ? item : item.token).join('');
+
diff --git a/packages/sheets-formula-ui/src/views/range-selector/utils/unitRangesToText.ts b/packages/sheets-formula-ui/src/views/range-selector/utils/unitRangesToText.ts
new file mode 100644
index 0000000000..b973bd272a
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/utils/unitRangesToText.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { IUnitRangeName, IUniverInstanceService, Workbook } from '@univerjs/core';
+import { serializeRange, serializeRangeWithSheet } from '@univerjs/engine-formula';
+
+export function getSheetIdByName(univerInstanceService: IUniverInstanceService, unitId: string, name: string) {
+ return univerInstanceService.getUnit<Workbook>(unitId)?.getSheetBySheetName(name)?.getSheetId() || '';
+}
+export function getSheetNameById(univerInstanceService: IUniverInstanceService, unitId: string, sheetId: string) {
+ return univerInstanceService.getUnit<Workbook>(unitId)?.getSheetBySheetId(sheetId)?.getName() || '';
+}
+
+export const unitRangesToText = (ranges: IUnitRangeName[], isSupportAcrossSheet: boolean = false) => {
+ if (!isSupportAcrossSheet) {
+ return ranges.map((item) => serializeRange(item.range));
+ } else {
+ return ranges.map((item) => {
+ if (item.sheetName !== '') {
+ return serializeRangeWithSheet(item.sheetName, item.range);
+ }
+ return serializeRange(item.range);
+ });
+ }
+};
diff --git a/packages/sheets-formula-ui/src/views/range-selector/utils/verifyRange.ts b/packages/sheets-formula-ui/src/views/range-selector/utils/verifyRange.ts
new file mode 100644
index 0000000000..20904727ef
--- /dev/null
+++ b/packages/sheets-formula-ui/src/views/range-selector/utils/verifyRange.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { type ISequenceNode, matchToken, sequenceNodeType } from '@univerjs/engine-formula';
+
+/**
+ * @param {((string | ISequenceNode)[])} sequenceNodes
+ * @return {*}
+ */
+export const verifyRange = (sequenceNodes: (string | ISequenceNode)[]) => {
+ const isFail = sequenceNodes.some((item) => {
+ if (typeof item === 'string') {
+ if (item !== matchToken.COMMA) {
+ return true;
+ }
+ } else {
+ if (item.nodeType !== sequenceNodeType.REFERENCE) {
+ return true;
+ }
+ }
+ return false;
+ });
+ return !isFail;
+};
diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.json
index 127ba39acc..87ea74d328 100644
--- a/packages/sheets-formula/package.json
+++ b/packages/sheets-formula/package.json
@@ -68,9 +68,7 @@
"@univerjs/icons": "^0.1.79",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@univerjs/sheets-numfmt": "workspace:*",
- "@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*"
+ "@univerjs/sheets-numfmt": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
index 4076098d26..b8f3aa0d28 100644
--- a/packages/sheets-hyper-link-ui/package.json
+++ b/packages/sheets-hyper-link-ui/package.json
@@ -73,6 +73,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/sheets": "workspace:*",
+ "@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-hyper-link": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
diff --git a/packages/sheets-hyper-link-ui/src/services/popup.service.ts b/packages/sheets-hyper-link-ui/src/services/popup.service.ts
index a470de0793..5ca508ca74 100644
--- a/packages/sheets-hyper-link-ui/src/services/popup.service.ts
+++ b/packages/sheets-hyper-link-ui/src/services/popup.service.ts
@@ -18,7 +18,7 @@ import type { DocumentDataModel, ICustomRange, IDisposable, INeedCheckDisposable
import type { IBoundRectNoAngle } from '@univerjs/engine-render';
import type { ISheetLocationBase } from '@univerjs/sheets';
import type { ICanvasPopup } from '@univerjs/sheets-ui';
-import { BuildTextUtils, createInternalEditorID, CustomRangeType, Disposable, DOCS_ZEN_EDITOR_UNIT_ID_KEY, Inject, Injector, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
+import { BuildTextUtils, CustomRangeType, Disposable, DOCS_ZEN_EDITOR_UNIT_ID_KEY, Inject, Injector, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { DocSelectionManagerService } from '@univerjs/docs';
import { DocCanvasPopManagerService, IEditorService, IRangeSelectorService } from '@univerjs/docs-ui';
import { getCustomRangePosition, getEditingCustomRangePosition, IEditorBridgeService, SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
@@ -77,6 +77,8 @@ export class SheetsHyperLinkPopupService extends Disposable {
private _currentEditing$ = new BehaviorSubject<(IHyperLinkEditing & { customRange?: ICustomRange; label?: string }) | null>(null);
currentEditing$ = this._currentEditing$.asObservable();
+ private _isKeepVisible: boolean = false;
+
get currentPopup() {
return this._currentPopup;
}
@@ -107,6 +109,14 @@ export class SheetsHyperLinkPopupService extends Disposable {
});
}
+ public setIsKeepVisible(v: boolean) {
+ this._isKeepVisible = v;
+ }
+
+ public getIsKeepVisible() {
+ return this._isKeepVisible;
+ }
+
showPopup(location: IHyperLinkPopupOptions) {
if (this._currentPopup && isEqualLink(location, this._currentPopup)) {
return;
@@ -226,17 +236,14 @@ export class SheetsHyperLinkPopupService extends Disposable {
componentKey: CellLinkEdit.componentKey,
direction: 'bottom',
onClickOutside: () => {
- const hyperLinkRangeSelectorId = createInternalEditorID('hyper-link-edit');
- if (this._editorService.getFocusId() === hyperLinkRangeSelectorId) {
- return;
- }
- if (this._rangeSelectorService.getCurrentSelectorId() === hyperLinkRangeSelectorId && this._rangeSelectorService.selectorModalVisible) {
- return;
+ if (!this.getIsKeepVisible()) {
+ this.endEditing();
}
- this.endEditing();
},
onContextMenu: () => {
- this.endEditing();
+ if (!this.getIsKeepVisible()) {
+ this.endEditing();
+ }
},
hiddenType: 'hide',
};
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
index 46c55d284e..1da8724263 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
@@ -14,15 +14,17 @@
* limitations under the License.
*/
-import type { DocumentDataModel, IUnitRangeWithName, Nullable, Workbook } from '@univerjs/core';
+import type { DocumentDataModel, Nullable, Workbook } from '@univerjs/core';
import type { ISetSelectionsOperationParams } from '@univerjs/sheets';
-import { BuildTextUtils, ColorKit, createInternalEditorID, CustomRangeType, DisposableCollection, DOCS_ZEN_EDITOR_UNIT_ID_KEY, FOCUSING_SHEET, generateRandomId, ICommandService, IContextService, isValidRange, IUniverInstanceService, LocaleService, ThemeService, Tools, UniverInstanceType, useDependency } from '@univerjs/core';
+import { BuildTextUtils, ColorKit, CustomRangeType, DisposableCollection, DOCS_ZEN_EDITOR_UNIT_ID_KEY, FOCUSING_SHEET, generateRandomId, ICommandService, IContextService, isValidRange, IUniverInstanceService, LocaleService, ThemeService, Tools, UniverInstanceType, useDependency } from '@univerjs/core';
import { Button, FormLayout, Input, Select } from '@univerjs/design';
import { DocSelectionManagerService } from '@univerjs/docs';
-import { DocBackScrollRenderController, DocSelectionRenderService, RangeSelector } from '@univerjs/docs-ui';
+import { DocBackScrollRenderController, DocSelectionRenderService } from '@univerjs/docs-ui';
import { deserializeRangeWithSheet, IDefinedNamesService, serializeRange, serializeRangeToRefString, serializeRangeWithSheet } from '@univerjs/engine-formula';
import { IRenderManagerService } from '@univerjs/engine-render';
+
import { SetSelectionsOperation, SetWorksheetActiveOperation } from '@univerjs/sheets';
+import { RangeSelector } from '@univerjs/sheets-formula-ui';
import { SheetHyperLinkType } from '@univerjs/sheets-hyper-link';
import { IEditorBridgeService, IMarkSelectionService, ScrollToRangeOperation } from '@univerjs/sheets-ui';
import { IZenZoneService, KeyCode, useEvent, useObservable } from '@univerjs/ui';
@@ -44,6 +46,7 @@ export const CellLinkEdit = () => {
const [showLabel, setShowLabel] = useState(true);
const [type, setType] = useState<SheetHyperLinkType | string>(SheetHyperLinkType.URL);
const [payload, setPayload] = useState('');
+
const localeService = useDependency(LocaleService);
const definedNameService = useDependency(IDefinedNamesService);
const editorBridgeService = useDependency(IEditorBridgeService);
@@ -62,6 +65,8 @@ export const CellLinkEdit = () => {
const themeService = useDependency(ThemeService);
const docSelectionManagerService = useDependency(DocSelectionManagerService);
+ const rangeSelectorActionsRef = useRef<Parameters<typeof RangeSelector>[0]['actions']>({});
+
const customHyperLinkSidePanel = useMemo(() => {
if (sidePanelService.isBuiltInLinkType(type)) {
return;
@@ -71,8 +76,18 @@ export const CellLinkEdit = () => {
const [showError, setShowError] = useState(false);
+ const [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(false);
+
const setByPayload = useRef(false);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
+
+ const subUnitId = workbook?.getActiveSheet().getSheetId() || '';
+
+ useEffect(() => {
+ isFocusRangeSelectorSet(false);
+ }, [subUnitId]);
+
useEffect(() => {
if (editing?.row !== undefined && editing.col !== undefined) {
const { label, customRange, row, col } = editing;
@@ -131,21 +146,21 @@ export const CellLinkEdit = () => {
const linkInfo = resolverService.parseHyperLink(link.payload);
setType(linkInfo.type === SheetHyperLinkType.INVALID ? SheetHyperLinkType.RANGE : linkInfo.type);
switch (linkInfo.type) {
- case SheetHyperLinkType.URL:{
+ case SheetHyperLinkType.URL: {
setPayload(linkInfo.url);
if (linkInfo.url === link.display) {
setByPayload.current = true;
}
break;
}
- case SheetHyperLinkType.RANGE:{
+ case SheetHyperLinkType.RANGE: {
const params = linkInfo.searchObj!;
const sheetName = params.gid ?
univerInstanceService
.getUnit<Workbook>(editing.unitId)
?.getSheetBySheetId(params.gid)
?.getName()
- ?? ''
+ ?? ''
: '';
const payload = (serializeRangeWithSheet(sheetName, deserializeRangeWithSheet(params.range!).range));
setPayload(payload);
@@ -154,12 +169,12 @@ export const CellLinkEdit = () => {
}
break;
}
- case SheetHyperLinkType.SHEET:{
+ case SheetHyperLinkType.SHEET: {
const params = linkInfo.searchObj!;
setPayload(params.gid!);
break;
}
- case SheetHyperLinkType.DEFINE_NAME:{
+ case SheetHyperLinkType.DEFINE_NAME: {
const params = linkInfo.searchObj!;
setPayload(params.rangeid!);
break;
@@ -225,6 +240,22 @@ export const CellLinkEdit = () => {
};
}, [editorBridgeService, renderManagerService]);
+ useEffect(() => {
+ popupService.setIsKeepVisible(type === SheetHyperLinkType.RANGE);
+ return () => {
+ popupService.setIsKeepVisible(false);
+ };
+ }, [type]);
+
+ useEffect(() => {
+ return () => {
+ if (zenZoneService.temporaryHidden) {
+ zenZoneService.show();
+ contextService.setContextValue(FOCUSING_SHEET, false);
+ }
+ };
+ }, [contextService, zenZoneService]);
+
const linkTypeOptions: Array<{
label: string;
value: SheetHyperLinkType | string;
@@ -248,10 +279,10 @@ export const CellLinkEdit = () => {
...sidePanelOptions,
];
- const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
if (!workbook) {
return;
}
+
const hiddens = workbook.getHiddenWorksheets();
const sheetsOption = workbook.getSheets().map((sheet) => ({ label: sheet.getName(), value: sheet.getSheetId() })).filter((opt) => hiddens.indexOf(opt.value) === -1);
const definedNames = Object.values(definedNameService.getDefinedNameMap(workbook.getUnitId()) ?? {}).map((value) => ({
@@ -275,7 +306,8 @@ export const CellLinkEdit = () => {
return `#${type}=${payload}`;
};
- const handleRangeChange = useEvent((newValue: IUnitRangeWithName[]) => {
+ const handleRangeChange = useEvent((rangeText: string) => {
+ const newValue = rangeText.split(',').map(deserializeRangeWithSheet);
const range = newValue[0];
if (!range || !isValidRange(range.range)) {
return;
@@ -352,13 +384,20 @@ export const CellLinkEdit = () => {
commandService.executeCommand(CloseHyperLinkPopupOperation.id);
};
+ const handlePanelClick = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+ if (type !== SheetHyperLinkType.RANGE) {
+ return;
+ }
+ const handleOutClick = rangeSelectorActionsRef.current?.handleOutClick;
+ handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
+ };
if (!editing) {
return null;
}
return (
- <div className={styles.cellLinkEdit} style={{ display: hide ? 'none' : 'block' }}>
+ <div className={styles.cellLinkEdit} style={{ display: hide ? 'none' : 'block' }} onClick={handlePanelClick}>
{showLabel
? (
<FormLayout
@@ -418,13 +457,16 @@ export const CellLinkEdit = () => {
{type === SheetHyperLinkType.RANGE && (
<FormLayout error={showError && !payload ? localeService.t('hyperLink.form.inputError') : ''}>
<RangeSelector
- openForSheetUnitId={workbook.getUnitId()}
- id={createInternalEditorID('hyper-link-edit')}
- isSingleChoice
- value={payloadInitial}
+ unitId={workbook.getUnitId()}
+ subUnitId={subUnitId}
+ isOnlyOneRange
+ isSupportAcrossSheet
+ initValue={payloadInitial}
onChange={handleRangeChange}
- dialogOnly
- onSelectorVisibleChange={async (visible) => {
+ isFocus={isFocusRangeSelector}
+ onBlur={() => { isFocusRangeSelectorSet(false); }}
+ actions={rangeSelectorActionsRef.current}
+ onRangeSelectorDialogVisibleChange={async (visible) => {
if (visible) {
if (editing.type === HyperLinkEditSourceType.ZEN_EDITOR) {
zenZoneService.hide();
diff --git a/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts b/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts
index e292d85a5b..ca93651353 100644
--- a/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts
+++ b/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+import type { IAccessor, ICommand } from '@univerjs/core';
import { CommandType, IUniverInstanceService, LocaleService } from '@univerjs/core';
import { IEditorService } from '@univerjs/docs-ui';
import { getSheetCommandTarget } from '@univerjs/sheets';
import { ISidebarService } from '@univerjs/ui';
-import type { IAccessor, ICommand } from '@univerjs/core';
import { DEFINED_NAME_CONTAINER } from '../../views/defined-name/component-name';
export interface IUIComponentCommandParams {
@@ -42,6 +42,7 @@ export const SidebarDefinedNameOperation: ICommand = {
case 'open':
editorService.setOperationSheetUnitId(unitId);
sidebarService.open({
+ id: DEFINED_NAME_CONTAINER,
header: { title: localeService.t('definedName.featureTitle') },
children: { label: DEFINED_NAME_CONTAINER },
onClose: () => {
diff --git a/packages/sheets-ui/src/common/keys.ts b/packages/sheets-ui/src/common/keys.ts
index 20738d2eb2..36adc342bb 100644
--- a/packages/sheets-ui/src/common/keys.ts
+++ b/packages/sheets-ui/src/common/keys.ts
@@ -16,6 +16,11 @@
export const SHEET_ZOOM_RANGE = [10, 400];
+/**
+ * TODO@ggg: To avoid introducing the range-selector of the sheet-formula-ui package into sheet-ui, use a component key for now
+ */
+export const RANGE_SELECTOR_COMPONENT_KEY = 'RANGE_SELECTOR_COMPONENT_KEY';
+
export enum SHEET_VIEW_KEY {
MAIN = '__SpreadsheetRender__',
ROW = '__SpreadsheetRowHeader__',
diff --git a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
index de27ed7513..83d15fd64b 100644
--- a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
@@ -16,12 +16,6 @@
/* eslint-disable max-lines-per-function */
-import type { DocumentDataModel, ICellData, ICommandInfo, IDisposable, IDocumentBody, IDocumentData, IPosition, IStyleData, Nullable, UnitModel, Workbook } from '@univerjs/core';
-import type { IRichTextEditingMutationParams } from '@univerjs/docs';
-import type { IEditorInputConfig } from '@univerjs/docs-ui';
-import type { DocumentSkeleton, IDocumentLayoutObject, IRenderContext, IRenderModule, Scene } from '@univerjs/engine-render';
-import type { WorkbookSelections } from '@univerjs/sheets';
-import type { IEditorBridgeServiceVisibleParam } from '../../services/editor-bridge.service';
import {
CellValueType, DEFAULT_EMPTY_DOCUMENT_VALUE, Direction, Disposable, DisposableCollection, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, EDITOR_ACTIVATED,
FOCUSING_EDITOR_BUT_HIDDEN,
@@ -65,6 +59,12 @@ import {
import { ClearSelectionFormatCommand, COMMAND_LISTENER_SKELETON_CHANGE, SetRangeValuesCommand, SetRangeValuesMutation, SetSelectionsOperation, SetWorksheetActivateCommand, SetWorksheetActiveOperation, SheetsSelectionsService } from '@univerjs/sheets';
import { ILayoutService, KeyCode, SetEditorResizeOperation } from '@univerjs/ui';
import { distinctUntilChanged, filter } from 'rxjs';
+import type { DocumentDataModel, ICellData, ICommandInfo, IDisposable, IDocumentBody, IDocumentData, IPosition, IStyleData, Nullable, UnitModel, Workbook } from '@univerjs/core';
+import type { IRichTextEditingMutationParams } from '@univerjs/docs';
+import type { IEditorInputConfig } from '@univerjs/docs-ui';
+
+import type { DocumentSkeleton, IDocumentLayoutObject, IRenderContext, IRenderModule, Scene } from '@univerjs/engine-render';
+import type { WorkbookSelections } from '@univerjs/sheets';
import { getEditorObject } from '../../basics/editor/get-editor-object';
import { MoveSelectionCommand, MoveSelectionEnterAndTabCommand } from '../../commands/commands/set-selection.command';
import { SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation, SetCellEditVisibleWithF2Operation } from '../../commands/operations/cell-edit.operation';
@@ -76,6 +76,8 @@ import styles from '../../views/sheet-container/index.module.less';
import { MOVE_SELECTION_KEYCODE_LIST } from '../shortcuts/editor.shortcut';
import { extractStringFromForceString, isForceString } from '../utils/cell-tools';
import { normalizeString } from '../utils/char-tools';
+import { isRangeSelector } from './utils/isRangeSelector';
+import type { IEditorBridgeServiceVisibleParam } from '../../services/editor-bridge.service';
const HIDDEN_EDITOR_POSITION = -1000;
@@ -850,7 +852,8 @@ export class EditingRenderController extends Disposable implements IRenderModule
// Only when the sheet it attached to is focused. Maybe we should change it to the render unit sys.
if (
!this._isCurrentSheetFocused() ||
- !this._editorService.isSheetEditor(commandUnitId)
+ !this._editorService.isSheetEditor(commandUnitId) ||
+ isRangeSelector(commandUnitId)
) {
return;
}
diff --git a/packages/sheets-ui/src/controllers/editor/utils/isRangeSelector.ts b/packages/sheets-ui/src/controllers/editor/utils/isRangeSelector.ts
new file mode 100644
index 0000000000..754bcbbe13
--- /dev/null
+++ b/packages/sheets-ui/src/controllers/editor/utils/isRangeSelector.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const RANGE_SELECTOR_SYMBOLS = 'range-selector';
+
+export const isRangeSelector = (unitId: string) => {
+ return unitId.includes(RANGE_SELECTOR_SYMBOLS);
+};
+
diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.ts
index 8677e5ef1d..3050ac9264 100644
--- a/packages/sheets-ui/src/index.ts
+++ b/packages/sheets-ui/src/index.ts
@@ -73,7 +73,7 @@ export { DragManagerService } from './services/drag-manager.service';
export { CellAlertManagerService, CellAlertType, type ICellAlert } from './services/cell-alert-manager.service';
export { HoverRenderController } from './controllers/hover-render.controller';
export { DragRenderController } from './controllers/drag-render.controller';
-export { SHEET_VIEW_KEY } from './common/keys';
+export { RANGE_SELECTOR_COMPONENT_KEY, SHEET_VIEW_KEY } from './common/keys';
export { type ICanvasPopup, SheetCanvasPopManagerService } from './services/canvas-pop-manager.service';
export { mergeSetRangeValues } from './services/clipboard/utils';
export type { IAutoFillLocation } from './services/auto-fill/type';
@@ -105,6 +105,7 @@ export { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from './components/
export { FONT_SIZE_COMPONENT } from './components/font-size/interface';
export { attachPrimaryWithCoord, attachSelectionWithCoord } from './services/selection/util';
export { SELECTION_SHAPE_DEPTH } from './services/selection/const';
+export { isRangeSelector, RANGE_SELECTOR_SYMBOLS } from './controllers/editor/utils/isRangeSelector';
export { menuSchema } from './controllers/menu.schema';
export { getCellRealRange } from './common/utils';
diff --git a/packages/sheets-ui/src/services/permission/sheet-permission-panel.model.ts b/packages/sheets-ui/src/services/permission/sheet-permission-panel.model.ts
index 41bfe4fe1e..0e035670e0 100644
--- a/packages/sheets-ui/src/services/permission/sheet-permission-panel.model.ts
+++ b/packages/sheets-ui/src/services/permission/sheet-permission-panel.model.ts
@@ -47,7 +47,7 @@ export class SheetPermissionPanelModel {
private _rule: IPermissionPanelRule = DEFAULT_RANGE_RULE;
private _rule$ = new BehaviorSubject(this._rule);
private _oldRule: Nullable<IPermissionPanelRule>;
- private _rangeErrorMsg$ = new BehaviorSubject('');
+ private _rangeErrorMsg$ = new BehaviorSubject<string | undefined>(undefined);
private _visible = false;
@@ -61,7 +61,7 @@ export class SheetPermissionPanelModel {
rangeErrorMsg$ = this._rangeErrorMsg$.asObservable();
- setRangeErrorMsg(msg: string) {
+ setRangeErrorMsg(msg: string | undefined) {
this._rangeErrorMsg$.next(msg);
}
diff --git a/packages/sheets-ui/src/services/selection/selection-render.service.ts b/packages/sheets-ui/src/services/selection/selection-render.service.ts
index e6a5458060..29ddfd042f 100644
--- a/packages/sheets-ui/src/services/selection/selection-render.service.ts
+++ b/packages/sheets-ui/src/services/selection/selection-render.service.ts
@@ -18,7 +18,7 @@ import { ICommandService, IContextService, ILogService, Inject, Injector, RANGE_
import { ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
import { convertSelectionDataToRange, DISABLE_NORMAL_SELECTIONS, SelectionMoveType, SetSelectionsOperation, SheetsSelectionsService } from '@univerjs/sheets';
import { IShortcutService } from '@univerjs/ui';
-import { distinctUntilChanged, startWith } from 'rxjs';
+import { distinctUntilChanged, merge, startWith } from 'rxjs';
import type { IDisposable, Nullable, Workbook } from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule } from '@univerjs/engine-render';
import type { ISelectionWithCoordAndStyle, ISetSelectionsOperationParams, WorkbookSelections } from '@univerjs/sheets';
@@ -147,7 +147,7 @@ export class SheetSelectionRenderService extends BaseSelectionRenderService impl
private _initSelectionChangeListener(): void {
// When selection completes, we need to update the selections' rendering and clear event handlers.
- this.disposeWithMe(this._workbookSelections.selectionMoveEnd$.subscribe((params) => {
+ this.disposeWithMe(merge(this._workbookSelections.selectionMoveEnd$, this._workbookSelections.selectionSet$).subscribe((params) => {
this._reset();
for (const selectionWithStyle of params) {
const selectionData = attachSelectionWithCoord(selectionWithStyle, this._skeleton);
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
index 32c24526dc..06c877020e 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
@@ -177,7 +177,7 @@ export const DefinedNameContainer = () => {
<IncreaseSingle />
<span className={styles.definedNameContainerAddButtonText}>{localeService.t('definedName.addButton')}</span>
</div>
- <DefinedNameInput confirm={insertConfirm} cancel={closeInput} state={editState} inputId="insertDefinedName" name={getInsertDefinedName()} formulaOrRefString={getInertFormulaOrRefString()} />
+ {editState && <DefinedNameInput confirm={insertConfirm} cancel={closeInput} state={editState} inputId="insertDefinedName" name={getInsertDefinedName()} formulaOrRefString={getInertFormulaOrRefString()} />}
</div>
{definedNames.map((definedName, index) => {
@@ -207,17 +207,20 @@ export const DefinedNameContainer = () => {
<Confirm visible={deleteConformKey === definedName.id} onClose={handleDeleteClose} onConfirm={() => { handleDeleteConfirm(definedName.id); }}>
{localeService.t('definedName.deleteConfirmText')}
</Confirm>
- <DefinedNameInput
- confirm={insertConfirm}
- cancel={closeInput}
- state={definedName.id === editorKey}
- id={definedName.id}
- inputId={definedName.id + index}
- name={definedName.name}
- formulaOrRefString={definedName.formulaOrRefString}
- comment={definedName.comment}
- localSheetId={definedName.localSheetId}
- />
+ {definedName.id === editorKey && (
+ <DefinedNameInput
+ confirm={insertConfirm}
+ cancel={closeInput}
+ state={definedName.id === editorKey}
+ id={definedName.id}
+ inputId={definedName.id + index}
+ name={definedName.name}
+ formulaOrRefString={definedName.formulaOrRefString}
+ comment={definedName.comment}
+ localSheetId={definedName.localSheetId}
+ />
+ )}
+
</div>
);
})}
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
index c7223ce98a..ee164d0f8a 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
@@ -14,16 +14,19 @@
* limitations under the License.
*/
-import { AbsoluteRefType, createInternalEditorID, IUniverInstanceService, LocaleService, Tools, UniverInstanceType, useDependency } from '@univerjs/core';
+import type { Nullable, Workbook } from '@univerjs/core';
+import { AbsoluteRefType, createInternalEditorID, IUniverInstanceService, LocaleService, Tools, UniverInstanceType, useDependency } from '@univerjs/core';
import { Button, Input, Radio, RadioGroup, Select } from '@univerjs/design';
-import { RangeSelector, TextEditor } from '@univerjs/docs-ui';
-import { IDefinedNamesService, type IDefinedNamesServiceParam, IFunctionService, isReferenceStrings, isReferenceStringWithEffectiveColumn, LexerTreeBuilder, operatorToken, serializeRangeToRefString } from '@univerjs/engine-formula';
+import { TextEditor } from '@univerjs/docs-ui';
+import { IDefinedNamesService, type IDefinedNamesServiceParam, IFunctionService, isReferenceStrings, isReferenceStringWithEffectiveColumn, LexerTreeBuilder, operatorToken } from '@univerjs/engine-formula';
import { hasCJKText } from '@univerjs/engine-render';
import { ErrorSingle } from '@univerjs/icons';
-import React, { useEffect, useState } from 'react';
-import type { IUnitRange, Nullable, Workbook } from '@univerjs/core';
+import { ComponentManager } from '@univerjs/ui';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { RANGE_SELECTOR_COMPONENT_KEY } from '../../common/keys';
import { SCOPE_WORKBOOK_VALUE } from './component-name';
+
import styles from './index.module.less';
export interface IDefinedNameInputProps extends Omit<IDefinedNamesServiceParam, 'id'> {
@@ -60,6 +63,9 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
const definedNamesService = useDependency(IDefinedNamesService);
const functionService = useDependency(IFunctionService);
const lexerTreeBuilder = useDependency(LexerTreeBuilder);
+ const componentManager = useDependency(ComponentManager);
+
+ const RangeSelector = useMemo(() => componentManager.get(RANGE_SELECTOR_COMPONENT_KEY), []);
if (workbook == null) {
return;
@@ -67,6 +73,8 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
const unitId = workbook.getUnitId();
+ const subUnitId = workbook.getActiveSheet().getSheetId();
+
const [nameValue, setNameValue] = useState(name);
const [formulaOrRefStringValue, setFormulaOrRefStringValue] = useState(formulaOrRefString);
@@ -81,6 +89,9 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
const [validFormulaOrRange, setValidFormulaOrRange] = useState(true);
+ const rangeSelectorActionsRef = useRef<any>({});
+ const [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(false);
+
const options = [{
label: localeService.t('definedName.scopeWorkbook'),
value: SCOPE_WORKBOOK_VALUE,
@@ -90,6 +101,10 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
return !isReferenceStrings(token);
};
+ useEffect(() => {
+ isFocusRangeSelectorSet(false);
+ }, [subUnitId]);
+
useEffect(() => {
setValidFormulaOrRange(true);
setNameValue(name);
@@ -118,19 +133,8 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
});
});
- const convertRangeToString = (ranges: IUnitRange[]) => {
- const refs = ranges.map((range) => {
- return serializeRangeToRefString({
- ...range,
- sheetName: workbook.getSheetBySheetId(range.sheetId)?.getName() || '',
- });
- });
-
- return refs.join(',');
- };
-
- const rangeSelectorChange = (ranges: IUnitRange[]) => {
- setFormulaOrRefStringValue(convertRangeToString(ranges));
+ const rangeSelectorChange = (rangesText: string) => {
+ setFormulaOrRefStringValue(rangesText);
};
const formulaEditorChange = (value: Nullable<string>) => {
@@ -198,8 +202,13 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
setTypeValue(type);
};
+ const handlePanelClick = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+ const handleOutClick = rangeSelectorActionsRef.current?.handleOutClick;
+ handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
+ };
+
return (
- <div className={styles.definedNameInput} style={{ display: state ? 'block' : 'none' }}>
+ <div className={styles.definedNameInput} style={{ display: state ? 'block' : 'none' }} onClick={handlePanelClick}>
<div>
<Input placeholder={localeService.t('definedName.inputNamePlaceholder')} value={nameValue} allowClear onChange={setNameValue} affixWrapperStyle={widthStyle} />
</div>
@@ -209,12 +218,33 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
<Radio value="formula">{localeService.t('definedName.ratioFormula')}</Radio>
</RadioGroup>
</div>
- <div style={{ display: typeValue === 'range' ? 'block' : 'none' }}>
- <RangeSelector key={`${inputId}-rangeSelector`} value={formulaOrRefStringValue} onValid={setValidFormulaOrRange} onChange={rangeSelectorChange} placeholder={localeService.t('definedName.inputRangePlaceholder')} id={createInternalEditorID(`${inputId}-rangeSelector`)} width="99%" openForSheetUnitId={unitId} />
- </div>
- <div style={{ display: typeValue === 'range' ? 'none' : 'block' }}>
- <TextEditor key={`${inputId}-editor`} value={formulaOrRefStringValue} onValid={setValidFormulaOrRange} onChange={formulaEditorChange} id={createInternalEditorID(`${inputId}-editor`)} placeholder={localeService.t('definedName.inputFormulaPlaceholder')} openForSheetUnitId={unitId} onlyInputFormula={true} style={{ width: '99%' }} canvasStyle={{ fontSize: 10 }} />
- </div>
+ {RangeSelector && typeValue === 'range' && (
+ <RangeSelector
+ unitId={unitId}
+ subUnitId={subUnitId}
+ initValue={formulaOrRefStringValue}
+ onChange={rangeSelectorChange}
+ isFocus={isFocusRangeSelector}
+ actions={rangeSelectorActionsRef.current}
+ isSupportAcrossSheet
+ onBlur={() => { isFocusRangeSelectorSet(false); }}
+ />
+ )}
+ {typeValue !== 'range' && (
+ <TextEditor
+ key={`${inputId}-editor`}
+ value={formulaOrRefStringValue}
+ onValid={setValidFormulaOrRange}
+ onChange={formulaEditorChange}
+ id={createInternalEditorID(`${inputId}-editor`)}
+ placeholder={localeService.t('definedName.inputFormulaPlaceholder')}
+ openForSheetUnitId={unitId}
+ onlyInputFormula={true}
+ style={{ width: '99%' }}
+ canvasStyle={{ fontSize: 10 }}
+ />
+ )}
+
<div>
<Select style={widthStyle} value={localSheetIdValue} options={options} onChange={setLocalSheetIdValue} />
</div>
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
index f4e86fd7db..29e4c8301a 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
@@ -20,8 +20,10 @@ import type { IDefinedNamesServiceParam } from '@univerjs/engine-formula';
import { ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType, useDependency } from '@univerjs/core';
import { IDefinedNamesService } from '@univerjs/engine-formula';
import { SetWorksheetShowCommand } from '@univerjs/sheets';
+import { ISidebarService } from '@univerjs/ui';
import React, { useEffect, useState } from 'react';
import { SidebarDefinedNameOperation } from '../../commands/operations/sidebar-defined-name.operation';
+import { DEFINED_NAME_CONTAINER } from './component-name';
import styles from './index.module.less';
export interface IDefinedNameOverlayProps {
@@ -33,6 +35,8 @@ export function DefinedNameOverlay(props: IDefinedNameOverlayProps) {
const localeService = useDependency(LocaleService);
const definedNamesService = useDependency(IDefinedNamesService);
const univerInstanceService = useDependency(IUniverInstanceService);
+ const sidebarService = useDependency(ISidebarService);
+
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const unitId = workbook.getUnitId();
@@ -56,6 +60,22 @@ export function DefinedNameOverlay(props: IDefinedNameOverlayProps) {
};
}, []); // Empty dependency array means this effect runs once on mount and clean up on unmount
+ // When closing the panel, clear the react cache
+ useEffect(() => {
+ const d = sidebarService.sidebarOptions$.subscribe((info) => {
+ if (info.id === DEFINED_NAME_CONTAINER) {
+ if (!info.visible) {
+ setTimeout(() => {
+ sidebarService.sidebarOptions$.next({ visible: false });
+ });
+ }
+ }
+ });
+ return () => {
+ d.unsubscribe();
+ };
+ }, []);
+
const openSlider = () => {
commandService.executeCommand(SidebarDefinedNameOperation.id, { value: 'open' });
};
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/index.tsx b/packages/sheets-ui/src/views/permission/panel-detail/index.tsx
index db66419597..5f725ef71b 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/index.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/index.tsx
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-import { createInternalEditorID, IAuthzIoService, isValidRange, IUniverInstanceService, LocaleService, RANGE_TYPE, Rectangle, UniverInstanceType, useDependency, UserManagerService } from '@univerjs/core';
+import type { IRange, Workbook } from '@univerjs/core';
+import type { ICollaborator, IUser } from '@univerjs/protocol';
+import { IAuthzIoService, isValidRange, IUniverInstanceService, LocaleService, RANGE_TYPE, Rectangle, UniverInstanceType, useDependency, UserManagerService } from '@univerjs/core';
import { Avatar, FormLayout, Input, Radio, RadioGroup, Select } from '@univerjs/design';
-import { RangeSelector } from '@univerjs/docs-ui';
-import { serializeRange } from '@univerjs/engine-formula';
+import { deserializeRangeWithSheet, serializeRange } from '@univerjs/engine-formula';
+
import { ObjectScope, UnitAction, UnitObject, UnitRole } from '@univerjs/protocol';
import { RangeProtectionRuleModel, setEndForRange, SheetsSelectionsService, WorksheetProtectionRuleModel } from '@univerjs/sheets';
-import { IDialogService, ISidebarService, useObservable } from '@univerjs/ui';
-import clsx from 'clsx';
-import React, { useEffect, useState } from 'react';
-import type { IRange, Workbook } from '@univerjs/core';
-import type { ICollaborator, IUser } from '@univerjs/protocol';
+import { ComponentManager, IDialogService, ISidebarService, useObservable } from '@univerjs/ui';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { RANGE_SELECTOR_COMPONENT_KEY } from '../../../common/keys';
import { UNIVER_SHEET_PERMISSION_USER_DIALOG, UNIVER_SHEET_PERMISSION_USER_DIALOG_ID } from '../../../consts/permission';
import { editState, SheetPermissionPanelModel, viewState } from '../../../services/permission/sheet-permission-panel.model';
import { SheetPermissionUserManagerService } from '../../../services/permission/sheet-permission-user-list.service';
@@ -45,8 +45,13 @@ export const SheetPermissionPanelDetail = ({ fromSheetBar }: { fromSheetBar: boo
const sidebarService = useDependency(ISidebarService);
const rangeProtectionRuleModel = useDependency(RangeProtectionRuleModel);
const worksheetRuleModel = useDependency(WorksheetProtectionRuleModel);
+ const componentManager = useDependency(ComponentManager);
+ const RangeSelector = useMemo(() => componentManager.get(RANGE_SELECTOR_COMPONENT_KEY), []);
+
const rangeErrorMsg = useObservable(sheetPermissionPanelModel.rangeErrorMsg$);
+ const rangeSelectorActionsRef = useRef<any>({});
+ const [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(false);
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const worksheet = workbook.getActiveSheet()!;
const unitId = workbook.getUnitId();
@@ -54,7 +59,7 @@ export const SheetPermissionPanelDetail = ({ fromSheetBar }: { fromSheetBar: boo
const selectUserList = useObservable(sheetPermissionUserManagerService.selectUserList$, sheetPermissionUserManagerService.selectUserList);
- // The status of these two collaborators is updated directly by calling the interface, and will not be written to the snapshot or undoredo, so they are pulled in real time when they need to be displayed.
+// The status of these two collaborators is updated directly by calling the interface, and will not be written to the snapshot or undoredo, so they are pulled in real time when they need to be displayed.
const [editorGroupValue, setEditorGroupValue] = React.useState<editState>(selectUserList.length ? editState.designedUserCanEdit : editState.onlyMe);
const [viewGroupValue, setViewGroupValue] = React.useState(viewState.othersCanView);
const [loading, setLoading] = useState(!!activeRule?.permissionId);
@@ -124,7 +129,7 @@ export const SheetPermissionPanelDetail = ({ fromSheetBar }: { fromSheetBar: boo
rangeErrorString = localeService.t('permission.panel.rangeOverlapOverPermissionError');
}
}
- return rangeErrorString;
+ return rangeErrorString === '' ? undefined : rangeErrorString;
};
useEffect(() => {
@@ -276,8 +281,57 @@ export const SheetPermissionPanelDetail = ({ fromSheetBar }: { fromSheetBar: boo
};
}, [sidebarService, subUnitId, univerInstanceService]);
+ const handleRangeChange = (rangeText: string) => {
+ const newRange = rangeText.split(',').map(deserializeRangeWithSheet).map((item) => item.range);
+ if (newRange.some((i) => !isValidRange(i) || i.endColumn < i.startColumn || i.endRow < i.startRow)) {
+ return;
+ }
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet()!;
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ const transformedRange = newRange.map((range) => {
+ const rowCount = worksheet.getRowCount();
+ const colCount = worksheet.getColumnCount();
+ setEndForRange(range, rowCount, colCount);
+ return range;
+ });
+ const rangeErrorString = checkRangeValid(transformedRange);
+ sheetPermissionPanelModel.setRangeErrorMsg(rangeErrorString);
+ if (rangeErrorString) return;
+
+ const sheetName = worksheet.getName();
+ const rangeStr = transformedRange.map((range) => {
+ const v = serializeRange(range);
+ return v === 'NaN' ? '' : v;
+ }).filter((r) => !!r).join(',');
+
+ const rule = {
+ ranges: transformedRange,
+ unitId,
+ subUnitId,
+ unitType: UnitObject.SelectRange,
+ name: `${sheetName}(${rangeStr})`,
+ };
+ if (rule.ranges.length === 1) {
+ const { startRow, endRow, startColumn, endColumn } = rule.ranges[0];
+ if (startRow === 0 && endRow === worksheet.getRowCount() - 1 && startColumn === 0 && worksheet.getColumnCount() - 1 === endColumn) {
+ rule.unitType = UnitObject.Worksheet;
+ rule.name = `${sheetName}`;
+ }
+ }
+
+ sheetPermissionPanelModel.setRule(rule);
+ };
+
+ const handlePanelClick = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+ const handleOutClick = rangeSelectorActionsRef.current?.handleOutClick;
+ handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
+ };
+
return (
- <div className={styles.permissionPanelDetailWrapper}>
+ <div className={styles.permissionPanelDetailWrapper} onClick={handlePanelClick}>
{/* <FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.name')}>
<Input
value={activeRule?.name ?? ''}
@@ -288,58 +342,18 @@ export const SheetPermissionPanelDetail = ({ fromSheetBar }: { fromSheetBar: boo
</FormLayout> */}
<Spin loading={loading}>
<FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.protectedRange')}>
- <RangeSelector
- className={clsx(styles.permissionRangeSelector)}
- textEditorClassName={clsx({ [styles.permissionRangeSelectorError]: rangeErrorMsg })}
- value={activeRule?.ranges?.map((i) => serializeRange(i)).join(',')}
- id={createInternalEditorID('sheet-permission-panel')}
- openForSheetUnitId={unitId}
- openForSheetSubUnitId={subUnitId}
- onChange={(newRange) => {
- if (newRange.some((i) => !isValidRange(i.range) || i.range.endColumn < i.range.startColumn || i.range.endRow < i.range.startRow)) {
- return;
- }
-
- const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
- const worksheet = workbook.getActiveSheet()!;
- const unitId = workbook.getUnitId();
- const subUnitId = worksheet.getSheetId();
- const transformedRange = newRange.map((i) => {
- const range = { ...i.range };
- const rowCount = worksheet.getRowCount();
- const colCount = worksheet.getColumnCount();
- setEndForRange(range, rowCount, colCount);
- return range;
- });
- const rangeErrorString = checkRangeValid(transformedRange);
- sheetPermissionPanelModel.setRangeErrorMsg(rangeErrorString);
- if (rangeErrorString) return;
-
- const sheetName = worksheet.getName();
- const rangeStr = transformedRange.map((range) => {
- const v = serializeRange(range);
- return v === 'NaN' ? '' : v;
- }).filter((r) => !!r).join(',');
-
- const rule = {
- ranges: transformedRange,
- unitId,
- subUnitId,
- unitType: UnitObject.SelectRange,
- name: `${sheetName}(${rangeStr})`,
- };
- if (rule.ranges.length === 1) {
- const { startRow, endRow, startColumn, endColumn } = rule.ranges[0];
- if (startRow === 0 && endRow === worksheet.getRowCount() - 1 && startColumn === 0 && worksheet.getColumnCount() - 1 === endColumn) {
- rule.unitType = UnitObject.Worksheet;
- rule.name = `${sheetName}`;
- }
- }
-
- sheetPermissionPanelModel.setRule(rule);
- }}
- />
- {rangeErrorMsg && <span className={styles.sheetPermissionPanelNameInputErrorText}>{rangeErrorMsg}</span>}
+ {RangeSelector && (
+ <RangeSelector
+ unitId={unitId}
+ errorText={rangeErrorMsg}
+ subUnitId={subUnitId}
+ initValue={activeRule?.ranges?.map((i) => serializeRange(i)).join(',')}
+ onChange={handleRangeChange}
+ // onVerify={handleVerify}
+ isFocus={isFocusRangeSelector}
+ actions={rangeSelectorActionsRef.current}
+ />
+ ) }
</FormLayout>
<FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.permissionDirection')}>
<Input
diff --git a/packages/sheets/src/services/selections/selection-manager.service.ts b/packages/sheets/src/services/selections/selection-manager.service.ts
index 8d3513a08c..57b507b837 100644
--- a/packages/sheets/src/services/selections/selection-manager.service.ts
+++ b/packages/sheets/src/services/selections/selection-manager.service.ts
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-import { Disposable, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
-import { BehaviorSubject, of, shareReplay, Subject, switchMap, takeUntil } from 'rxjs';
import type { DeepReadonly, ISelectionCell, Nullable, Workbook } from '@univerjs/core';
import type { Observable } from 'rxjs';
-
import type { ISelectionWithStyle } from '../../basics/selection';
+import { Disposable, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
+
+import { BehaviorSubject, of, shareReplay, Subject, switchMap, takeUntil } from 'rxjs';
export interface ISelectionManagerSearchParam {
unitId: string;
@@ -30,6 +30,10 @@ export enum SelectionMoveType {
MOVE_START,
MOVING,
MOVE_END,
+ /**
+ * Events are not triggered by the API
+ */
+ ONLY_SET,
}
export class SheetsSelectionsService extends RxDisposable {
@@ -211,6 +215,9 @@ export class WorkbookSelections extends Disposable {
private readonly _selectionMoveEnd$ = new BehaviorSubject<ISelectionWithStyle[]>([]);
readonly selectionMoveEnd$ = this._selectionMoveEnd$.asObservable();
+ private readonly _selectionSet$ = new BehaviorSubject<ISelectionWithStyle[]>([]);
+ readonly selectionSet$ = this._selectionSet$.asObservable();
+
private readonly _beforeSelectionMoveEnd$ = new BehaviorSubject<ISelectionWithStyle[]>([]);
readonly beforeSelectionMoveEnd$ = this._beforeSelectionMoveEnd$.asObservable();
@@ -265,6 +272,10 @@ export class WorkbookSelections extends Disposable {
case SelectionMoveType.MOVE_END:
this._emitOnEnd(selectionDatas);
break;
+ case SelectionMoveType.ONLY_SET: {
+ this._selectionSet$.next(selectionDatas);
+ break;
+ }
default:
this._emitOnEnd(selectionDatas);
break;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb1b305713..d341829c7a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,7 +10,7 @@ importers:
devDependencies:
'@antfu/eslint-config':
specifier: 3.7.3
'@commitlint/cli':
specifier: ^19.5.0
version: 19.5.0(@types/[email protected])([email protected])
@@ -28,7 +28,7 @@ importers:
'@release-it/conventional-changelog':
specifier: ^8.0.2
'@storybook/react':
specifier: 8.3.5
@@ -118,7 +118,7 @@ importers:
vite-plugin-dts:
specifier: ^4.2.3
vitest:
specifier: ^2.1.2
@@ -402,7 +402,7 @@ importers:
version: 2.1.1([email protected])
esbuild-plugin-vue3:
specifier: ^0.4.2
esbuild-style-plugin:
specifier: ^1.6.3
version: 1.6.3
@@ -643,14 +643,14 @@ importers:
optionalDependencies:
vue:
specifier: '>=3.0.0'
- version: 3.5.9([email protected])
+ version: 3.4.38([email protected])
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
'@vitejs/plugin-vue':
specifier: ^5.1.3
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1987,6 +1987,9 @@ importers:
'@univerjs/sheets-conditional-formatting':
specifier: workspace:*
version: link:../sheets-conditional-formatting
+ '@univerjs/sheets-formula-ui':
+ specifier: workspace:*
+ version: link:../sheets-formula-ui
'@univerjs/sheets-ui':
specifier: workspace:*
version: link:../sheets-ui
@@ -2164,6 +2167,9 @@ importers:
'@univerjs/sheets-data-validation':
specifier: workspace:*
version: link:../sheets-data-validation
+ '@univerjs/sheets-formula-ui':
+ specifier: workspace:*
+ version: link:../sheets-formula-ui
'@univerjs/sheets-numfmt':
specifier: workspace:*
version: link:../sheets-numfmt
@@ -2434,12 +2440,6 @@ importers:
'@univerjs/sheets-numfmt':
specifier: workspace:*
version: link:../sheets-numfmt
- '@univerjs/sheets-ui':
- specifier: workspace:*
- version: link:../sheets-ui
- '@univerjs/ui':
- specifier: workspace:*
- version: link:../ui
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2498,6 +2498,9 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
+ clsx:
+ specifier: ^2.1.1
+ version: 2.1.1
devDependencies:
'@types/react':
specifier: ^18.3.11
@@ -2584,6 +2587,9 @@ importers:
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
+ '@univerjs/sheets-formula-ui':
+ specifier: workspace:*
+ version: link:../sheets-formula-ui
'@univerjs/sheets-hyper-link':
specifier: workspace:*
version: link:../sheets-hyper-link
@@ -3206,7 +3212,7 @@ importers:
optionalDependencies:
vue:
specifier: '>=3.0.0'
- version: 3.5.9([email protected])
+ version: 3.4.38([email protected])
devDependencies:
'@testing-library/react':
specifier: ^16.0.1
@@ -3541,94 +3547,73 @@ packages:
resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==}
- engines: {node: '>=6.9.0'}
-
- '@babel/[email protected]':
- resolution: {integrity: sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0
- '@babel/[email protected]':
- resolution: {integrity: sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==}
engines: {node: '>=6.9.0'}
resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==}
- engines: {node: '>=6.9.0'}
-
resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==}
- engines: {node: '>=6.9.0'}
-
- '@babel/[email protected]':
- resolution: {integrity: sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==}
engines: {node: '>=6.9.0'}
resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==}
- engines: {node: '>=6.9.0'}
-
- '@babel/[email protected]':
- resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==}
engines: {node: '>=6.0.0'}
hasBin: true
- '@babel/[email protected]':
- resolution: {integrity: sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==}
- engines: {node: '>=6.0.0'}
- hasBin: true
-
- '@babel/[email protected]':
- resolution: {integrity: sha512-JD9MUnLbPL0WdVK8AWC7F7tTG2OS6u/AKKnsK+NdRhUiVdnzyR1S3kKQCaRLOiaULvUiqK6Z4JQE635VgtCFeg==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0-0
- '@babel/[email protected]':
- resolution: {integrity: sha512-S/JXG/KrbIY06iyJPKfxr0qRxnhNOdkNXYBl/rmwgDd72cQLH9tEGkDm/yJPGvcSIUoikzfjMios9i+xT/uv9w==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0-0
@@ -3645,31 +3630,19 @@ packages:
resolution: {integrity: sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==}
- engines: {node: '>=6.9.0'}
-
- '@babel/[email protected]':
- resolution: {integrity: sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==}
- engines: {node: '>=6.9.0'}
-
resolution: {integrity: sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==}
- '@babel/[email protected]':
- resolution: {integrity: sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==}
- engines: {node: '>=6.9.0'}
-
- '@babel/[email protected]':
- resolution: {integrity: sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==}
engines: {node: '>=6.9.0'}
- '@babel/[email protected]':
- resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==}
engines: {node: '>=6.9.0'}
@@ -4228,8 +4201,8 @@ packages:
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
- '@eslint-community/[email protected]':
- resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==}
+ '@eslint-community/[email protected]':
+ resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==}
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
'@eslint-react/[email protected]':
@@ -4452,8 +4425,8 @@ packages:
cpu: [x64]
os: [win32]
- '@inquirer/[email protected]':
- resolution: {integrity: sha512-m+Trk77mp54Zma6xLkLuY+mvanPxlE4A7yNKs2HBiyZ4UkVs28Mv5c/pgWrHeInx+USHeX/WEPzjrWrcJiQgjw==}
+ '@inquirer/[email protected]':
+ resolution: {integrity: sha512-ErXXzENMH5pJt5/ssXV0DfWUZqly8nGzf0UcBV9xTnP+KyffE2mqyxIMBrZ8ijQck2nU0TQm40EQB53YreyWHw==}
engines: {node: '>=18'}
'@isaacs/[email protected]':
@@ -4487,9 +4460,6 @@ packages:
'@jridgewell/[email protected]':
resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
- '@jridgewell/[email protected]':
- resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
-
'@jridgewell/[email protected]':
resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
@@ -4579,8 +4549,8 @@ packages:
resolution: {integrity: sha512-MB4AYDsM5jhIHro/dq4ix1iWTLGToIGk6cWF5L6vanFaMble5jTX/UBQyiv05HsWnwUtY8JrfHy2LWfKwihqMw==}
engines: {node: '>= 18'}
- '@octokit/[email protected]':
- resolution: {integrity: sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==}
+ '@octokit/[email protected]':
+ resolution: {integrity: sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==}
resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
@@ -4603,8 +4573,8 @@ packages:
resolution: {integrity: sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==}
engines: {node: '>=12.22.0'}
- resolution: {integrity: sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==}
+ resolution: {integrity: sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==}
engines: {node: '>=12'}
'@protobufjs/[email protected]':
@@ -4682,8 +4652,8 @@ packages:
peerDependencies:
release-it: ^17.0.0
- '@rollup/[email protected]':
- resolution: {integrity: sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
engines: {node: '>=14.0.0'}
peerDependencies:
rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
@@ -4691,83 +4661,83 @@ packages:
rollup:
optional: true
- '@rollup/[email protected]':
- resolution: {integrity: sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==}
cpu: [arm]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==}
cpu: [arm64]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==}
cpu: [arm64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==}
cpu: [x64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==}
cpu: [arm]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==}
cpu: [arm]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==}
cpu: [ppc64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==}
cpu: [riscv64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==}
cpu: [s390x]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==}
cpu: [arm64]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==}
cpu: [ia32]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==}
cpu: [x64]
os: [win32]
@@ -5256,8 +5226,8 @@ packages:
resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
- '@types/[email protected]':
- resolution: {integrity: sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==}
resolution: {integrity: sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==}
@@ -5349,15 +5319,6 @@ packages:
typescript:
optional: true
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -5390,12 +5351,6 @@ packages:
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- eslint: ^8.57.0 || ^9.0.0
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -5477,6 +5432,9 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-SjxPFOtuINDUW8/UkElJYQSFtnWX7tMksSGW0vfjxMneFqxVr8YJ979QpMbDW7g+BIiq88RAGDjf7en6rvLPPQ==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==}
@@ -5495,35 +5453,32 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-Y6Q9TsI+qJ2CC0ZKj6VBb+T8UPz593N113nnUykqwANqhgf3QkZeHFlusgKLTqrnVHbj/XDKZcDHol+dxVT+rQ==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==}
- '@volar/[email protected]':
- resolution: {integrity: sha512-FxUfxaB8sCqvY46YjyAAV6c3mMIq/NWQMVvJ+uS4yxr1KzOvyg61gAuOnNvgCvO4TZ7HcLExBEsWcDu4+K4E8A==}
+ '@volar/[email protected]':
+ resolution: {integrity: sha512-kO9k4kTLfxpg+6lq7/KAIv3m2d62IHuCL6GbVgYZTpfKvIGoAIlDxK7pFcB/eczN2+ydg/vnyaeZ6SGyZrJw2w==}
- '@volar/[email protected]':
- resolution: {integrity: sha512-Nsh7UW2ruK+uURIPzjJgF0YRGP5CX9nQHypA2OMqdM2FKy7rh+uv3XgPnWPw30JADbKvZ5HuBzG4gSbVDYVtiw==}
+ '@volar/[email protected]':
+ resolution: {integrity: sha512-xG3PZqOP2haG8XG4Pg3PD1UGDAdqZg24Ru8c/qYjYAnmcj6GBR64mstx+bZux5QOyRaJK+/lNM/RnpvBD3489g==}
- '@volar/[email protected]':
- resolution: {integrity: sha512-NMIrA7y5OOqddL9VtngPWYmdQU03htNKFtAYidbYfWA0TOhyGVd9tfcP4TsLWQ+RBWDZCbBqsr8xzU0ZOxYTCQ==}
+ '@volar/[email protected]':
+ resolution: {integrity: sha512-QQMQRVj0fVHJ3XdRKiS1LclhG0VBXdFYlyuHRQF/xLk2PuJuHNWP26MDZNvEVCvnyUQuUQhIAfylwY5TGPgc6w==}
- resolution: {integrity: sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==}
+ resolution: {integrity: sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==}
- resolution: {integrity: sha512-KE1sCdwqSKq0CQ/ltg3XnlMTKeinjegIkuFsuq9DKvNPmqLGdmI51ChZdGBBRXIvEYTLm8X/JxOuBQ1HqF/+PA==}
+ resolution: {integrity: sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==}
- resolution: {integrity: sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==}
+ resolution: {integrity: sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ==}
- resolution: {integrity: sha512-gEAURwPo902AsJF50vl59VaWR+Cx6cX9SoqLYHu1jq9hDbmQlXvpZyYNIIbxa2JTJ+FD/oBQweVUwuTQv79KTg==}
-
- resolution: {integrity: sha512-kp9qawcTXakYm0TN6YAwH24IurSywoXh4fWhRbLu0at4UVyo994bhEzJlQn82eiyqtut4GjkQodSfn8drFbpZQ==}
-
- resolution: {integrity: sha512-fb1g2mQv32QzIei76rlXRTz08Grw+ZzBXSQfHo4StGFutm/flyebw3dGJkexKwcU3GjX9s5fIGjEv/cjO8j8Yw==}
+ resolution: {integrity: sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==}
resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
@@ -5536,25 +5491,22 @@ packages:
typescript:
optional: true
- resolution: {integrity: sha512-88ApgNZ6yPYpyYkTfXzcbWk6O8+LrPRIpa/U4AdeTzpfRUO+EUt5jemnTBVSlAUNmlYY96xa5feUNEq+BouLog==}
+ resolution: {integrity: sha512-4vl4wMMVniLsSYYeldAKzbk72+D3hUnkw9z8lDeJacTxAkXeDAP1uE9xr2+aKIN0ipOL8EG2GPouVTH6yF7Gnw==}
- resolution: {integrity: sha512-YAeP0zNkjSl5mEc1NxOg9qoAhLNbREElHAhfYbMXT57oF0ixehEEJWBhg2uvVxslCGh23JhpEAyMvJrJHW9WGg==}
+ resolution: {integrity: sha512-21z3wA99EABtuf+O3IhdxP0iHgkBs1vuoCAsCKLVJPEjpVqvblwBnTj42vzHRlWDCyxu9ptDm7sI2ZMcWrQqlA==}
- resolution: {integrity: sha512-5Oq/5oenpB9lw94moKvOHqBDEaMSyDmcu2HS8AtAT6/pwdo/t9fR9aVtLh6FzYGGqZR9yRfoHAN6P7goblq1aA==}
+ resolution: {integrity: sha512-afZzmUreU7vKwKsV17H1NDThEEmdYI+GCAK/KY1U957Ig2NATPVjCROv61R19fjZNzMmiU03n79OMnXyJVN0UA==}
- resolution: {integrity: sha512-tbuUsZfMWGazR9LXLNiiDSTwkO8K9sLyR70diY+FbQmKmh7236PPz4jkTxymelV8D89IJUGtbfe4VdmpHkmuxg==}
+ resolution: {integrity: sha512-NggOTr82FbPEkkUvBm4fTGcwUY8UuTsnWC/L2YZBmvaQ4C4Jl/Ao4HHTB+l7WnFCt5M/dN3l0XLuyjzswGYVCA==}
peerDependencies:
- vue: 3.5.9
-
- resolution: {integrity: sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==}
+ vue: 3.4.38
- resolution: {integrity: sha512-8wiT/m0mnsLhTME0mPgc57jv+4TipRBSAAmheUdYgiOaO6AobZPNOmm87ub4np65VVDgLcWxc+Edc++5Wyz1uA==}
+ resolution: {integrity: sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==}
'@webassemblyjs/[email protected]':
resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}
@@ -5912,8 +5864,8 @@ packages:
resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==}
- resolution: {integrity: sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==}
+ resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==}
engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
hasBin: true
@@ -5962,8 +5914,8 @@ packages:
resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==}
engines: {node: '>=16'}
- resolution: {integrity: sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==}
+ resolution: {integrity: sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==}
resolution: {integrity: sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==}
@@ -6461,8 +6413,8 @@ packages:
supports-color:
optional: true
- resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
+ resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
engines: {node: '>=6.0'}
peerDependencies:
supports-color: '*'
@@ -6470,8 +6422,8 @@ packages:
supports-color:
optional: true
- resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+ resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
engines: {node: '>=6.0'}
peerDependencies:
supports-color: '*'
@@ -6639,15 +6591,12 @@ packages:
resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
- resolution: {integrity: sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==}
+ resolution: {integrity: sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw==}
resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==}
- resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
-
resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -6706,8 +6655,8 @@ packages:
resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
engines: {node: '>= 0.4'}
- resolution: {integrity: sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==}
+ resolution: {integrity: sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==}
engines: {node: '>= 0.4'}
@@ -7377,10 +7326,6 @@ packages:
resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
engines: {node: '>=14'}
- resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
- engines: {node: '>=14'}
-
resolution: {integrity: sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==}
engines: {node: '>=12.13.0', yarn: '>=1.0.0'}
@@ -7475,8 +7420,8 @@ packages:
resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
engines: {node: '>= 0.4'}
- resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
+ resolution: {integrity: sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==}
resolution: {integrity: sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==}
@@ -7522,10 +7467,6 @@ packages:
engines: {node: '>=16 || 14 >=14.18'}
hasBin: true
- resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
- hasBin: true
-
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
deprecated: Glob versions prior to v9 are no longer supported
@@ -8015,8 +7956,8 @@ packages:
resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}
engines: {node: '>=12'}
- resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
+ resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==}
engines: {node: '>=18'}
@@ -8071,17 +8012,13 @@ packages:
resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==}
- engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
resolution: {integrity: sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==}
engines: {node: '>=14'}
- resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
-
resolution: {integrity: sha512-gt+KZpIIrrxXHEQGD8xZrL8mTRwRY0U76/xz/YX0gZdPrSqQhT/c7dYLASlLlecT3r+FxE7je/+C0oLnTDCx4A==}
engines: {node: '>=12.22.0'}
@@ -8132,6 +8069,11 @@ packages:
resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
hasBin: true
+ resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
+ engines: {node: '>=4'}
+ hasBin: true
+
resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
engines: {node: '>=6'}
@@ -8188,8 +8130,8 @@ packages:
resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
- resolution: {integrity: sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==}
+ resolution: {integrity: sha512-tPhhoGUiEiU/WXR4rt8klIoLdnTtyu+9jVKHd/wauEjYud32jyn63mzKWQweaQrHWxBQtYoVtdcEnYX1LosnFQ==}
engines: {node: '>=18'}
@@ -8345,9 +8287,6 @@ packages:
resolution: {integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==}
- resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==}
-
resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
@@ -8370,15 +8309,15 @@ packages:
resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
hasBin: true
- resolution: {integrity: sha512-tPJQ1HeyiU2vRruNGhZ+VleWuMQRro8iFtJxYgnS4NQe+EukKF6aGiIT+7flZhISAt2iaXBCfFGvAyif7/f8nQ==}
+ resolution: {integrity: sha512-fSErXALFNsnowREYZ49XCdOHF8wOPWuFOGQrAhP7x5J/BqQv+B02cNsTykGpDgRVx43EKg++6ANmTaGTtW+hUA==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
- resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==}
+ resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==}
resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
@@ -8748,9 +8687,6 @@ packages:
resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
engines: {node: '>=0.10.0'}
- resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
-
resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
engines: {node: '>= 0.4'}
@@ -8884,17 +8820,14 @@ packages:
resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
engines: {node: '>=6'}
- resolution: {integrity: sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==}
+ resolution: {integrity: sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==}
engines: {node: '>= 14'}
resolution: {integrity: sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==}
engines: {node: '>= 14'}
- resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
-
resolution: {integrity: sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==}
engines: {node: '>=18'}
@@ -8913,8 +8846,8 @@ packages:
resolution: {integrity: sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog==}
engines: {node: '>=14'}
- resolution: {integrity: sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==}
+ resolution: {integrity: sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==}
engines: {node: '>= 18'}
@@ -9034,9 +8967,6 @@ packages:
resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==}
-
resolution: {integrity: sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==}
@@ -9110,8 +9040,12 @@ packages:
resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==}
engines: {node: ^10 || ^12 || >=14}
- resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
+ resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==}
+ engines: {node: ^10 || ^12 || >=14}
+
+ resolution: {integrity: sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==}
engines: {node: ^10 || ^12 || >=14}
@@ -9254,12 +9188,6 @@ packages:
react: '>=16.9.0'
react-dom: '>=16.9.0'
- resolution: {integrity: sha512-rkW47ABVkic7WEB0EKJqzySpvDqwl60/tdkY7hWP7dYnh5pm0SzJpo54oW3TDUGXV5wfxXFmMkxrzRRbotQ0+w==}
- peerDependencies:
- react: '>=16.9.0'
- react-dom: '>=16.9.0'
-
resolution: {integrity: sha512-Id4IYMoii3zzrG0lB0gD6dPgJx4Iu95Xu0BQrhHIbp7ZnAZbLqdqQ73aIWH0d0UFcElxwaKjnzNovTjo7kXz7g==}
engines: {node: '>=8.x'}
@@ -9546,8 +9474,8 @@ packages:
resolution: {integrity: sha512-HbLDPF+RkBiPjlzmU0hnUQd4abs56JiA2riHxNVfxjagcGwIy3Xhc2Yyx2+0/p5QeM0kj270nEOlTj57HvWXFA==}
engines: {node: '>=16'}
- resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
+ resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
engines: {node: '>= 0.4'}
@@ -9652,8 +9580,8 @@ packages:
deprecated: Rimraf versions prior to v4 are no longer supported
hasBin: true
- resolution: {integrity: sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==}
+ resolution: {integrity: sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==}
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
@@ -9838,8 +9766,8 @@ packages:
resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
- resolution: {integrity: sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==}
+ resolution: {integrity: sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==}
engines: {node: '>= 14'}
@@ -10134,16 +10062,16 @@ packages:
resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==}
- resolution: {integrity: sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==}
+ resolution: {integrity: sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==}
engines: {node: ^18.0.0 || >=20.0.0}
resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==}
engines: {node: '>=14.0.0'}
- resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
+ resolution: {integrity: sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==}
engines: {node: '>=14.0.0'}
@@ -10533,8 +10461,8 @@ packages:
peerDependencies:
eslint: '>=6.0.0'
- resolution: {integrity: sha512-nHzQhZ5cjFKynAY2beAm7XtJ5C13VKAFTLTgRYXy+Id1KEKBeiK6hO2RcW1hUjdbHMadz1YzxyHgQigOC54wug==}
+ resolution: {integrity: sha512-f0ZgN+mZ5KFgVv9wz0f4OgVKukoXtS3nwET4c2vLBGQR50aI8G0cqbFtLlX9Yiyg3LFGBitruPHt2PxwTduJEw==}
peerDependencies:
typescript: '*'
peerDependenciesMeta:
@@ -10729,11 +10657,6 @@ packages:
engines: {node: '>= 14'}
hasBin: true
- resolution: {integrity: sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==}
- engines: {node: '>= 14'}
- hasBin: true
-
resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
engines: {node: '>=12'}
@@ -10750,8 +10673,8 @@ packages:
resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
engines: {node: '>=12.20'}
- resolution: {integrity: sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==}
+ resolution: {integrity: sha512-c6T13b6qYcJZvck7QbEFXrFX/Mu2KOjvAGiKHmYMUg96jxNpfP6i+psGW72BOPxOIDUJrORG+Kyu7quMX9CQBQ==}
engines: {node: '>=18'}
@@ -10785,7 +10708,7 @@ snapshots:
dependencies:
'@babel/runtime': 7.25.0
dependencies:
'@antfu/install-pkg': 0.4.1
'@clack/prompts': 0.7.0
@@ -10794,7 +10717,7 @@ snapshots:
'@stylistic/eslint-plugin': 2.8.0([email protected]([email protected]))([email protected])
'@typescript-eslint/parser': 8.8.1([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
eslint-config-flat-gitignore: 0.3.0([email protected]([email protected]))
eslint-flat-config-utils: 0.4.0
@@ -10813,7 +10736,7 @@ snapshots:
eslint-plugin-vue: 9.28.0([email protected]([email protected]))
eslint-plugin-yml: 1.14.0([email protected]([email protected]))
- eslint-processor-vue-blocks: 0.1.2(@vue/[email protected])([email protected]([email protected]))
+ eslint-processor-vue-blocks: 0.1.2(@vue/[email protected])([email protected]([email protected]))
globals: 15.9.0
jsonc-eslint-parser: 2.4.0
local-pkg: 0.5.0
@@ -10848,88 +10771,79 @@ snapshots:
'@babel/highlight': 7.24.7
picocolors: 1.0.1
- '@babel/[email protected]':
- dependencies:
- '@babel/highlight': 7.25.7
- picocolors: 1.1.0
+ '@babel/[email protected]': {}
- '@babel/[email protected]': {}
-
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
'@ampproject/remapping': 2.3.0
- '@babel/code-frame': 7.25.7
- '@babel/generator': 7.25.7
- '@babel/helper-compilation-targets': 7.25.7
- '@babel/helper-module-transforms': 7.25.7(@babel/[email protected])
- '@babel/helpers': 7.25.7
- '@babel/parser': 7.25.8
- '@babel/template': 7.25.7
- '@babel/traverse': 7.25.7
- '@babel/types': 7.25.8
+ '@babel/code-frame': 7.24.7
+ '@babel/generator': 7.25.5
+ '@babel/helper-compilation-targets': 7.25.2
+ '@babel/helper-module-transforms': 7.25.2(@babel/[email protected])
+ '@babel/helpers': 7.25.0
+ '@babel/parser': 7.25.4
+ '@babel/template': 7.25.0
+ '@babel/traverse': 7.25.4
+ '@babel/types': 7.25.4
convert-source-map: 2.0.0
- debug: 4.3.7
+ debug: 4.3.6
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
transitivePeerDependencies:
- supports-color
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/types': 7.25.8
+ '@babel/types': 7.25.4
'@jridgewell/gen-mapping': 0.3.5
'@jridgewell/trace-mapping': 0.3.25
- jsesc: 3.0.2
+ jsesc: 2.5.2
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/compat-data': 7.25.8
- '@babel/helper-validator-option': 7.25.7
- browserslist: 4.24.0
+ '@babel/compat-data': 7.25.4
+ '@babel/helper-validator-option': 7.24.8
+ browserslist: 4.23.3
lru-cache: 5.1.1
semver: 6.3.1
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/traverse': 7.25.7
- '@babel/types': 7.25.8
+ '@babel/traverse': 7.25.4
+ '@babel/types': 7.25.4
transitivePeerDependencies:
- supports-color
dependencies:
- '@babel/core': 7.25.8
- '@babel/helper-module-imports': 7.25.7
- '@babel/helper-simple-access': 7.25.7
- '@babel/helper-validator-identifier': 7.25.7
- '@babel/traverse': 7.25.7
+ '@babel/core': 7.25.2
+ '@babel/helper-module-imports': 7.24.7
+ '@babel/helper-simple-access': 7.24.7
+ '@babel/helper-validator-identifier': 7.24.7
+ '@babel/traverse': 7.25.4
transitivePeerDependencies:
- supports-color
- '@babel/[email protected]': {}
+ '@babel/[email protected]': {}
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/traverse': 7.25.7
- '@babel/types': 7.25.8
+ '@babel/traverse': 7.25.4
+ '@babel/types': 7.25.4
transitivePeerDependencies:
- supports-color
'@babel/[email protected]': {}
- '@babel/[email protected]': {}
-
'@babel/[email protected]': {}
- '@babel/[email protected]': {}
-
- '@babel/[email protected]': {}
+ '@babel/[email protected]': {}
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/template': 7.25.7
- '@babel/types': 7.25.8
+ '@babel/template': 7.25.0
+ '@babel/types': 7.25.4
dependencies:
@@ -10938,30 +10852,19 @@ snapshots:
js-tokens: 4.0.0
picocolors: 1.0.1
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/helper-validator-identifier': 7.25.7
- chalk: 2.4.2
- js-tokens: 4.0.0
- picocolors: 1.1.0
-
- '@babel/[email protected]':
- dependencies:
- '@babel/types': 7.25.6
+ '@babel/types': 7.25.4
- '@babel/[email protected]':
dependencies:
- '@babel/types': 7.25.8
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.7
dependencies:
- '@babel/core': 7.25.8
- '@babel/helper-plugin-utils': 7.25.7
-
- dependencies:
- '@babel/core': 7.25.8
- '@babel/helper-plugin-utils': 7.25.7
+ '@babel/core': 7.25.2
+ '@babel/helper-plugin-utils': 7.24.7
dependencies:
@@ -10975,48 +10878,34 @@ snapshots:
dependencies:
regenerator-runtime: 0.14.1
- '@babel/[email protected]':
- dependencies:
- regenerator-runtime: 0.14.1
-
- '@babel/[email protected]':
- dependencies:
- regenerator-runtime: 0.14.1
-
dependencies:
regenerator-runtime: 0.13.11
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/code-frame': 7.25.7
- '@babel/parser': 7.25.8
- '@babel/types': 7.25.8
+ '@babel/code-frame': 7.24.7
+ '@babel/parser': 7.25.4
+ '@babel/types': 7.25.4
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
- '@babel/code-frame': 7.25.7
- '@babel/generator': 7.25.7
- '@babel/parser': 7.25.8
- '@babel/template': 7.25.7
- '@babel/types': 7.25.8
- debug: 4.3.7
+ '@babel/code-frame': 7.24.7
+ '@babel/generator': 7.25.5
+ '@babel/parser': 7.25.4
+ '@babel/template': 7.25.0
+ '@babel/types': 7.25.4
+ debug: 4.3.6
globals: 11.12.0
transitivePeerDependencies:
- supports-color
- '@babel/[email protected]':
+ '@babel/[email protected]':
dependencies:
'@babel/helper-string-parser': 7.24.8
'@babel/helper-validator-identifier': 7.24.7
to-fast-properties: 2.0.0
- '@babel/[email protected]':
- dependencies:
- '@babel/helper-string-parser': 7.25.7
- '@babel/helper-validator-identifier': 7.25.7
- to-fast-properties: 2.0.0
-
'@base2/[email protected]': {}
@@ -11152,10 +11041,13 @@ snapshots:
'@types/conventional-commits-parser': 5.0.0
chalk: 5.3.0
- '@conventional-changelog/[email protected]':
dependencies:
'@types/semver': 7.5.8
semver: 7.6.3
+ optionalDependencies:
+ conventional-commits-filter: 4.0.0
+ conventional-commits-parser: 5.0.0
'@dprint/[email protected]': {}
@@ -11401,15 +11293,15 @@ snapshots:
eslint: 9.12.0([email protected])
eslint-visitor-keys: 3.4.3
- '@eslint-community/[email protected]': {}
+ '@eslint-community/[email protected]': {}
dependencies:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/typescript-estree': 8.8.1([email protected])
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/typescript-estree': 8.7.0([email protected])
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
birecord: 0.1.1
string-ts: 2.2.0
ts-pattern: 5.4.0
@@ -11426,10 +11318,10 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/type-utils': 8.8.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
birecord: 0.1.1
short-unique-id: 5.2.0
ts-pattern: 5.4.0
@@ -11443,10 +11335,10 @@ snapshots:
'@eslint-react/shared': 1.14.3([email protected]([email protected]))([email protected])
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/type-utils': 8.8.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
eslint-plugin-react-debug: 1.14.3([email protected]([email protected]))([email protected])
eslint-plugin-react-dom: 1.14.3([email protected]([email protected]))([email protected])
@@ -11465,9 +11357,9 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
ts-pattern: 5.4.0
transitivePeerDependencies:
- eslint
@@ -11477,7 +11369,7 @@ snapshots:
dependencies:
'@eslint-react/tools': 1.14.3
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
picomatch: 4.0.2
transitivePeerDependencies:
- eslint
@@ -11489,8 +11381,8 @@ snapshots:
dependencies:
'@eslint-react/tools': 1.14.3
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
transitivePeerDependencies:
- eslint
- supports-color
@@ -11501,9 +11393,9 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
ts-pattern: 5.4.0
transitivePeerDependencies:
- eslint
@@ -11515,7 +11407,7 @@ snapshots:
'@eslint/[email protected]':
dependencies:
'@eslint/object-schema': 2.1.4
- debug: 4.3.7
+ debug: 4.3.6
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@@ -11525,7 +11417,7 @@ snapshots:
'@eslint/[email protected]':
dependencies:
ajv: 6.12.6
- debug: 4.3.7
+ debug: 4.3.6
espree: 10.2.0
globals: 14.0.0
ignore: 5.3.2
@@ -11674,7 +11566,7 @@ snapshots:
optional: true
- '@inquirer/[email protected]': {}
+ '@inquirer/[email protected]': {}
'@isaacs/[email protected]':
dependencies:
@@ -11701,7 +11593,7 @@ snapshots:
'@jridgewell/[email protected]':
dependencies:
'@jridgewell/set-array': 1.2.1
- '@jridgewell/sourcemap-codec': 1.4.15
+ '@jridgewell/sourcemap-codec': 1.5.0
'@jridgewell/trace-mapping': 0.3.25
'@jridgewell/[email protected]': {}
@@ -11713,14 +11605,12 @@ snapshots:
'@jridgewell/gen-mapping': 0.3.5
'@jridgewell/trace-mapping': 0.3.25
- '@jridgewell/[email protected]': {}
-
'@jridgewell/[email protected]': {}
'@jridgewell/[email protected]':
dependencies:
'@jridgewell/resolve-uri': 3.1.2
- '@jridgewell/sourcemap-codec': 1.4.15
+ '@jridgewell/sourcemap-codec': 1.5.0
'@js-sdsl/[email protected]': {}
@@ -11785,19 +11675,19 @@ snapshots:
'@octokit/graphql': 7.1.0
'@octokit/request': 8.4.0
'@octokit/request-error': 5.1.0
- '@octokit/types': 13.6.1
+ '@octokit/types': 13.5.0
before-after-hook: 2.2.3
universal-user-agent: 6.0.1
'@octokit/[email protected]':
dependencies:
- '@octokit/types': 13.6.1
+ '@octokit/types': 13.5.0
universal-user-agent: 6.0.1
'@octokit/[email protected]':
dependencies:
'@octokit/request': 8.4.0
- '@octokit/types': 13.6.1
+ '@octokit/types': 13.5.0
universal-user-agent: 6.0.1
'@octokit/[email protected]': {}
@@ -11805,7 +11695,7 @@ snapshots:
'@octokit/[email protected](@octokit/[email protected])':
dependencies:
'@octokit/core': 5.2.0
- '@octokit/types': 13.6.1
+ '@octokit/types': 13.5.0
'@octokit/[email protected](@octokit/[email protected])':
dependencies:
@@ -11814,11 +11704,11 @@ snapshots:
'@octokit/[email protected](@octokit/[email protected])':
dependencies:
'@octokit/core': 5.2.0
- '@octokit/types': 13.6.1
+ '@octokit/types': 13.5.0
'@octokit/[email protected]':
dependencies:
- '@octokit/types': 13.6.1
+ '@octokit/types': 13.5.0
deprecation: 2.3.1
once: 1.4.0
@@ -11826,7 +11716,7 @@ snapshots:
dependencies:
'@octokit/endpoint': 9.0.5
'@octokit/request-error': 5.1.0
- '@octokit/types': 13.6.1
+ '@octokit/types': 13.5.0
universal-user-agent: 6.0.1
'@octokit/[email protected]':
@@ -11836,7 +11726,7 @@ snapshots:
'@octokit/plugin-request-log': 4.0.1(@octokit/[email protected])
'@octokit/plugin-rest-endpoint-methods': 13.2.2(@octokit/[email protected])
- '@octokit/[email protected]':
+ '@octokit/[email protected]':
dependencies:
'@octokit/openapi-types': 22.2.0
@@ -11855,7 +11745,7 @@ snapshots:
dependencies:
graceful-fs: 4.2.10
dependencies:
'@pnpm/config.env-replace': 1.1.0
'@pnpm/network.ca-file': 1.0.2
@@ -11907,10 +11797,10 @@ snapshots:
dependencies:
- '@babel/runtime': 7.25.6
+ '@babel/runtime': 7.25.4
'@rc-component/portal': 1.1.2([email protected]([email protected]))([email protected])
classnames: 2.5.1
react: 18.3.1
@@ -11933,72 +11823,72 @@ snapshots:
walk-sync: 2.2.0
yaml: 2.4.5
dependencies:
concat-stream: 2.0.0
conventional-changelog: 5.1.0
conventional-recommended-bump: 9.0.0
- git-semver-tags: 8.0.0
+ git-semver-tags: 8.0.0([email protected])([email protected])
release-it: 17.8.2([email protected])
semver: 7.6.3
transitivePeerDependencies:
- conventional-commits-filter
- conventional-commits-parser
dependencies:
'@types/estree': 1.0.6
estree-walker: 2.0.2
picomatch: 2.3.1
optionalDependencies:
- rollup: 4.22.4
+ rollup: 4.21.2
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
'@rushstack/[email protected](@types/[email protected])':
@@ -12258,7 +12148,7 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
- '@vitest/utils': 2.1.2
+ '@vitest/utils': 2.1.1
storybook: 8.3.5
util: 0.12.5
@@ -12302,7 +12192,7 @@ snapshots:
dependencies:
- debug: 4.3.7
+ debug: 4.3.6
endent: 2.1.0
find-cache-dir: 3.3.2
flat-cache: 3.2.0
@@ -12456,8 +12346,8 @@ snapshots:
'@testing-library/[email protected]':
dependencies:
- '@babel/code-frame': 7.25.7
- '@babel/runtime': 7.25.6
+ '@babel/code-frame': 7.24.7
+ '@babel/runtime': 7.25.4
'@types/aria-query': 5.0.4
aria-query: 5.3.0
chalk: 4.1.2
@@ -12506,24 +12396,24 @@ snapshots:
dependencies:
- '@babel/parser': 7.25.8
- '@babel/types': 7.25.8
+ '@babel/parser': 7.25.4
+ '@babel/types': 7.25.4
'@types/babel__generator': 7.6.8
'@types/babel__template': 7.4.4
'@types/babel__traverse': 7.20.6
dependencies:
- '@babel/types': 7.25.8
+ '@babel/types': 7.25.4
dependencies:
- '@babel/parser': 7.25.8
- '@babel/types': 7.25.8
+ '@babel/parser': 7.25.4
+ '@babel/types': 7.25.4
dependencies:
- '@babel/types': 7.25.8
+ '@babel/types': 7.25.4
dependencies:
@@ -12629,7 +12519,7 @@ snapshots:
'@types/[email protected]': {}
- '@types/[email protected]': {}
+ '@types/[email protected]': {}
'@types/[email protected]': {}
@@ -12655,7 +12545,7 @@ snapshots:
dependencies:
- '@types/prop-types': 15.7.13
+ '@types/prop-types': 15.7.12
csstype: 3.1.3
'@types/[email protected]': {}
@@ -12689,7 +12579,7 @@ snapshots:
dependencies:
- '@eslint-community/regexpp': 4.11.1
+ '@eslint-community/regexpp': 4.11.0
'@typescript-eslint/parser': 8.8.1([email protected]([email protected]))([email protected])
'@typescript-eslint/scope-manager': 8.7.0
'@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
@@ -12711,7 +12601,7 @@ snapshots:
'@typescript-eslint/types': 8.8.1
'@typescript-eslint/typescript-estree': 8.8.1([email protected])
'@typescript-eslint/visitor-keys': 8.8.1
- debug: 4.3.7
+ debug: 4.3.6
eslint: 9.12.0([email protected])
optionalDependencies:
typescript: 5.6.3
@@ -12732,19 +12622,7 @@ snapshots:
dependencies:
'@typescript-eslint/typescript-estree': 8.7.0([email protected])
'@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
- debug: 4.3.7
- ts-api-utils: 1.3.0([email protected])
- optionalDependencies:
- typescript: 5.6.3
- transitivePeerDependencies:
- - eslint
- - supports-color
-
- dependencies:
- '@typescript-eslint/typescript-estree': 8.8.1([email protected])
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
- debug: 4.3.7
+ debug: 4.3.6
ts-api-utils: 1.3.0([email protected])
optionalDependencies:
typescript: 5.6.3
@@ -12760,7 +12638,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 8.7.0
'@typescript-eslint/visitor-keys': 8.7.0
- debug: 4.3.7
+ debug: 4.3.6
fast-glob: 3.3.2
is-glob: 4.0.3
minimatch: 9.0.5
@@ -12775,7 +12653,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 8.8.1
'@typescript-eslint/visitor-keys': 8.8.1
- debug: 4.3.7
+ debug: 4.3.6
fast-glob: 3.3.2
is-glob: 4.0.3
minimatch: 9.0.5
@@ -12797,17 +12675,6 @@ snapshots:
- supports-color
- typescript
- dependencies:
- '@eslint-community/eslint-utils': 4.4.0([email protected]([email protected]))
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/typescript-estree': 8.8.1([email protected])
- eslint: 9.12.0([email protected])
- transitivePeerDependencies:
- - supports-color
- - typescript
-
'@typescript-eslint/[email protected]':
dependencies:
'@typescript-eslint/types': 8.7.0
@@ -12834,41 +12701,41 @@ snapshots:
dependencies:
- '@babel/core': 7.25.8
- '@babel/plugin-transform-react-jsx-self': 7.25.7(@babel/[email protected])
- '@babel/plugin-transform-react-jsx-source': 7.25.7(@babel/[email protected])
+ '@babel/core': 7.25.2
+ '@babel/plugin-transform-react-jsx-self': 7.24.7(@babel/[email protected])
+ '@babel/plugin-transform-react-jsx-source': 7.24.7(@babel/[email protected])
'@types/babel__core': 7.20.5
react-refresh: 0.14.2
transitivePeerDependencies:
- supports-color
dependencies:
- vue: 3.5.9([email protected])
+ vue: 3.4.38([email protected])
dependencies:
'@istanbuljs/schema': 0.1.3
- debug: 4.3.7
+ debug: 4.3.6
istanbul-lib-coverage: 3.2.2
istanbul-lib-instrument: 6.0.3
istanbul-lib-report: 3.0.1
istanbul-lib-source-maps: 5.0.6
istanbul-reports: 3.1.7
- magicast: 0.3.5
+ magicast: 0.3.4
test-exclude: 7.0.1
tinyrainbow: 1.2.0
transitivePeerDependencies:
- supports-color
dependencies:
eslint: 9.12.0([email protected])
optionalDependencies:
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
typescript: 5.6.3
@@ -12898,6 +12765,10 @@ snapshots:
dependencies:
tinyrainbow: 1.2.0
+ '@vitest/[email protected]':
+ dependencies:
+ tinyrainbow: 1.2.0
+
'@vitest/[email protected]':
dependencies:
tinyrainbow: 1.2.0
@@ -12915,79 +12786,72 @@ snapshots:
'@vitest/[email protected]':
dependencies:
- tinyspy: 3.0.2
+ tinyspy: 3.0.0
'@vitest/[email protected]':
dependencies:
- tinyspy: 3.0.2
+ tinyspy: 3.0.0
'@vitest/[email protected]':
dependencies:
'@vitest/pretty-format': 2.0.5
estree-walker: 3.0.3
- loupe: 3.1.2
+ loupe: 3.1.1
+ tinyrainbow: 1.2.0
+
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/pretty-format': 2.1.1
+ loupe: 3.1.1
tinyrainbow: 1.2.0
'@vitest/[email protected]':
dependencies:
'@vitest/pretty-format': 2.1.2
- loupe: 3.1.2
+ loupe: 3.1.1
tinyrainbow: 1.2.0
- '@volar/[email protected]':
+ '@volar/[email protected]':
dependencies:
- '@volar/source-map': 2.4.6
+ '@volar/source-map': 2.4.4
- '@volar/[email protected]': {}
+ '@volar/[email protected]': {}
- '@volar/[email protected]':
+ '@volar/[email protected]':
dependencies:
- '@volar/language-core': 2.4.6
+ '@volar/language-core': 2.4.4
path-browserify: 1.0.1
vscode-uri: 3.0.8
dependencies:
- '@babel/parser': 7.25.8
- '@vue/shared': 3.5.11
+ '@babel/parser': 7.25.4
+ '@vue/shared': 3.4.38
entities: 4.5.0
estree-walker: 2.0.2
- source-map-js: 1.2.1
-
- dependencies:
- '@babel/parser': 7.25.6
- '@vue/shared': 3.5.9
- entities: 4.5.0
- estree-walker: 2.0.2
- source-map-js: 1.2.1
-
- dependencies:
- '@vue/compiler-core': 3.5.11
- '@vue/shared': 3.5.11
+ source-map-js: 1.2.0
dependencies:
- '@vue/compiler-core': 3.5.9
- '@vue/shared': 3.5.9
+ '@vue/compiler-core': 3.4.38
+ '@vue/shared': 3.4.38
dependencies:
- '@babel/parser': 7.25.6
- '@vue/compiler-core': 3.5.9
- '@vue/compiler-dom': 3.5.9
- '@vue/compiler-ssr': 3.5.9
- '@vue/shared': 3.5.9
+ '@babel/parser': 7.25.4
+ '@vue/compiler-core': 3.4.38
+ '@vue/compiler-dom': 3.4.38
+ '@vue/compiler-ssr': 3.4.38
+ '@vue/shared': 3.4.38
estree-walker: 2.0.2
magic-string: 0.30.11
- postcss: 8.4.47
- source-map-js: 1.2.1
+ postcss: 8.4.41
+ source-map-js: 1.2.0
dependencies:
- '@vue/compiler-dom': 3.5.9
- '@vue/shared': 3.5.9
+ '@vue/compiler-dom': 3.4.38
+ '@vue/shared': 3.4.38
dependencies:
@@ -12996,10 +12860,10 @@ snapshots:
dependencies:
- '@volar/language-core': 2.4.6
- '@vue/compiler-dom': 3.5.11
+ '@volar/language-core': 2.4.4
+ '@vue/compiler-dom': 3.4.38
'@vue/compiler-vue2': 2.7.16
- '@vue/shared': 3.5.11
+ '@vue/shared': 3.4.38
computeds: 0.0.1
minimatch: 9.0.5
muggle-string: 0.4.1
@@ -13007,31 +12871,29 @@ snapshots:
optionalDependencies:
typescript: 5.6.3
dependencies:
- '@vue/shared': 3.5.9
+ '@vue/shared': 3.4.38
dependencies:
- '@vue/reactivity': 3.5.9
- '@vue/shared': 3.5.9
+ '@vue/reactivity': 3.4.38
+ '@vue/shared': 3.4.38
dependencies:
- '@vue/reactivity': 3.5.9
- '@vue/runtime-core': 3.5.9
- '@vue/shared': 3.5.9
+ '@vue/reactivity': 3.4.38
+ '@vue/runtime-core': 3.4.38
+ '@vue/shared': 3.4.38
csstype: 3.1.3
dependencies:
- '@vue/compiler-ssr': 3.5.9
- '@vue/shared': 3.5.9
- vue: 3.5.9([email protected])
+ '@vue/compiler-ssr': 3.4.38
+ '@vue/shared': 3.4.38
+ vue: 3.4.38([email protected])
- '@vue/[email protected]': {}
-
- '@vue/[email protected]': {}
+ '@vue/[email protected]': {}
'@webassemblyjs/[email protected]':
dependencies:
@@ -13459,12 +13321,12 @@ snapshots:
dependencies:
- caniuse-lite: 1.0.30001664
- electron-to-chromium: 1.5.29
+ caniuse-lite: 1.0.30001651
+ electron-to-chromium: 1.5.6
node-releases: 2.0.18
- update-browserslist-db: 1.1.0([email protected])
+ update-browserslist-db: 1.1.0([email protected])
@@ -13504,7 +13366,7 @@ snapshots:
@@ -13828,7 +13690,7 @@ snapshots:
dependencies:
- browserslist: 4.24.0
+ browserslist: 4.23.3
dependencies:
@@ -13864,12 +13726,12 @@ snapshots:
dependencies:
- icss-utils: 5.1.0([email protected])
- postcss: 8.4.47
- postcss-modules-extract-imports: 3.1.0([email protected])
- postcss-modules-local-by-default: 4.0.5([email protected])
- postcss-modules-scope: 3.2.0([email protected])
- postcss-modules-values: 4.0.0([email protected])
+ icss-utils: 5.1.0([email protected])
+ postcss: 8.4.45
+ postcss-modules-extract-imports: 3.1.0([email protected])
+ postcss-modules-local-by-default: 4.0.5([email protected])
+ postcss-modules-scope: 3.2.0([email protected])
+ postcss-modules-values: 4.0.0([email protected])
postcss-value-parser: 4.2.0
semver: 7.6.3
optionalDependencies:
@@ -13985,13 +13847,13 @@ snapshots:
dependencies:
ms: 2.1.3
dependencies:
ms: 2.1.2
dependencies:
- ms: 2.1.3
+ ms: 2.1.2
@@ -14144,18 +14006,16 @@ snapshots:
dependencies:
- type-fest: 4.26.1
+ type-fest: 4.20.0
-
@@ -14233,7 +14093,7 @@ snapshots:
object-inspect: 1.13.2
object-keys: 1.1.1
object.assign: 4.1.5
- regexp.prototype.flags: 1.5.3
+ regexp.prototype.flags: 1.5.2
safe-array-concat: 1.1.2
safe-regex-test: 1.0.3
string.prototype.trim: 1.2.9
@@ -14252,7 +14112,7 @@ snapshots:
dependencies:
call-bind: 1.0.7
define-properties: 1.2.1
@@ -14266,7 +14126,7 @@ snapshots:
has-proto: 1.0.3
has-symbols: 1.0.3
internal-slot: 1.0.7
- iterator.prototype: 1.1.3
+ iterator.prototype: 1.1.2
safe-array-concat: 1.1.2
@@ -14355,17 +14215,17 @@ snapshots:
fs-extra: 10.1.0
globby: 11.1.0
dependencies:
esbuild: 0.14.54
typescript: 4.9.5
- vue: 3.5.9([email protected])
+ vue: 3.4.38([email protected])
optionalDependencies:
sass: 1.77.5
dependencies:
- debug: 4.3.7
+ debug: 4.3.6
esbuild: 0.23.1
transitivePeerDependencies:
- supports-color
@@ -14562,7 +14422,7 @@ snapshots:
dependencies:
'@eslint-community/eslint-utils': 4.4.0([email protected]([email protected]))
- '@eslint-community/regexpp': 4.11.1
+ '@eslint-community/regexpp': 4.11.0
eslint: 9.12.0([email protected])
eslint-compat-utils: 0.5.1([email protected]([email protected]))
@@ -14584,11 +14444,11 @@ snapshots:
dependencies:
'@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
- debug: 4.3.7
+ debug: 4.3.6
doctrine: 3.0.0
eslint: 9.12.0([email protected])
eslint-import-resolver-node: 0.3.9
- get-tsconfig: 4.8.1
+ get-tsconfig: 4.7.6
is-glob: 4.0.3
minimatch: 9.0.5
semver: 7.6.3
@@ -14603,12 +14463,12 @@ snapshots:
'@es-joy/jsdoccomment': 0.48.0
are-docs-informative: 0.0.2
comment-parser: 1.4.1
- debug: 4.3.7
+ debug: 4.3.6
escape-string-regexp: 4.0.0
eslint: 9.12.0([email protected])
espree: 10.1.0
esquery: 1.6.0
- parse-imports: 2.2.1
+ parse-imports: 2.1.1
semver: 7.6.3
spdx-expression-parse: 4.0.0
synckit: 0.9.1
@@ -14632,7 +14492,7 @@ snapshots:
enhanced-resolve: 5.17.1
eslint: 9.12.0([email protected])
eslint-plugin-es-x: 7.8.0([email protected]([email protected]))
- get-tsconfig: 4.8.1
+ get-tsconfig: 4.7.6
globals: 15.9.0
ignore: 5.3.2
minimatch: 9.0.5
@@ -14672,10 +14532,10 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/type-utils': 8.8.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
string-ts: 2.2.0
ts-pattern: 5.4.0
@@ -14693,9 +14553,9 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
ts-pattern: 5.4.0
optionalDependencies:
@@ -14712,10 +14572,10 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/type-utils': 8.8.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
ts-pattern: 5.4.0
optionalDependencies:
@@ -14735,10 +14595,10 @@ snapshots:
'@eslint-react/shared': 1.14.3([email protected]([email protected]))([email protected])
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/type-utils': 8.8.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
ts-pattern: 5.4.0
optionalDependencies:
@@ -14759,9 +14619,9 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
birecord: 0.1.1
eslint: 9.12.0([email protected])
ts-pattern: 5.4.0
@@ -14779,10 +14639,10 @@ snapshots:
'@eslint-react/tools': 1.14.3
'@eslint-react/types': 1.14.3([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.8.1
- '@typescript-eslint/type-utils': 8.8.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.8.1
- '@typescript-eslint/utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.7.0
+ '@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.7.0
+ '@typescript-eslint/utils': 8.7.0([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
ts-pattern: 5.4.0
@@ -14798,7 +14658,7 @@ snapshots:
array.prototype.flatmap: 1.3.2
array.prototype.tosorted: 1.1.4
doctrine: 2.1.0
- es-iterator-helpers: 1.1.0
+ es-iterator-helpers: 1.0.19
eslint: 9.12.0([email protected])
estraverse: 5.3.0
hasown: 2.0.2
@@ -14816,7 +14676,7 @@ snapshots:
dependencies:
'@eslint-community/eslint-utils': 4.4.0([email protected]([email protected]))
- '@eslint-community/regexpp': 4.11.1
+ '@eslint-community/regexpp': 4.11.0
comment-parser: 1.4.1
eslint: 9.12.0([email protected])
jsdoc-type-pratt-parser: 4.1.0
@@ -14826,7 +14686,7 @@ snapshots:
dependencies:
- debug: 4.3.7
+ debug: 4.3.6
eslint: 9.12.0([email protected])
eslint-compat-utils: 0.5.1([email protected]([email protected]))
lodash: 4.17.21
@@ -14876,7 +14736,7 @@ snapshots:
dependencies:
- debug: 4.3.7
+ debug: 4.3.6
eslint: 9.12.0([email protected])
eslint-compat-utils: 0.5.1([email protected]([email protected]))
lodash: 4.17.21
@@ -14885,9 +14745,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@vue/compiler-sfc': 3.5.9
+ '@vue/compiler-sfc': 3.4.38
eslint: 9.12.0([email protected])
@@ -14921,7 +14781,7 @@ snapshots:
dependencies:
'@eslint-community/eslint-utils': 4.4.0([email protected]([email protected]))
- '@eslint-community/regexpp': 4.11.1
+ '@eslint-community/regexpp': 4.11.0
'@eslint/config-array': 0.18.0
'@eslint/core': 0.6.0
'@eslint/eslintrc': 3.1.0
@@ -14935,7 +14795,7 @@ snapshots:
ajv: 6.12.6
chalk: 4.1.2
cross-spawn: 7.0.3
- debug: 4.3.7
+ debug: 4.3.6
escape-string-regexp: 4.0.0
eslint-scope: 8.1.0
eslint-visitor-keys: 4.1.0
@@ -14996,7 +14856,7 @@ snapshots:
dependencies:
- '@types/estree': 1.0.5
+ '@types/estree': 1.0.6
@@ -15187,14 +15047,9 @@ snapshots:
cross-spawn: 7.0.3
signal-exit: 4.1.0
- dependencies:
- cross-spawn: 7.0.3
- signal-exit: 4.1.0
-
dependencies:
- '@babel/code-frame': 7.25.7
+ '@babel/code-frame': 7.24.7
chalk: 4.1.2
chokidar: 3.6.0
cosmiconfig: 7.1.0
@@ -15292,7 +15147,7 @@ snapshots:
es-errors: 1.3.0
get-intrinsic: 1.2.4
dependencies:
resolve-pkg-maps: 1.0.0
@@ -15300,7 +15155,7 @@ snapshots:
dependencies:
basic-ftp: 5.0.5
data-uri-to-buffer: 6.0.2
- debug: 4.3.7
+ debug: 4.3.6
fs-extra: 11.2.0
transitivePeerDependencies:
- supports-color
@@ -15316,9 +15171,9 @@ snapshots:
meow: 12.1.1
semver: 7.6.3
dependencies:
- '@conventional-changelog/git-client': 1.0.1
+ '@conventional-changelog/git-client': 1.0.1([email protected])([email protected])
meow: 13.2.0
transitivePeerDependencies:
- conventional-commits-filter
@@ -15353,15 +15208,6 @@ snapshots:
minipass: 7.1.2
path-scurry: 1.11.1
- dependencies:
- foreground-child: 3.3.0
- jackspeak: 3.4.3
- minimatch: 9.0.5
- minipass: 7.1.2
- package-json-from-dist: 1.0.1
- path-scurry: 1.11.1
-
dependencies:
fs.realpath: 1.0.0
@@ -15527,7 +15373,7 @@ snapshots:
dependencies:
agent-base: 7.1.1
- debug: 4.3.6
+ debug: 4.3.5
transitivePeerDependencies:
- supports-color
@@ -15560,9 +15406,9 @@ snapshots:
dependencies:
postcss: 8.4.40
dependencies:
- postcss: 8.4.47
+ postcss: 8.4.45
@@ -15605,7 +15451,7 @@ snapshots:
dependencies:
- '@inquirer/figures': 1.0.7
+ '@inquirer/figures': 1.0.3
ansi-escapes: 4.3.2
cli-width: 4.1.0
external-editor: 3.1.0
@@ -15616,7 +15462,7 @@ snapshots:
string-width: 4.2.3
strip-ansi: 6.0.1
wrap-ansi: 6.2.0
- yoctocolors-cjs: 2.1.2
+ yoctocolors-cjs: 2.1.1
dependencies:
@@ -15724,7 +15570,7 @@ snapshots:
dependencies:
- '@typescript-eslint/type-utils': 8.8.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/type-utils': 8.7.0([email protected]([email protected]))([email protected])
eslint: 9.12.0([email protected])
ts-api-utils: 1.3.0([email protected])
ts-declaration-location: 1.0.4([email protected])
@@ -15817,7 +15663,7 @@ snapshots:
@@ -15856,8 +15702,8 @@ snapshots:
dependencies:
- '@babel/core': 7.25.8
- '@babel/parser': 7.25.8
+ '@babel/core': 7.25.2
+ '@babel/parser': 7.25.4
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.2
semver: 7.6.3
@@ -15873,7 +15719,7 @@ snapshots:
dependencies:
'@jridgewell/trace-mapping': 0.3.25
- debug: 4.3.7
+ debug: 4.3.6
istanbul-lib-coverage: 3.2.2
transitivePeerDependencies:
- supports-color
@@ -15883,7 +15729,7 @@ snapshots:
html-escaper: 2.0.2
istanbul-lib-report: 3.0.1
dependencies:
define-properties: 1.2.1
get-intrinsic: 1.2.4
@@ -15897,12 +15743,6 @@ snapshots:
optionalDependencies:
'@pkgjs/parseargs': 0.11.0
- dependencies:
- '@isaacs/cliui': 8.0.2
- optionalDependencies:
- '@pkgjs/parseargs': 0.11.0
-
dependencies:
'@javascript-obfuscator/escodegen': 2.3.0
@@ -15986,6 +15826,8 @@ snapshots:
+
@@ -16036,7 +15878,7 @@ snapshots:
dependencies:
@@ -16193,8 +16035,6 @@ snapshots:
dependencies:
get-func-name: 2.0.2
-
dependencies:
tslib: 2.7.0
@@ -16213,16 +16053,16 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.0
dependencies:
- '@babel/parser': 7.25.8
- '@babel/types': 7.25.8
+ '@babel/parser': 7.25.4
+ '@babel/types': 7.25.4
source-map-js: 1.2.1
@@ -16553,7 +16393,7 @@ snapshots:
dependencies:
'@types/debug': 4.1.12
- debug: 4.3.7
+ debug: 4.3.6
decode-named-character-reference: 1.0.2
devlop: 1.1.0
micromark-core-commonmark: 2.0.1
@@ -16634,7 +16474,7 @@ snapshots:
dependencies:
acorn: 8.12.1
pathe: 1.1.2
- pkg-types: 1.1.3
+ pkg-types: 1.2.0
ufo: 1.5.4
@@ -16732,8 +16572,6 @@ snapshots:
-
@@ -16849,7 +16687,7 @@ snapshots:
cli-cursor: 5.0.0
cli-spinners: 2.9.2
is-interactive: 2.0.0
- is-unicode-supported: 2.1.0
+ is-unicode-supported: 2.0.0
log-symbols: 6.0.0
stdin-discarder: 0.2.2
string-width: 7.2.0
@@ -16857,7 +16695,7 @@ snapshots:
dependencies:
- macos-release: 3.3.0
+ macos-release: 3.2.0
windows-release: 5.1.1
@@ -16900,16 +16738,16 @@ snapshots:
dependencies:
'@tootallnate/quickjs-emscripten': 0.23.0
agent-base: 7.1.1
- debug: 4.3.7
+ debug: 4.3.6
get-uri: 6.0.3
http-proxy-agent: 7.0.2
https-proxy-agent: 7.0.5
pac-resolver: 7.0.1
- socks-proxy-agent: 8.0.4
+ socks-proxy-agent: 8.0.3
transitivePeerDependencies:
- supports-color
@@ -16918,11 +16756,9 @@ snapshots:
degenerator: 5.0.1
netmask: 2.0.2
-
dependencies:
- ky: 1.7.2
+ ky: 1.4.0
registry-auth-token: 5.0.2
registry-url: 6.0.1
semver: 7.6.3
@@ -16940,7 +16776,7 @@ snapshots:
dependencies:
es-module-lexer: 1.5.4
slashes: 3.0.12
@@ -17037,12 +16873,6 @@ snapshots:
dependencies:
find-up: 4.1.0
- dependencies:
- confbox: 0.1.7
- mlly: 1.7.1
- pathe: 1.1.2
-
dependencies:
confbox: 0.1.7
@@ -17061,7 +16891,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.25.6
+ '@babel/runtime': 7.25.4
@@ -17073,9 +16903,9 @@ snapshots:
dependencies:
postcss: 8.4.40
dependencies:
- postcss: 8.4.47
+ postcss: 8.4.45
dependencies:
@@ -17091,10 +16921,10 @@ snapshots:
postcss-selector-parser: 6.1.0
postcss-value-parser: 4.2.0
dependencies:
- icss-utils: 5.1.0([email protected])
- postcss: 8.4.47
+ icss-utils: 5.1.0([email protected])
+ postcss: 8.4.45
postcss-selector-parser: 6.1.0
postcss-value-parser: 4.2.0
@@ -17108,9 +16938,9 @@ snapshots:
postcss: 8.4.40
postcss-selector-parser: 6.1.0
dependencies:
- postcss: 8.4.47
+ postcss: 8.4.45
postcss-selector-parser: 6.1.0
@@ -17123,10 +16953,10 @@ snapshots:
icss-utils: 5.1.0([email protected])
postcss: 8.4.40
dependencies:
- icss-utils: 5.1.0([email protected])
- postcss: 8.4.47
+ icss-utils: 5.1.0([email protected])
+ postcss: 8.4.45
dependencies:
@@ -17164,7 +16994,13 @@ snapshots:
picocolors: 1.0.1
source-map-js: 1.2.0
+ dependencies:
+ nanoid: 3.3.7
+ picocolors: 1.0.1
+ source-map-js: 1.2.0
+
dependencies:
nanoid: 3.3.7
picocolors: 1.1.0
@@ -17226,13 +17062,13 @@ snapshots:
dependencies:
agent-base: 7.1.1
- debug: 4.3.7
+ debug: 4.3.6
http-proxy-agent: 7.0.2
https-proxy-agent: 7.0.5
lru-cache: 7.18.3
- pac-proxy-agent: 7.0.2
+ pac-proxy-agent: 7.0.1
proxy-from-env: 1.1.0
- socks-proxy-agent: 8.0.4
+ socks-proxy-agent: 8.0.3
transitivePeerDependencies:
- supports-color
@@ -17340,26 +17176,18 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1([email protected])
- dependencies:
- '@babel/runtime': 7.25.6
- classnames: 2.5.1
- react: 18.3.1
- react-dom: 18.3.1([email protected])
-
dependencies:
- '@babel/runtime': 7.25.6
+ '@babel/runtime': 7.25.4
classnames: 2.5.1
react: 18.3.1
react-dom: 18.3.1([email protected])
dependencies:
- '@babel/runtime': 7.24.7
+ '@babel/runtime': 7.25.4
classnames: 2.5.1
@@ -17368,7 +17196,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.25.6
+ '@babel/runtime': 7.25.4
'@rc-component/trigger': 2.2.3([email protected]([email protected]))([email protected])
classnames: 2.5.1
@@ -17411,7 +17239,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.25.6
+ '@babel/runtime': 7.25.4
classnames: 2.5.1
@@ -17421,7 +17249,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.25.6
+ '@babel/runtime': 7.25.4
'@rc-component/trigger': 2.2.3([email protected]([email protected]))([email protected])
classnames: 2.5.1
react: 18.3.1
@@ -17445,7 +17273,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.25.7
+ '@babel/runtime': 7.25.4
classnames: 2.5.1
@@ -17518,9 +17346,9 @@ snapshots:
dependencies:
- '@babel/core': 7.25.8
- '@babel/traverse': 7.25.7
- '@babel/types': 7.25.8
+ '@babel/core': 7.25.2
+ '@babel/traverse': 7.25.4
+ '@babel/types': 7.25.4
'@types/babel__core': 7.20.5
'@types/babel__traverse': 7.20.6
'@types/doctrine': 0.0.9
@@ -17687,7 +17515,7 @@ snapshots:
dependencies:
- '@eslint-community/regexpp': 4.11.1
+ '@eslint-community/regexpp': 4.11.0
@@ -17707,7 +17535,7 @@ snapshots:
dependencies:
- '@eslint-community/regexpp': 4.11.1
+ '@eslint-community/regexpp': 4.11.0
refa: 0.12.1
@@ -17716,7 +17544,7 @@ snapshots:
dependencies:
tslib: 2.6.3
dependencies:
call-bind: 1.0.7
define-properties: 1.2.1
@@ -17730,7 +17558,7 @@ snapshots:
dependencies:
- '@pnpm/npm-conf': 2.3.1
+ '@pnpm/npm-conf': 2.2.2
dependencies:
@@ -17854,26 +17682,26 @@ snapshots:
dependencies:
glob: 7.2.3
dependencies:
'@types/estree': 1.0.5
optionalDependencies:
- '@rollup/rollup-android-arm-eabi': 4.22.4
- '@rollup/rollup-android-arm64': 4.22.4
- '@rollup/rollup-darwin-arm64': 4.22.4
- '@rollup/rollup-darwin-x64': 4.22.4
- '@rollup/rollup-linux-arm-gnueabihf': 4.22.4
- '@rollup/rollup-linux-arm-musleabihf': 4.22.4
- '@rollup/rollup-linux-arm64-gnu': 4.22.4
- '@rollup/rollup-linux-arm64-musl': 4.22.4
- '@rollup/rollup-linux-powerpc64le-gnu': 4.22.4
- '@rollup/rollup-linux-riscv64-gnu': 4.22.4
- '@rollup/rollup-linux-s390x-gnu': 4.22.4
- '@rollup/rollup-linux-x64-gnu': 4.22.4
- '@rollup/rollup-linux-x64-musl': 4.22.4
- '@rollup/rollup-win32-arm64-msvc': 4.22.4
- '@rollup/rollup-win32-ia32-msvc': 4.22.4
- '@rollup/rollup-win32-x64-msvc': 4.22.4
+ '@rollup/rollup-android-arm-eabi': 4.21.2
+ '@rollup/rollup-android-arm64': 4.21.2
+ '@rollup/rollup-darwin-arm64': 4.21.2
+ '@rollup/rollup-darwin-x64': 4.21.2
+ '@rollup/rollup-linux-arm-gnueabihf': 4.21.2
+ '@rollup/rollup-linux-arm-musleabihf': 4.21.2
+ '@rollup/rollup-linux-arm64-gnu': 4.21.2
+ '@rollup/rollup-linux-arm64-musl': 4.21.2
+ '@rollup/rollup-linux-powerpc64le-gnu': 4.21.2
+ '@rollup/rollup-linux-riscv64-gnu': 4.21.2
+ '@rollup/rollup-linux-s390x-gnu': 4.21.2
+ '@rollup/rollup-linux-x64-gnu': 4.21.2
+ '@rollup/rollup-linux-x64-musl': 4.21.2
+ '@rollup/rollup-win32-arm64-msvc': 4.21.2
+ '@rollup/rollup-win32-ia32-msvc': 4.21.2
+ '@rollup/rollup-win32-x64-msvc': 4.21.2
fsevents: 2.3.3
@@ -17943,7 +17771,7 @@ snapshots:
dependencies:
- '@eslint-community/regexpp': 4.11.1
+ '@eslint-community/regexpp': 4.11.0
refa: 0.12.1
regexp-ast-analysis: 0.7.1
@@ -18080,7 +17908,7 @@ snapshots:
call-bind: 1.0.7
es-errors: 1.3.0
get-intrinsic: 1.2.4
- object-inspect: 1.13.1
+ object-inspect: 1.13.2
@@ -18112,10 +17940,10 @@ snapshots:
dependencies:
agent-base: 7.1.1
- debug: 4.3.7
+ debug: 4.3.6
socks: 2.8.3
transitivePeerDependencies:
- supports-color
@@ -18221,7 +18049,7 @@ snapshots:
dependencies:
- emoji-regex: 10.4.0
+ emoji-regex: 10.3.0
get-east-asian-width: 1.2.0
strip-ansi: 7.1.0
@@ -18238,7 +18066,7 @@ snapshots:
gopd: 1.0.1
has-symbols: 1.0.3
internal-slot: 1.0.7
- regexp.prototype.flags: 1.5.3
+ regexp.prototype.flags: 1.5.2
set-function-name: 2.0.2
side-channel: 1.0.6
@@ -18385,7 +18213,7 @@ snapshots:
dependencies:
'@istanbuljs/schema': 0.1.3
- glob: 10.4.5
+ glob: 10.4.1
minimatch: 9.0.5
@@ -18402,11 +18230,11 @@ snapshots:
dependencies:
@@ -18627,9 +18455,9 @@ snapshots:
webpack-sources: 3.2.3
webpack-virtual-modules: 0.6.2
dependencies:
- browserslist: 4.24.0
+ browserslist: 4.23.3
escalade: 3.1.2
picocolors: 1.0.1
@@ -18706,7 +18534,7 @@ snapshots:
dependencies:
cac: 6.7.14
- debug: 4.3.7
+ debug: 4.3.6
pathe: 1.1.2
transitivePeerDependencies:
@@ -18720,14 +18548,14 @@ snapshots:
- supports-color
- terser
dependencies:
'@microsoft/api-extractor': 7.47.7(@types/[email protected])
- '@rollup/pluginutils': 5.1.2([email protected])
- '@volar/typescript': 2.4.6
+ '@rollup/pluginutils': 5.1.0([email protected])
+ '@volar/typescript': 2.4.4
'@vue/language-core': 2.1.6([email protected])
compare-versions: 6.1.1
- debug: 4.3.7
+ debug: 4.3.6
kolorist: 1.8.0
local-pkg: 0.5.0
magic-string: 0.30.11
@@ -18742,8 +18570,8 @@ snapshots:
dependencies:
esbuild: 0.21.5
- postcss: 8.4.47
- rollup: 4.22.4
+ postcss: 8.4.45
+ rollup: 4.21.2
optionalDependencies:
'@types/node': 22.7.5
fsevents: 2.3.3
@@ -18761,13 +18589,13 @@ snapshots:
'@vitest/spy': 2.1.2
'@vitest/utils': 2.1.2
chai: 5.1.1
- debug: 4.3.7
+ debug: 4.3.6
magic-string: 0.30.11
pathe: 1.1.2
std-env: 3.7.0
tinybench: 2.9.0
tinyexec: 0.3.0
- tinypool: 1.0.1
+ tinypool: 1.0.0
tinyrainbow: 1.2.0
@@ -18791,7 +18619,7 @@ snapshots:
dependencies:
- debug: 4.3.7
+ debug: 4.3.6
eslint: 9.12.0([email protected])
eslint-scope: 7.2.2
eslint-visitor-keys: 3.4.3
@@ -18802,13 +18630,13 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@vue/compiler-dom': 3.5.9
- '@vue/compiler-sfc': 3.5.9
- '@vue/runtime-dom': 3.5.9
- '@vue/server-renderer': 3.5.9([email protected]([email protected]))
- '@vue/shared': 3.5.9
+ '@vue/compiler-dom': 3.4.38
+ '@vue/compiler-sfc': 3.4.38
+ '@vue/runtime-dom': 3.4.38
+ '@vue/server-renderer': 3.4.38([email protected]([email protected]))
+ '@vue/shared': 3.4.38
optionalDependencies:
typescript: 5.6.3
@@ -18862,7 +18690,7 @@ snapshots:
'@webassemblyjs/wasm-parser': 1.12.1
acorn: 8.12.1
acorn-import-attributes: 1.9.5([email protected])
- browserslist: 4.24.0
+ browserslist: 4.23.3
chrome-trace-event: 1.0.4
enhanced-resolve: 5.17.1
es-module-lexer: 1.5.4
@@ -19010,7 +18838,7 @@ snapshots:
dependencies:
eslint-visitor-keys: 3.4.3
lodash: 4.17.21
- yaml: 2.5.1
+ yaml: 2.5.0
@@ -19018,8 +18846,6 @@ snapshots:
-
@@ -19036,7 +18862,7 @@ snapshots:
dependencies: