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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
feat(sparkline): add render extension (#4233)
ybzky96efb3d361e2
diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.tsindex 3e3b522ccc..54ec9af856 100644--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts@@ -67,7 +67,8 @@ import {ObjectMatrix,searchArray,Tools,- WrapStrategy } from '@univerjs/core';+ WrapStrategy,+} from '@univerjs/core';import { distinctUntilChanged, startWith } from 'rxjs';import { BORDER_TYPE as BORDER_LTRB, COLOR_BLACK_RGB, MAXIMUM_COL_WIDTH, MAXIMUM_ROW_HEIGHT, MIN_COL_WIDTH } from '../../basics/const';import { getRotateOffsetAndFarthestHypotenuse } from '../../basics/draw';diff --git a/packages/sheets-graphics/README.md b/packages/sheets-graphics/README.mdnew file mode 100644index 0000000000..ecd7013d7e--- /dev/null+++ b/packages/sheets-graphics/README.md@@ -0,0 +1,27 @@+# @univerjs/sheets-graphics++## Package Overview++| Package Name | UMD Namespace | Version | License | Downloads | Contains CSS | Contains i18n locales |+| --- | --- | --- | --- | --- | :---: | :---: |+| `@univerjs/sheets-graphics` | `UniverSheetGraphicsPlugin` | [![][npm-version-shield]][npm-version-link] | ![][npm-license-shield] | ![][npm-downloads-shield] | ❌ | ❌ |++## Introduction++`@univerjs/sheets-graphics` is a basic in-cell graphics drawing plugin for Univer Sheet.++## Installation++```shell+# Using npm+npm install @univerjs/sheets-graphics++# Using pnpm+pnpm add @univerjs/sheets-graphics+```++<!-- Links -->+[npm-version-shield]: https://img.shields.io/npm/v/@univerjs/sheets-graphics?style=flat-square+[npm-version-link]: https://npmjs.com/package/@univerjs/sheets-graphics+[npm-license-shield]: https://img.shields.io/npm/l/@univerjs/sheets-graphics?style=flat-square+[npm-downloads-shield]: https://img.shields.io/npm/dm/@univerjs/sheets-graphics?style=flat-squarediff --git a/packages/sheets-graphics/build.ts b/packages/sheets-graphics/build.tsnew file mode 100644index 0000000000..cdb3dc98ea--- /dev/null+++ b/packages/sheets-graphics/build.ts@@ -0,0 +1,19 @@+/**+ * 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 { build } from '@univerjs-infra/shared/vite';++build();diff --git a/packages/sheets-graphics/package.json b/packages/sheets-graphics/package.jsonnew file mode 100644index 0000000000..78508904e6--- /dev/null+++ b/packages/sheets-graphics/package.json@@ -0,0 +1,86 @@+{+ "name": "@univerjs/sheets-graphics",+ "version": "0.5.0-alpha.0",+ "private": false,+ "description": "Drawing graphics for Univer Sheets",+ "author": "DreamNum <[email protected]>",+ "license": "Apache-2.0",+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/univer"+ },+ "homepage": "https://univer.ai",+ "repository": {+ "type": "git",+ "url": "https://github.com/dream-num/univer"+ },+ "bugs": {+ "url": "https://github.com/dream-num/univer/issues"+ },+ "keywords": [],+ "exports": {+ ".": "./src/index.ts",+ "./*": "./src/*"+ },+ "main": "./src/index.ts",+ "types": "./lib/types/index.d.ts",+ "publishConfig": {+ "access": "public",+ "main": "./lib/es/index.js",+ "module": "./lib/es/index.js",+ "exports": {+ ".": {+ "import": "./lib/es/index.js",+ "require": "./lib/cjs/index.js",+ "types": "./lib/types/index.d.ts"+ },+ "./*": {+ "import": "./lib/es/*",+ "require": "./lib/cjs/*",+ "types": "./lib/types/index.d.ts"+ },+ "./lib/*": "./lib/*"+ }+ },+ "directories": {+ "lib": "lib"+ },+ "files": [+ "lib"+ ],+ "scripts": {+ "test": "vitest run",+ "test:watch": "vitest",+ "coverage": "vitest run --coverage",+ "lint:types": "tsc --noEmit",+ "build": "tsx build.ts"+ },+ "peerDependencies": {+ "rxjs": ">=7.0.0"+ },+ "dependencies": {+ "@univerjs/core": "workspace:*",+ "@univerjs/engine-render": "workspace:*",+ "@univerjs/icons": "^0.2.5"+ },+ "devDependencies": {+ "@univerjs-infra/shared": "workspace:*",+ "rxjs": "^7.8.1",+ "typescript": "^5.6.3",+ "vite": "^5.4.10",+ "vitest": "^2.1.4"+ },+ "space": {+ ".": {+ "import": "./lib/es/index.js",+ "require": "./lib/cjs/index.js",+ "types": "./lib/types/index.d.ts"+ },+ "./*": {+ "import": "./lib/es/*",+ "require": "./lib/cjs/*",+ "types": "./lib/types/index.d.ts"+ },+ "./lib/*": "./lib/*"+ }+}diff --git a/packages/sheets-graphics/src/common/const.ts b/packages/sheets-graphics/src/common/const.tsnew file mode 100644index 0000000000..05261d1ca7--- /dev/null+++ b/packages/sheets-graphics/src/common/const.ts@@ -0,0 +1,18 @@+/**+ * 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 UNIQUE_KEY = 'SheetGraphicsExtension';+export const GRAPHICS_EXTENSION_INDEX = 35;diff --git a/packages/sheets-graphics/src/controllers/config.schema.ts b/packages/sheets-graphics/src/controllers/config.schema.tsnew file mode 100644index 0000000000..09640a60cf--- /dev/null+++ b/packages/sheets-graphics/src/controllers/config.schema.ts@@ -0,0 +1,27 @@+/**+ * 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 { DependencyOverride } from '@univerjs/core';++export const PLUGIN_CONFIG_KEY = 'graphics.config';++export const configSymbol = Symbol(PLUGIN_CONFIG_KEY);++export interface IUniverSheetGraphicsConfig {+ override?: DependencyOverride;+}++export const defaultPluginConfig: IUniverSheetGraphicsConfig = {};diff --git a/packages/sheets-graphics/src/controllers/graphics-render.controller.ts b/packages/sheets-graphics/src/controllers/graphics-render.controller.tsnew file mode 100644index 0000000000..4463598bfe--- /dev/null+++ b/packages/sheets-graphics/src/controllers/graphics-render.controller.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 type { ISelectionCellWithMergeInfo } from '@univerjs/core';+import type { IRenderContext, IRenderModule, Spreadsheet, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';+import { Disposable } from '@univerjs/core';+import { UNIQUE_KEY } from '../common/const';+import { Graphics } from '../views/extensions/graphics.extension';++export class SheetGraphicsRenderController extends Disposable implements IRenderModule {+ private _graphicsExtensionInstance: Graphics | null = null;++ constructor(+ private readonly _context: IRenderContext+ ) {+ super();+ this._initRender();+ }++ private _initRender() {+ const spreadsheet = this._context.mainComponent as Spreadsheet;+ if (spreadsheet && !spreadsheet.getExtensionByKey(UNIQUE_KEY)) {+ this._graphicsExtensionInstance = new Graphics();+ spreadsheet.register(this._graphicsExtensionInstance);+ }+ }++ registerRenderer(key: string, renderer: (ctx: UniverRenderingContext, skeleton: SpreadsheetSkeleton, coordInfo: ISelectionCellWithMergeInfo) => void) {+ this._graphicsExtensionInstance?.registerRenderer(key, renderer);+ }+}diff --git a/packages/sheets-graphics/src/index.ts b/packages/sheets-graphics/src/index.tsnew file mode 100644index 0000000000..57e4469377--- /dev/null+++ b/packages/sheets-graphics/src/index.ts@@ -0,0 +1,19 @@+/**+ * 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 { UniverSheetGraphicsPlugin } from './plugin';+export { SheetGraphicsRenderController } from './controllers/graphics-render.controller';+diff --git a/packages/sheets-graphics/src/plugin.ts b/packages/sheets-graphics/src/plugin.tsnew file mode 100644index 0000000000..ece07b2802--- /dev/null+++ b/packages/sheets-graphics/src/plugin.ts@@ -0,0 +1,49 @@+/**+ * 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 { Dependency } from '@univerjs/core';+import type { IUniverSheetGraphicsConfig } from './controllers/config.schema';++import { IConfigService, Inject, Injector, Plugin, UniverInstanceType } from '@univerjs/core';+import { IRenderManagerService } from '@univerjs/engine-render';+import { defaultPluginConfig, PLUGIN_CONFIG_KEY } from './controllers/config.schema';+import { SheetGraphicsRenderController } from './controllers/graphics-render.controller';++const PLUGIN_NAME = 'UNIVER_SHEET_DRAWING_PLUGIN';++export class UniverSheetGraphicsPlugin extends Plugin {+ static override pluginName = PLUGIN_NAME;++ constructor(+ private readonly _config: Partial<IUniverSheetGraphicsConfig> = defaultPluginConfig,+ @Inject(Injector) protected _injector: Injector,+ @IConfigService private readonly _configService: IConfigService,+ @IRenderManagerService private readonly _renderManagerService: IRenderManagerService+ ) {+ super();++ const { ...rest } = this._config;+ this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);+ }++ override onRendered(): void {+ ([+ [SheetGraphicsRenderController],+ ] as Dependency[]).forEach((dep) => {+ this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, dep);+ });+ }+}diff --git a/packages/sheets-graphics/src/views/extensions/graphics.extension.ts b/packages/sheets-graphics/src/views/extensions/graphics.extension.tsnew file mode 100644index 0000000000..26b160e30f--- /dev/null+++ b/packages/sheets-graphics/src/views/extensions/graphics.extension.ts@@ -0,0 +1,57 @@+/**+ * 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 { IObjectMatrixPrimitiveType, IRange, IScale, ISelectionCellWithMergeInfo } from '@univerjs/core';+import type { IDrawInfo, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';+import { Range } from '@univerjs/core';+import { SheetExtension } from '@univerjs/engine-render';+import { GRAPHICS_EXTENSION_INDEX, UNIQUE_KEY } from '../../common/const';++type IGraphicsCache = IObjectMatrixPrimitiveType<ISelectionCellWithMergeInfo>;++type IGraphicsRenderer = (ctx: UniverRenderingContext, skeleton: SpreadsheetSkeleton, coordInfo: ISelectionCellWithMergeInfo) => void;+type IGraphicsRenderMap = Map<string, IGraphicsRenderer>;++export class Graphics extends SheetExtension {+ override uKey = UNIQUE_KEY;+ protected override Z_INDEX = GRAPHICS_EXTENSION_INDEX;++ private _graphicsRenderMap: IGraphicsRenderMap = new Map();++ public registerRenderer(key: string, renderer: IGraphicsRenderer) {+ this._graphicsRenderMap.set(key, renderer);+ }++ override draw(ctx: UniverRenderingContext, _parentScale: IScale, skeleton: SpreadsheetSkeleton, diffBounds: IRange[], { viewRanges }: IDrawInfo): void {+ const featureTypes = Array.from(this._graphicsRenderMap.keys());+ viewRanges.forEach((range) => {+ Range.foreach(range, (row, col) => {+ const cellPosition = skeleton.getCellByIndexWithNoHeader(row, col);+ if (!cellPosition) {+ return;+ }+ featureTypes.forEach((featureType) => {+ const renderer = this._graphicsRenderMap.get(featureType);+ renderer?.(ctx, skeleton, cellPosition);+ });+ });+ });+ }++ override dispose(): void {+ this._graphicsRenderMap.clear();+ }+}diff --git a/packages/sheets-graphics/src/vite-env.d.ts b/packages/sheets-graphics/src/vite-env.d.tsnew file mode 100644index 0000000000..11f02fe2a0--- /dev/null+++ b/packages/sheets-graphics/src/vite-env.d.ts@@ -0,0 +1 @@+/// <reference types="vite/client" />diff --git a/packages/sheets-graphics/tsconfig.json b/packages/sheets-graphics/tsconfig.jsonnew file mode 100644index 0000000000..c62210cbad--- /dev/null+++ b/packages/sheets-graphics/tsconfig.json@@ -0,0 +1,9 @@+{+ "extends": "@univerjs-infra/shared/tsconfigs/base",+ "compilerOptions": {+ "rootDir": "src",+ "outDir": "lib/types"+ },+ "references": [{ "path": "./tsconfig.node.json" }],+ "include": ["src"]+}diff --git a/packages/sheets-graphics/tsconfig.node.json b/packages/sheets-graphics/tsconfig.node.jsonnew file mode 100644index 0000000000..7818f253cc--- /dev/null+++ b/packages/sheets-graphics/tsconfig.node.json@@ -0,0 +1,4 @@+{+ "extends": "@univerjs-infra/shared/tsconfigs/node",+ "include": ["vitest.config.ts", "build.ts"]+}diff --git a/packages/sheets-graphics/vitest.config.ts b/packages/sheets-graphics/vitest.config.tsnew file mode 100644index 0000000000..af97c6d7a2--- /dev/null+++ b/packages/sheets-graphics/vitest.config.ts@@ -0,0 +1,3 @@+import createConfig from '@univerjs-infra/shared/vitest';++export default createConfig();diff --git a/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.ts b/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.tsindex e59b008fbf..afc49f1c02 100644--- a/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.ts+++ b/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.ts@@ -181,6 +181,10 @@ class MarkSelectionService extends Disposable implements IMarkSelectionService {return null;}+ addShapeWithNoFresh(): string | null {+ return null;+ }+refreshShapes() { /* TODO document why this method 'refreshShapes' is empty */ }removeShape(id: string): void { /* TODO document why this method 'removeShape' is empty */ }@@ -344,7 +348,7 @@ describe('Test format painter rules in controller', () => {});describe('format painter to single cell', () => {- it ('will copy whole original styles', async () => {+ it('will copy whole original styles', async () => {expect(await commandService.executeCommand(SetSelectionsOperation.id, {unitId: 'workbook-01',subUnitId: 'sheet-0011',@@ -380,7 +384,7 @@ describe('Test format painter rules in controller', () => {});describe('format painter from non-style cell to styled cell', () => {- it ('will clear styles', async () => {+ it('will clear styles', async () => {expect(await commandService.executeCommand(SetSelectionsOperation.id, {unitId: 'workbook-01',subUnitId: 'sheet-0011',diff --git a/packages/sheets-ui/src/commands/commands/add-worksheet-merge.command.ts b/packages/sheets-ui/src/commands/commands/add-worksheet-merge.command.tsindex 148359e76f..aba7ed94f6 100644--- a/packages/sheets-ui/src/commands/commands/add-worksheet-merge.command.ts+++ b/packages/sheets-ui/src/commands/commands/add-worksheet-merge.command.ts@@ -16,6 +16,8 @@/* eslint-disable max-lines-per-function */+import type { IAccessor, ICommand, IMutationInfo, IRange, Workbook } from '@univerjs/core';+import type { IAddWorksheetMergeMutationParams, IRemoveWorksheetMergeMutationParams } from '@univerjs/sheets';import {CommandType,Dimension,@@ -34,11 +36,9 @@ import {AddWorksheetMergeMutation,getAddMergeMutationRangeByType,RemoveMergeUndoMutationFactory,- RemoveWorksheetMergeMutation, SheetsSelectionsService,+ RemoveWorksheetMergeMutation, SheetInterceptorService, SheetsSelectionsService,} from '@univerjs/sheets';import { IConfirmService } from '@univerjs/ui';-import type { IAccessor, ICommand, IMutationInfo, IRange, Workbook } from '@univerjs/core';-import type { IAddWorksheetMergeMutationParams, IRemoveWorksheetMergeMutationParams } from '@univerjs/sheets';import { checkCellContentInRanges, getClearContentMutationParamsForRanges } from '../../common/utils';import { getMergeableSelectionsByType, MergeType } from './utils/selection-utils';@@ -127,6 +127,15 @@ export const AddWorksheetMergeCommand: ICommand = {const addMergeUndoSelectionsMutation = AddMergeUndoSelectionsOperationFactory(accessor, params);addMergeUndoSelectionsMutation && undoMutations.push(addMergeUndoSelectionsMutation);+ const sheetInterceptorService = accessor.get(SheetInterceptorService);+ const interceptor = sheetInterceptorService.onCommandExecute({+ id: AddWorksheetMergeCommand.id,+ params: { unitId, subUnitId, ranges },+ });++ redoMutations.push(...interceptor.redos);+ undoMutations.push(...interceptor.undos);+const result = sequenceExecute(redoMutations, commandService);if (result.result) {undoRedoService.pushUndoRedo({diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.tsindex 8064059fa1..dda7e7f2df 100644--- a/packages/sheets-ui/src/index.ts+++ b/packages/sheets-ui/src/index.ts@@ -83,7 +83,7 @@ export { type ICanvasPopup, SheetCanvasPopManagerService } from './services/canvexport { mergeSetRangeValues } from './services/clipboard/utils';export type { IAutoFillLocation } from './services/auto-fill/type';export type { IDiscreteRange } from './controllers/utils/range-tools';-export { rangeToDiscreteRange, virtualizeDiscreteRanges } from './controllers/utils/range-tools';+export { discreteRangeToRange, rangeToDiscreteRange, virtualizeDiscreteRanges } from './controllers/utils/range-tools';export { type IHoverCellPosition } from './services/hover-manager.service';export { AFFECT_LAYOUT_STYLES, AutoHeightController } from './controllers/auto-height.controller';export { AutoWidthController } from './controllers/auto-width.controller';diff --git a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.tsindex 93a21e7ae8..6dabc7eef5 100644--- a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts+++ b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts@@ -487,6 +487,10 @@ export class testMarkSelectionService {return null;}+ addShapeWithNoFresh(): string | null {+ return null;+ }+removeShape(id: string): void {// empty}diff --git a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts b/packages/sheets-ui/src/services/clipboard/clipboard.service.tsindex 38dc2f63f8..ca93a9b030 100644--- a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts+++ b/packages/sheets-ui/src/services/clipboard/clipboard.service.ts@@ -49,6 +49,7 @@ import { IRenderManagerService } from '@univerjs/engine-render';import {getPrimaryForRange,SetSelectionsOperation,+ SetWorksheetActiveOperation,SheetsSelectionsService,} from '@univerjs/sheets';import { HTML_CLIPBOARD_MIME_TYPE, IClipboardInterfaceService, INotificationService, IPlatformService, PLAIN_TEXT_CLIPBOARD_MIME_TYPE } from '@univerjs/ui';@@ -673,6 +674,7 @@ export class SheetClipboardService extends Disposable implements ISheetClipboardredoMutationsInfo = mergeSetRangeValues(redoMutationsInfo);undoMutationsInfo = mergeSetRangeValues(undoMutationsInfo);+ undoMutationsInfo.push({ id: SetWorksheetActiveOperation.id, params: { unitId: target.unitId, subUnitId: target.subUnitId } });this._logService.log('[SheetClipboardService]', 'pasting mutations', {undoMutationsInfo,diff --git a/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts b/packages/sheets-ui/src/services/mark-selection/mark-selection.service.tsindex af267cfa5f..40c949af84 100644--- a/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts+++ b/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts@@ -26,6 +26,7 @@ import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';export interface IMarkSelectionService {addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;+ addShapeWithNoFresh(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;removeShape(id: string): void;removeAllShapes(): void;refreshShapes(): void;@@ -80,6 +81,23 @@ export class MarkSelectionService extends Disposable implements IMarkSelectionSereturn id;}+ addShapeWithNoFresh(selection: ISelectionWithStyle, exits: string[] = [], zIndex: number = DEFAULT_Z_INDEX): string | null {+ const workbook = this._currentService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const subUnitId = workbook.getActiveSheet()?.getSheetId();+ if (!subUnitId) return null;+ const id = Tools.generateRandomId();+ this._shapeMap.set(id, {+ selection,+ subUnitId,+ unitId: workbook.getUnitId(),+ zIndex,+ control: null,+ exits,+ });++ return id;+ }+refreshShapes(): void {const currentSheet = this._currentService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);if (!currentSheet) return;diff --git a/packages/sheets/src/index.ts b/packages/sheets/src/index.tsindex 67f512b7c1..b0e702a9d6 100644--- a/packages/sheets/src/index.ts+++ b/packages/sheets/src/index.ts@@ -66,6 +66,7 @@ export { EffectRefRangId, OperatorType } from './services/ref-range/type';export { DefinedNameDataController } from './controllers/defined-name-data.controller';export {getSeparateEffectedRangesOnCommand,+ adjustRangeOnMutation,handleBaseInsertRange,handleBaseMoveRowsCols,handleBaseRemoveRange,@@ -87,6 +88,7 @@ export {rotateRange,runRefRangeMutations,} from './services/ref-range/util';+export type { MutationsAffectRange } from './services/ref-range/util';export { InterceptCellContentPriority, INTERCEPTOR_POINT } from './services/sheet-interceptor/interceptor-const';export { AFTER_CELL_EDIT, AFTER_CELL_EDIT_ASYNC, BEFORE_CELL_EDIT, SheetInterceptorService } from './services/sheet-interceptor/sheet-interceptor.service';export type { ISheetLocation, ISheetLocationBase, ISheetRowLocation } from './services/sheet-interceptor/utils/interceptor';diff --git a/packages/sheets/src/services/exclusive-range/exclusive-range-service.ts b/packages/sheets/src/services/exclusive-range/exclusive-range-service.tsindex 39890666e4..9d5ca8fd5f 100644--- a/packages/sheets/src/services/exclusive-range/exclusive-range-service.ts+++ b/packages/sheets/src/services/exclusive-range/exclusive-range-service.ts@@ -15,8 +15,10 @@*/import type { IRange } from '@univerjs/core';-import { createIdentifier, Disposable, Rectangle } from '@univerjs/core';+import type { Observable } from 'rxjs';import type { ISelectionWithStyle } from '../../basics/selection';+import { createIdentifier, Disposable, Rectangle } from '@univerjs/core';+import { Subject } from 'rxjs';interface IFeatureRange {groupId: string;@@ -24,6 +26,8 @@ interface IFeatureRange {}export interface IExclusiveRangeService {+ exclusiveRangesChange$: Observable<{ unitId: string; subUnitId: string; ranges: IRange[] }>;+/*** @description Add an exclusive range to the service* @param {string} unitId The unitId of the exclusive range@@ -70,6 +74,9 @@ export class ExclusiveRangeService extends Disposable implements IExclusiveRange*/private _exclusiveRanges: Map<string, Map<string, Map<string, IFeatureRange[]>>> = new Map();+ private _exclusiveRangesChange$ = new Subject<{ unitId: string; subUnitId: string; ranges: IRange[] }>();+ public exclusiveRangesChange$ = this._exclusiveRangesChange$.asObservable();+private _ensureUnitMap(unitId: string) {if (!this._exclusiveRanges.has(unitId)) {this._exclusiveRanges.set(unitId, new Map());@@ -96,6 +103,7 @@ export class ExclusiveRangeService extends Disposable implements IExclusiveRangepublic addExclusiveRange(unitId: string, sheetId: string, feature: string, ranges: IFeatureRange[]) {const featureMap = this._ensureFeature(unitId, sheetId, feature);featureMap.push(...ranges);+ this._exclusiveRangesChange$.next({ unitId, subUnitId: sheetId, ranges: featureMap.map((item) => item.range) });}public getExclusiveRanges(unitId: string, sheetId: string, feature: string): undefined | IFeatureRange[] {@@ -103,11 +111,16 @@ export class ExclusiveRangeService extends Disposable implements IExclusiveRange}public clearExclusiveRanges(unitId: string, sheetId: string, feature: string) {+ const ranges = this.getExclusiveRanges(unitId, sheetId, feature);+ this._exclusiveRangesChange$.next({ unitId, subUnitId: sheetId, ranges: ranges?.map((item) => item.range) || [] });+this._ensureFeature(unitId, sheetId, feature);this._exclusiveRanges.get(unitId)!.get(sheetId)!.set(feature, []);}public clearExclusiveRangesByGroupId(unitId: string, sheetId: string, feature: string, groupId: string) {+ const ranges = this.getExclusiveRanges(unitId, sheetId, feature);+ this._exclusiveRangesChange$.next({ unitId, subUnitId: sheetId, ranges: ranges?.map((item) => item.range) || [] });const featureMap = this.getExclusiveRanges(unitId, sheetId, feature);if (featureMap) {const newFeatureMap = featureMap.filter((item) => item.groupId !== groupId);diff --git a/packages/sheets/src/services/ref-range/util.ts b/packages/sheets/src/services/ref-range/util.tsindex 6508c95288..e0560b382e 100644--- a/packages/sheets/src/services/ref-range/util.ts+++ b/packages/sheets/src/services/ref-range/util.ts@@ -16,7 +16,6 @@import type { IAccessor, ICommandInfo, IMutationInfo, IRange, Nullable } from '@univerjs/core';import type { IInsertColMutationParams, IInsertRowMutationParams, IRemoveColMutationParams, IRemoveRowsMutationParams, IRemoveSheetMutationParams } from '../../basics';-import type { IInsertColCommandParams, IInsertRowCommandParams } from '../../commands/commands/insert-row-col.command';import type { IRemoveRowColCommandInterceptParams } from '../../commands/commands/remove-row-col.command';import type { ISheetCommandSharedParams } from '../../commands/utils/interface';@@ -1090,7 +1089,7 @@ export const handleDefaultRangeChangeWithEffectRefCommandsSkipNoInterests = (ranreturn range;};-type MutationsAffectRange =+export type MutationsAffectRange =ISheetCommandSharedParams| IRemoveSheetMutationParams| IMoveRowsMutationParamsdiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 68ac9fdc52..1edc136b76 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -2588,6 +2588,34 @@ importers:specifier: ^2.1.6version: 2.1.6(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ packages/sheets-graphics:+ dependencies:+ '@univerjs/core':+ specifier: workspace:*+ version: link:../core+ '@univerjs/engine-render':+ specifier: workspace:*+ version: link:../engine-render+ '@univerjs/icons':+ specifier: ^0.2.5+ devDependencies:+ '@univerjs-infra/shared':+ specifier: workspace:*+ version: link:../../common/shared+ rxjs:+ specifier: ^7.8.1+ version: 7.8.1+ typescript:+ specifier: ^5.6.3+ version: 5.7.2+ vite:+ specifier: ^5.4.10+ version: 5.4.11(@types/[email protected])([email protected])([email protected])([email protected])+ vitest:+ specifier: ^2.1.4+ version: 2.1.6(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+packages/sheets-hyper-link:dependencies:'@univerjs/core':@@ -3765,6 +3793,12 @@ packages:resolution: {integrity: sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==}engines: {node: '>=16'}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}+ engines: {node: '>=12'}+ cpu: [ppc64]+ os: [aix]+'@esbuild/[email protected]':resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==}engines: {node: '>=18'}@@ -3777,6 +3811,12 @@ packages:cpu: [ppc64]os: [aix]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}+ engines: {node: '>=12'}+ cpu: [arm64]+ os: [android]+'@esbuild/[email protected]':resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==}engines: {node: '>=18'}@@ -3789,6 +3829,12 @@ packages:cpu: [arm64]os: [android]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}+ engines: {node: '>=12'}+ cpu: [arm]+ os: [android]+'@esbuild/[email protected]':resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==}engines: {node: '>=18'}@@ -3801,6 +3847,12 @@ packages:cpu: [arm]os: [android]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [android]+'@esbuild/[email protected]':resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==}engines: {node: '>=18'}@@ -3813,6 +3865,12 @@ packages:cpu: [x64]os: [android]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}+ engines: {node: '>=12'}+ cpu: [arm64]+ os: [darwin]+'@esbuild/[email protected]':resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==}engines: {node: '>=18'}@@ -3825,6 +3883,12 @@ packages:cpu: [arm64]os: [darwin]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [darwin]+'@esbuild/[email protected]':resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==}engines: {node: '>=18'}@@ -3837,6 +3901,12 @@ packages:cpu: [x64]os: [darwin]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}+ engines: {node: '>=12'}+ cpu: [arm64]+ os: [freebsd]+'@esbuild/[email protected]':resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==}engines: {node: '>=18'}@@ -3849,6 +3919,12 @@ packages:cpu: [arm64]os: [freebsd]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [freebsd]+'@esbuild/[email protected]':resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==}engines: {node: '>=18'}@@ -3861,6 +3937,12 @@ packages:cpu: [x64]os: [freebsd]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}+ engines: {node: '>=12'}+ cpu: [arm64]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==}engines: {node: '>=18'}@@ -3873,6 +3955,12 @@ packages:cpu: [arm64]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}+ engines: {node: '>=12'}+ cpu: [arm]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==}engines: {node: '>=18'}@@ -3885,6 +3973,12 @@ packages:cpu: [arm]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}+ engines: {node: '>=12'}+ cpu: [ia32]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==}engines: {node: '>=18'}@@ -3903,6 +3997,12 @@ packages:cpu: [loong64]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}+ engines: {node: '>=12'}+ cpu: [loong64]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==}engines: {node: '>=18'}@@ -3915,6 +4015,12 @@ packages:cpu: [loong64]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}+ engines: {node: '>=12'}+ cpu: [mips64el]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==}engines: {node: '>=18'}@@ -3927,6 +4033,12 @@ packages:cpu: [mips64el]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}+ engines: {node: '>=12'}+ cpu: [ppc64]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==}engines: {node: '>=18'}@@ -3939,6 +4051,12 @@ packages:cpu: [ppc64]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}+ engines: {node: '>=12'}+ cpu: [riscv64]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==}engines: {node: '>=18'}@@ -3951,6 +4069,12 @@ packages:cpu: [riscv64]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}+ engines: {node: '>=12'}+ cpu: [s390x]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==}engines: {node: '>=18'}@@ -3963,6 +4087,12 @@ packages:cpu: [s390x]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [linux]+'@esbuild/[email protected]':resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==}engines: {node: '>=18'}@@ -3975,6 +4105,12 @@ packages:cpu: [x64]os: [linux]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [netbsd]+'@esbuild/[email protected]':resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==}engines: {node: '>=18'}@@ -3999,6 +4135,12 @@ packages:cpu: [arm64]os: [openbsd]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [openbsd]+'@esbuild/[email protected]':resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==}engines: {node: '>=18'}@@ -4011,6 +4153,12 @@ packages:cpu: [x64]os: [openbsd]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [sunos]+'@esbuild/[email protected]':resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==}engines: {node: '>=18'}@@ -4023,6 +4171,12 @@ packages:cpu: [x64]os: [sunos]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}+ engines: {node: '>=12'}+ cpu: [arm64]+ os: [win32]+'@esbuild/[email protected]':resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==}engines: {node: '>=18'}@@ -4035,6 +4189,12 @@ packages:cpu: [arm64]os: [win32]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}+ engines: {node: '>=12'}+ cpu: [ia32]+ os: [win32]+'@esbuild/[email protected]':resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==}engines: {node: '>=18'}@@ -4047,6 +4207,12 @@ packages:cpu: [ia32]os: [win32]+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}+ engines: {node: '>=12'}+ cpu: [x64]+ os: [win32]+'@esbuild/[email protected]':resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==}engines: {node: '>=18'}@@ -6581,6 +6747,11 @@ packages:engines: {node: '>=12'}hasBin: true+ resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}+ engines: {node: '>=12'}+ hasBin: true+resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==}engines: {node: '>=18'}@@ -10078,6 +10249,37 @@ packages:resolution: {integrity: sha512-aoukfac66QevFAbRF2ZD81WPSqeqhgEfbfhPYQP9RPWO1en+Lw4HyhWRdvSjYn56gcKUJCtHdFG2jEpYgleLng==}engines: {node: '>=14.18.0', vite: '>=3.1.0'}+ resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}+ engines: {node: ^18.0.0 || >=20.0.0}+ hasBin: true+ peerDependencies:+ '@types/node': ^18.0.0 || >=20.0.0+ less: '*'+ lightningcss: ^1.21.0+ sass: '*'+ sass-embedded: '*'+ stylus: '*'+ sugarss: '*'+ terser: ^5.4.0+ peerDependenciesMeta:+ '@types/node':+ optional: true+ less:+ optional: true+ lightningcss:+ optional: true+ sass:+ optional: true+ sass-embedded:+ optional: true+ stylus:+ optional: true+ sugarss:+ optional: true+ terser:+ optional: true+resolution: {integrity: sha512-Ldn6gorLGr4mCdFnmeAOLweJxZ34HjKnDm4HGo6P66IEqTxQb36VEdFJQENKxWjupNfoIjvRUnswjn1hpYEpjQ==}engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}@@ -10780,66 +10982,99 @@ snapshots:esquery: 1.6.0jsdoc-type-pratt-parser: 4.1.0+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true@@ -10849,42 +11084,63 @@ snapshots:'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true@@ -10897,30 +11153,45 @@ snapshots:'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true'@esbuild/[email protected]':optional: true+ '@esbuild/[email protected]':+ optional: true+'@esbuild/[email protected]':optional: true@@ -13752,6 +14023,32 @@ snapshots:esbuild-windows-64: 0.14.54esbuild-windows-arm64: 0.14.54+ optionalDependencies:+ '@esbuild/aix-ppc64': 0.21.5+ '@esbuild/android-arm': 0.21.5+ '@esbuild/android-arm64': 0.21.5+ '@esbuild/android-x64': 0.21.5+ '@esbuild/darwin-arm64': 0.21.5+ '@esbuild/darwin-x64': 0.21.5+ '@esbuild/freebsd-arm64': 0.21.5+ '@esbuild/freebsd-x64': 0.21.5+ '@esbuild/linux-arm': 0.21.5+ '@esbuild/linux-arm64': 0.21.5+ '@esbuild/linux-ia32': 0.21.5+ '@esbuild/linux-loong64': 0.21.5+ '@esbuild/linux-mips64el': 0.21.5+ '@esbuild/linux-ppc64': 0.21.5+ '@esbuild/linux-riscv64': 0.21.5+ '@esbuild/linux-s390x': 0.21.5+ '@esbuild/linux-x64': 0.21.5+ '@esbuild/netbsd-x64': 0.21.5+ '@esbuild/openbsd-x64': 0.21.5+ '@esbuild/sunos-x64': 0.21.5+ '@esbuild/win32-arm64': 0.21.5+ '@esbuild/win32-ia32': 0.21.5+ '@esbuild/win32-x64': 0.21.5+optionalDependencies:'@esbuild/aix-ppc64': 0.23.1@@ -17890,6 +18187,18 @@ snapshots:'@types/node': 14.18.63fs-extra: 11.2.0+ [email protected](@types/[email protected])([email protected])([email protected])([email protected]):+ dependencies:+ esbuild: 0.21.5+ postcss: 8.4.49+ rollup: 4.27.4+ optionalDependencies:+ '@types/node': 22.10.1+ fsevents: 2.3.3+ less: 4.2.1+ sass: 1.77.5+ terser: 5.31.6+[email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):dependencies:esbuild: 0.24.0