@univerjs/sheets-ui 1.0.0-alpha.8 → 1.0.0-beta.1

package/lib/cjs/facade.js

@@ -150,13 +150,11 @@ var FUniverSheetsUIMixin = class extends _univerjs_core_facade.FUniver {
 	_initObserverListener(injector) {
 		const renderManagerService = injector.get(_univerjs_engine_render.IRenderManagerService);
 		const lifeCycleService = injector.get(_univerjs_core.LifecycleService);
+		const univerInstanceService = injector.get(_univerjs_core.IUniverInstanceService);
 		const lifecycle$Disposable = new _univerjs_core.DisposableCollection();
-		this.disposeWithMe(lifeCycleService.lifecycle$.subscribe((lifecycle) => {
-			if (lifecycle !== _univerjs_core.LifecycleStages.Rendered) return;
+		const registerPointerEventListeners = () => {
 			const hoverManagerService = injector.get(_univerjs_sheets_ui.HoverManagerService);
 			const dragManagerService = injector.get(_univerjs_sheets_ui.DragManagerService);
-			if (!hoverManagerService) return;
-			lifecycle$Disposable.dispose();
 			lifecycle$Disposable.add(this.registerEventHandler(this.Event.CellClicked, () => {
 				var _hoverManagerService$;
 				return (_hoverManagerService$ = hoverManagerService.currentClickedCell$) === null || _hoverManagerService$ === void 0 ? void 0 : _hoverManagerService$.pipe((0, rxjs.filter)((cell) => !!cell)).subscribe((cell) => {
@@ -437,7 +435,9 @@ var FUniverSheetsUIMixin = class extends _univerjs_core_facade.FUniver {
 				});
 			}));
 			this.disposeWithMe(lifecycle$Disposable);
-		}));
+		};
+		const sheetAvailable$ = univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).length > 0 ? (0, rxjs.of)(true) : univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs.take)(1));
+		this.disposeWithMe((0, rxjs.combineLatest)([sheetAvailable$, lifeCycleService.lifecycle$]).pipe((0, rxjs.filter)(([, lifecycle]) => lifecycle >= _univerjs_core.LifecycleStages.Rendered), (0, rxjs.take)(1)).subscribe(() => registerPointerEventListeners()));
 		let sheetRenderUnit;
 		const combined$ = (0, rxjs.combineLatest)([renderManagerService.created$, lifeCycleService.lifecycle$]);
 		const combined$Disposable = new _univerjs_core.DisposableCollection();
