@univerjs/sheets-ui 0.5.0-alpha.0 → 0.5.0-beta.0

package/lib/types/services/selection/selection-render-model.d.ts

@@ -1,4 +1,9 @@
-import { IRangeWithCoord, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, RANGE_TYPE } from '@univerjs/core';
+import { ICellWithCoord, IRangeWithCoord, Nullable, RANGE_TYPE } from '@univerjs/core';
+import { ISelectionWithCoord } from '@univerjs/sheets';
+/**
+ * Data model for SelectionControl.model
+ * NOT Same as @univerjs/sheet.WorkbookSelectionModel, that's data model for Workbook
+ */
 export declare class SelectionRenderModel implements IRangeWithCoord {
     private _startColumn;
     private _startRow;
@@ -13,6 +18,7 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
      */
     private _primary;
     private _rangeType;
+    constructor();
     get startColumn(): number;
     get startRow(): number;
     get endColumn(): number;
@@ -21,7 +27,7 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
     get startY(): number;
     get endX(): number;
     get endY(): number;
-    get currentCell(): Nullable<ISelectionCellWithMergeInfo>;
+    get currentCell(): Nullable<ICellWithCoord>;
     get rangeType(): RANGE_TYPE;
     /**
      * @deprecated, Duplicate with `Rectangle`
@@ -31,19 +37,20 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
      * @deprecated, Duplicate with `Rectangle`
      */
     isInclude(rangeWithCoord: IRangeWithCoord): boolean;
-    highlightToSelection(): IRangeWithCoord | undefined;
+    highlightToSelection(): Nullable<IRangeWithCoord>;
     getRange(): IRangeWithCoord;
-    getCell(): Nullable<ISelectionCellWithMergeInfo>;
+    getCell(): Nullable<ICellWithCoord>;
     getRangeType(): RANGE_TYPE;
     setRangeType(rangeType: RANGE_TYPE): void;
     getValue(): ISelectionWithCoord;
-    setValue(newSelectionRange: IRangeWithCoord, currentCell: Nullable<ISelectionCellWithMergeInfo>): void;
+    setValue(newSelectionRange: IRangeWithCoord, currentCell: Nullable<ICellWithCoord>): void;
     /**
      * Set primary cell.
      *
-     * TODO @lumixraku there are 3 concepts for same thing, primary and current and highlight, primary is better cuz selectionModel is using primary.
+     * @TODO lumixraku there are 3 concepts for same thing, primary and current and highlight
+     * highlight is best. primary sometimes means the actual cell(actual means ignore merge)
      * @param currentCell
      */
-    setCurrentCell(currentCell: Nullable<ISelectionCellWithMergeInfo>): void;
+    setCurrentCell(currentCell: Nullable<ICellWithCoord>): void;
     clearCurrentCell(): void;
 }

package/lib/types/services/selection/selection-render.service.d.ts

@@ -1,5 +1,5 @@
-import { Workbook, ICommandService, IContextService, ILogService, Injector, ThemeService } from '@univerjs/core';
-import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import { Nullable, Workbook, ICommandService, IContextService, ILogService, Injector, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Viewport, ScrollTimerType } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
@@ -23,7 +23,7 @@ export declare class SheetSelectionRenderService extends BaseSelectionRenderServ
     private _initSelectionChangeListener;
     private _initUserActionSyncListener;
     /**
-     * Update selectionData to current sheet.
+     * Update selectionData to selectionDataModel (WorkBookSelections) by SetSelectionsOperation.
      * @param selectionDataWithStyleList
      * @param type
      */
@@ -31,4 +31,15 @@ export declare class SheetSelectionRenderService extends BaseSelectionRenderServ
     private _initSkeletonChangeListener;
     private _getActiveViewport;
     private _getSheetObject;
