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.

feat(filter): add facade API and docs (#3103)

Wenzhao Hudc37071446dd
diff --git a/packages/core/src/services/lifecycle/lifecycle.ts b/packages/core/src/services/lifecycle/lifecycle.ts
index bfb47955a9..a7278bc2e2 100644
--- a/packages/core/src/services/lifecycle/lifecycle.ts
+++ b/packages/core/src/services/lifecycle/lifecycle.ts
@@ -58,6 +58,8 @@ export const LifecycleToModules = new Map<LifecycleStages, Array<DependencyIdent
* @param identifier The dependency identifier of the class. Usually, it is the class itself unless you bind this class
* with another injection identifier.
*
+ * @deprecated This API does not work as expected and will be removed in future versions. Please call
+ * `this._injector.get(YourDependency)` in plugins' lifecycle hooks instead.
*
* @example
* // Ignore the `\` below. This is JSDoc's bug.
@@ -86,6 +88,9 @@ export function OnLifecycle(lifecycleStage: LifecycleStages, identifier: Depende
* @param identifier The dependencies' identifier. **Beware** that if the dependency (e.g. a class) is bound to an
* identifier, you should register the identifier instead of the dependency itself.
*
+ * @deprecated This API does not work as expected and will be removed in future versions. Please call
+ * `this._injector.get(YourDependency)` in plugins' lifecycle hooks instead.
+ *
* @example
* runOnLifecycle(LifecycleStages.Ready, MyService);
*
diff --git a/packages/facade/package.json b/packages/facade/package.json
index 1a2cdf2517..8d3eea4177 100644
--- a/packages/facade/package.json
+++ b/packages/facade/package.json
@@ -67,6 +67,8 @@
"@univerjs/network": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
+ "@univerjs/sheets-filter": "workspace:*",
+ "@univerjs/sheets-filter-ui": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
@@ -84,6 +86,8 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-conditional-formatting": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
+ "@univerjs/sheets-filter": "workspace:*",
+ "@univerjs/sheets-filter-ui": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/facade/src/apis/__tests__/create-test-bed.ts b/packages/facade/src/apis/__tests__/create-test-bed.ts
index 9e29814e08..6eaeecee40 100644
--- a/packages/facade/src/apis/__tests__/create-test-bed.ts
+++ b/packages/facade/src/apis/__tests__/create-test-bed.ts
@@ -34,7 +34,16 @@ import {
} from '@univerjs/core';
import { FormulaDataModel, FunctionService, IFunctionService, LexerTreeBuilder } from '@univerjs/engine-formula';
import { ISocketService, WebSocketService } from '@univerjs/network';
-import { RangeProtectionRuleModel, SheetInterceptorService, SheetsSelectionsService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import {
+ RangeProtectionRuleModel,
+ RefRangeService,
+ SheetInterceptorService,
+ SheetsSelectionsService,
+ WorkbookPermissionService,
+ WorksheetPermissionService,
+ WorksheetProtectionPointModel,
+ WorksheetProtectionRuleModel,
+} from '@univerjs/sheets';
import {
DescriptionService,
IDescriptionService,
@@ -52,6 +61,7 @@ import { ConditionalFormattingFormulaService, ConditionalFormattingRuleModel, Co
import { UniverDataValidationPlugin } from '@univerjs/data-validation';
import { DataValidationCacheService, DataValidationCustomFormulaService, DataValidationFormulaService, DataValidationModel, SheetDataValidationManager, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';
import { ActiveDirtyManagerService, IActiveDirtyManagerService } from '@univerjs/engine-formula/services/active-dirty-manager.service.js';
+import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';
import { FUniver } from '../facade';
function getTestWorkbookDataDemo(): IWorkbookData {
@@ -149,6 +159,7 @@ export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?:
injector.add([SheetSkeletonManagerService]);
injector.add([FormulaDataModel]);
injector.add([LexerTreeBuilder]);
+ injector.add([RefRangeService]);
injector.add([WorksheetPermissionService]);
injector.add([WorkbookPermissionService]);
injector.add([WorksheetProtectionPointModel]);
@@ -160,18 +171,23 @@ export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?:
renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, [SheetSkeletonManagerService] as Dependency);
renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, [SheetRenderController] as Dependency);
+ // register feature modules
([
+ // conditional formatting
[ConditionalFormattingService],
[ConditionalFormattingFormulaService],
[ConditionalFormattingRuleModel],
[ConditionalFormattingViewModel],
+ // data validation
[DataValidationCacheService],
[DataValidationFormulaService],
[DataValidationCustomFormulaService],
[RegisterOtherFormulaService],
[IActiveDirtyManagerService, { useClass: ActiveDirtyManagerService }],
[SheetsDataValidationValidatorService],
+
+ // sheets filter
] as Dependency[]).forEach((d) => {
injector.add(d);
});
@@ -180,25 +196,28 @@ export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?:
}
}
+ // load i18n
injector.get(LocaleService).load({ zhCN, enUS });
+ // load theme service
const themeService = injector.get(ThemeService);
- themeService.setTheme({
- colorBlack: '#35322b',
- });
+ themeService.setTheme({ colorBlack: '#35322b' });
+ // register builtin plugins
+ // note that UI plugins are not registered here, because the unit test environment does not have a UI
univer.registerPlugin(TestPlugin);
+ univer.registerPlugin(UniverSheetsFilterPlugin);
univer.registerPlugin(UniverDataValidationPlugin);
const sheet = univer.createUnit(UniverInstanceType.UNIVER_SHEET, workbookData || getTestWorkbookDataDemo());
-
const univerInstanceService = injector.get(IUniverInstanceService);
univerInstanceService.focusUnit('test');
- const logService = injector.get(ILogService);
- logService.setLogLevel(LogLevel.SILENT); // change this to `LogLevel.VERBOSE` to debug tests via logs
+ // set log level
+ const logService = injector.get(ILogService);
+ logService.setLogLevel(LogLevel.SILENT); // NOTE: change this to `LogLevel.VERBOSE` to debug tests via logs
- const univerAPI = FUniver.newAPI(injector);
+ // init data validation
const createSheetDataValidationManager = (unitId: string, subUnitId: string) => {
return new SheetDataValidationManager(
unitId,
@@ -209,6 +228,8 @@ export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?:
const dataValidationModel = injector.get(DataValidationModel);
dataValidationModel.setManagerCreator(createSheetDataValidationManager);
+ const univerAPI = FUniver.newAPI(injector);
+
return {
univer,
get: injector.get.bind(injector),
diff --git a/packages/facade/src/apis/__tests__/facade.spec.ts b/packages/facade/src/apis/__tests__/facade.spec.ts
index f9001c2591..de4045c911 100644
--- a/packages/facade/src/apis/__tests__/facade.spec.ts
+++ b/packages/facade/src/apis/__tests__/facade.spec.ts
@@ -288,6 +288,10 @@ describe('Test FUniver', () => {
name: 'SHEET_CONDITIONAL_FORMATTING_PLUGIN',
data: '{"sheet-0011":[{"cfId":"AEGZdW8C","ranges":[{"startRow":2,"startColumn":1,"endRow":11,"endColumn":5,"startAbsoluteRefType":0,"endAbsoluteRefType":0,"rangeType":0}],"rule":{"type":"highlightCell","subType":"text","operator":"containsText","style":{"cl":{"rgb":"#2f56ef"},"bg":{"rgb":"#e8ecfc"}},"value":""},"stopIfTrue":false},{"cfId":"4ICEXdJj","ranges":[{"startRow":2,"startColumn":1,"endRow":11,"endColumn":5,"startAbsoluteRefType":0,"endAbsoluteRefType":0,"rangeType":0}],"rule":{"type":"highlightCell","subType":"text","operator":"containsText","style":{"cl":{"rgb":"#2f56ef"},"bg":{"rgb":"#e8ecfc"}},"value":""},"stopIfTrue":false},{"cfId":"geCv018z","ranges":[{"startRow":2,"startColumn":1,"endRow":11,"endColumn":5,"startAbsoluteRefType":0,"endAbsoluteRefType":0,"rangeType":0}],"rule":{"type":"highlightCell","subType":"text","operator":"containsText","style":{"cl":{"rgb":"#2f56ef"},"bg":{"rgb":"#e8ecfc"}},"value":""},"stopIfTrue":false}]}',
},
+ {
+ data: '{}',
+ name: 'SHEET_FILTER_PLUGIN',
+ },
{
data: '{}',
name: 'SHEET_DATA_VALIDATION_PLUGIN',
diff --git a/packages/facade/src/apis/facade.ts b/packages/facade/src/apis/facade.ts
index 7d7953ed8b..544c57c2a7 100644
--- a/packages/facade/src/apis/facade.ts
+++ b/packages/facade/src/apis/facade.ts
@@ -205,7 +205,7 @@ export class FUniver {
* @returns {FWorkbook | null} The currently focused Univer spreadsheet.
*/
getActiveWorkbook(): FWorkbook | null {
- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
if (!workbook) {
return null;
}
diff --git a/packages/facade/src/apis/sheets/__tests__/f-range.spec.ts b/packages/facade/src/apis/sheets/__tests__/f-range.spec.ts
index 4dd0fd56fd..cdc6e62e11 100644
--- a/packages/facade/src/apis/sheets/__tests__/f-range.spec.ts
+++ b/packages/facade/src/apis/sheets/__tests__/f-range.spec.ts
@@ -14,13 +14,16 @@
* limitations under the License.
*/
-import type { ICellData, Injector, IStyleData, Nullable } from '@univerjs/core';
+/* eslint-disable ts/no-non-null-asserted-optional-chain */
+
+import type { ICellData, Injector, IRange, IStyleData, Nullable } from '@univerjs/core';
import { DataValidationType, HorizontalAlign, ICommandService, IUniverInstanceService, VerticalAlign, WrapStrategy } from '@univerjs/core';
import { SetHorizontalTextAlignCommand, SetRangeValuesCommand, SetRangeValuesMutation, SetStyleCommand, SetTextWrapCommand, SetVerticalTextAlignCommand } from '@univerjs/sheets';
import { beforeEach, describe, expect, it } from 'vitest';
import { FormulaDataModel } from '@univerjs/engine-formula';
import { AddSheetDataValidationCommand } from '@univerjs/sheets-data-validation';
+import { ClearSheetsFilterCriteriaCommand, RemoveSheetFilterCommand, SetSheetFilterRangeCommand, SetSheetsFilterCriteriaCommand } from '@univerjs/sheets-filter-ui';
import { FUniver } from '../../facade';
import { createFacadeTestBed } from '../../__tests__/create-test-bed';
@@ -556,12 +559,12 @@ describe('Test FRange', () => {
});
it('Range set data validation', async () => {
- const activeSheet = univerAPI.getActiveWorkbook()?.getActiveSheet();
- const range = activeSheet?.getRange(0, 0, 10, 10)!;
- const range2 = activeSheet?.getRange(11, 11, 2, 2);
+ const activeSheet = univerAPI.getActiveWorkbook()?.getActiveSheet()!;
+ const range = activeSheet.getRange(0, 0, 10, 10);
+ const range2 = activeSheet.getRange(11, 11, 2, 2);
await range.setDataValidation(FUniver.newDataValidation().requireCheckbox().build());
await range2?.setDataValidation(FUniver.newDataValidation().requireNumberEqualTo(1).build());
- const range3 = activeSheet?.getRange(0, 0, 100, 100);
+ const range3 = activeSheet.getRange(0, 0, 100, 100);
expect(range.getDataValidation()).toBeTruthy();
expect(range.getDataValidation()?.rule.ranges).toEqual([{
@@ -576,4 +579,46 @@ describe('Test FRange', () => {
expect(activeSheet?.getDataValidations().length).toEqual(2);
});
+
+ // #region Filter
+
+ describe('FFilter', () => {
+ beforeEach(() => {
+ commandService.registerCommand(SetSheetsFilterCriteriaCommand);
+ commandService.registerCommand(ClearSheetsFilterCriteriaCommand);
+ commandService.registerCommand(SetSheetFilterRangeCommand);
+ commandService.registerCommand(RemoveSheetFilterCommand);
+ });
+
+ it('create, modify and clear filters with Facade API', async () => {
+ const activeSheet = univerAPI.getActiveWorkbook()!.getActiveSheet();
+ expect(activeSheet.getFilter()).toBeNull();
+ expect(activeSheet.getRange(0, 0, 1, 1).getFilter()).toBeNull();
+
+ const range = activeSheet.getRange(0, 0, 10, 10);
+ const filter = (await range.createFilter())!;
+
+ expect(filter).not.toBeNull();
+ expect(activeSheet.getFilter()).not.toBeNull();
+ expect(activeSheet.getRange(0, 0, 1, 1).getFilter()).not.toBeNull();
+ expect(filter.getRange().getRange()).toStrictEqual({ startColumn: 0, startRow: 0, endColumn: 9, endRow: 9 } as IRange);
+
+ expect(await filter.setColumnFilterCriteria(1, { colId: 1, filters: { blank: true } })).toBeTruthy();
+ expect(filter.getColumnFilterCriteria(1)).toEqual({ colId: 1, filters: { blank: true } });
+
+ expect(await filter.setColumnFilterCriteria(2, { colId: 2, filters: { filters: ['a'] } })).toBeTruthy();
+ expect(filter.getColumnFilterCriteria(2)).toEqual({ colId: 2, filters: { filters: ['a'] } });
+
+ expect(await filter.removeColumnFilterCriteria(1)).toBeTruthy();
+ expect(filter.getColumnFilterCriteria(1)).toBeFalsy();
+
+ expect(await filter.removeFilterCriteria()).toBeTruthy();
+ expect(filter.getColumnFilterCriteria(2)).toBeFalsy();
+
+ expect(await filter.remove()).toBeTruthy();
+ expect(activeSheet.getFilter()).toBeNull();
+ });
+ });
+
+ // #endregion
});
diff --git a/packages/facade/src/apis/sheets/f-filter.ts b/packages/facade/src/apis/sheets/f-filter.ts
new file mode 100644
index 0000000000..0905f3dee7
--- /dev/null
+++ b/packages/facade/src/apis/sheets/f-filter.ts
@@ -0,0 +1,104 @@
+/**
+ * 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, Workbook, Worksheet } from '@univerjs/core';
+import { ICommandService, Inject, Injector } from '@univerjs/core';
+import type { FilterModel, IFilterColumn } from '@univerjs/sheets-filter';
+import type { ISetSheetsFilterCriteriaCommandParams } from '@univerjs/sheets-filter-ui';
+import { ClearSheetsFilterCriteriaCommand, RemoveSheetFilterCommand, SetSheetsFilterCriteriaCommand } from '@univerjs/sheets-filter-ui';
+import type { ISheetCommandSharedParams } from '@univerjs/sheets';
+import { FRange } from './f-range';
+
+/**
+ * This interface class provides methods to modify the filter settings of a worksheet.
+ */
+export class FFilter {
+ constructor(
+ private readonly _workbook: Workbook,
+ private readonly _worksheet: Worksheet,
+ private readonly _filterModel: FilterModel,
+ @Inject(Injector) private readonly _injector: Injector,
+ @ICommandService private readonly _commandSrv: ICommandService
+ ) {
+ // empty
+ }
+
+ /**
+ * Get the filter criteria of a column.
+ * @param {number} col The column number.
+ * @returns {Nullable<IFilterColumn>} The filter criteria of the column.
+ */
+ getColumnFilterCriteria(col: number): Nullable<IFilterColumn> {
+ return this._filterModel.getFilterColumn(col)?.getColumnData();
+ }
+
+ /**
+ * Clear the filter criteria of a column.
+ * @param {number} col The column number.
+ * @returns {Promise<boolean>} If the filter criteria is cleared.
+ */
+ removeColumnFilterCriteria(col: number): Promise<boolean> {
+ return this._commandSrv.executeCommand(SetSheetsFilterCriteriaCommand.id, {
+ unitId: this._workbook.getUnitId(),
+ subUnitId: this._worksheet.getSheetId(),
+ col,
+ criteria: null,
+ } as ISetSheetsFilterCriteriaCommandParams);
+ }
+
+ /**
+ * Set the filter criteria of a column.
+ * @param {number} col The column number.
+ * @param {ISetSheetsFilterCriteriaCommandParams['criteria']} criteria The new filter criteria.
+ * @returns {Promise<boolean>} If the filter criteria is set.
+ */
+ setColumnFilterCriteria(col: number, criteria: ISetSheetsFilterCriteriaCommandParams['criteria']): Promise<boolean> {
+ return this._commandSrv.executeCommand(SetSheetsFilterCriteriaCommand.id, {
+ unitId: this._workbook.getUnitId(),
+ subUnitId: this._worksheet.getSheetId(),
+ col,
+ criteria,
+ } as ISetSheetsFilterCriteriaCommandParams);
+ }
+
+ /**
+ * Get the range of the filter.
+ * @returns {FRange} The range of the filter.
+ */
+ getRange(): FRange {
+ const range = this._filterModel.getRange();
+ return this._injector.createInstance(FRange, this._workbook, this._worksheet, range);
+ }
+
+ /**
+ * Remove the filter criteria of all columns.
+ * @returns {Promise<boolean>} If the filter criteria is removed.
+ */
+ removeFilterCriteria(): Promise<boolean> {
+ return this._commandSrv.executeCommand(ClearSheetsFilterCriteriaCommand.id);
+ }
+
+ /**
+ * Remove the filter from the worksheet.
+ * @returns {Promise<boolean>} If the filter is removed.
+ */
+ remove(): Promise<boolean> {
+ return this._commandSrv.executeCommand(RemoveSheetFilterCommand.id, {
+ unitId: this._workbook.getUnitId(),
+ subUnitId: this._worksheet.getSheetId(),
+ } as ISheetCommandSharedParams);
+ }
+}
diff --git a/packages/facade/src/apis/sheets/f-range.ts b/packages/facade/src/apis/sheets/f-range.ts
index 35548ab81b..e49339f739 100644
--- a/packages/facade/src/apis/sheets/f-range.ts
+++ b/packages/facade/src/apis/sheets/f-range.ts
@@ -50,6 +50,10 @@ import { ISheetClipboardService, SheetSkeletonManagerService } from '@univerjs/s
import { IRenderManagerService } from '@univerjs/engine-render';
import type { IAddSheetDataValidationCommandParams, IClearRangeDataValidationCommandParams } from '@univerjs/sheets-data-validation';
import { AddSheetDataValidationCommand, ClearRangeDataValidationCommand, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';
+import type { FilterModel } from '@univerjs/sheets-filter';
+import { SheetsFilterService } from '@univerjs/sheets-filter';
+import type { ISetSheetFilterRangeCommandParams } from '@univerjs/sheets-filter-ui';
+import { SetSheetFilterRangeCommand } from '@univerjs/sheets-filter-ui';
import type { FHorizontalAlignment, FVerticalAlignment } from './utils';
import {
covertCellValue,
@@ -61,6 +65,7 @@ import {
transformFacadeVerticalAlignment,
} from './utils';
import { FDataValidation } from './f-data-validation';
+import { FFilter } from './f-filter';
export type FontLine = 'none' | 'underline' | 'line-through';
export type FontStyle = 'normal' | 'italic';
@@ -586,6 +591,8 @@ export class FRange {
return copyContent?.html ?? '';
}
+ // #region DataValidation
+
/**
* set a data validation rule to current range
* @param rule data validation rule, build by `FUniver.newDataValidation`
@@ -658,4 +665,52 @@ export class FRange {
[this._range]
);
}
+
+ // #endregion
+
+ // #region Filter
+
+ /**
+ * Create a filter for the current range. If the worksheet already has a filter, this method would return `null`.
+ *
+ * @async
+ *
+ * @return The interface class to handle the filter. If the worksheet already has a filter,
+ * this method would return `null`.
+ */
+ async createFilter(): Promise<FFilter | null> {
+ if (this._getFilterModel()) return null;
+
+ const success = await this._commandService.executeCommand(SetSheetFilterRangeCommand.id, <ISetSheetFilterRangeCommandParams>{
+ unitId: this._workbook.getUnitId(),
+ subUnitId: this._worksheet.getSheetId(),
+ range: this._range,
+ });
+
+ if (!success) return null;
+
+ return this.getFilter();
+ }
+
+ /**
+ * Get the filter for the current range's worksheet.
+ *
+ * @return {FFilter | null} The interface class to handle the filter. If the worksheet does not have a filter,
+ * this method would return `null`.
+ */
+ getFilter(): FFilter | null {
+ const filterModel = this._getFilterModel();
+ if (!filterModel) return null;
+
+ return this._injector.createInstance(FFilter, this._workbook, this._worksheet, filterModel);
+ }
+
+ private _getFilterModel(): Nullable<FilterModel> {
+ return this._injector.get(SheetsFilterService).getFilterModel(
+ this._workbook.getUnitId(),
+ this._worksheet.getSheetId()
+ );
+ }
+
+ // #endregion
}
diff --git a/packages/facade/src/apis/sheets/f-workbook.ts b/packages/facade/src/apis/sheets/f-workbook.ts
index ae6445d1ed..a7956638a8 100644
--- a/packages/facade/src/apis/sheets/f-workbook.ts
+++ b/packages/facade/src/apis/sheets/f-workbook.ts
@@ -72,12 +72,8 @@ export class FWorkbook {
* Get the active sheet of the workbook.
* @returns The active sheet of the workbook
*/
- getActiveSheet(): FWorksheet | null {
+ getActiveSheet(): FWorksheet {
const activeSheet = this._workbook.getActiveSheet();
- if (!activeSheet) {
- return null;
- }
-
return this._injector.createInstance(FWorksheet, this._workbook, activeSheet);
}
diff --git a/packages/facade/src/apis/sheets/f-worksheet.ts b/packages/facade/src/apis/sheets/f-worksheet.ts
index 5c3029ab40..7d785c0fe1 100644
--- a/packages/facade/src/apis/sheets/f-worksheet.ts
+++ b/packages/facade/src/apis/sheets/f-worksheet.ts
@@ -14,15 +14,18 @@
* limitations under the License.
*/
-import { ICommandService, type IRange, type Workbook, type Worksheet } from '@univerjs/core';
+import { ICommandService, type IRange, type Nullable, type Workbook, type Worksheet } from '@univerjs/core';
import type { ISetWorksheetColWidthMutationParams, ISetWorksheetRowHeightMutationParams } from '@univerjs/sheets';
import { SetWorksheetColWidthMutation, SetWorksheetRowHeightMutation, SheetsSelectionsService } from '@univerjs/sheets';
import { Inject, Injector } from '@univerjs/core';
import { DataValidationModel, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';
+import type { FilterModel } from '@univerjs/sheets-filter';
+import { SheetsFilterService } from '@univerjs/sheets-filter';
import { FRange } from './f-range';
import { FSelection } from './f-selection';
import { FDataValidation } from './f-data-validation';
+import { FFilter } from './f-filter';
export class FWorksheet {
constructor(
@@ -60,7 +63,7 @@ export class FWorksheet {
return this._injector.createInstance(FSelection, this._workbook, this._worksheet, selections);
}
- getRange(row: number, col: number, height?: number, width?: number): FRange | null {
+ getRange(row: number, col: number, height?: number, width?: number): FRange {
const range: IRange = {
startRow: row,
endRow: row + (height ?? 1) - 1,
@@ -139,4 +142,22 @@ export class FWorksheet {
this._worksheet.getSheetId()
);
}
+
+ // #region Filter
+
+ getFilter(): FFilter | null {
+ const filterModel = this._getFilterModel();
+ if (!filterModel) return null;
+
+ return this._injector.createInstance(FFilter, this._workbook, this._worksheet, filterModel);
+ }
+
+ private _getFilterModel(): Nullable<FilterModel> {
+ return this._injector.get(SheetsFilterService).getFilterModel(
+ this._workbook.getUnitId(),
+ this._worksheet.getSheetId()
+ );
+ }
+
+ // #endregion
}
diff --git a/packages/sheets-filter-ui/src/commands/commands/__tests__/sheets-filter.command.spec.ts b/packages/sheets-filter-ui/src/commands/commands/__tests__/sheets-filter.command.spec.ts
index 1c07ad21d5..e7bbdc07ce 100644
--- a/packages/sheets-filter-ui/src/commands/commands/__tests__/sheets-filter.command.spec.ts
+++ b/packages/sheets-filter-ui/src/commands/commands/__tests__/sheets-filter.command.spec.ts
@@ -25,7 +25,7 @@ import { IMessageService } from '@univerjs/ui';
import { MockMessageService } from '@univerjs/ui/services/message/__testing__/mock-message.service.js';
import type { ISetSheetsFilterCriteriaCommandParams } from '../sheets-filter.command';
-import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SetSheetsFilterCriteriaCommand, SmartToggleSheetsFilterCommand } from '../sheets-filter.command';
+import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, RemoveSheetFilterCommand, SetSheetFilterRangeCommand, SetSheetsFilterCriteriaCommand, SmartToggleSheetsFilterCommand } from '../sheets-filter.command';
function testWorkbookDataFactory(): IWorkbookData {
return {
@@ -112,6 +112,8 @@ function createFilterCommandTestBed() {
[
SetRangeValuesCommand,
SetRangeValuesMutation,
+ RemoveSheetFilterCommand,
+ SetSheetFilterRangeCommand,
SmartToggleSheetsFilterCommand,
SetSheetsFilterCriteriaCommand,
ClearSheetsFilterCriteriaCommand,
diff --git a/packages/sheets-filter-ui/src/commands/commands/sheets-filter.command.ts b/packages/sheets-filter-ui/src/commands/commands/sheets-filter.command.ts
index 8241327dcd..6d573a1ed4 100644
--- a/packages/sheets-filter-ui/src/commands/commands/sheets-filter.command.ts
+++ b/packages/sheets-filter-ui/src/commands/commands/sheets-filter.command.ts
@@ -14,17 +14,104 @@
* limitations under the License.
*/
-import type { IAccessor, ICommand, IMutationInfo, Nullable, Workbook } from '@univerjs/core';
+import type { IAccessor, ICommand, IMutationInfo, IRange, Nullable, Workbook } from '@univerjs/core';
import { CommandType, ICommandService, IUndoRedoService, IUniverInstanceService, LocaleService, Quantity, sequenceExecute, UniverInstanceType } from '@univerjs/core';
import { MessageType } from '@univerjs/design';
import type { ISheetCommandSharedParams } from '@univerjs/sheets';
-import { expandToContinuousRange, isSingleCellSelection, SheetsSelectionsService } from '@univerjs/sheets';
-import type { FilterColumn, IAutoFilter, IFilterColumn, IReCalcSheetsFilterMutationParams, ISetSheetsFilterCriteriaMutationParams, ISetSheetsFilterRangeMutationParams } from '@univerjs/sheets-filter';
+import { expandToContinuousRange, getSheetCommandTarget, isSingleCellSelection, SheetsSelectionsService } from '@univerjs/sheets';
+import type { FilterColumn, IAutoFilter, IFilterColumn, ISetSheetsFilterCriteriaMutationParams, ISetSheetsFilterRangeMutationParams } from '@univerjs/sheets-filter';
import { ReCalcSheetsFilterMutation, RemoveSheetsFilterMutation, SetSheetsFilterCriteriaMutation, SetSheetsFilterRangeMutation, SheetsFilterService } from '@univerjs/sheets-filter';
import { IMessageService } from '@univerjs/ui';
/**
- * This command is for toggling filter in the currently active Worksheet.
+ * Parameters of command {@link SetSheetFilterRangeCommand}.
+ * @property {IRange} range - the range to be set as filter range.
+ */
+export interface ISetSheetFilterRangeCommandParams extends ISheetCommandSharedParams {
+ range: IRange;
+}
+
+/**
+ * A {@link CommandType.COMMAND} to set filter range in a Worksheet. Its params {@link ISetSheetFilterRangeCommandParams}
+ * is required. If the {@link FilterModel} does not exist, it will be created.
+ */
+export const SetSheetFilterRangeCommand: ICommand<ISetSheetFilterRangeCommandParams> = {
+ id: 'sheet.command.set-filter-range',
+ type: CommandType.COMMAND,
+ handler: (accessor, params: ISetSheetFilterRangeCommandParams) => {
+ const sheetsFilterService = accessor.get(SheetsFilterService);
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const instanceSrv = accessor.get(IUniverInstanceService);
+
+ const { unitId, subUnitId, range } = params;
+
+ const commandTarget = getSheetCommandTarget(instanceSrv, params);
+ if (!commandTarget) return false;
+
+ const filterModel = sheetsFilterService.getFilterModel(unitId, subUnitId);
+ if (filterModel) return false;
+
+ if (range.endRow === range.startRow) {
+ const messageService = accessor.get(IMessageService, Quantity.OPTIONAL);
+ const localeService = accessor.get(LocaleService);
+ messageService?.show({ type: MessageType.Warning, content: localeService.t('sheets-filter.command.not-valid-filter-range') });
+ return false;
+ }
+
+ // Execute the command to set filter range and prepare undo redo.
+ const redoMutation = { id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range } };
+ const result = commandService.syncExecuteCommand(redoMutation.id, redoMutation.params);
+ if (result) {
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ undoMutations: [{ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId } }],
+ redoMutations: [redoMutation],
+ });
+ }
+
+ return result;
+ },
+};
+
+/**
+ * A {@link CommandType.COMMAND} to remove filter in a Worksheet. Its params {@link ISheetCommandSharedParams} is
+ * required. If the {@link FilterModel} does not exist, it will fail to execute.
+ */
+export const RemoveSheetFilterCommand: ICommand<ISheetCommandSharedParams> = {
+ id: 'sheet.command.remove-sheet-filter',
+ type: CommandType.COMMAND,
+ handler: (accessor, params: ISheetCommandSharedParams) => {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const sheetsFilterService = accessor.get(SheetsFilterService);
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+
+ const commandTarget = getSheetCommandTarget(univerInstanceService, params);
+ if (!commandTarget) return false;
+
+ // If there is a filter model, we should remove it and prepare undo redo.
+ const { unitId, subUnitId } = commandTarget;
+ const filterModel = sheetsFilterService.getFilterModel(unitId, subUnitId);
+ if (!filterModel) return false;
+
+ const autoFilter = filterModel?.serialize();
+ const undoMutations = destructFilterModel(unitId, subUnitId, autoFilter);
+ const result = commandService.syncExecuteCommand(RemoveSheetsFilterMutation.id, { unitId, subUnitId });
+ if (result) {
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ undoMutations,
+ redoMutations: [{ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId } }],
+ });
+ }
+
+ return result;
+ },
+};
+
+/**
+ * A {@link CommandType.COMMAND} to toggle filter in the current {@link Worksheet}.
*/
export const SmartToggleSheetsFilterCommand: ICommand = {
id: 'sheet.command.smart-toggle-filter',
@@ -33,7 +120,6 @@ export const SmartToggleSheetsFilterCommand: ICommand = {
const univerInstanceService = accessor.get(IUniverInstanceService);
const sheetsFilterService = accessor.get(SheetsFilterService);
const commandService = accessor.get(ICommandService);
- const undoRedoService = accessor.get(IUndoRedoService);
const currentWorkbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
const currentWorksheet = currentWorkbook?.getActiveSheet();
@@ -45,20 +131,10 @@ export const SmartToggleSheetsFilterCommand: ICommand = {
// If there is a filter model, we should remove it and prepare undo redo.
const filterModel = sheetsFilterService.getFilterModel(unitId, subUnitId);
if (filterModel) {
- const autoFilter = filterModel?.serialize();
- const undoMutations = destructFilterModel(unitId, subUnitId, autoFilter);
- const result = commandService.syncExecuteCommand(RemoveSheetsFilterMutation.id, { unitId, subUnitId });
- if (result) {
- undoRedoService.pushUndoRedo({
- unitID: unitId,
- undoMutations,
- redoMutations: [{ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId } }],
- });
- }
-
- return result;
+ return commandService.executeCommand(RemoveSheetFilterCommand.id, { unitId, subUnitId });
}
+ // Other wise we should set the filter range to the current selection.
const selectionManager = accessor.get(SheetsSelectionsService);
const lastSelection = selectionManager.getCurrentLastSelection();
if (!lastSelection) return false;
@@ -68,34 +144,27 @@ export const SmartToggleSheetsFilterCommand: ICommand = {
? expandToContinuousRange(startRange, { left: true, right: true, up: true, down: true }, currentWorksheet)
: startRange;
- if (targetFilterRange.endRow === targetFilterRange.startRow) {
- const messageService = accessor.get(IMessageService, Quantity.OPTIONAL);
- const localeService = accessor.get(LocaleService);
- messageService?.show({ type: MessageType.Warning, content: localeService.t('sheets-filter.command.not-valid-filter-range') });
- return false;
- }
-
- // Execute the command to set filter range and prepare undo redo.
- const redoMutation = { id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range: targetFilterRange } };
- const result = commandService.syncExecuteCommand(redoMutation.id, redoMutation.params);
- if (result) {
- undoRedoService.pushUndoRedo({
- unitID: unitId,
- undoMutations: [{ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId } }],
- redoMutations: [redoMutation],
- });
- }
-
- return result;
+ return commandService.executeCommand(SetSheetFilterRangeCommand.id, {
+ unitId,
+ subUnitId,
+ range: targetFilterRange,
+ } as ISetSheetFilterRangeCommandParams);
},
};
+/**
+ * Parameters of command {@link SetSheetsFilterCriteriaCommand}.
+ * @property {number} col - the column index of the filter criteria
+ * @property {Nullable<IFilterColumn>} criteria - the filter criteria to be set
+ */
export interface ISetSheetsFilterCriteriaCommandParams extends ISheetCommandSharedParams {
col: number;
criteria: Nullable<IFilterColumn>;
}
+
/**
- * This command is for setting filter criteria to a column in the targeting `FilterModel`.
+ * A {@link CommandType.COMMAND} to set filter criteria to a column in the targeting {@link FilterModel}. Its params
+ * {@link ISetSheetsFilterCriteriaCommandParams} is required.
*/
export const SetSheetsFilterCriteriaCommand: ICommand<ISetSheetsFilterCriteriaCommandParams> = {
id: 'sheet.command.set-filter-criteria',
@@ -107,14 +176,10 @@ export const SetSheetsFilterCriteriaCommand: ICommand<ISetSheetsFilterCriteriaCo
const { unitId, subUnitId, col, criteria } = params;
const filterModel = sheetsFilterService.getFilterModel(unitId, subUnitId);
- if (!filterModel) {
- return false;
- }
+ if (!filterModel) return false;
const range = filterModel.getRange();
- if (!range || col < range.startColumn || col > range.endColumn) {
- return false;
- }
+ if (!range || col < range.startColumn || col > range.endColumn) return false;
const filterColumn = filterModel.getFilterColumn(col);
const undoMutation = destructFilterColumn(unitId, subUnitId, col, filterColumn);
@@ -142,67 +207,73 @@ export const SetSheetsFilterCriteriaCommand: ICommand<ISetSheetsFilterCriteriaCo
};
/**
- * This command is for clearing all filter criteria in the currently active `FilterModel`.
+ * A {@link CommandType.COMMAND} to clear all filter criteria in the targeting {@link FilterModel}. Its params
+ * {@link ISheetCommandSharedParams} is required.
*/
-export const ClearSheetsFilterCriteriaCommand: ICommand = {
+export const ClearSheetsFilterCriteriaCommand: ICommand<ISheetCommandSharedParams> = {
id: 'sheet.command.clear-filter-criteria',
type: CommandType.COMMAND,
- handler: (accessor: IAccessor) => {
+ handler: (accessor: IAccessor, params) => {
const sheetsFilterService = accessor.get(SheetsFilterService);
const undoRedoService = accessor.get(IUndoRedoService);
const commandService = accessor.get(ICommandService);
+ const instanceSrv = accessor.get(IUniverInstanceService);
- const currentFilterModel = sheetsFilterService.activeFilterModel;
- if (!currentFilterModel) {
- return false;
- }
+ const commandTarget = getSheetCommandTarget(instanceSrv, params);
+ if (!commandTarget) return false;
- // TODO@wzhudev: should also return when no filter criteria is set
+ const { unitId, subUnitId } = commandTarget;
+ const filterModel = sheetsFilterService.getFilterModel(commandTarget.unitId, commandTarget.subUnitId);
+ if (!filterModel) return false;
- const { unitId, subUnitId } = currentFilterModel;
- const autoFilter = currentFilterModel.serialize();
+ const autoFilter = filterModel.serialize();
const undoMutations = destructFilterCriteria(unitId, subUnitId, autoFilter);
const redoMutations = generateRemoveCriteriaMutations(unitId, subUnitId, autoFilter);
const result = sequenceExecute(redoMutations, commandService);
- if (result) {
+ if (result.result) {
undoRedoService.pushUndoRedo({
unitID: unitId,
undoMutations,
redoMutations,
});
+
+ return true;
}
- return true;
+ return false;
},
};
/**
- * This command force the currently active `FilterModel` to re-calculate all filter criteria.
+ * A {@link CommandType.COMMAND} forcing the currently active {@link FilterModel} to re-calculate all filter criteria.
+ * Its params {@link ISheetCommandSharedParams} is required.
*/
-export const ReCalcSheetsFilterCommand: ICommand = {
+export const ReCalcSheetsFilterCommand: ICommand<ISheetCommandSharedParams> = {
id: 'sheet.command.re-calc-filter',
type: CommandType.COMMAND,
- handler: (accessor: IAccessor) => {
+ handler: (accessor, params) => {
const sheetsFilterService = accessor.get(SheetsFilterService);
const commandService = accessor.get(ICommandService);
+ const instanceSrv = accessor.get(IUniverInstanceService);
- const currentFilterModel = sheetsFilterService.activeFilterModel;
- if (!currentFilterModel) {
- return false;
- }
+ const commandTarget = getSheetCommandTarget(instanceSrv, params);
+ if (!commandTarget) return false;
+
+ const { unitId, subUnitId } = commandTarget;
+ const filterModel = sheetsFilterService.getFilterModel(commandTarget.unitId, commandTarget.subUnitId);
+ if (!filterModel) return false;
// No need to handle undo redo for this command.
- const { unitId, subUnitId } = currentFilterModel;
- return commandService.executeCommand(ReCalcSheetsFilterMutation.id, { unitId, subUnitId } as IReCalcSheetsFilterMutationParams);
+ return commandService.executeCommand(ReCalcSheetsFilterMutation.id, { unitId, subUnitId } as ISheetCommandSharedParams);
},
};
/**
* Destruct a `FilterModel` to a list of mutations.
- * @param unitId the unit id of the Workbook
- * @param subUnitId the sub unit id of the Worksheet
- * @param autoFilter the to be destructed FilterModel
+ * @param {string} unitId - the unit id of the Workbook
+ * @param {string} subUnitId - the sub unit id of the Worksheet
+ * @param {IAutoFilter} autoFilter - the to be destructed FilterModel
* @returns a list of mutations those can be used to reconstruct the FilterModel
*/
function destructFilterModel(
@@ -228,12 +299,20 @@ function destructFilterModel(
return mutations;
}
+/**
+ * Transform a {@link FilterModel} to a list of mutations to set the filter criteria.
+ * @param unitId - the unit id of the {@link Workbook}
+ * @param subUnitId - the sub unit id of the {@link Worksheet}
+ * @param autoFilter - the to be destructed {@link FilterModel}
+ * @returns {IMutationInfo<ISetSheetsFilterCriteriaMutationParams>} a list of mutations those can be used to
+ * reconstruct the {@link FilterModel}
+ */
export function destructFilterCriteria(
unitId: string,
subUnitId: string,
autoFilter: IAutoFilter
-): IMutationInfo[] {
- const mutations: IMutationInfo[] = [];
+): IMutationInfo<ISetSheetsFilterCriteriaMutationParams>[] {
+ const mutations: IMutationInfo<ISetSheetsFilterCriteriaMutationParams>[] = [];
autoFilter.filterColumns?.forEach((filterColumn) => {
const setFilterCriteriaMutation: IMutationInfo<ISetSheetsFilterCriteriaMutationParams> = {
@@ -278,11 +357,11 @@ function generateRemoveCriteriaMutations(
/**
* Prepare the undo mutation, it should rollback to the old criteria if there's already a `FilterColumn`,
* or remove the filter criteria when there is no `FilterColumn`.
- * @param unitId
- * @param subUnitId
- * @param colId
- * @param filterColumn
- * @returns the undo mutation
+ * @param {string} unitId
+ * @param {string} subUnitId
+ * @param {number} colId
+ * @param {Nullable<FilterColumn>} filterColumn
+ * @returns {IMutationInfo<ISetSheetsFilterCriteriaMutationParams>} the undo mutation
*/
function destructFilterColumn(
unitId: string,
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.ts
index 0b9f074c08..1e6003b93a 100644
--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.ts
+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter-permission.controller.ts
@@ -15,7 +15,7 @@
*/
import type { ICommandInfo } from '@univerjs/core';
-import { Disposable, ICommandService, Inject, LifecycleStages, LocaleService, OnLifecycle, Tools } from '@univerjs/core';
+import { Disposable, ICommandService, Inject, LocaleService, Tools } from '@univerjs/core';
import type { MenuConfig } from '@univerjs/ui';
import { SheetPermissionInterceptorBaseController } from '@univerjs/sheets-ui';
@@ -36,14 +36,13 @@ export const FILTER_PANEL_POPUP_KEY = 'FILTER_PANEL_POPUP';
/**
* This controller controls the UI of "filter" features. Menus, commands and filter panel etc. Except for the rendering.
*/
-@OnLifecycle(LifecycleStages.Ready, SheetsFilterPermissionController)
export class SheetsFilterPermissionController extends Disposable {
constructor(
@Inject(SheetsFilterService) private _sheetsFilterService: SheetsFilterService,
@Inject(LocaleService) private _localeService: LocaleService,
@ICommandService private readonly _commandService: ICommandService,
- @Inject(SheetPermissionInterceptorBaseController) private readonly _sheetPermissionInterceptorBaseController: SheetPermissionInterceptorBaseController
-
+ @Inject(SheetPermissionInterceptorBaseController)
+ private readonly _sheetPermissionInterceptorBaseController: SheetPermissionInterceptorBaseController
) {
super();
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-ui.controller.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-desktop.controller.ts
similarity index 92%
rename from packages/sheets-filter-ui/src/controllers/sheets-filter-ui.controller.ts
rename to packages/sheets-filter-ui/src/controllers/sheets-filter-ui-desktop.controller.ts
index 1f8e786376..ec1edbebae 100644
--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-ui.controller.ts
+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-desktop.controller.ts
@@ -15,7 +15,7 @@
*/
import type { IDisposable, Nullable } from '@univerjs/core';
-import { ICommandService, IContextService, Inject, Injector, LifecycleStages, LocaleService, OnLifecycle } from '@univerjs/core';
+import { ICommandService, IContextService, Inject, Injector, LocaleService } from '@univerjs/core';
import { ComponentManager, IMenuService, IMessageService, IShortcutService } from '@univerjs/ui';
import type { IMenuItemFactory, MenuConfig } from '@univerjs/ui';
@@ -26,13 +26,13 @@ import { FilterSingle } from '@univerjs/icons';
import { IRenderManagerService } from '@univerjs/engine-render';
import { SheetsFilterService } from '@univerjs/sheets-filter';
import { MessageType } from '@univerjs/design';
-import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SetSheetsFilterCriteriaCommand, SmartToggleSheetsFilterCommand } from '../commands/commands/sheets-filter.command';
+import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, RemoveSheetFilterCommand, SetSheetFilterRangeCommand, SetSheetsFilterCriteriaCommand, SmartToggleSheetsFilterCommand } from '../commands/commands/sheets-filter.command';
import { FilterPanel } from '../views/components/SheetsFilterPanel';
import { ChangeFilterByOperation, CloseFilterPanelOperation, FILTER_PANEL_OPENED_KEY, OpenFilterPanelOperation } from '../commands/operations/sheets-filter.operation';
import { SheetsFilterPanelService } from '../services/sheets-filter-panel.service';
import { SmartToggleFilterShortcut } from './sheets-filter.shortcut';
import { ClearFilterCriteriaMenuItemFactory, ReCalcFilterMenuItemFactory, SmartToggleFilterMenuItemFactory } from './sheets-filter.menu';
-import { SheetsFilterMobileUIController } from './sheets-filter-mobile-ui.controller';
+import { SheetsFilterUIMobileController } from './sheets-filter-ui-mobile.controller';
export interface IUniverSheetsFilterUIConfig {
menu: MenuConfig;
@@ -47,8 +47,7 @@ export const FILTER_PANEL_POPUP_KEY = 'FILTER_PANEL_POPUP';
/**
* This controller controls the UI of "filter" features. Menus, commands and filter panel etc. Except for the rendering.
*/
-@OnLifecycle(LifecycleStages.Rendered, SheetsFilterUIController)
-export class SheetsFilterUIController extends SheetsFilterMobileUIController {
+export class SheetsFilterUIDesktopController extends SheetsFilterUIMobileController {
constructor(
private readonly _config: Partial<IUniverSheetsFilterUIConfig>,
@Inject(Injector) private readonly _injector: Injector,
@@ -89,6 +88,8 @@ export class SheetsFilterUIController extends SheetsFilterMobileUIController {
private _initCommands(): void {
[
SmartToggleSheetsFilterCommand,
+ RemoveSheetFilterCommand,
+ SetSheetFilterRangeCommand,
SetSheetsFilterCriteriaCommand,
ClearSheetsFilterCriteriaCommand,
ReCalcSheetsFilterCommand,
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-mobile-ui.controller.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-mobile.controller.ts
similarity index 77%
rename from packages/sheets-filter-ui/src/controllers/sheets-filter-mobile-ui.controller.ts
rename to packages/sheets-filter-ui/src/controllers/sheets-filter-ui-mobile.controller.ts
index 34944372e4..2de772bfc2 100644
--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-mobile-ui.controller.ts
+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-mobile.controller.ts
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-import { LifecycleStages, runOnLifecycle, RxDisposable, UniverInstanceType } from '@univerjs/core';
+import { RxDisposable, UniverInstanceType } from '@univerjs/core';
import { IRenderManagerService } from '@univerjs/engine-render';
import type { Dependency } from '@univerjs/core';
-import { SheetsFilterRenderController } from './sheets-filter-render.controller';
+import { SheetsFilterRenderController } from '../views/widgets/render-modules/sheets-filter.render-controller';
-export class SheetsFilterMobileUIController extends RxDisposable {
+export class SheetsFilterUIMobileController extends RxDisposable {
constructor(
@IRenderManagerService private readonly _renderManagerService: IRenderManagerService
) {
@@ -32,5 +32,3 @@ export class SheetsFilterMobileUIController extends RxDisposable {
this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, [SheetsFilterRenderController] as Dependency));
}
}
-
-runOnLifecycle(LifecycleStages.Rendered, SheetsFilterMobileUIController);
diff --git a/packages/sheets-filter-ui/src/plugin.ts b/packages/sheets-filter-ui/src/filter-ui-desktop.plugin.ts
similarity index 69%
rename from packages/sheets-filter-ui/src/plugin.ts
rename to packages/sheets-filter-ui/src/filter-ui-desktop.plugin.ts
index 1d78a7196b..8efe0785ae 100644
--- a/packages/sheets-filter-ui/src/plugin.ts
+++ b/packages/sheets-filter-ui/src/filter-ui-desktop.plugin.ts
@@ -18,14 +18,17 @@ import { DependentOn, Inject, Injector, Optional, Plugin, Tools, UniverInstanceT
import type { Dependency } from '@univerjs/core';
import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';
import { IRPCChannelService, toModule } from '@univerjs/rpc';
-import type { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui.controller';
-import { DefaultSheetFilterUiConfig, SheetsFilterUIController } from './controllers/sheets-filter-ui.controller';
+import type { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui-desktop.controller';
+import { DefaultSheetFilterUiConfig, SheetsFilterUIDesktopController } from './controllers/sheets-filter-ui-desktop.controller';
import { SheetsFilterPanelService } from './services/sheets-filter-panel.service';
import { SheetsFilterPermissionController } from './controllers/sheets-filter-permission.controller';
import { ISheetsGenerateFilterValuesService, SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME } from './worker/generate-filter-values.service';
const NAME = 'SHEET_FILTER_UI_PLUGIN';
+/**
+ * The plugin for the desktop version of the sheets filter UI. Its type is {@link UniverInstanceType.UNIVER_SHEET}.
+ */
@DependentOn(UniverSheetsFilterPlugin)
export class UniverSheetsFilterUIPlugin extends Plugin {
static override type = UniverInstanceType.UNIVER_SHEET;
@@ -45,22 +48,25 @@ export class UniverSheetsFilterUIPlugin extends Plugin {
([
[SheetsFilterPanelService],
[SheetsFilterPermissionController],
- [
- SheetsFilterUIController,
- {
- useFactory: () => this._injector.createInstance(SheetsFilterUIController, this._config),
- },
- ],
+ [SheetsFilterUIDesktopController, {
+ useFactory: () => this._injector.createInstance(SheetsFilterUIDesktopController, this._config),
+ }],
] as Dependency[]).forEach((d) => this._injector.add(d));
if (this._config.useRemoteFilterValuesGenerator && this._rpcChannelService) {
- this._injector.add([
- ISheetsGenerateFilterValuesService, {
- useFactory: () => toModule<ISheetsGenerateFilterValuesService>(
- this._rpcChannelService!.requestChannel(SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME)
- ),
- },
- ]);
+ this._injector.add([ISheetsGenerateFilterValuesService, {
+ useFactory: () => toModule<ISheetsGenerateFilterValuesService>(
+ this._rpcChannelService!.requestChannel(SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME)
+ ),
+ }]);
}
}
+
+ override onReady(): void {
+ this._injector.get(SheetsFilterPermissionController);
+ }
+
+ override onRendered(): void {
+ this._injector.get(SheetsFilterUIDesktopController);
+ }
}
diff --git a/packages/sheets-filter-ui/src/mobile-plugin.ts b/packages/sheets-filter-ui/src/filter-ui-mobile.plugin.ts
similarity index 80%
rename from packages/sheets-filter-ui/src/mobile-plugin.ts
rename to packages/sheets-filter-ui/src/filter-ui-mobile.plugin.ts
index bdd70e1c71..1c3fb512e0 100644
--- a/packages/sheets-filter-ui/src/mobile-plugin.ts
+++ b/packages/sheets-filter-ui/src/filter-ui-mobile.plugin.ts
@@ -18,10 +18,10 @@ import { DependentOn, Inject, Injector, Plugin, Tools, UniverInstanceType } from
import type { Dependency } from '@univerjs/core';
import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';
-import type { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui.controller';
-import { DefaultSheetFilterUiConfig } from './controllers/sheets-filter-ui.controller';
+import type { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui-desktop.controller';
+import { DefaultSheetFilterUiConfig } from './controllers/sheets-filter-ui-desktop.controller';
import { SheetsFilterPermissionController } from './controllers/sheets-filter-permission.controller';
-import { SheetsFilterMobileUIController } from './controllers/sheets-filter-mobile-ui.controller';
+import { SheetsFilterUIMobileController } from './controllers/sheets-filter-ui-mobile.controller';
const NAME = 'SHEET_FILTER_UI_PLUGIN';
@@ -42,7 +42,15 @@ export class UniverSheetsFilterMobileUIPlugin extends Plugin {
override onStarting(): void {
([
[SheetsFilterPermissionController],
- [SheetsFilterMobileUIController],
+ [SheetsFilterUIMobileController],
] as Dependency[]).forEach((d) => this._injector.add(d));
}
+
+ override onReady(): void {
+ this._injector.get(SheetsFilterPermissionController);
+ }
+
+ override onRendered(): void {
+ this._injector.get(SheetsFilterUIMobileController);
+ }
}
diff --git a/packages/sheets-filter-ui/src/index.ts b/packages/sheets-filter-ui/src/index.ts
index 177f562bca..72f2f76844 100644
--- a/packages/sheets-filter-ui/src/index.ts
+++ b/packages/sheets-filter-ui/src/index.ts
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-export { UniverSheetsFilterUIPlugin } from './plugin';
-export { UniverSheetsFilterMobileUIPlugin } from './mobile-plugin';
+export { UniverSheetsFilterUIPlugin } from './filter-ui-desktop.plugin';
+export { UniverSheetsFilterMobileUIPlugin } from './filter-ui-mobile.plugin';
export { UniverSheetsFilterUIWorkerPlugin } from './worker/plugin';
// #region - all commands
@@ -24,7 +24,11 @@ export {
SmartToggleSheetsFilterCommand,
SetSheetsFilterCriteriaCommand,
ClearSheetsFilterCriteriaCommand,
+ SetSheetFilterRangeCommand,
+ RemoveSheetFilterCommand,
+ type ISetSheetFilterRangeCommandParams,
ReCalcSheetsFilterCommand,
+ type ISetSheetsFilterCriteriaCommandParams,
} from './commands/commands/sheets-filter.command';
export {
OpenFilterPanelOperation,
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-render.controller.ts b/packages/sheets-filter-ui/src/views/widgets/render-modules/sheets-filter.render-controller.ts
similarity index 98%
rename from packages/sheets-filter-ui/src/controllers/sheets-filter-render.controller.ts
rename to packages/sheets-filter-ui/src/views/widgets/render-modules/sheets-filter.render-controller.ts
index 5dbd35ce35..17857dc40f 100644
--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-render.controller.ts
+++ b/packages/sheets-filter-ui/src/views/widgets/render-modules/sheets-filter.render-controller.ts
@@ -25,8 +25,8 @@ import { FILTER_MUTATIONS, ReCalcSheetsFilterMutation, RemoveSheetsFilterMutatio
import { getCoordByCell, ISheetSelectionRenderService, SelectionShape, SheetSkeletonManagerService, SheetsRenderService } from '@univerjs/sheets-ui';
import { filter, map, of, startWith, switchMap, takeUntil, throttleTime } from 'rxjs';
-import type { ISheetsFilterButtonShapeProps } from '../views/widgets/filter-button.shape';
-import { FILTER_ICON_PADDING, FILTER_ICON_SIZE, SheetsFilterButtonShape } from '../views/widgets/filter-button.shape';
+import type { ISheetsFilterButtonShapeProps } from '../filter-button.shape';
+import { FILTER_ICON_PADDING, FILTER_ICON_SIZE, SheetsFilterButtonShape } from '../filter-button.shape';
const DEFAULT_Z_INDEX = 1000;
diff --git a/packages/sheets-filter/docs/architecture.excalidraw b/packages/sheets-filter/docs/architecture.excalidraw
index 7b0e59d90c..45e0b63411 100644
--- a/packages/sheets-filter/docs/architecture.excalidraw
+++ b/packages/sheets-filter/docs/architecture.excalidraw
@@ -3,6 +3,35 @@
"version": 2,
"source": "https://marketplace.visualstudio.com/items?itemName=pomdtr.excalidraw-editor",
"elements": [
+ {
+ "id": "GkhcbCIaJwMOj0vrLIE45",
+ "type": "rectangle",
+ "x": 510.9039999526664,
+ "y": 696.7008515214206,
+ "width": 1876.6669921874993,
+ "height": 247.99999999999977,
+ "angle": 0,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "fillStyle": "solid",
+ "strokeWidth": 2,
+ "strokeStyle": "dashed",
+ "roughness": 1,
+ "opacity": 100,
+ "groupIds": [],
+ "frameId": null,
+ "roundness": {
+ "type": 3
+ },
+ "seed": 1656082346,
+ "version": 44,
+ "versionNonce": 2085945078,
+ "isDeleted": false,
+ "boundElements": null,
+ "updated": 1723879164257,
+ "link": null,
+ "locked": false
+ },
{
"type": "rectangle",
"version": 535,
@@ -83,7 +112,7 @@
"containerId": "Wo0_9IeyNh2nP4LXReZmo",
"originalText": "SheetsFilterModel",
"lineHeight": 1.25,
- "baseline": 18
+ "baseline": 20
},
{
"type": "rectangle",
@@ -153,7 +182,7 @@
"containerId": "2GiJPBSXYl-3UZCZzA7T8",
"originalText": "SheetsFilterColumn",
"lineHeight": 1.25,
- "baseline": 19
+ "baseline": 20
},
{
"type": "rectangle",
@@ -223,7 +252,7 @@
"containerId": "ESHr4MN4x6js5bqTvZL8A",
"originalText": "SheetsFilterColumn",
"lineHeight": 1.25,
- "baseline": 19
+ "baseline": 20
},
{
"type": "rectangle",
@@ -293,32 +322,32 @@
"containerId": "rLpLoR7dI717hG_0fDIOz",
"originalText": "SheetsFilterColumn",
"lineHeight": 1.25,
- "baseline": 19
+ "baseline": 20
},
{
- "id": "eD7q3TO5HwewuHD1ehJ5A",
"type": "rectangle",
- "x": 1117.6464725834735,
- "y": -40.00893620465888,
- "width": 428.0325042529553,
- "height": 113.36248554036945,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 465,
+ "versionNonce": 160904676,
+ "isDeleted": false,
+ "id": "eD7q3TO5HwewuHD1ehJ5A",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1117.6464725834735,
+ "y": -40.00893620465888,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 428.0325042529553,
+ "height": 113.36248554036945,
+ "seed": 1450039516,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 3
},
- "seed": 1450039516,
- "version": 465,
- "versionNonce": 160904676,
- "isDeleted": false,
"boundElements": [
{
"type": "text",
@@ -354,40 +383,40 @@
"locked": false
},
{
- "id": "wMsEnyH_fm8arkwE8qiOF",
"type": "text",
- "x": 1244.3128177885644,
- "y": 4.172306565525844,
- "width": 174.69981384277344,
- "height": 25,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 337,
+ "versionNonce": 1283381604,
+ "isDeleted": false,
+ "id": "wMsEnyH_fm8arkwE8qiOF",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1244.3128177885644,
+ "y": 4.172306565525844,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 174.69981384277344,
+ "height": 25,
+ "seed": 92494300,
"groupIds": [],
"frameId": null,
"roundness": null,
- "seed": 92494300,
- "version": 337,
- "versionNonce": 1283381604,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529850348,
"link": null,
"locked": false,
- "text": "SheetsFilterService",
"fontSize": 20,
"fontFamily": 1,
+ "text": "SheetsFilterService",
"textAlign": "center",
"verticalAlign": "middle",
- "baseline": 18,
"containerId": "eD7q3TO5HwewuHD1ehJ5A",
"originalText": "SheetsFilterService",
- "lineHeight": 1.25
+ "lineHeight": 1.25,
+ "baseline": 20
},
{
"type": "rectangle",
@@ -465,32 +494,32 @@
"containerId": "k8VRsAR3ODxOqJPd38VTV",
"originalText": "Commands / Mutations",
"lineHeight": 1.25,
- "baseline": 18
+ "baseline": 20
},
{
- "id": "1LQZ-4OhRIcHkjiftPB_k",
"type": "arrow",
- "x": 1247.3575471004908,
- "y": 93.94614810485214,
- "width": 296.4683248639353,
- "height": 261.0458056224046,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 740,
+ "versionNonce": 1877860444,
+ "isDeleted": false,
+ "id": "1LQZ-4OhRIcHkjiftPB_k",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1247.3575471004908,
+ "y": 93.94614810485214,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 296.4683248639353,
+ "height": 261.0458056224046,
+ "seed": 1721263716,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1721263716,
- "version": 740,
- "versionNonce": 1877860444,
- "isDeleted": false,
"boundElements": [
{
"type": "text",
@@ -500,17 +529,6 @@
"updated": 1709529868650,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- -296.4683248639353,
- 261.0458056224046
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "eD7q3TO5HwewuHD1ehJ5A",
"gap": 20.592598769141546,
@@ -521,84 +539,84 @@
"gap": 18.03534772390435,
"focus": -0.29252454387057053
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ -296.4683248639353,
+ 261.0458056224046
+ ]
+ ]
},
{
- "id": "l2-xMVe93eyzttz1sAmfv",
"type": "text",
- "x": 981.4028668194715,
- "y": 201.74257841264455,
- "width": 210.83984375,
- "height": 75,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 68,
+ "versionNonce": 1209153508,
+ "isDeleted": false,
+ "id": "l2-xMVe93eyzttz1sAmfv",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 981.4028668194715,
+ "y": 201.74257841264455,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 210.83984375,
+ "height": 75,
+ "seed": 1055404508,
"groupIds": [],
"frameId": null,
"roundness": null,
- "seed": 1055404508,
- "version": 68,
- "versionNonce": 1209153508,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529541346,
"link": null,
"locked": false,
- "text": "manage instances of \nSheetsFilterModel for \neach Worksheet",
"fontSize": 20,
"fontFamily": 1,
+ "text": "manage instances of \nSheetsFilterModel for \neach Worksheet",
"textAlign": "center",
"verticalAlign": "middle",
- "baseline": 68,
"containerId": "1LQZ-4OhRIcHkjiftPB_k",
"originalText": "manage instances of SheetsFilterModel for each Worksheet",
- "lineHeight": 1.25
+ "lineHeight": 1.25,
+ "baseline": 70
},
{
- "id": "MAt44M2i9bMujXxTybVyG",
"type": "arrow",
- "x": 679.1095310252703,
- "y": 73.22931012970312,
- "width": 100.80883902524477,
- "height": 274.8777351366351,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 477,
+ "versionNonce": 1371437404,
+ "isDeleted": false,
+ "id": "MAt44M2i9bMujXxTybVyG",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 679.1095310252703,
+ "y": 73.22931012970312,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 100.80883902524477,
+ "height": 274.8777351366351,
+ "seed": 1917390436,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1917390436,
- "version": 477,
- "versionNonce": 1371437404,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529868651,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 100.80883902524477,
- 274.8777351366351
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "k8VRsAR3ODxOqJPd38VTV",
"gap": 15.847215838096986,
@@ -609,8 +627,19 @@
"gap": 24.920256184822847,
"focus": -0.3858087535356203
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 100.80883902524477,
+ 274.8777351366351
+ ]
+ ]
},
{
"type": "rectangle",
@@ -692,32 +721,32 @@
"containerId": "B0d_SJgkv3tx8QXxBpD9m",
"originalText": "SheetInterceptorService",
"lineHeight": 1.25,
- "baseline": 18
+ "baseline": 20
},
{
- "id": "rNw6wTRniT8wZrtOFMT3f",
"type": "arrow",
- "x": 1366.6752688239949,
- "y": 89.92142690031405,
- "width": 255.16430494480664,
- "height": 134.54569627549859,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 579,
+ "versionNonce": 1953416036,
+ "isDeleted": false,
+ "id": "rNw6wTRniT8wZrtOFMT3f",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1366.6752688239949,
+ "y": 89.92142690031405,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 255.16430494480664,
+ "height": 134.54569627549859,
+ "seed": 1509428572,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1509428572,
- "version": 579,
- "versionNonce": 1953416036,
- "isDeleted": false,
"boundElements": [
{
"type": "text",
@@ -727,17 +756,6 @@
"updated": 1709530103486,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 255.16430494480664,
- 134.54569627549859
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "eD7q3TO5HwewuHD1ehJ5A",
"focus": 0.3231720186558348,
@@ -748,84 +766,84 @@
"focus": 0.32201723866591586,
"gap": 17.440845778691198
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 255.16430494480664,
+ 134.54569627549859
+ ]
+ ]
},
{
- "id": "jbZpkBJ8GDIY0_FtQclm5",
"type": "text",
- "x": 1385.667531770031,
- "y": 132.19427503806332,
- "width": 217.17977905273438,
- "height": 50,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 50,
+ "versionNonce": 1735711708,
+ "isDeleted": false,
+ "id": "jbZpkBJ8GDIY0_FtQclm5",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
- "groupIds": [],
- "frameId": null,
- "roundness": null,
+ "angle": 0,
+ "x": 1385.667531770031,
+ "y": 132.19427503806332,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 217.17977905273438,
+ "height": 50,
"seed": 1245867364,
- "version": 50,
- "versionNonce": 1735711708,
- "isDeleted": false,
- "boundElements": null,
+ "groupIds": [],
+ "frameId": null,
+ "roundness": null,
+ "boundElements": [],
"updated": 1709530102404,
"link": null,
"locked": false,
- "text": "RegisterFilterIntecept\nor",
"fontSize": 20,
"fontFamily": 1,
+ "text": "RegisterFilterIntecept\nor",
"textAlign": "center",
"verticalAlign": "middle",
- "baseline": 43,
"containerId": "rNw6wTRniT8wZrtOFMT3f",
"originalText": "RegisterFilterInteceptor",
- "lineHeight": 1.25
+ "lineHeight": 1.25,
+ "baseline": 45
},
{
- "id": "pJZRckWJwVwymCILKT7Ul",
"type": "arrow",
- "x": 1651.9372616908367,
- "y": 373.67859969501,
- "width": 34.726079206353006,
- "height": 161.156845679997,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 622,
+ "versionNonce": 513226282,
+ "isDeleted": false,
+ "id": "pJZRckWJwVwymCILKT7Ul",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1598.9773535375507,
+ "y": 373.67859969501,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 166.72976613973992,
+ "height": 375.82347165655926,
+ "seed": 122126684,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 122126684,
- "version": 534,
- "versionNonce": 786713436,
- "isDeleted": false,
- "boundElements": null,
- "updated": 1709529860383,
+ "boundElements": [],
+ "updated": 1723879171755,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 34.726079206353006,
- 161.156845679997
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "B0d_SJgkv3tx8QXxBpD9m",
"gap": 18.408145200136744,
@@ -836,13 +854,24 @@
"gap": 16.325585576558012,
"focus": -0.2476381428592879
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ -166.72976613973992,
+ 375.82347165655926
+ ]
+ ]
},
{
"type": "rectangle",
- "version": 626,
- "versionNonce": 1632026212,
+ "version": 670,
+ "versionNonce": 106046954,
"isDeleted": false,
"id": "LN9hzLXZEu1nq-GHD2QOt",
"fillStyle": "solid",
@@ -851,8 +880,8 @@
"roughness": 1,
"opacity": 100,
"angle": 0,
- "x": 1631.5767909976685,
- "y": 551.1610309515651,
+ "x": 1332.243416974231,
+ "y": 765.8276569281273,
"strokeColor": "#1e1e1e",
"backgroundColor": "transparent",
"width": 196.295528007121,
@@ -881,14 +910,14 @@
"type": "arrow"
}
],
- "updated": 1709529743523,
+ "updated": 1723879171755,
"link": null,
"locked": false
},
{
"type": "text",
- "version": 547,
- "versionNonce": 175385820,
+ "version": 591,
+ "versionNonce": 363452586,
"isDeleted": false,
"id": "xqc2JD9eCY5yXVm2z1Rl9",
"fillStyle": "solid",
@@ -897,8 +926,8 @@
"roughness": 1,
"opacity": 100,
"angle": 0,
- "x": 1665.5946035241782,
- "y": 582.8422737217497,
+ "x": 1366.2612295007407,
+ "y": 797.508899698312,
"strokeColor": "#1e1e1e",
"backgroundColor": "transparent",
"width": 128.25990295410156,
@@ -908,7 +937,7 @@
"frameId": null,
"roundness": null,
"boundElements": [],
- "updated": 1709529737734,
+ "updated": 1723879171755,
"link": null,
"locked": false,
"fontSize": 20,
@@ -919,187 +948,36 @@
"containerId": "LN9hzLXZEu1nq-GHD2QOt",
"originalText": "Worksheet / ViewModel",
"lineHeight": 1.25,
- "baseline": 43
- },
- {
- "type": "rectangle",
- "version": 680,
- "versionNonce": 1370018276,
- "isDeleted": false,
- "id": "Y5dNLERl6k8elExZjb3YX",
- "fillStyle": "solid",
- "strokeWidth": 2,
- "strokeStyle": "solid",
- "roughness": 1,
- "opacity": 100,
- "angle": 0,
- "x": 1866.565342872022,
- "y": 550.3083653407415,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
- "width": 196.295528007121,
- "height": 113.36248554036945,
- "seed": 181482460,
- "groupIds": [],
- "frameId": null,
- "roundness": {
- "type": 3
- },
- "boundElements": [
- {
- "type": "text",
- "id": "h7YAuHDVNfWfLKJP6FVwX"
- }
- ],
- "updated": 1709529605299,
- "link": null,
- "locked": false
- },
- {
- "type": "text",
- "version": 591,
- "versionNonce": 362695132,
- "isDeleted": false,
- "id": "h7YAuHDVNfWfLKJP6FVwX",
- "fillStyle": "solid",
- "strokeWidth": 2,
- "strokeStyle": "solid",
- "roughness": 1,
- "opacity": 100,
- "angle": 0,
- "x": 1918.8031489898403,
- "y": 594.4896081109262,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
- "width": 91.81991577148438,
- "height": 25,
- "seed": 2058770524,
- "groupIds": [],
- "frameId": null,
- "roundness": null,
- "boundElements": [],
- "updated": 1709529605299,
- "link": null,
- "locked": false,
- "fontSize": 20,
- "fontFamily": 1,
- "text": "ViewModel",
- "textAlign": "center",
- "verticalAlign": "middle",
- "containerId": "Y5dNLERl6k8elExZjb3YX",
- "originalText": "ViewModel",
- "lineHeight": 1.25,
- "baseline": 18
- },
- {
- "type": "rectangle",
- "version": 740,
- "versionNonce": 1949914460,
- "isDeleted": false,
- "id": "UqRuy0eTjDjLvl8lETWrA",
- "fillStyle": "solid",
- "strokeWidth": 2,
- "strokeStyle": "solid",
- "roughness": 1,
- "opacity": 100,
- "angle": 0,
- "x": 2100.2870772674373,
- "y": 550.3083653407415,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
- "width": 196.295528007121,
- "height": 113.36248554036945,
- "seed": 1611470948,
- "groupIds": [],
- "frameId": null,
- "roundness": {
- "type": 3
- },
- "boundElements": [
- {
- "type": "text",
- "id": "zzCU14ylPnJnMo0ZDoMF7"
- }
- ],
- "updated": 1709529604310,
- "link": null,
- "locked": false
+ "baseline": 45
},
{
- "type": "text",
- "version": 652,
- "versionNonce": 672611044,
+ "type": "arrow",
+ "version": 526,
+ "versionNonce": 2129343402,
"isDeleted": false,
- "id": "zzCU14ylPnJnMo0ZDoMF7",
+ "id": "OabY2dpulZvjMUBYLDb-c",
"fillStyle": "solid",
"strokeWidth": 2,
- "strokeStyle": "solid",
+ "strokeStyle": "dashed",
"roughness": 1,
"opacity": 100,
"angle": 0,
- "x": 2152.5248833852556,
- "y": 594.4896081109262,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
- "width": 91.81991577148438,
- "height": 25,
- "seed": 1326738404,
- "groupIds": [],
- "frameId": null,
- "roundness": null,
- "boundElements": [],
- "updated": 1709529604310,
- "link": null,
- "locked": false,
- "fontSize": 20,
- "fontFamily": 1,
- "text": "ViewModel",
- "textAlign": "center",
- "verticalAlign": "middle",
- "containerId": "UqRuy0eTjDjLvl8lETWrA",
- "originalText": "ViewModel",
- "lineHeight": 1.25,
- "baseline": 18
- },
- {
- "id": "OabY2dpulZvjMUBYLDb-c",
- "type": "arrow",
- "x": 967.9945166944887,
+ "x": 736.9218119523429,
"y": 547.5557698021926,
- "width": 648.6239450309803,
- "height": 74.98118527864256,
- "angle": 0,
"strokeColor": "#1e1e1e",
"backgroundColor": "transparent",
- "fillStyle": "solid",
- "strokeWidth": 2,
- "strokeStyle": "dashed",
- "roughness": 1,
- "opacity": 100,
+ "width": 580.3632757496886,
+ "height": 264.7692677800817,
+ "seed": 1459661028,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1459661028,
- "version": 438,
- "versionNonce": 687657564,
- "isDeleted": false,
- "boundElements": null,
- "updated": 1709529868651,
+ "boundElements": [],
+ "updated": 1723879171755,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 648.6239450309803,
- 74.98118527864256
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "Wo0_9IeyNh2nP4LXReZmo",
"gap": 19.210240694789263,
@@ -1110,8 +988,19 @@
"gap": 14.958329272199535,
"focus": -0.4082162078529981
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 580.3632757496886,
+ 264.7692677800817
+ ]
+ ]
},
{
"type": "rectangle",
@@ -1193,47 +1082,36 @@
"containerId": "a1dvkJycQ8OE6bnv7yVWt",
"originalText": "SheetsFilterUIController",
"lineHeight": 1.25,
- "baseline": 18
+ "baseline": 20
},
{
- "id": "GvT8eNMzbir52Ncwk_ieq",
"type": "arrow",
- "x": 1329.4428737142298,
- "y": -309.9949177482932,
- "width": 4.716473982616208,
- "height": 249.03863056135498,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 485,
+ "versionNonce": 1709619172,
+ "isDeleted": false,
+ "id": "GvT8eNMzbir52Ncwk_ieq",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1329.4428737142298,
+ "y": -309.9949177482932,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 4.716473982616208,
+ "height": 249.03863056135498,
+ "seed": 1710778468,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1710778468,
- "version": 485,
- "versionNonce": 1709619172,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529853518,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 4.716473982616208,
- 249.03863056135498
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "a1dvkJycQ8OE6bnv7yVWt",
"gap": 18.298516764459293,
@@ -1244,8 +1122,19 @@
"gap": 20.947350982279318,
"focus": 0.01844258052068849
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 4.716473982616208,
+ 249.03863056135498
+ ]
+ ]
},
{
"type": "rectangle",
@@ -1327,47 +1216,36 @@
"containerId": "PwHD7KKAVA21vpjUo86nG",
"originalText": "SheetSkeleton",
"lineHeight": 1.25,
- "baseline": 18
+ "baseline": 20
},
{
- "id": "2OyzL49hpoQ1cSagBLOW3",
"type": "arrow",
- "x": 1559.5761785884113,
- "y": 43.195770053308934,
- "width": 609.1530838648735,
- "height": 45.94795527255235,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 539,
+ "versionNonce": 2129253860,
+ "isDeleted": false,
+ "id": "2OyzL49hpoQ1cSagBLOW3",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1559.5761785884113,
+ "y": 43.195770053308934,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 609.1530838648735,
+ "height": 45.94795527255235,
+ "seed": 1731732828,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1731732828,
- "version": 539,
- "versionNonce": 2129253860,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529858212,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 609.1530838648735,
- 45.94795527255235
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "eD7q3TO5HwewuHD1ehJ5A",
"gap": 13.897201751982493,
@@ -1378,53 +1256,53 @@
"gap": 16.05113383307406,
"focus": 0.7209365350584219
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 609.1530838648735,
+ 45.94795527255235
+ ]
+ ]
},
{
- "id": "4sD4NnxsLDc3_sGQDhM5k",
"type": "arrow",
- "x": 2261.8835599320473,
- "y": 216.33042261378108,
- "width": 514.9892872668315,
- "height": 313.80888195363497,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 491,
+ "versionNonce": 1165873450,
+ "isDeleted": false,
+ "id": "4sD4NnxsLDc3_sGQDhM5k",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 2266.655601111999,
+ "y": 216.33042261378108,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 822.8743252553909,
+ "height": 528.4755079301972,
+ "seed": 907773028,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 907773028,
- "version": 403,
- "versionNonce": 584101092,
- "isDeleted": false,
"boundElements": [
{
"type": "text",
"id": "T4yDQDrr0C2H3j3dN9QBY"
}
],
- "updated": 1709529858212,
+ "updated": 1723879171755,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- -514.9892872668315,
- 313.80888195363497
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "PwHD7KKAVA21vpjUo86nG",
"gap": 8.50504317728462,
@@ -1435,44 +1313,55 @@
"gap": 21.021726384148963,
"focus": -0.5772338750446874
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ -822.8743252553909,
+ 528.4755079301972
+ ]
+ ]
},
{
- "id": "T4yDQDrr0C2H3j3dN9QBY",
"type": "text",
- "x": 2299.625583944765,
- "y": 265.49771787758834,
- "width": 134.71986389160156,
- "height": 25,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 16,
+ "versionNonce": 1474248490,
+ "isDeleted": false,
+ "id": "T4yDQDrr0C2H3j3dN9QBY",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 2299.625583944765,
+ "y": 265.49771787758834,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 173.7998504638672,
+ "height": 25,
+ "seed": 1504563036,
"groupIds": [],
"frameId": null,
"roundness": null,
- "seed": 1504563036,
- "version": 15,
- "versionNonce": 1048303844,
- "isDeleted": false,
- "boundElements": null,
- "updated": 1709529729061,
+ "boundElements": [],
+ "updated": 1723879170656,
"link": null,
"locked": false,
- "text": "getRowRawVisible?",
"fontSize": 20,
"fontFamily": 1,
+ "text": "getRowRawVisible?",
"textAlign": "center",
"verticalAlign": "middle",
- "baseline": 18,
"containerId": "4sD4NnxsLDc3_sGQDhM5k",
"originalText": "getRowRawVisible?",
- "lineHeight": 1.25
+ "lineHeight": 1.25,
+ "baseline": 17
},
{
"type": "rectangle",
@@ -1554,47 +1443,36 @@
"containerId": "nIWLYf7WUUkh8GE7kwhA5",
"originalText": "FilterRenderController",
"lineHeight": 1.25,
- "baseline": 18
+ "baseline": 20
},
{
- "id": "SuJYIRe0j0ZqodTUuZkDy",
"type": "arrow",
- "x": 1517.8855370706126,
- "y": -315.3155955610826,
- "width": 295.03740343972436,
- "height": 39.48498198001437,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 481,
+ "versionNonce": 1444244060,
+ "isDeleted": false,
+ "id": "SuJYIRe0j0ZqodTUuZkDy",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1517.8855370706126,
+ "y": -315.3155955610826,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 295.03740343972436,
+ "height": 39.48498198001437,
+ "seed": 1762341724,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1762341724,
- "version": 481,
- "versionNonce": 1444244060,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529855934,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 295.03740343972436,
- 39.48498198001437
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "a1dvkJycQ8OE6bnv7yVWt",
"gap": 16.842894757410647,
@@ -1605,48 +1483,48 @@
"gap": 16.574914136865686,
"focus": 0.6533938662679707
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 295.03740343972436,
+ 39.48498198001437
+ ]
+ ]
},
{
- "id": "frIZ04lSYhsp0eiNkKcnd",
"type": "arrow",
- "x": 1849.1746779414852,
- "y": -137.01056167032658,
- "width": 310.3974663357285,
- "height": 81.13981580508693,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 370,
+ "versionNonce": 1191936860,
+ "isDeleted": false,
+ "id": "frIZ04lSYhsp0eiNkKcnd",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1849.1746779414852,
+ "y": -137.01056167032658,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 310.3974663357285,
+ "height": 81.13981580508693,
+ "seed": 775177060,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 775177060,
- "version": 370,
- "versionNonce": 1191936860,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529855934,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- -310.3974663357285,
- 81.13981580508693
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "nIWLYf7WUUkh8GE7kwhA5",
"gap": 8.88265223350652,
@@ -1657,33 +1535,44 @@
"gap": 15.861809660580775,
"focus": -0.1633901418219207
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ -310.3974663357285,
+ 81.13981580508693
+ ]
+ ]
},
{
- "id": "8Hyck_68cfbdi9aXxGGwj",
"type": "arrow",
- "x": 2008.9455103294063,
- "y": -129.66545647994565,
- "width": 315.93064511498915,
- "height": 208.4061018500305,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 256,
+ "versionNonce": 2116928484,
+ "isDeleted": false,
+ "id": "8Hyck_68cfbdi9aXxGGwj",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 2008.9455103294063,
+ "y": -129.66545647994565,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 315.93064511498915,
+ "height": 208.4061018500305,
+ "seed": 1076104548,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1076104548,
- "version": 256,
- "versionNonce": 2116928484,
- "isDeleted": false,
"boundElements": [
{
"type": "text",
@@ -1693,17 +1582,6 @@
"updated": 1709529858213,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 315.93064511498915,
- 208.4061018500305
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "nIWLYf7WUUkh8GE7kwhA5",
"gap": 16.227757423887454,
@@ -1714,44 +1592,55 @@
"gap": 15.722248526042165,
"focus": 0.40312260319074367
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 315.93064511498915,
+ 208.4061018500305
+ ]
+ ]
},
{
- "id": "pEKCJZjnA8AbYkXCKtgt2",
"type": "text",
- "x": 2093.7695549049927,
- "y": -43.84258835904927,
- "width": 203.09982299804688,
- "height": 75,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 127,
+ "versionNonce": 1219283172,
+ "isDeleted": false,
+ "id": "pEKCJZjnA8AbYkXCKtgt2",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 2093.7695549049927,
+ "y": -43.84258835904927,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 203.09982299804688,
+ "height": 75,
+ "seed": 1087199452,
"groupIds": [],
"frameId": null,
"roundness": null,
- "seed": 1087199452,
- "version": 127,
- "versionNonce": 1219283172,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529857568,
"link": null,
"locked": false,
- "text": "Register how to \nrender filter ranges \nand buttons",
"fontSize": 20,
"fontFamily": 1,
+ "text": "Register how to \nrender filter ranges \nand buttons",
"textAlign": "center",
"verticalAlign": "middle",
- "baseline": 68,
"containerId": "8Hyck_68cfbdi9aXxGGwj",
"originalText": "Register how to render filter ranges and buttons",
- "lineHeight": 1.25
+ "lineHeight": 1.25,
+ "baseline": 70
},
{
"type": "rectangle",
@@ -1833,47 +1722,36 @@
"containerId": "SBWl3n8p3gP3n8e4_IbLf",
"originalText": "FitlerPanel",
"lineHeight": 1.25,
- "baseline": 18
+ "baseline": 20
},
{
- "id": "IcurtrVGFRXj0JtMBjhKz",
"type": "arrow",
- "x": 1138.5683649126772,
- "y": -399.40204325330967,
- "width": 285.83475251818516,
- "height": 119.13489801594665,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 216,
+ "versionNonce": 917087716,
+ "isDeleted": false,
+ "id": "IcurtrVGFRXj0JtMBjhKz",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 1138.5683649126772,
+ "y": -399.40204325330967,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 285.83475251818516,
+ "height": 119.13489801594665,
+ "seed": 1195241948,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1195241948,
- "version": 216,
- "versionNonce": 917087716,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529853518,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- -285.83475251818516,
- 119.13489801594665
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "a1dvkJycQ8OE6bnv7yVWt",
"gap": 11.087836445924381,
@@ -1884,48 +1762,48 @@
"gap": 13.913813898939793,
"focus": 0.7499031108699328
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ -285.83475251818516,
+ 119.13489801594665
+ ]
+ ]
},
{
- "id": "_wfgP2BWS8519rai8Nc_K",
"type": "arrow",
- "x": 855.69358015778,
- "y": -270.1375969875737,
- "width": 375.54295362397295,
- "height": 210.6985978027534,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 182,
+ "versionNonce": 1344037732,
+ "isDeleted": false,
+ "id": "_wfgP2BWS8519rai8Nc_K",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 855.69358015778,
+ "y": -270.1375969875737,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 375.54295362397295,
+ "height": 210.6985978027534,
+ "seed": 1737375076,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 1737375076,
- "version": 182,
- "versionNonce": 1344037732,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529850349,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- 375.54295362397295,
- 210.6985978027534
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "SBWl3n8p3gP3n8e4_IbLf",
"gap": 16.87378166222777,
@@ -1936,48 +1814,48 @@
"gap": 19.430062980161438,
"focus": 0.11183338766534877
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 375.54295362397295,
+ 210.6985978027534
+ ]
+ ]
},
{
- "id": "Bduw1dViUvutS_TpDV07Q",
"type": "arrow",
- "x": 683.228875163786,
- "y": -225.71373040791127,
- "width": 9.090132629715072,
- "height": 145.99462397895786,
- "angle": 0,
- "strokeColor": "#1e1e1e",
- "backgroundColor": "transparent",
+ "version": 179,
+ "versionNonce": 236675036,
+ "isDeleted": false,
+ "id": "Bduw1dViUvutS_TpDV07Q",
"fillStyle": "solid",
"strokeWidth": 2,
"strokeStyle": "solid",
"roughness": 1,
"opacity": 100,
+ "angle": 0,
+ "x": 683.228875163786,
+ "y": -225.71373040791127,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "width": 9.090132629715072,
+ "height": 145.99462397895786,
+ "seed": 668128228,
"groupIds": [],
"frameId": null,
"roundness": {
"type": 2
},
- "seed": 668128228,
- "version": 179,
- "versionNonce": 236675036,
- "isDeleted": false,
- "boundElements": null,
+ "boundElements": [],
"updated": 1709529847744,
"link": null,
"locked": false,
- "points": [
- [
- 0,
- 0
- ],
- [
- -9.090132629715072,
- 145.99462397895786
- ]
- ],
- "lastCommittedPoint": null,
"startBinding": {
"elementId": "SBWl3n8p3gP3n8e4_IbLf",
"gap": 18.52424475875341,
@@ -1988,8 +1866,55 @@
"gap": 23.73871518019007,
"focus": -0.020766241510610742
},
+ "lastCommittedPoint": null,
"startArrowhead": null,
- "endArrowhead": "arrow"
+ "endArrowhead": "arrow",
+ "points": [
+ [
+ 0,
+ 0
+ ],
+ [
+ -9.090132629715072,
+ 145.99462397895786
+ ]
+ ]
+ },
+ {
+ "id": "s4MEzVd1HJqYkY0btaFjl",
+ "type": "text",
+ "x": 374.9039389057915,
+ "y": 808.2008524745457,
+ "width": 53.979949951171875,
+ "height": 25,
+ "angle": 0,
+ "strokeColor": "#1e1e1e",
+ "backgroundColor": "transparent",
+ "fillStyle": "solid",
+ "strokeWidth": 2,
+ "strokeStyle": "dashed",
+ "roughness": 1,
+ "opacity": 100,
+ "groupIds": [],
+ "frameId": null,
+ "roundness": null,
+ "seed": 1234569462,
+ "version": 49,
+ "versionNonce": 86991030,
+ "isDeleted": false,
+ "boundElements": null,
+ "updated": 1723879181259,
+ "link": null,
+ "locked": false,
+ "text": "Model",
+ "fontSize": 20,
+ "fontFamily": 1,
+ "textAlign": "left",
+ "verticalAlign": "top",
+ "baseline": 17,
+ "containerId": null,
+ "originalText": "Model",
+ "lineHeight": 1.25
}
],
"appState": {
diff --git a/packages/sheets-filter/src/commands/mutations/sheets-filter.mutation.ts b/packages/sheets-filter/src/commands/mutations/sheets-filter.mutation.ts
index 21007299a3..2e70f61e39 100644
--- a/packages/sheets-filter/src/commands/mutations/sheets-filter.mutation.ts
+++ b/packages/sheets-filter/src/commands/mutations/sheets-filter.mutation.ts
@@ -14,9 +14,6 @@
* limitations under the License.
*/
-// This file provides a ton of mutations to manipulate `FilterModel`.
-// These models would be held on `SheetsFilterService`.
-
import { CommandType } from '@univerjs/core';
import type { IMutation, IRange, Nullable } from '@univerjs/core';
import type { ISheetCommandSharedParams } from '@univerjs/sheets';
@@ -24,12 +21,17 @@ import type { ISheetCommandSharedParams } from '@univerjs/sheets';
import { SheetsFilterService } from '../../services/sheet-filter.service';
import type { IFilterColumn } from '../../models/types';
+/**
+ * Parameters of mutation {@link SetSheetsFilterRangeMutation}.
+ * @property range - the range to be set as filter range.
+ */
export interface ISetSheetsFilterRangeMutationParams extends ISheetCommandSharedParams {
range: IRange;
}
/**
- * Set filter range in a Worksheet. If the `FilterModel` does not exist, it will be created.
+ * A {@link CommandType.MUTATION} to set filter range in a {@link Worksheet}. If no {@link FilterModel} exists,
+ * a new `FilterModel` will be created.
*
* Since there could only be a filter on a worksheet, when you want to update the range, you
* don't necessarily need to remove the filter first, you can just execute this mutation.
@@ -49,23 +51,20 @@ export const SetSheetsFilterRangeMutation: IMutation<ISetSheetsFilterRangeMutati
},
};
+/**
+ * Parameters of mutation {@link SetSheetsFilterCriteriaMutation}.
+ * @property {number} col - the column index to set filter criteria.
+ * @property {IFilterColumn | null} criteria - the filter criteria to set. If it is `null`, the criteria will be removed.
+ * @property {boolean} [reCalc=true] - if it should trigger calculation on this `FilterColumn`.
+ */
export interface ISetSheetsFilterCriteriaMutationParams extends ISheetCommandSharedParams {
col: number;
-
- /**
- * Filter criteria to set. If it is `null`, the criteria will be removed.
- */
criteria: Nullable<IFilterColumn>;
-
- /**
- * If it should trigger calculation on this `FilterColumn`.
- *
- * @default true
- */
reCalc?: boolean;
}
+
/**
- * Set filter criteria of a Worksheet.
+ * A {@link CommandType.MUTATION} to set filter criteria of a given column of a {@link FilterModel}.
*/
export const SetSheetsFilterCriteriaMutation: IMutation<ISetSheetsFilterCriteriaMutationParams> = {
id: 'sheet.mutation.set-filter-criteria',
@@ -75,19 +74,17 @@ export const SetSheetsFilterCriteriaMutation: IMutation<ISetSheetsFilterCriteria
const sheetsFilterService = accessor.get(SheetsFilterService);
const filterModel = sheetsFilterService.getFilterModel(unitId, subUnitId);
- if (!filterModel) {
- return false;
- }
-
- // TODO@wzhudev: check criteria out of bound.
+ if (!filterModel) return false;
filterModel.setCriteria(col, criteria, reCalc);
return true;
},
};
-export interface IRemoveSheetsFilterMutationParams extends ISheetCommandSharedParams { }
-export const RemoveSheetsFilterMutation: IMutation<IRemoveSheetsFilterMutationParams> = {
+/**
+ * A {@link CommandType.MUTATION} to remove a {@link FilterModel} in a {@link Worksheet}.
+ */
+export const RemoveSheetsFilterMutation: IMutation<ISheetCommandSharedParams> = {
id: 'sheet.mutation.remove-filter',
type: CommandType.MUTATION,
handler: (accessor, params) => {
@@ -97,8 +94,10 @@ export const RemoveSheetsFilterMutation: IMutation<IRemoveSheetsFilterMutationPa
},
};
-export interface IReCalcSheetsFilterMutationParams extends ISheetCommandSharedParams { }
-export const ReCalcSheetsFilterMutation: IMutation<IReCalcSheetsFilterMutationParams> = {
+/**
+ * A {@link CommandType.MUTATION} to re-calculate a {@link FilterModel}.
+ */
+export const ReCalcSheetsFilterMutation: IMutation<ISheetCommandSharedParams> = {
id: 'sheet.mutation.re-calc-filter',
type: CommandType.MUTATION,
handler: (accessor, params) => {
diff --git a/packages/sheets-filter/src/controllers/sheets-filter.controller.ts b/packages/sheets-filter/src/controllers/sheets-filter.controller.ts
index 9fa687e813..1ebe0a221e 100644
--- a/packages/sheets-filter/src/controllers/sheets-filter.controller.ts
+++ b/packages/sheets-filter/src/controllers/sheets-filter.controller.ts
@@ -15,17 +15,16 @@
*/
import type { ICommandInfo, IMutationInfo, IObjectArrayPrimitiveType, IRange, Nullable, Workbook } from '@univerjs/core';
-import { Disposable, DisposableCollection, ICommandService, Inject, IUniverInstanceService, LifecycleStages, moveMatrixArray, OnLifecycle, Rectangle } from '@univerjs/core';
+import { Disposable, DisposableCollection, ICommandService, Inject, IUniverInstanceService, moveMatrixArray, Rectangle } from '@univerjs/core';
import type { EffectRefRangeParams, IAddWorksheetMergeMutationParams, IInsertColCommandParams, IInsertRowCommandParams, IInsertRowMutationParams, IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, IRemoveColMutationParams, IRemoveRowsMutationParams, IRemoveSheetCommandParams, ISetRangeValuesMutationParams, ISetWorksheetActivateCommandParams, ISheetCommandSharedParams } from '@univerjs/sheets';
import { EffectRefRangId, expandToContinuousRange, getSheetCommandTarget, InsertColCommand, InsertRowCommand, InsertRowMutation, INTERCEPTOR_POINT, MoveRangeCommand, MoveRowsCommand, RefRangeService, RemoveColCommand, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, SetRangeValuesMutation, SetWorksheetActivateCommand, SheetInterceptorService } from '@univerjs/sheets';
import { SheetsFilterService } from '../services/sheet-filter.service';
-import type { IRemoveSheetsFilterMutationParams, ISetSheetsFilterCriteriaMutationParams, ISetSheetsFilterRangeMutationParams } from '../commands/mutations/sheets-filter.mutation';
+import type { ISetSheetsFilterCriteriaMutationParams, ISetSheetsFilterRangeMutationParams } from '../commands/mutations/sheets-filter.mutation';
import { ReCalcSheetsFilterMutation, RemoveSheetsFilterMutation, SetSheetsFilterCriteriaMutation, SetSheetsFilterRangeMutation } from '../commands/mutations/sheets-filter.mutation';
import type { FilterColumn } from '../models/filter-model';
import { mergeSetFilterCriteria } from '../utils';
-@OnLifecycle(LifecycleStages.Ready, SheetsFilterController)
export class SheetsFilterController extends Disposable {
constructor(
@ICommandService private readonly _commandService: ICommandService,
@@ -283,7 +282,7 @@ export class SheetsFilterController extends Disposable {
}
if (rangeRemoveCount === endColumn - startColumn + 1) {
- const removeFilterRangeMutationParams: IRemoveSheetsFilterMutationParams = {
+ const removeFilterRangeMutationParams: ISheetCommandSharedParams = {
unitId,
subUnitId,
};
@@ -343,7 +342,7 @@ export class SheetsFilterController extends Disposable {
const count = Math.min(removeEndRow, endRow) - Math.max(removeStartRow, startRow) + 1;
if (count === endRow - startRow + 1 || filterHeaderIsRemoved) {
- const removeFilterRangeMutationParams: IRemoveSheetsFilterMutationParams = {
+ const removeFilterRangeMutationParams: ISheetCommandSharedParams = {
unitId,
subUnitId,
};
diff --git a/packages/sheets-filter/src/index.ts b/packages/sheets-filter/src/index.ts
index 0fff34542f..0abb771fd8 100644
--- a/packages/sheets-filter/src/index.ts
+++ b/packages/sheets-filter/src/index.ts
@@ -34,8 +34,6 @@ export { CustomFilterOperator } from './models/types';
export {
type ISetSheetsFilterRangeMutationParams,
type ISetSheetsFilterCriteriaMutationParams,
- type IRemoveSheetsFilterMutationParams,
- type IReCalcSheetsFilterMutationParams,
SetSheetsFilterRangeMutation,
SetSheetsFilterCriteriaMutation,
RemoveSheetsFilterMutation,
diff --git a/packages/sheets-filter/src/models/__tests__/filter-interceptor.spec.ts b/packages/sheets-filter/src/models/__tests__/filter-interceptor.spec.ts
index 6041b3c8ae..3e7dd73878 100644
--- a/packages/sheets-filter/src/models/__tests__/filter-interceptor.spec.ts
+++ b/packages/sheets-filter/src/models/__tests__/filter-interceptor.spec.ts
@@ -207,6 +207,10 @@ function createFilterTestUniver(dependencies?: Dependency[], workbookData?: IWor
injector.add([RefRangeService]);
injector.add([SheetsFilterController]);
}
+
+ override onReady(): void {
+ this._injector.get(SheetsFilterController);
+ }
}
univer.registerPlugin(TestPlugin);
diff --git a/packages/sheets-filter/src/models/types.ts b/packages/sheets-filter/src/models/types.ts
index 5d7a047247..837d46c15e 100644
--- a/packages/sheets-filter/src/models/types.ts
+++ b/packages/sheets-filter/src/models/types.ts
@@ -16,9 +16,16 @@
import type { BooleanNumber, IRange } from '@univerjs/core';
-// NOTE: Please refer to 18.3.2 AutoFilter Settings. Properties of this interface would be added in the future.
-// Please make sure that it is backward compatible.
-
+/**
+ * Data of a filter in a {@link Worksheet}.
+ *
+ * Please refer to 18.3.2 AutoFilter Settings. Properties of this interface would be added in the future.
+ * Please make sure that it is backward compatible.
+ *
+ * @property {IRange} ref The range of the filter.
+ * @property {IFilterColumn[]} [filterColumns] The filter criteria of each column.
+ * @property {number[]} [cachedFilteredOut] The cached filtered out row numbers.
+ */
export interface IAutoFilter {
ref: IRange;
@@ -26,39 +33,50 @@ export interface IAutoFilter {
cachedFilteredOut?: number[];
}
+/**
+ * The filter criteria of a column.
+ *
+ * @property {number} colId The column number.
+ * @property {IFilters} [filters] The basic filters (filter by value).
+ * @property {ICustomFilters} [customFilters] The custom filters.
+ */
export interface IFilterColumn {
colId: number;
-
- /**
- * The filter value could be an empty string, which means <filters blank="1">.
- */
filters?: IFilters;
customFilters?: ICustomFilters;
};
+/**
+ * Basic filters (filter by value).
+ *
+ * @property {true} [blank] Filter by blank. If this field is present, blank cells would be visible.
+ * @property {Array<string>} [filters] Filter by values. Cells with values in this array would be visible.
+ */
export interface IFilters {
blank?: true;
-
filters?: Array<string>;
}
+/**
+ * Custom filters.
+ *
+ * @property {BooleanNumber.TRUE} and The logical operator of the custom filters. If this field is present,
+ * the custom filters would be connected by 'and'. Otherwise, they would be connected by 'or'.
+ * @property {ICustomFilter[]} customFilters The custom filters.
+ */
export interface ICustomFilters {
and?: BooleanNumber.TRUE;
-
- /** Max 2 capacity. */
customFilters: [ICustomFilter] | [ICustomFilter, ICustomFilter];
}
-export interface IDynamicFilter {
- val: string | number;
-
- type: DynamicFilterOperator;
-}
-
+/**
+ * A custom filter.
+ *
+ * @property {string | number} val The value to be compared.
+ * @property {CustomFilterOperator} [operator] The operator of the comparison. If this field is empty, the operator would be 'equal'.
+ */
export interface ICustomFilter {
val: string | number;
-
- /** This field may be empty. */
operator?: CustomFilterOperator;
}
@@ -77,6 +95,12 @@ export enum CustomFilterOperator {
NOT_EQUALS = 'notEqual',
}
+export interface IDynamicFilter {
+ val: string | number;
+
+ type: DynamicFilterOperator;
+}
+
/**
* Not used now. Would be used in the future.
*/
diff --git a/packages/sheets-filter/src/plugin.ts b/packages/sheets-filter/src/plugin.ts
index d5c9f80ac1..826c2440cf 100644
--- a/packages/sheets-filter/src/plugin.ts
+++ b/packages/sheets-filter/src/plugin.ts
@@ -34,4 +34,8 @@ export class UniverSheetsFilterPlugin extends Plugin {
[SheetsFilterController],
] as Dependency[]).forEach((d) => this._injector.add(d));
}
+
+ override onReady(): void {
+ this._injector.get(SheetsFilterController);
+ }
}
diff --git a/packages/sheets-filter/src/services/sheet-filter.service.ts b/packages/sheets-filter/src/services/sheet-filter.service.ts
index 044ef07e3c..8b649edd68 100644
--- a/packages/sheets-filter/src/services/sheet-filter.service.ts
+++ b/packages/sheets-filter/src/services/sheet-filter.service.ts
@@ -21,8 +21,6 @@ import {
ICommandService,
IResourceManagerService,
IUniverInstanceService,
- LifecycleStages,
- OnLifecycle,
UniverInstanceType,
} from '@univerjs/core';
import { BehaviorSubject, filter, merge, of, switchMap } from 'rxjs';
@@ -53,7 +51,6 @@ export const SHEET_FILTER_SNAPSHOT_ID = 'SHEET_FILTER_PLUGIN';
/**
* This service is responsible for managing filter models, especially their lifecycle.
*/
-@OnLifecycle(LifecycleStages.Ready, SheetsFilterService)
export class SheetsFilterService extends Disposable {
private readonly _filterModels = new Map<string, Map<string, FilterModel>>();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 42f65c7735..35eaa6105e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,7 +10,7 @@ importers:
devDependencies:
'@antfu/eslint-config':
specifier: 2.25.0
'@commitlint/cli':
specifier: ^19.4.0
version: 19.4.0(@types/[email protected])([email protected])
@@ -31,7 +31,7 @@ importers:
'@storybook/react':
specifier: 8.2.8
'@types/node':
specifier: ^22.1.0
version: 22.1.0
@@ -133,7 +133,7 @@ importers:
'@storybook/addon-interactions':
specifier: 8.2.8
'@storybook/addon-links':
specifier: 8.2.8
@@ -151,7 +151,7 @@ importers:
'@storybook/react':
specifier: 8.2.8
'@storybook/react-webpack5':
specifier: 8.2.8
@@ -175,7 +175,7 @@ importers:
storybook:
specifier: 8.2.8
- version: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ version: 8.2.8(@babel/[email protected])
storybook-addon-swc:
specifier: ^1.2.0
@@ -1530,6 +1530,12 @@ importers:
'@univerjs/sheets-data-validation':
specifier: workspace:*
version: link:../sheets-data-validation
+ '@univerjs/sheets-filter':
+ specifier: workspace:*
+ version: link:../sheets-filter
+ '@univerjs/sheets-filter-ui':
+ specifier: workspace:*
+ version: link:../sheets-filter-ui
'@univerjs/sheets-formula':
specifier: workspace:*
version: link:../sheets-formula
@@ -11034,7 +11040,7 @@ snapshots:
dependencies:
'@babel/runtime': 7.25.0
dependencies:
'@antfu/install-pkg': 0.3.3
'@clack/prompts': 0.7.0
@@ -11059,7 +11065,7 @@ snapshots:
eslint-plugin-toml: 0.11.1([email protected]([email protected]))
eslint-plugin-unicorn: 55.0.0([email protected]([email protected]))
eslint-plugin-vue: 9.27.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]))
@@ -11180,20 +11186,6 @@ snapshots:
lru-cache: 5.1.1
semver: 6.3.1
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-annotate-as-pure': 7.24.7
- '@babel/helper-member-expression-to-functions': 7.24.8
- '@babel/helper-optimise-call-expression': 7.24.7
- '@babel/helper-replace-supers': 7.25.0(@babel/[email protected])
- '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
- '@babel/traverse': 7.25.3
- semver: 6.3.1
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11207,14 +11199,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-annotate-as-pure': 7.24.7
- regexpu-core: 5.3.2
- semver: 6.3.1
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11222,18 +11206,6 @@ snapshots:
regexpu-core: 5.3.2
semver: 6.3.1
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-compilation-targets': 7.25.2
- '@babel/helper-plugin-utils': 7.24.8
- debug: 4.3.6
- lodash.debounce: 4.0.8
- resolve: 1.22.8
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11283,17 +11255,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@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.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11312,16 +11273,6 @@ snapshots:
'@babel/[email protected]': {}
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-annotate-as-pure': 7.24.7
- '@babel/helper-wrap-function': 7.25.0
- '@babel/traverse': 7.25.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11331,16 +11282,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-member-expression-to-functions': 7.24.8
- '@babel/helper-optimise-call-expression': 7.24.7
- '@babel/traverse': 7.25.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11411,15 +11352,6 @@ snapshots:
dependencies:
'@babel/types': 7.25.2
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/traverse': 7.25.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11428,38 +11360,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0(@babel/[email protected])':
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
'@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0(@babel/[email protected])':
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
- '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11469,15 +11379,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/traverse': 7.25.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11486,65 +11387,30 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/[email protected])':
- dependencies:
- '@babel/core': 7.24.7
- optional: true
-
'@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/[email protected])':
dependencies:
'@babel/core': 7.25.2
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11555,45 +11421,21 @@ snapshots:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11604,89 +11446,41 @@ snapshots:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11697,41 +11491,17 @@ snapshots:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-remap-async-to-generator': 7.25.0(@babel/[email protected])
- '@babel/plugin-syntax-async-generators': 7.8.4(@babel/[email protected])
- '@babel/traverse': 7.25.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11742,16 +11512,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-module-imports': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-remap-async-to-generator': 7.25.0(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11761,37 +11521,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-class-features-plugin': 7.25.0(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11800,16 +11539,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-class-features-plugin': 7.25.0(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11819,19 +11548,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-annotate-as-pure': 7.24.7
- '@babel/helper-compilation-targets': 7.25.2
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-replace-supers': 7.25.0(@babel/[email protected])
- '@babel/traverse': 7.25.3
- globals: 11.12.0
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11844,89 +11560,40 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@babel/core': 7.24.7
+ '@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
'@babel/template': 7.25.0
- optional: true
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- '@babel/template': 7.25.0
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
- dependencies:
- '@babel/core': 7.25.2
- '@babel/helper-plugin-utils': 7.24.8
-
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
'@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-builder-binary-assignment-operator-visitor': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11935,13 +11602,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11954,15 +11614,6 @@ snapshots:
'@babel/helper-plugin-utils': 7.24.8
'@babel/plugin-syntax-flow': 7.24.7(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11971,16 +11622,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-compilation-targets': 7.25.2
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/traverse': 7.25.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -11990,63 +11631,28 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-json-strings': 7.8.3(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
'@babel/plugin-syntax-json-strings': 7.8.3(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
'@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-module-transforms': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12055,16 +11661,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-module-transforms': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-simple-access': 7.24.7
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12074,17 +11670,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-module-transforms': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-validator-identifier': 7.24.7
- '@babel/traverse': 7.25.3
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12095,15 +11680,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-module-transforms': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12112,65 +11688,29 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
'@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
'@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-compilation-targets': 7.25.2
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/[email protected])
- '@babel/plugin-transform-parameters': 7.24.7(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12179,15 +11719,6 @@ snapshots:
'@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/[email protected])
'@babel/plugin-transform-parameters': 7.24.7(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-replace-supers': 7.25.0(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12196,29 +11727,12 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/[email protected])
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
'@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
- '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12228,26 +11742,11 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-class-features-plugin': 7.25.0(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12256,17 +11755,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-annotate-as-pure': 7.24.7
- '@babel/helper-create-class-features-plugin': 7.25.0(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12277,12 +11765,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12298,50 +11780,22 @@ snapshots:
'@babel/core': 7.24.7
'@babel/helper-plugin-utils': 7.24.7
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- regenerator-transform: 0.15.2
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
regenerator-transform: 0.15.2
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12350,34 +11804,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -12394,146 +11830,29 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
- '@babel/helper-plugin-utils': 7.24.8
- optional: true
-
dependencies:
'@babel/core': 7.25.2
'@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/[email protected])
'@babel/helper-plugin-utils': 7.24.8
- dependencies:
- '@babel/compat-data': 7.25.2
- '@babel/core': 7.24.7
- '@babel/helper-compilation-targets': 7.25.2
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/helper-validator-option': 7.24.8
- '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.3(@babel/[email protected])
- '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.0(@babel/[email protected])
- '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.0(@babel/[email protected])
- '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.7(@babel/[email protected])
- '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.0(@babel/[email protected])
- '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/[email protected])
- '@babel/plugin-syntax-async-generators': 7.8.4(@babel/[email protected])
- '@babel/plugin-syntax-class-properties': 7.12.13(@babel/[email protected])
- '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/[email protected])
- '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/[email protected])
- '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/[email protected])
- '@babel/plugin-syntax-import-assertions': 7.24.7(@babel/[email protected])
- '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/[email protected])
- '@babel/plugin-syntax-import-meta': 7.10.4(@babel/[email protected])
- '@babel/plugin-syntax-json-strings': 7.8.3(@babel/[email protected])
- '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/[email protected])
- '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/[email protected])
- '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/[email protected])
- '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/[email protected])
- '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/[email protected])
- '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/[email protected])
- '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/[email protected])
- '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/[email protected])
- '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/[email protected])
- '@babel/plugin-transform-arrow-functions': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-async-generator-functions': 7.25.0(@babel/[email protected])
- '@babel/plugin-transform-async-to-generator': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-block-scoped-functions': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-block-scoping': 7.25.0(@babel/[email protected])
- '@babel/plugin-transform-class-properties': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-class-static-block': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-classes': 7.25.0(@babel/[email protected])
- '@babel/plugin-transform-computed-properties': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-destructuring': 7.24.8(@babel/[email protected])
- '@babel/plugin-transform-dotall-regex': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-duplicate-keys': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.0(@babel/[email protected])
- '@babel/plugin-transform-dynamic-import': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-exponentiation-operator': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-export-namespace-from': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-for-of': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-function-name': 7.25.1(@babel/[email protected])
- '@babel/plugin-transform-json-strings': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-literals': 7.25.2(@babel/[email protected])
- '@babel/plugin-transform-logical-assignment-operators': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-member-expression-literals': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-modules-amd': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/[email protected])
- '@babel/plugin-transform-modules-systemjs': 7.25.0(@babel/[email protected])
- '@babel/plugin-transform-modules-umd': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-named-capturing-groups-regex': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-new-target': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-numeric-separator': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-object-rest-spread': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-object-super': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-optional-catch-binding': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/[email protected])
- '@babel/plugin-transform-parameters': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-private-methods': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-private-property-in-object': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-property-literals': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-regenerator': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-reserved-words': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-shorthand-properties': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-spread': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-sticky-regex': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-template-literals': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-typeof-symbol': 7.24.8(@babel/[email protected])
- '@babel/plugin-transform-unicode-escapes': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-unicode-property-regex': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-unicode-regex': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-unicode-sets-regex': 7.24.7(@babel/[email protected])
- '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/[email protected])
- babel-plugin-polyfill-corejs2: 0.4.11(@babel/[email protected])
- babel-plugin-polyfill-corejs3: 0.10.6(@babel/[email protected])
- babel-plugin-polyfill-regenerator: 0.6.2(@babel/[email protected])
- core-js-compat: 3.38.0
- semver: 6.3.1
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/compat-data': 7.25.2
@@ -12630,14 +11949,6 @@ snapshots:
'@babel/helper-validator-option': 7.24.8
'@babel/plugin-transform-flow-strip-types': 7.25.2(@babel/[email protected])
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-plugin-utils': 7.24.8
- '@babel/types': 7.25.2
- esutils: 2.0.3
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -13665,21 +12976,21 @@ snapshots:
'@types/uuid': 9.0.8
dequal: 2.0.3
polished: 4.3.1
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
uuid: 9.0.1
dependencies:
'@storybook/global': 5.0.0
memoizerific: 1.11.3
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
dependencies:
dequal: 2.0.3
lodash: 4.17.21
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
@@ -13689,14 +13000,14 @@ snapshots:
'@storybook/csf-plugin': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/global': 5.0.0
'@types/react': 18.3.3
fs-extra: 11.2.0
react: 18.3.1
react-dom: 18.3.1([email protected])
rehype-external-links: 3.0.0
rehype-slug: 6.0.0
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
transitivePeerDependencies:
- supports-color
@@ -13712,7 +13023,7 @@ snapshots:
'@storybook/addon-outline': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/addon-toolbars': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/addon-viewport': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
transitivePeerDependencies:
- supports-color
@@ -13720,15 +13031,15 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
'@storybook/global': 5.0.0
'@storybook/instrumenter': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
polished: 4.3.1
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
transitivePeerDependencies:
- '@jest/globals'
@@ -13741,7 +13052,7 @@ snapshots:
dependencies:
'@storybook/csf': 0.1.11
'@storybook/global': 5.0.0
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
optionalDependencies:
react: 18.3.1
@@ -13749,13 +13060,13 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
tiny-invariant: 1.3.3
dependencies:
'@storybook/global': 5.0.0
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
@@ -13765,12 +13076,12 @@ snapshots:
dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
memoizerific: 1.11.3
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
@@ -13793,7 +13104,7 @@ snapshots:
memoizerific: 1.11.3
polished: 4.3.1
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
telejson: 7.2.0
ts-dedent: 2.2.0
util-deprecate: 1.0.2
@@ -13820,7 +13131,7 @@ snapshots:
path-browserify: 1.0.1
process: 0.11.10
semver: 7.6.3
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
@@ -13851,7 +13162,7 @@ snapshots:
'@types/cross-spawn': 6.0.6
cross-spawn: 7.0.3
globby: 14.0.2
- jscodeshift: 0.15.2(@babel/[email protected](@babel/[email protected]))
+ jscodeshift: 0.15.2(@babel/[email protected])
lodash: 4.17.21
prettier: 3.3.3
recast: 0.23.9
@@ -13861,18 +13172,14 @@ snapshots:
- supports-color
- utf-8-validate
dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
-
- dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
'@types/node': 18.19.44
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
'@storybook/[email protected]':
@@ -13895,7 +13202,7 @@ snapshots:
dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
unplugin: 1.12.1
'@storybook/[email protected]':
@@ -13913,23 +13220,19 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
'@vitest/utils': 1.6.0
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
util: 0.12.5
- dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
-
dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
'@storybook/[email protected]': {}
dependencies:
'@storybook/core-webpack': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0([email protected])([email protected](@swc/[email protected])([email protected]))
'@types/node': 18.19.44
'@types/semver': 7.5.8
@@ -13941,7 +13244,7 @@ snapshots:
react-dom: 18.3.1([email protected])
resolve: 1.22.8
semver: 7.6.3
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
tsconfig-paths: 4.2.0
webpack: 5.93.0(@swc/[email protected])([email protected])
optionalDependencies:
@@ -13953,13 +13256,9 @@ snapshots:
- uglify-js
- webpack-cli
- dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
-
dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
@@ -13975,27 +13274,21 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
react: 18.3.1
react-dom: 18.3.1([email protected])
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
-
- dependencies:
- react: 18.3.1
- react-dom: 18.3.1([email protected])
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
'@types/node': 18.19.44
react: 18.3.1
react-dom: 18.3.1([email protected])
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
optionalDependencies:
typescript: 5.5.4
transitivePeerDependencies:
@@ -14006,14 +13299,14 @@ snapshots:
- uglify-js
- webpack-cli
dependencies:
- '@storybook/components': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
+ '@storybook/components': 8.2.8([email protected](@babel/[email protected]))
'@storybook/global': 5.0.0
- '@storybook/manager-api': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
- '@storybook/preview-api': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
- '@storybook/theming': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
+ '@storybook/manager-api': 8.2.8([email protected](@babel/[email protected]))
+ '@storybook/preview-api': 8.2.8([email protected](@babel/[email protected]))
+ '@storybook/theming': 8.2.8([email protected](@babel/[email protected]))
'@types/escodegen': 0.0.6
'@types/estree': 0.0.51
'@types/node': 18.19.44
@@ -14028,52 +13321,23 @@ snapshots:
react-dom: 18.3.1([email protected])
react-element-to-jsx-string: 15.0.0([email protected]([email protected]))([email protected])
semver: 7.6.3
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
ts-dedent: 2.2.0
type-fest: 2.19.0
util-deprecate: 1.0.2
optionalDependencies:
typescript: 5.5.4
- dependencies:
- '@storybook/components': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
- '@storybook/global': 5.0.0
- '@storybook/manager-api': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
- '@storybook/preview-api': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
- '@storybook/theming': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
- '@types/escodegen': 0.0.6
- '@types/estree': 0.0.51
- '@types/node': 18.19.44
- acorn: 7.4.1
- acorn-jsx: 5.3.2([email protected])
- acorn-walk: 7.2.0
- escodegen: 2.1.0
- html-tags: 3.3.1
- lodash: 4.17.21
- prop-types: 15.8.1
- react: 18.3.1
- react-dom: 18.3.1([email protected])
- react-element-to-jsx-string: 15.0.0([email protected]([email protected]))([email protected])
- semver: 7.6.3
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
- ts-dedent: 2.2.0
- type-fest: 2.19.0
- util-deprecate: 1.0.2
- optionalDependencies:
- typescript: 5.5.4
-
dependencies:
'@storybook/csf': 0.1.11
'@storybook/instrumenter': 8.2.8([email protected](@babel/[email protected](@babel/[email protected])))
'@testing-library/dom': 10.1.0
'@testing-library/user-event': 14.5.2(@testing-library/[email protected])
'@vitest/expect': 1.6.0
'@vitest/spy': 1.6.0
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
util: 0.12.5
transitivePeerDependencies:
- '@jest/globals'
@@ -14082,17 +13346,13 @@ snapshots:
- jest
- vitest
dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
-
- dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
- storybook: 8.2.8(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.8(@babel/[email protected])
dependencies:
@@ -14208,7 +13468,7 @@ snapshots:
lz-string: 1.5.0
pretty-format: 27.5.1
dependencies:
'@adobe/css-tools': 4.4.0
'@babel/runtime': 7.25.0
@@ -14219,7 +13479,7 @@ snapshots:
lodash: 4.17.21
redent: 3.0.0
optionalDependencies:
dependencies:
@@ -15176,16 +14436,6 @@ snapshots:
dependencies:
'@babel/core': 7.25.2
- dependencies:
- '@babel/compat-data': 7.25.2
- '@babel/core': 7.24.7
- '@babel/helper-define-polyfill-provider': 0.6.2(@babel/[email protected])
- semver: 6.3.1
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/compat-data': 7.25.2
@@ -15195,15 +14445,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-define-polyfill-provider': 0.6.2(@babel/[email protected])
- core-js-compat: 3.38.0
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -15212,14 +14453,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@babel/core': 7.24.7
- '@babel/helper-define-polyfill-provider': 0.6.2(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
- optional: true
-
dependencies:
'@babel/core': 7.25.2
@@ -16725,13 +15958,13 @@ snapshots:
optionalDependencies:
dependencies:
'@typescript-eslint/utils': 7.18.0([email protected]([email protected]))([email protected])
eslint: 9.9.0([email protected])
optionalDependencies:
transitivePeerDependencies:
- supports-color
- typescript
@@ -17865,34 +17098,7 @@ snapshots:
- dependencies:
- '@babel/core': 7.25.2
- '@babel/parser': 7.25.3
- '@babel/plugin-transform-class-properties': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/[email protected])
- '@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/[email protected])
- '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/[email protected])
- '@babel/plugin-transform-private-methods': 7.24.7(@babel/[email protected])
- '@babel/preset-flow': 7.24.7(@babel/[email protected])
- '@babel/preset-typescript': 7.24.7(@babel/[email protected])
- '@babel/register': 7.24.6(@babel/[email protected])
- babel-core: 7.0.0-bridge.0(@babel/[email protected])
- chalk: 4.1.2
- flow-parser: 0.243.0
- graceful-fs: 4.2.11
- micromatch: 4.0.7
- neo-async: 2.6.2
- node-dir: 0.1.17
- recast: 0.23.9
- temp: 0.8.4
- write-file-atomic: 2.4.3
- optionalDependencies:
- '@babel/preset-env': 7.25.3(@babel/[email protected])
- transitivePeerDependencies:
- - supports-color
-
dependencies:
'@babel/core': 7.25.2
'@babel/parser': 7.25.3
@@ -19976,7 +19182,7 @@ snapshots:
webpack: 5.93.0(@swc/[email protected])([email protected])
dependencies:
'@babel/core': 7.25.2
'@babel/types': 7.25.2
@@ -19996,43 +19202,7 @@ snapshots:
fs-extra: 11.2.0
giget: 1.2.3
globby: 14.0.2
- jscodeshift: 0.15.2(@babel/[email protected](@babel/[email protected]))
- leven: 3.1.0
- ora: 5.4.1
- prettier: 3.3.3
- prompts: 2.4.2
- semver: 7.6.3
- strip-json-comments: 3.1.1
- tempy: 3.1.0
- tiny-invariant: 1.3.3
- ts-dedent: 2.2.0
- transitivePeerDependencies:
- - '@babel/preset-env'
- - bufferutil
- - supports-color
- - utf-8-validate
-
- dependencies:
- '@babel/core': 7.25.2
- '@babel/types': 7.25.2
- '@storybook/codemod': 8.2.8
- '@storybook/core': 8.2.8
- '@types/semver': 7.5.8
- '@yarnpkg/fslib': 2.10.3
- '@yarnpkg/libzip': 2.3.0
- chalk: 4.1.2
- commander: 6.2.1
- cross-spawn: 7.0.3
- detect-indent: 6.1.0
- envinfo: 7.13.0
- execa: 5.1.1
- fd-package-json: 1.2.0
- find-up: 5.0.0
- fs-extra: 11.2.0
- giget: 1.2.3
- globby: 14.0.2
- jscodeshift: 0.15.2(@babel/[email protected](@babel/[email protected]))
+ jscodeshift: 0.15.2(@babel/[email protected])
leven: 3.1.0
ora: 5.4.1
prettier: 3.3.3
@@ -20686,7 +19856,7 @@ snapshots:
sass: 1.77.5
terser: 5.31.5
dependencies:
'@ampproject/remapping': 2.3.0
'@vitest/expect': 2.0.5
@@ -20709,8 +19879,6 @@ snapshots:
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 22.1.0
- happy-dom: 14.12.3
- jsdom: 24.1.0
transitivePeerDependencies:
- less
- lightningcss