@univerjs/sheets-ui 0.4.2 → 0.5.0-nightly.202411091605

package/lib/types/services/canvas-pop-manager.service.d.ts

@@ -1,7 +1,7 @@
 import { INeedCheckDisposable, Nullable, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { BaseObject, IBoundRectNoAngle, Viewport, IRenderManagerService } from '@univerjs/engine-render';
+import { ISheetLocationBase, RefRangeService } from '@univerjs/sheets';
 import { IPopup, ICanvasPopupService } from '@univerjs/ui';
-import { RefRangeService } from '@univerjs/sheets';
 export interface ICanvasPopup extends Omit<IPopup, 'anchorRect' | 'anchorRect$' | 'unitId' | 'subUnitId' | 'canvasElement'> {
     mask?: boolean;
     extraProps?: Record<string, any>;
@@ -13,6 +13,7 @@ export declare class SheetCanvasPopManagerService extends Disposable {
     private readonly _refRangeService;
     private readonly _commandService;
     constructor(_globalPopupManagerService: ICanvasPopupService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _refRangeService: RefRangeService, _commandService: ICommandService);
+    private _createHiddenRectObserver;
     private _createPositionObserver;
     /**
      * attach a popup to canvas object
@@ -21,7 +22,7 @@ export declare class SheetCanvasPopManagerService extends Disposable {
      * @returns disposable
      */
     attachPopupToObject(targetObject: BaseObject, popup: ICanvasPopup): INeedCheckDisposable;
-    attachPopupByPosition(bound: IBoundRectNoAngle, popup: ICanvasPopup, _unitId?: string, _subUnitId?: string): Nullable<INeedCheckDisposable>;
+    attachPopupByPosition(bound: IBoundRectNoAngle, popup: ICanvasPopup, location: ISheetLocationBase): Nullable<INeedCheckDisposable>;
     attachPopupToAbsolutePosition(bound: IBoundRectNoAngle, popup: ICanvasPopup, _unitId?: string, _subUnitId?: string): {
         dispose: () => void;
         canDispose: () => boolean;

package/lib/types/services/clipboard/html-to-usm/utils.d.ts

@@ -1,4 +1,16 @@
-import { IParagraph, IParagraphStyle, Nullable } from '@univerjs/core';
+import { IParagraph, IParagraphStyle, ITextRun, Nullable } from '@univerjs/core';
+import { ICellDataWithSpanInfo } from '../type';
 export default function parseToDom(rawHtml: string): HTMLBodyElement;
 export declare function getParagraphStyle(el: HTMLElement): Nullable<IParagraphStyle>;
 export declare function generateParagraphs(dataStream: string, prevParagraph?: IParagraph): IParagraph[];
+export declare function convertToCellStyle(cell: ICellDataWithSpanInfo, dataStream: string, textRuns: ITextRun[] | undefined): ICellDataWithSpanInfo | {
+    s: import('@univerjs/core').ITextStyle | undefined;
+    p?: Nullable<import('@univerjs/core').IDocumentData>;
+    v?: Nullable<import('@univerjs/core').CellValue>;
+    t?: Nullable<import('@univerjs/core').CellValueType>;
+    f?: Nullable<string>;
+    si?: Nullable<string>;
+    custom?: import('@univerjs/core').CustomData;
+    rowSpan?: number;
+    colSpan?: number;
+};

package/lib/types/services/editor-bridge.service.d.ts

@@ -1,6 +1,6 @@
-import { ICellData, ICellDataForSheetInterceptor, IDisposable, IPosition, ISelectionCell, Nullable, Workbook, Worksheet, Disposable, IContextService, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import { IDisposable, IPosition, ISelectionCell, Nullable, Disposable, IContextService, IUniverInstanceService, ThemeService } from '@univerjs/core';
 import { Engine, IDocumentLayoutObject, Scene, DeviceInputEventType, IRenderManagerService } from '@univerjs/engine-render';
-import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
+import { SheetsSelectionsService, SheetInterceptorService } from '@univerjs/sheets';
 import { KeyCode } from '@univerjs/ui';
 import { Observable } from 'rxjs';
 import { IEditorService } from '@univerjs/docs-ui';
@@ -37,22 +37,11 @@ export interface ICellEditorLayout {
 }
 export interface IEditorBridgeServiceParam extends ICellEditorState, ICellEditorLayout {
 }
-interface ISheetLocationForEditor extends ISheetLocation {
-    origin: Nullable<ICellData>;
-}
-declare const BEFORE_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-declare const AFTER_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-declare const AFTER_CELL_EDIT_ASYNC: import('@univerjs/core').IInterceptor<Promise<Nullable<ICellDataForSheetInterceptor>>, ISheetLocationForEditor>;
 export interface IEditorBridgeService {
     currentEditCellState$: Observable<Nullable<ICellEditorState>>;
     currentEditCellLayout$: Observable<Nullable<ICellEditorLayout>>;
     currentEditCell$: Observable<Nullable<IEditorBridgeServiceParam>>;
     visible$: Observable<IEditorBridgeServiceVisibleParam>;
-    interceptor: InterceptorManager<{
-        BEFORE_CELL_EDIT: typeof BEFORE_CELL_EDIT;
-        AFTER_CELL_EDIT: typeof AFTER_CELL_EDIT;
-        AFTER_CELL_EDIT_ASYNC: typeof AFTER_CELL_EDIT_ASYNC;
-    }>;
     dispose(): void;
     refreshEditCellState(): void;
     refreshEditCellPosition(resetSizeOnly?: boolean): void;
@@ -69,9 +58,9 @@ export interface IEditorBridgeService {
     disableForceKeepVisible(): void;
     isForceKeepVisible(): boolean;
     getCurrentEditorId(): Nullable<string>;
-    beforeSetRangeValue(workbook: Workbook, worksheet: Worksheet, row: number, column: number, cellData: ICellData): Promise<Nullable<ICellData>>;
 }
 export declare class EditorBridgeService extends Disposable implements IEditorBridgeService, IDisposable {
+    private readonly _sheetInterceptorService;
     private readonly _renderManagerService;
     private readonly _themeService;
     private readonly _univerInstanceService;
@@ -110,12 +99,7 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     readonly visible$: Observable<IEditorBridgeServiceVisibleParam>;
     private readonly _afterVisible$;
     readonly afterVisible$: Observable<IEditorBridgeServiceVisibleParam>;
-    readonly interceptor: InterceptorManager<{
-        BEFORE_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-        AFTER_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-        AFTER_CELL_EDIT_ASYNC: import('@univerjs/core').IInterceptor<Promise<Nullable<ICellDataForSheetInterceptor>>, ISheetLocationForEditor>;
-    }>;
-    constructor(_renderManagerService: IRenderManagerService, _themeService: ThemeService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService, _refSelectionsService: SheetsSelectionsService, _contextService: IContextService);
+    constructor(_sheetInterceptorService: SheetInterceptorService, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService, _refSelectionsService: SheetsSelectionsService, _contextService: IContextService);
     refreshEditCellState(): void;
     refreshEditCellPosition(resetSizeOnly?: boolean): void;
     setEditCell(param: ICurrentEditCellParam): void;
@@ -152,7 +136,5 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     isForceKeepVisible(): boolean;
     changeEditorDirty(dirtyStatus: boolean): void;
     getEditorDirty(): boolean;
-    beforeSetRangeValue(workbook: Workbook, worksheet: Worksheet, row: number, column: number, cellData: ICellData): Promise<Nullable<ICellDataForSheetInterceptor>>;
 }
 export declare const IEditorBridgeService: import('@wendellhu/redi').IdentifierDecorator<EditorBridgeService>;
-export {};

package/lib/types/services/permission/sheet-permission-panel.model.d.ts

@@ -1,35 +1,14 @@
-import { IRange, Nullable } from '@univerjs/core';
+import { IRange } from '@univerjs/core';
 import { IRangeProtectionRule, IWorksheetProtectionRule } from '@univerjs/sheets';
-export declare enum viewState {
-    othersCanView = "othersCanView",
-    noOneElseCanView = "noOneElseCanView"
-}
-export declare enum editState {
-    designedUserCanEdit = "designedUserCanEdit",
-    onlyMe = "onlyMe"
-}
-type IPermissionPanelBaseRule = IRangeProtectionRule | IWorksheetProtectionRule;
-export type IPermissionPanelRule = IPermissionPanelBaseRule & {
-    viewStatus?: viewState;
-    editStatus?: editState;
+export declare const DEFAULT_RANGE_RULE: IRangeProtectionRule;
+export type IPermissionPanelRule = (IRangeProtectionRule | IWorksheetProtectionRule) & {
     ranges: IRange[];
+    id: string;
 };
 export declare class SheetPermissionPanelModel {
     private _rule;
-    private _rule$;
-    private _oldRule;
-    private _rangeErrorMsg$;
     private _visible;
     setVisible(v: boolean): void;
     getVisible(): boolean;
-    rangeErrorMsg$: import('rxjs').Observable<string | undefined>;
-    setRangeErrorMsg(msg: string | undefined): void;
-    rule$: import('rxjs').Observable<IPermissionPanelRule>;
-    get rule(): IPermissionPanelRule;
-    setRule(ruleObj: Partial<IPermissionPanelRule>): void;
-    resetRule(): void;
     reset(): void;
-    get oldRule(): Nullable<IPermissionPanelRule>;
-    setOldRule(ruleObj: Nullable<IPermissionPanelRule>): void;
 }
-export {};

package/lib/types/services/permission/sheet-permission-user-list.service.d.ts

@@ -3,13 +3,10 @@ export declare class SheetPermissionUserManagerService {
     private _userList;
     private _oldCollaboratorList;
     private _selectUserList;
-    private _allUserList;
     private _selectUserList$;
     selectUserList$: import('rxjs').Observable<ICollaborator[]>;
     get userList(): ICollaborator[];
-    get allUserList(): ICollaborator[];
-    setAllUserList(userList: ICollaborator[]): void;
-    setUserList(userList: ICollaborator[]): void;
+    setCanEditUserList(userList: ICollaborator[]): void;
     reset(): void;
     get oldCollaboratorList(): ICollaborator[];
     setOldCollaboratorList(userList: ICollaborator[]): void;

package/lib/types/services/sheet-skeleton-manager.service.d.ts

@@ -46,6 +46,11 @@ export declare class SheetSkeletonManagerService extends Disposable implements I
     private _setCurrent;
     reCalculate(): void;
     private _reCalculate;
+    /**
+     * Make param dirty, if param is dirty, then the skeleton will be makeDirty in _reCalculate()
+     * @param searchParm
+     * @param state
+     */
     makeDirty(searchParm: ISheetSkeletonManagerSearch, state?: boolean): void;
     getOrCreateSkeleton(searchParam: ISheetSkeletonManagerSearch): SpreadsheetSkeleton | undefined;
     disposeSkeleton(searchParm: ISheetSkeletonManagerSearch): void;

package/lib/types/views/permission/index.d.ts

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { SheetPermissionPanelFooter } from './footer';
-export { SheetPermissionPanelAddFooter } from './footer/permission-list-footer';
 export { SheetPermissionPanel } from './panel';
 export { SheetPermissionPanelList } from './panel-list';
 export { SheetPermissionDialog } from './permission-dialog';

package/lib/types/views/permission/panel/index.d.ts

@@ -1,7 +1,10 @@
+import { IPermissionPanelRule } from '../../../services/permission/sheet-permission-panel.model';
 import { default as React } from 'react';
 interface ISheetPermissionPanelProps {
     showDetail: boolean;
     fromSheetBar: boolean;
+    rule?: IPermissionPanelRule;
+    oldRule?: IPermissionPanelRule;
 }
-export declare const SheetPermissionPanel: ({ showDetail, fromSheetBar }: ISheetPermissionPanelProps) => React.JSX.Element | null;
+export declare const SheetPermissionPanel: ({ showDetail, fromSheetBar, rule, oldRule }: ISheetPermissionPanelProps) => React.JSX.Element | null;
 export {};

package/lib/types/views/permission/panel-detail/PermissionDetailFooterPart.d.ts

@@ -0,0 +1,16 @@
+import { IRange } from '@univerjs/core';
+import { IPermissionPanelRule } from '../../../services/permission/sheet-permission-panel.model';
+import { EditStateEnum, ViewStateEnum } from '@univerjs/sheets';
+import { default as React } from 'react';
+interface IPermissionDetailFooterPartProps {
+    permissionId: string;
+    id: string;
+    ranges: IRange[];
+    rangesErrMsg?: string;
+    desc?: string;
+    editState: EditStateEnum;
+    viewState: ViewStateEnum;
+    oldRule?: IPermissionPanelRule;
+}
+export declare const PermissionDetailFooterPart: (props: IPermissionDetailFooterPartProps) => React.JSX.Element | null;
+export {};

package/lib/types/views/permission/panel-detail/PermissionDetailMainPart.d.ts

@@ -0,0 +1,14 @@
+import { IRange } from '@univerjs/core';
+import { default as React } from 'react';
+interface IPermissionDetailMainPartProps {
+    permissionId: string;
+    ranges: IRange[];
+    onRangesChange: (ranges: IRange[], err?: string) => void;
+    isFocusRangeSelector: boolean;
+    rangesErrMsg?: string;
+    desc?: string;
+    onDescChange: (desc: string) => void;
+    rangeSelectorRef: React.MutableRefObject<any>;
+}
+export declare const PermissionDetailMainPart: (props: IPermissionDetailMainPartProps) => React.JSX.Element | null;
+export {};

package/lib/types/views/permission/panel-detail/PermissionDetailPanel.d.ts

@@ -0,0 +1,9 @@
+import { IPermissionPanelRule } from '../../../services/permission/sheet-permission-panel.model';
+import { default as React } from 'react';
+interface ISheetPermissionPanelDetailProps {
+    fromSheetBar: boolean;
+    rule?: IPermissionPanelRule;
+    oldRule?: IPermissionPanelRule;
+}
+export declare const SheetPermissionPanelDetail: (props: ISheetPermissionPanelDetailProps) => React.JSX.Element;
+export {};

package/lib/types/views/permission/panel-detail/PermissionDetailUserPart.d.ts

@@ -0,0 +1,11 @@
+import { EditStateEnum, ViewStateEnum } from '@univerjs/sheets';
+import { default as React } from 'react';
+interface IPermissionDetailUserPartProps {
+    editState: EditStateEnum;
+    onEditStateChange: (v: EditStateEnum) => void;
+    viewState: ViewStateEnum;
+    onViewStateChange: (v: ViewStateEnum) => void;
+    permissionId: string;
+}
+export declare const PermissionDetailUserPart: (props: IPermissionDetailUserPartProps) => React.JSX.Element | null;
+export {};

package/lib/types/views/permission/panel-list/index.d.ts

@@ -1,2 +1,2 @@
 import { default as React } from 'react';
-export declare const SheetPermissionPanelList: () => React.JSX.Element;
+export declare const SheetPermissionPanelList: () => React.JSX.Element | null;

package/lib/types/views/permission/util.d.ts

@@ -0,0 +1,17 @@
+import { Injector, IRange, Worksheet } from '@univerjs/core';
+import { IPermissionPanelRule } from '../../services/permission/sheet-permission-panel.model';
+import { EditStateEnum, UnitObject, ViewStateEnum } from '@univerjs/sheets';
+export declare const checkRangeValid: (injector: Injector, permissionRanges: IRange[], permissionId: string, unitId: string, subUnitId: string) => string | undefined;
+export declare const checkRangesIsWholeSheet: (ranges: IRange[], sheet: Worksheet) => boolean;
+export declare const generateDefaultRule: (injector: Injector, fromSheetBar: boolean) => {
+    unitId: string;
+    subUnitId: string;
+    permissionId: string;
+    unitType: UnitObject.Worksheet | UnitObject.SelectRange;
+    description: string;
+    id: string;
+    ranges: IRange[];
+    editState: EditStateEnum;
+    viewState: ViewStateEnum;
+};
+export declare const generateRuleByUnitType: (injector: Injector, rule: IPermissionPanelRule) => IPermissionPanelRule;

package/lib/umd/facade.js

@@ -0,0 +1 @@
+(function(s,o){typeof exports=="object"&&typeof module<"u"?o(exports,require("@univerjs/core"),require("@univerjs/engine-render"),require("@univerjs/sheets-ui"),require("@univerjs/sheets/facade"),require("@univerjs/ui")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@univerjs/engine-render","@univerjs/sheets-ui","@univerjs/sheets/facade","@univerjs/ui"],o):(s=typeof globalThis<"u"?globalThis:s||self,o(s.UniverSheetsUiFacade={},s.UniverCore,s.UniverEngineRender,s.UniverSheetsUi,s.UniverSheetsFacade,s.UniverUi))})(this,function(s,o,u,a,h,g){"use strict";class S extends o.FUniver{customizeColumnHeader(e){const t=this.getActiveWorkbook();if(!t){console.error("WorkBook not exist");return}const r=t==null?void 0:t.getId();this._getSheetRenderComponent(r,a.SHEET_VIEW_KEY.COLUMN).setCustomHeader(e)}customizeRowHeader(e){const t=this.getActiveWorkbook();if(!t){console.error("WorkBook not exist");return}const r=t==null?void 0:t.getId();this._getSheetRenderComponent(r,a.SHEET_VIEW_KEY.ROW).setCustomHeader(e)}registerSheetRowHeaderExtension(e,...t){const r=this._getSheetRenderComponent(e,a.SHEET_VIEW_KEY.ROW),n=r.register(...t);return o.toDisposable(()=>{n.dispose(),r.makeDirty(!0)})}registerSheetColumnHeaderExtension(e,...t){const r=this._getSheetRenderComponent(e,a.SHEET_VIEW_KEY.COLUMN),n=r.register(...t);return o.toDisposable(()=>{n.dispose(),r.makeDirty(!0)})}registerSheetMainExtension(e,...t){const r=this._getSheetRenderComponent(e,a.SHEET_VIEW_KEY.MAIN),n=r.register(...t);return o.toDisposable(()=>{n.dispose(),r.makeDirty(!0)})}_getSheetRenderComponent(e,t){const n=this._injector.get(u.IRenderManagerService).getRenderById(e);if(!n)throw new Error("Render not found");const{components:i}=n,d=i.get(t);if(!d)throw new Error("Render component not found");return d}}o.FUniver.extend(S);class v extends h.FWorkbook{openSiderbar(e){return this._logDeprecation("openSiderbar"),this._injector.get(g.ISidebarService).open(e)}openDialog(e){this._logDeprecation("openDialog");const r=this._injector.get(g.IDialogService).open({...e,onClose:()=>{r.dispose()}});return r}_logDeprecation(e){this._injector.get(o.ILogService).warn("[FWorkbook]",`${e} is deprecated. Please use the function of the same name on "FUniver".`)}}h.FWorkbook.extend(v);class _ extends h.FPermission{setPermissionDialogVisible(e){this._permissionService.setShowComponents(e)}}h.FPermission.extend(_);class m extends h.FRange{getCell(){const e=this._injector.get(u.IRenderManagerService),t=this._workbook.getUnitId(),r=this._worksheet.getSheetId();return e.getRenderById(t).with(a.SheetSkeletonManagerService).getWorksheetSkeleton(r).skeleton.getCellByIndex(this._range.startRow,this._range.startColumn)}getCellRect(){const{startX:e,startY:t,endX:r,endY:n}=this.getCell(),i={x:e,y:t,width:r-e,height:n-t,top:t,left:e,bottom:n,right:r};return{...i,toJSON:()=>JSON.stringify(i)}}generateHTML(){var t;const e=this._injector.get(a.ISheetClipboardService).generateCopyContent(this._workbook.getUnitId(),this._worksheet.getSheetId(),this._range);return(t=e==null?void 0:e.html)!=null?t:""}attachPopup(e){const{key:t,disposableCollection:r}=p(e,this._injector.get(g.ComponentManager)),i=this._injector.get(a.SheetCanvasPopManagerService).attachPopupToCell(this._range.startRow,this._range.startColumn,{...e,componentKey:t},this.getUnitId(),this._worksheet.getSheetId());return i?(r.add(i),r):(r.dispose(),null)}attachAlertPopup(e){const t=this._injector.get(a.CellAlertManagerService),r={workbook:this._workbook,worksheet:this._worksheet,row:this._range.startRow,col:this._range.startColumn,unitId:this.getUnitId(),subUnitId:this._worksheet.getSheetId()};return t.showAlert({...e,location:r}),{dispose:()=>{t.removeAlert(e.key)}}}}h.FRange.extend(m);function p(c,e){const{componentKey:t,isVue3:r}=c;let n;const i=new o.DisposableCollection;return typeof t=="string"?n=t:(n=`External_${o.generateRandomId(6)}`,i.add(e.register(n,t,{framework:r?"vue3":"react"}))),{key:n,disposableCollection:i}}var C=Object.defineProperty,k=Object.getOwnPropertyDescriptor,I=(c,e,t,r)=>{for(var n=r>1?void 0:r?k(e,t):e,i=c.length-1,d;i>=0;i--)(d=c[i])&&(n=(r?d(e,t,n):d(n))||n);return r&&n&&C(e,t,n),n},l=(c,e)=>(t,r)=>e(t,r,c);s.FSheetHooks=class{constructor(e,t,r){this._injector=e,this._hoverManagerService=t,this._dragManagerService=r}onCellPointerMove(e){return o.toDisposable(this._hoverManagerService.currentPosition$.subscribe(e))}onCellPointerOver(e){return o.toDisposable(this._hoverManagerService.currentCell$.subscribe(e))}onCellDragOver(e){return o.toDisposable(this._dragManagerService.currentCell$.subscribe(e))}onCellDrop(e){return o.toDisposable(this._dragManagerService.endCell$.subscribe(e))}},s.FSheetHooks=I([l(0,o.Inject(o.Injector)),l(1,o.Inject(a.HoverManagerService)),l(2,o.Inject(a.DragManagerService))],s.FSheetHooks),s.transformComponentKey=p,Object.defineProperty(s,Symbol.toStringTag,{value:"Module"})});