+    /**
+     * Handle pointer down event, bind pointermove & pointerup handler.
+     * then trigger selectionMoveStart$.
+     *
+     * @param evt
+     * @param _zIndex
+     * @param rangeType
+     * @param viewport
+     * @param scrollTimerType
+     */
+    protected _onPointerDown(evt: IPointerEvent | IMouseEvent, _zIndex: number | undefined, rangeType: RANGE_TYPE | undefined, viewport: Nullable<Viewport>, scrollTimerType?: ScrollTimerType): void;
 }

package/lib/types/services/selection/selection-shape-extension.d.ts

@@ -5,18 +5,19 @@ export interface ISelectionShapeTargetSelection {
     originControl: SelectionControl;
     targetSelection: IRangeWithCoord;
 }
+export interface ISelectionShapeExtensionOption {
+    skeleton: SpreadsheetSkeleton;
+    scene: Scene;
+    themeService: ThemeService;
+    injector: Injector;
+    selectionHooks: Record<string, () => void>;
+}
 /**
  * for auto-fill (crosshair expand selection range)
  * drag selection range
  */
 export declare class SelectionShapeExtension {
     private _control;
-    private _skeleton;
-    private _scene;
-    private readonly _themeService;
-    /** @deprecated injection in extensions should be strictly limited. */
-    private readonly _injector;
-    private _selectionHooks;
     private _startOffsetX;
     private _startOffsetY;
     private _relativeSelectionPositionRow;
@@ -25,24 +26,36 @@ export declare class SelectionShapeExtension {
     private _relativeSelectionColumnLength;
     private _scenePointerMoveSub;
     private _scenePointerUpSub;
+    /**
+     * The shadow selection under cursor when move whole selection control(for moving normal selection)
+     */
     private _helperSelection;
     private _scrollTimer;
     private _activeViewport;
     private _targetSelection;
     private _isInMergeState;
     private _fillControlColors;
-    constructor(_control: SelectionControl, _skeleton: SpreadsheetSkeleton, _scene: Scene, _themeService: ThemeService, 
-    /** @deprecated injection in extensions should be strictly limited. */
-    _injector: Injector, _selectionHooks: Record<string, () => void>);
+    private _skeleton;
+    private _scene;
+    private readonly _themeService;
+    private readonly _injector;
+    private _selectionHooks;
+    constructor(_control: SelectionControl, options: ISelectionShapeExtensionOption);
     get isHelperSelection(): boolean;
     dispose(): void;
     private _getFreeze;
     private _isSelectionInViewport;
     private _clearObserverEvent;
     private _initialControl;
+    /**
+     * Move the whole selection control after cursor turn into move state.
+     * NOT same as widgetMoving, that's for 8 control points.
+     * @param moveOffsetX
+     * @param moveOffsetY
+     */
     private _controlMoving;
     /**
-     * Drag move whole selectionControl when cusor turns to crosshair. Not for dragging 8 control points.
+     * Drag move whole selectionControl when cursor turns to crosshair. Not for dragging 8 control points.
      * @param evt
      */
     private _controlEvent;
@@ -60,10 +73,19 @@ export declare class SelectionShapeExtension {
      * @param cursor
      */
     private _widgetMoving;
-    private _initialFill;
-    private _fillMoving;
-    private _fillEvent;
+    private _initialAutoFill;
+    private _autoFillMoving;
+    private _autoFillForPointerdown;
     private _hasMergeInRange;
+    /**
+     * Make sure startRow < endRow and startColumn < endColumn
+     *
+     * @param startRow
+     * @param startColumn
+     * @param endRow
+     * @param endColumn
+     * @returns {IRange} range
+     */
     private _swapPositions;
     private _controlHandler;
     private _fillRuler;

package/lib/types/services/selection/util.d.ts

@@ -1,5 +1,19 @@
-import { ISelectionCell, ISelectionCellWithMergeInfo } from '@univerjs/core';
+import { ICellWithCoord, IRange, IRangeWithCoord, ISelectionCell } from '@univerjs/core';
 import { SpreadsheetSkeleton } from '@univerjs/engine-render';
-import { ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
-export declare function attachSelectionWithCoord(selection: ISelectionWithStyle, skeleton: SpreadsheetSkeleton): ISelectionWithCoordAndStyle;
-export declare function attachPrimaryWithCoord(primary: ISelectionCell, skeleton: SpreadsheetSkeleton): ISelectionCellWithMergeInfo;
+import { ISelectionWithCoord, ISelectionWithStyle } from '@univerjs/sheets';
+/**
+ * Add startXY endXY to range, XY are no merge cell position.
+ * @param skeleton
+ * @param range
+ * @returns {IRangeWithCoord}
+ */
+export declare function attachRangeWithCoord(skeleton: SpreadsheetSkeleton, range: IRange): IRangeWithCoord;
+/**
+ * Return selection with coord and style from selection, which has range & primary & style.
+ * coord are no merge cell position.
+ * @param selection
+ * @param skeleton
+ * @returns {ISelectionWithCoord} selection with coord and style
+ */
+export declare function attachSelectionWithCoord(selection: ISelectionWithStyle, skeleton: SpreadsheetSkeleton): ISelectionWithCoord;
+export declare function attachPrimaryWithCoord(skeleton: SpreadsheetSkeleton, primary: ISelectionCell): ICellWithCoord;

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

@@ -59,4 +59,3 @@ export declare class SheetSkeletonManagerService extends Disposable implements I
     private _getSkeleton;
     private _buildSkeleton;
 }
-export declare function attachRangeWithCoord(skeleton: SpreadsheetSkeleton, range: IRange): IRangeWithCoord;

package/lib/types/services/utils/doc-skeleton-util.d.ts

@@ -1,4 +1,4 @@
-import { ICustomRange, Injector, IParagraph, ISelectionCellWithMergeInfo } from '@univerjs/core';
+import { ICellWithCoord, ICustomRange, Injector, IParagraph } from '@univerjs/core';
 import { DocumentSkeleton, IFontCacheItem } from '@univerjs/engine-render';
 export declare const calculateDocSkeletonRects: (docSkeleton: DocumentSkeleton, paddingLeft?: number, paddingTop?: number) => {
     links: {
@@ -22,7 +22,7 @@ export declare const calculateDocSkeletonRects: (docSkeleton: DocumentSkeleton,
         paragraph: IParagraph;
     }[];
 };
-export declare function calcPadding(cell: ISelectionCellWithMergeInfo, font: IFontCacheItem): {
+export declare function calcPadding(cell: ICellWithCoord, font: IFontCacheItem): {
     paddingLeft: number;
     paddingTop: number;
 };

package/lib/types/services/utils/selection-util.d.ts

@@ -1,3 +1,3 @@
 import { ThemeService } from '@univerjs/core';
 import { ISelectionStyle } from '@univerjs/sheets';
-export declare function createCopyPasteSelectionStyle(themeService: ThemeService): ISelectionStyle;
+export declare function createCopyPasteSelectionStyle(themeService: ThemeService): Partial<ISelectionStyle>;

package/lib/types/views/permission/extensions/range-protection.render.d.ts

@@ -1,5 +1,5 @@
-import { SheetExtension, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
 import { ICellDataForSheetInterceptor, IScale } from '@univerjs/core';
+import { SpreadsheetSkeleton, UniverRenderingContext, SheetExtension } from '@univerjs/engine-render';
 import { ICellPermission } from '@univerjs/sheets';
 export declare const RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY = "RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY";
 export declare const RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY = "RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY";

package/lib/types/views/permission/extensions/worksheet-permission.render.d.ts

@@ -1,5 +1,5 @@
-import { SheetExtension, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
 import { IScale } from '@univerjs/core';
+import { SpreadsheetSkeleton, UniverRenderingContext, SheetExtension } from '@univerjs/engine-render';
 export declare const worksheetProtectionKey = "worksheet-protection";
 export declare class WorksheetProtectionRenderExtension extends SheetExtension {
     uKey: string;

package/lib/umd/facade.js

@@ -1 +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"})});
+(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.getCellWithCoordByIndex(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"})});