@univerjs/sheets-drawing 0.25.0-insiders.20260623-012b5a8 → 0.25.1

package/LICENSE

@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

package/lib/cjs/facade.js

@@ -3,10 +3,9 @@ let _univerjs_core_facade = require("@univerjs/core/facade");
 let _univerjs_drawing = require("@univerjs/drawing");
 let _univerjs_sheets = require("@univerjs/sheets");
 let _univerjs_sheets_drawing = require("@univerjs/sheets-drawing");
-let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -17,7 +16,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -30,14 +29,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -48,7 +47,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -56,7 +55,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -891,11 +890,6 @@ FOverGridImage = __decorate([__decorateParam(1, _univerjs_core.ICommandService),
 
 //#endregion
 //#region src/facade/f-worksheet.ts
-const GROUPABLE_DRAWING_TYPES = /* @__PURE__ */ new Set([
-	_univerjs_core.DrawingTypeEnum.DRAWING_IMAGE,
-	_univerjs_core.DrawingTypeEnum.DRAWING_SHAPE,
-	_univerjs_core.DrawingTypeEnum.DRAWING_GROUP
-]);
 var FWorksheetDrawingMixin = class extends _univerjs_sheets_facade.FWorksheet {
 	async insertImage(url, column, row, offsetX, offsetY) {
 		const imageBuilder = this.newOverGridImage();
@@ -985,201 +979,6 @@ var FWorksheetDrawingMixin = class extends _univerjs_sheets_facade.FWorksheet {
 		const subUnitId = this.getSheetId();
 		return this._injector.createInstance(FOverGridImageBuilder, unitId, subUnitId);
 	}
-	groupDrawings(drawingIds, groupId = (0, _univerjs_core.generateRandomId)(10)) {
-		const uniqueDrawingIds = Array.from(new Set(drawingIds));
-		if (uniqueDrawingIds.length < 2) return null;
-		const unitId = this._fWorkbook.getId();
-		const subUnitId = this.getSheetId();
-		const sheetDrawingService = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService);
-		if (sheetDrawingService.getDrawingByParam({
-			unitId,
-			subUnitId,
-			drawingId: groupId
-		})) return null;
-		const drawings = uniqueDrawingIds.map((drawingId) => sheetDrawingService.getDrawingByParam({
-			unitId,
-			subUnitId,
-			drawingId
-		}));
-		if (drawings.some((drawing) => !drawing)) return null;
-		if (drawings.some((drawing) => !GROUPABLE_DRAWING_TYPES.has(drawing.drawingType))) return null;
-		const validDrawings = drawings;
-		const groupTransform = (0, _univerjs_engine_render.getGroupState)(0, 0, validDrawings.map((drawing) => drawing.transform || {}));
-		const groupParam = {
-			unitId,
-			subUnitId,
-			drawingId: groupId,
-			drawingType: _univerjs_core.DrawingTypeEnum.DRAWING_GROUP,
-			transform: groupTransform,
-			groupBaseBound: {
-				left: groupTransform.left,
-				top: groupTransform.top,
-				width: groupTransform.width,
-				height: groupTransform.height
-			}
-		};
-		const children = validDrawings.map((drawing) => ({
-			...drawing,
-			groupId
-		}));
-		return this._applyGroupDrawingOperation([{
-			parent: groupParam,
-			children
-		}], _univerjs_sheets_drawing.DrawingApplyType.GROUP) ? groupId : null;
-	}
-	ungroupDrawings(groupIds) {
-		const unitId = this._fWorkbook.getId();
-		const subUnitId = this.getSheetId();
-		const sheetDrawingService = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService);
-		const groupParams = [];
-		for (const groupId of groupIds) {
-			const groupDrawing = sheetDrawingService.getDrawingByParam({
-				unitId,
-				subUnitId,
-				drawingId: groupId
-			});
-			if (!groupDrawing || groupDrawing.drawingType !== _univerjs_core.DrawingTypeEnum.DRAWING_GROUP) continue;
-			const groupTransform = groupDrawing.transform || {
-				width: 0,
-				height: 0
-			};
-			const children = sheetDrawingService.getDrawingsByGroup({
-				unitId,
-				subUnitId,
-				drawingId: groupId
-			}).map((drawing) => {
-				const newTransform = (0, _univerjs_engine_render.transformObjectOutOfGroup)(drawing.transform || {}, groupTransform, groupTransform.width || 0, groupTransform.height || 0, groupDrawing.groupBaseBound);
-				return {
-					...drawing,
-					transform: {
-						...drawing.transform,
-						...newTransform
-					},
-					groupId: void 0
-				};
-			});
-			if (children.length > 0) groupParams.push({
-				parent: groupDrawing,
-				children
-			});
-		}
-		return this._applyGroupDrawingOperation(groupParams, _univerjs_sheets_drawing.DrawingApplyType.UNGROUP);
-	}
-	getDrawingGroupChildren(groupId, recursive = false) {
-		const unitId = this._fWorkbook.getId();
-		const subUnitId = this.getSheetId();
-		const sheetDrawingService = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService);
-		if (!recursive) return sheetDrawingService.getDrawingsByGroup({
-			unitId,
-			subUnitId,
-			drawingId: groupId
-		});
-		const nested = sheetDrawingService.getDrawingsByGroupNested({
-			unitId,
-			subUnitId,
-			drawingId: groupId
-		});
-		if (!nested) return [];
-		return [...nested.flatChildren || [], ...nested.groups.filter((group) => group.drawingId !== groupId)];
-	}
-	getDrawingParentGroup(drawingId) {
-		const unitId = this._fWorkbook.getId();
-		const subUnitId = this.getSheetId();
-		const sheetDrawingService = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService);
-		const drawing = sheetDrawingService.getDrawingByParam({
-			unitId,
-			subUnitId,
-			drawingId
-		});
-		if (!(drawing === null || drawing === void 0 ? void 0 : drawing.groupId)) return null;
-		const groupDrawing = sheetDrawingService.getDrawingByParam({
-			unitId,
-			subUnitId,
-			drawingId: drawing.groupId
-		});
-		if (!groupDrawing || groupDrawing.drawingType !== _univerjs_core.DrawingTypeEnum.DRAWING_GROUP) return null;
-		return groupDrawing;
-	}
-	isDrawingGrouped(drawingId) {
-		return this.getDrawingParentGroup(drawingId) !== null;
-	}
-	_applyGroupDrawingOperation(groupParams, type) {
-		if (groupParams.length === 0) return false;
-		const sheetDrawingService = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService);
-		const commandService = this._commandService;
-		const undoRedoService = this._injector.get(_univerjs_core.IUndoRedoService);
-		const { unitId, subUnitId, undo, redo, objects } = type === _univerjs_sheets_drawing.DrawingApplyType.GROUP ? sheetDrawingService.getGroupDrawingOp(groupParams) : sheetDrawingService.getUngroupDrawingOp(groupParams);
-		if (commandService.syncExecuteCommand(_univerjs_sheets_drawing.SetDrawingApplyMutation.id, {
-			op: redo,
-			unitId,
-			subUnitId,
-			objects,
-			type
-		})) {
-			const inverseType = type === _univerjs_sheets_drawing.DrawingApplyType.GROUP ? _univerjs_sheets_drawing.DrawingApplyType.UNGROUP : _univerjs_sheets_drawing.DrawingApplyType.GROUP;
-			undoRedoService.pushUndoRedo({
-				unitID: unitId,
-				undoMutations: [{
-					id: _univerjs_sheets_drawing.SetDrawingApplyMutation.id,
-					params: {
-						op: undo,
-						unitId,
-						subUnitId,
-						objects: this._invertGroupOperationObjects(objects, type),
-						type: inverseType
-					}
-				}],
-				redoMutations: [{
-					id: _univerjs_sheets_drawing.SetDrawingApplyMutation.id,
-					params: {
-						op: redo,
-						unitId,
-						subUnitId,
-						objects,
-						type
-					}
-				}]
-			});
-			return true;
-		}
-		return false;
-	}
-	_invertGroupOperationObjects(groupParams, type) {
-		return type === _univerjs_sheets_drawing.DrawingApplyType.GROUP ? groupParams.map((groupParam) => {
-			const { parent, children } = groupParam;
-			const groupTransform = parent.transform || {
-				width: 0,
-				height: 0
-			};
-			return {
-				parent: {
-					...parent,
-					transform: {
-						left: 0,
-						top: 0
-					}
-				},
-				children: children.map((child) => ({
-					...child,
-					transform: (0, _univerjs_engine_render.transformObjectOutOfGroup)(child.transform || {}, groupTransform, groupTransform.width || 0, groupTransform.height || 0, parent.groupBaseBound),
-					groupId: void 0
-				}))
-			};
-		}) : groupParams.map((groupParam) => {
-			const { parent, children } = groupParam;
-			const groupTransform = (0, _univerjs_engine_render.getGroupState)(0, 0, children.map((child) => child.transform || {}));
-			return {
-				parent: {
-					...parent,
-					transform: groupTransform
-				},
-				children: children.map((child) => ({
-					...child,
-					groupId: parent.drawingId
-				}))
-			};
-		});
-	}
 };
 _univerjs_sheets_facade.FWorksheet.extend(FWorksheetDrawingMixin);
 

package/lib/cjs/index.js

@@ -406,7 +406,7 @@ const SetSheetDrawingCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -414,7 +414,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -584,7 +584,7 @@ SheetsDrawingLoadController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing";
-var version = "0.25.0-insiders.20260623-012b5a8";
+var version = "0.25.1";
 
 //#endregion
 //#region src/config/config.ts
@@ -608,7 +608,7 @@ const configSymbol = Symbol(SHEETS_DRAWING_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -619,7 +619,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -632,14 +632,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,