@univerjs/sheets-filter-ui 0.2.3 → 0.2.4-alpha.0

package/lib/es/index.js

@@ -1,8 +1,7 @@
 var bi = Object.defineProperty;
 var yi = (e, t, r) => t in e ? bi(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var N = (e, t, r) => yi(e, typeof t != "symbol" ? t + "" : t, r);
-import { CommandType as Te, IUniverInstanceService as cr, ICommandService as ae, IUndoRedoService as fr, UniverInstanceType as Pe, LocaleService as Fe, sequenceExecute as Ri, BooleanNumber as Wr, Disposable as Mt, extractPureTextFromCell as Ti, IContextService as wt, ThemeService as dn, RxDisposable as vn, fromCallback as Fi, runOnLifecycle as Oi, LifecycleStages as hr, OnLifecycle as mn, Tools as dr, Plugin as pn, DependentOn as _n } from "@univerjs/core";
-import { Quantity as gn, createIdentifier as Ci, Inject as D, Injector as ot } from "@wendellhu/redi";
+import { CommandType as Te, IUniverInstanceService as cr, ICommandService as ae, IUndoRedoService as fr, UniverInstanceType as Pe, Quantity as dn, LocaleService as Fe, sequenceExecute as Ri, BooleanNumber as Wr, createIdentifier as Ti, Disposable as Mt, Inject as D, Injector as ot, extractPureTextFromCell as Fi, IContextService as wt, useDependency as $e, ThemeService as vn, RxDisposable as mn, fromCallback as Oi, runOnLifecycle as Ci, LifecycleStages as hr, OnLifecycle as pn, Tools as dr, Plugin as _n, DependentOn as gn } from "@univerjs/core";
 import { SheetsFilterService as ee, RemoveSheetsFilterMutation as gt, SetSheetsFilterRangeMutation as vr, SetSheetsFilterCriteriaMutation as Ue, ReCalcSheetsFilterMutation as Sn, CustomFilterOperator as v, FILTER_MUTATIONS as Pi, UniverSheetsFilterPlugin as En } from "@univerjs/sheets-filter";
 import { IMessageService as bn, ILayoutService as Ni, useObservable as be, useComponentsOfPart as Ii, ComponentContainer as Mi, KeyCode as wi, MetaKeys as Vr, MenuGroup as mr, MenuItemType as pr, MenuPosition as Ai, getMenuHiddenObservable as _r, ComponentManager as Li, IShortcutService as $i, IMenuService as Di } from "@univerjs/ui";
 import { BehaviorSubject as Ce, ReplaySubject as Hi, of as st, Subject as Ui, merge as xi, combineLatest as Bi, throttleTime as yn, startWith as Rn, map as xe, shareReplay as Wi, switchMap as gr, filter as Vi, takeUntil as ji, distinctUntilChanged as zi } from "rxjs";
@@ -12,7 +11,6 @@ import { MessageType as Tn, Select as zr, RadioGroup as io, Radio as kr, Input a
 import { SheetsSelectionsService as ao, isSingleCellSelection as lo, RefRangeService as uo, WorkbookEditablePermission as er, WorksheetFilterPermission as tr, WorksheetEditPermission as rr, RangeProtectionPermissionEditPoint as co, INTERCEPTOR_POINT as fo, SheetInterceptorService as ho, RangeProtectionPermissionViewPoint as Gr } from "@univerjs/sheets";
 import * as d from "react";
 import T, { forwardRef as On, useRef as w, createElement as Cn, useCallback as fe, useMemo as Er, version as vo, isValidElement as mo, useEffect as po, useState as Zt } from "react";
-import { useDependency as $e } from "@wendellhu/redi/react-bindings";
 import Yr, { flushSync as Xr } from "react-dom";
 var oe = function() {
   return oe = Object.assign || function(e) {
@@ -84,7 +82,7 @@ const Ve = {
     if (!h) return !1;
     const m = h.range, f = lo(h) ? ki(m, { left: !0, right: !0, up: !0, down: !0 }, i) : m;
     if (f.endRow === f.startRow) {
-      const _ = e.get(bn, gn.OPTIONAL), b = e.get(Fe);
+      const _ = e.get(bn, dn.OPTIONAL), b = e.get(Fe);
       return _ == null || _.show({ type: Tn.Warning, content: b.t("sheets-filter.command.not-valid-filter-range") }), !1;
     }
     const g = { id: vr.id, params: { unitId: s, subUnitId: l, range: f } }, p = n.syncExecuteCommand(g.id, g.params);
@@ -705,7 +703,7 @@ var Fo = Object.defineProperty, Oo = Object.getOwnPropertyDescriptor, br = (e, t
     (i = e[a]) && (o = (n ? i(t, r, o) : i(o)) || o);
   return n && o && Fo(t, r, o), o;
 }, De = (e, t) => (r, n) => t(r, n, e), bt = /* @__PURE__ */ ((e) => (e[e.VALUES = 0] = "VALUES", e[e.CONDITIONS = 1] = "CONDITIONS", e))(bt || {});
-Ci("sheets-filter-ui.sheets-filter-panel.service");
+Ti("sheets-filter-ui.sheets-filter-panel.service");
 let Re = class extends Mt {
   constructor(t, r, n, o) {
     super();
@@ -965,7 +963,7 @@ let Rt = class extends Mt {
           W++;
           continue;
         }
-        const z = F != null && F.value ? Ti(F.value) : "";
+        const z = F != null && F.value ? Fi(F.value) : "";
         if (!z) {
           O += 1, W += H;
           continue;
@@ -1088,7 +1086,7 @@ const Be = "FILTER_PANEL_OPENED", Tt = {
   id: "sheet.operation.close-filter-panel",
   type: Te.OPERATION,
   handler: (e) => {
-    const t = e.get(wt), r = e.get(Re), n = e.get(Ni, gn.OPTIONAL);
+    const t = e.get(wt), r = e.get(Re), n = e.get(Ni, dn.OPTIONAL);
     return t.getContextValue(Be) ? (t.setContextValue(Be, !1), n == null || n.focus(), r.terminate()) : !1;
   }
 }, Ln = {
@@ -2846,7 +2844,7 @@ let lr = class extends no {
 lr = Ta([
   Jt(2, wt),
   Jt(3, ae),
-  Jt(4, D(dn))
+  Jt(4, D(vn))
 ], lr);
 var Fa = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, Ca = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? Oa(t, r) : t, a = e.length - 1, i; a >= 0; a--)
@@ -2854,7 +2852,7 @@ var Fa = Object.defineProperty, Oa = Object.getOwnPropertyDescriptor, Ca = (e, t
   return n && o && Fa(t, r, o), o;
 }, pe = (e, t) => (r, n) => t(r, n, e);
 const Pa = 1e3, Na = 5e3;
-let ur = class extends vn {
+let ur = class extends mn {
   constructor(t, r, n, o, a, i, s, l, u, c) {
     super();
     N(this, "_filterRangeShape", null);
@@ -2879,7 +2877,7 @@ let ur = class extends vn {
           range: a == null ? void 0 : a.getRange(),
           skeleton: t.skeleton
         });
-        return Fi(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+        return Oi(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
           Vi(
             ([u]) => u.type === Te.MUTATION && u.params.unitId === r.getUnitId() && Pi.has(u.id)
           ),
@@ -2961,7 +2959,7 @@ ur = Ca([
   pe(1, D(ot)),
   pe(2, D(Zi)),
   pe(3, D(ee)),
-  pe(4, D(dn)),
+  pe(4, D(vn)),
   pe(5, D(ho)),
   pe(6, D(Ji)),
   pe(7, ae),
@@ -2973,7 +2971,7 @@ var Ia = Object.defineProperty, Ma = Object.getOwnPropertyDescriptor, wa = (e, t
     (i = e[a]) && (o = (n ? i(t, r, o) : i(o)) || o);
   return n && o && Ia(t, r, o), o;
 }, Aa = (e, t) => (r, n) => t(r, n, e);
-let it = class extends vn {
+let it = class extends mn {
   constructor(e) {
     super(), this._renderManagerService = e, this._initRenderControllers();
   }
@@ -2984,7 +2982,7 @@ let it = class extends vn {
 it = wa([
   Aa(0, Sr)
 ], it);
-Oi(hr.Rendered, it);
+Ci(hr.Rendered, it);
 var La = Object.defineProperty, $a = Object.getOwnPropertyDescriptor, Da = (e, t, r, n) => {
   for (var o = n > 1 ? void 0 : n ? $a(t, r) : t, a = e.length - 1, i; a >= 0; a--)
     (i = e[a]) && (o = (n ? i(t, r, o) : i(o)) || o);
@@ -3059,7 +3057,7 @@ let tt = class extends it {
   }
 };
 tt = Da([
-  mn(hr.Rendered, tt),
+  pn(hr.Rendered, tt),
   ie(1, D(ot)),
   ie(2, D(Li)),
   ie(3, D(Re)),
@@ -3103,7 +3101,7 @@ let rt = class extends Mt {
   }
 };
 rt = xa([
-  mn(hr.Ready, rt),
+  pn(hr.Ready, rt),
   _t(0, D(ee)),
   _t(1, D(Fe)),
   _t(2, ae),
@@ -3115,7 +3113,7 @@ var ti = Object.defineProperty, Ba = Object.getOwnPropertyDescriptor, Wa = (e, t
   return n && o && ti(t, r, o), o;
 }, hn = (e, t) => (r, n) => t(r, n, e), ri = (e, t, r) => Wa(e, typeof t != "symbol" ? t + "" : t, r);
 const ja = "SHEET_FILTER_UI_PLUGIN";
-let Nt = class extends pn {
+let Nt = class extends _n {
   constructor(e = {}, t, r) {
     super(), this._config = e, this._injector = t, this._localeService = r, this._config = dr.deepMerge({}, ei, this._config);
   }
@@ -3135,7 +3133,7 @@ let Nt = class extends pn {
 ri(Nt, "type", Pe.UNIVER_SHEET);
 ri(Nt, "pluginName", ja);
 Nt = Va([
-  _n(En),
+  gn(En),
   hn(1, D(ot)),
   hn(2, D(Fe))
 ], Nt);
@@ -3145,7 +3143,7 @@ var ni = Object.defineProperty, za = Object.getOwnPropertyDescriptor, ka = (e, t
   return n && o && ni(t, r, o), o;
 }, Ga = (e, t) => (r, n) => t(r, n, e), ii = (e, t, r) => ka(e, typeof t != "symbol" ? t + "" : t, r);
 const Ya = "SHEET_FILTER_UI_PLUGIN";
-let It = class extends pn {
+let It = class extends _n {
   constructor(e = {}, t) {
     super(), this._config = e, this._injector = t, this._config = dr.deepMerge({}, ei, this._config);
   }
@@ -3159,7 +3157,7 @@ let It = class extends pn {
 ii(It, "type", Pe.UNIVER_SHEET);
 ii(It, "pluginName", Ya);
 It = Qa([
-  _n(En),
+  gn(En),
   Ga(1, D(ot))
 ], It);
 export {

package/lib/types/controllers/sheets-filter-render.controller.d.ts

@@ -1,9 +1,8 @@
-import { Workbook, ICommandService, RxDisposable, ThemeService } from '@univerjs/core';
+import { Workbook, ICommandService, Injector, RxDisposable, ThemeService } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
 import { SheetInterceptorService } from '@univerjs/sheets';
 import { SheetsFilterService } from '@univerjs/sheets-filter';
 import { ISheetSelectionRenderService, SheetSkeletonManagerService, SheetsRenderService } from '@univerjs/sheets-ui';
-import { Injector } from '@wendellhu/redi';
 
 export declare class SheetsFilterRenderController extends RxDisposable implements IRenderModule {
     private readonly _context;

package/lib/types/controllers/sheets-filter-ui.controller.d.ts

@@ -1,6 +1,5 @@
-import { ICommandService, IContextService, LocaleService } from '@univerjs/core';
+import { ICommandService, IContextService, Injector, LocaleService } from '@univerjs/core';
 import { ComponentManager, IMenuService, IMessageService, IShortcutService, MenuConfig } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetsFilterService } from '@univerjs/sheets-filter';

package/lib/types/controllers/sheets-filter.menu.d.ts

@@ -1,5 +1,5 @@
 import { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare function SmartToggleFilterMenuItemFactory(accessor: IAccessor): IMenuSelectorItem;
 export declare function ClearFilterCriteriaMenuItemFactory(accessor: IAccessor): IMenuButtonItem;

package/lib/types/mobile-plugin.d.ts

@@ -1,5 +1,4 @@
-import { Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 import { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui.controller';
 
 export declare class UniverSheetsFilterMobileUIPlugin extends Plugin {

package/lib/types/plugin.d.ts

@@ -1,5 +1,4 @@
-import { LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
 import { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui.controller';
 
 export declare class UniverSheetsFilterUIPlugin extends Plugin {

package/lib/types/services/sheets-filter-panel.service.d.ts

@@ -1,6 +1,5 @@
-import { Nullable, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { IDisposable, Nullable, Disposable, ICommandService, Injector, IUniverInstanceService } from '@univerjs/core';
 import { SheetsFilterService, FilterColumn, FilterModel } from '@univerjs/sheets-filter';
-import { IDisposable, Injector } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 import { RefRangeService } from '@univerjs/sheets';
 import { FilterOperator, IFilterConditionFormParams, IFilterConditionItem } from '../models/conditions';
@@ -32,7 +31,7 @@ export interface ISheetsFilterPanelService {
      */
     terminate(): boolean;
 }
-export declare const ISheetsFilterPanelService: import('@wendellhu/redi').IdentifierDecorator<ISheetsFilterPanelService>;
+export declare const ISheetsFilterPanelService: import('@univerjs/core').IdentifierDecorator<ISheetsFilterPanelService>;
 export interface IFilterByModel extends IDisposable {
     canApply$: Observable<boolean>;
     deltaCol(offset: number): void;