@@ -461,38 +461,34 @@ var FUniverSheetsUIMixin = class extends _univerjs_core_facade.FUniver {
 			})));
 			if (selectionService) {
 				combined$Disposable.add(this.registerEventHandler(this.Event.SelectionMoveStart, () => selectionService.selectionMoveStart$.subscribe((selections) => {
-					var _selections$map;
 					const eventParams = {
 						workbook,
 						worksheet: workbook.getActiveSheet(),
-						selections: (_selections$map = selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) !== null && _selections$map !== void 0 ? _selections$map : []
+						selections: (selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) ?? []
 					};
 					this.fireEvent(this.Event.SelectionMoveStart, eventParams);
 				})));
 				combined$Disposable.add(this.registerEventHandler(this.Event.SelectionMoving, () => selectionService.selectionMoving$.subscribe((selections) => {
-					var _selections$map2;
 					const eventParams = {
 						workbook,
 						worksheet: workbook.getActiveSheet(),
-						selections: (_selections$map2 = selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) !== null && _selections$map2 !== void 0 ? _selections$map2 : []
+						selections: (selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) ?? []
 					};
 					this.fireEvent(this.Event.SelectionMoving, eventParams);
 				})));
 				combined$Disposable.add(this.registerEventHandler(this.Event.SelectionMoveEnd, () => selectionService.selectionMoveEnd$.subscribe((selections) => {
-					var _selections$map3;
 					const eventParams = {
 						workbook,
 						worksheet: workbook.getActiveSheet(),
-						selections: (_selections$map3 = selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) !== null && _selections$map3 !== void 0 ? _selections$map3 : []
+						selections: (selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) ?? []
 					};
 					this.fireEvent(this.Event.SelectionMoveEnd, eventParams);
 				})));
 				combined$Disposable.add(this.registerEventHandler(this.Event.SelectionChanged, () => selectionService.selectionChanged$.subscribe((selections) => {
-					var _selections$map4;
 					const eventParams = {
 						workbook,
 						worksheet: workbook.getActiveSheet(),
-						selections: (_selections$map4 = selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) !== null && _selections$map4 !== void 0 ? _selections$map4 : []
+						selections: (selections === null || selections === void 0 ? void 0 : selections.map((s) => s.range)) ?? []
 					};
 					this.fireEvent(this.Event.SelectionChanged, eventParams);
 				})));
@@ -1170,15 +1166,13 @@ var FRangeSheetsUIMixin = class extends _univerjs_sheets_facade.FRange {
 		};
 	}
 	generateHTML() {
-		var _copyContent$html;
 		const copyContent = this._injector.get(_univerjs_sheets_ui.ISheetClipboardService).generateCopyContent(this._workbook.getUnitId(), this._worksheet.getSheetId(), this._range);
-		return (_copyContent$html = copyContent === null || copyContent === void 0 ? void 0 : copyContent.html) !== null && _copyContent$html !== void 0 ? _copyContent$html : "";
+		return (copyContent === null || copyContent === void 0 ? void 0 : copyContent.html) ?? "";
 	}
 	attachPopup(popup) {
-		var _popup$direction, _popup$extraProps, _popup$offset;
-		popup.direction = (_popup$direction = popup.direction) !== null && _popup$direction !== void 0 ? _popup$direction : "horizontal";
-		popup.extraProps = (_popup$extraProps = popup.extraProps) !== null && _popup$extraProps !== void 0 ? _popup$extraProps : {};
-		popup.offset = (_popup$offset = popup.offset) !== null && _popup$offset !== void 0 ? _popup$offset : [0, 0];
+		popup.direction = popup.direction ?? "horizontal";
+		popup.extraProps = popup.extraProps ?? {};
+		popup.offset = popup.offset ?? [0, 0];
 		const { key, disposableCollection } = transformComponentKey(popup, this._injector.get(_univerjs_ui.ComponentManager));
 		const disposePopup = this._injector.get(_univerjs_sheets_ui.SheetCanvasPopManagerService).attachPopupToCell(this._range.startRow, this._range.startColumn, {
 			...popup,
@@ -1226,10 +1220,9 @@ var FRangeSheetsUIMixin = class extends _univerjs_sheets_facade.FRange {
 	* ```
 	*/
 	attachRangePopup(popup) {
-		var _popup$direction2, _popup$extraProps2, _popup$offset2;
-		popup.direction = (_popup$direction2 = popup.direction) !== null && _popup$direction2 !== void 0 ? _popup$direction2 : "top-center";
-		popup.extraProps = (_popup$extraProps2 = popup.extraProps) !== null && _popup$extraProps2 !== void 0 ? _popup$extraProps2 : {};
-		popup.offset = (_popup$offset2 = popup.offset) !== null && _popup$offset2 !== void 0 ? _popup$offset2 : [0, 0];
+		popup.direction = popup.direction ?? "top-center";
+		popup.extraProps = popup.extraProps ?? {};
+		popup.offset = popup.offset ?? [0, 0];
 		const { key, disposableCollection } = transformComponentKey(popup, this._injector.get(_univerjs_ui.ComponentManager));
 		const disposePopup = this._injector.get(_univerjs_sheets_ui.SheetCanvasPopManagerService).attachRangePopup(this._range, {
 			...popup,
@@ -1271,7 +1264,7 @@ function transformComponentKey(component, componentManager) {
 	const disposableCollection = new _univerjs_core.DisposableCollection();
 	if (typeof componentKey === "string") key = componentKey;
 	else {
-		const resolvedFramework = framework !== null && framework !== void 0 ? framework : "react";
+		const resolvedFramework = framework ?? "react";
 		key = resolvedFramework === "web-component" ? `external-${(0, _univerjs_core.generateRandomId)(6).toLowerCase()}` : `External_${(0, _univerjs_core.generateRandomId)(6)}`;
 		disposableCollection.add(componentManager.register(key, componentKey, { framework: resolvedFramework }));
 	}