@fulate/ui 1.0.11 → 1.0.13

package/dist/connection/commands.d.ts

@@ -10,14 +10,14 @@ export declare function disconnectEndpoint(root: Root, source: EndpointRef, opti
 /** @internal 从调用时 live scene 按当前连接规则生成一次 owner change。 */
 export declare function resolveConnectEndpointChange(root: Root, source: EndpointRef, target: ConnectionPortRef): OwnerPropertyChange | null;
 /** @internal 按 source owner 合并多个 detach 为每 owner 一个 final change。 */
-export declare function resolveDisconnectEndpointChanges(root: Root, sources: readonly EndpointRef[], localPositions?: ReadonlyMap<AnchorId, PointView>): OwnerPropertyChange[];
+export declare function resolveDisconnectEndpointChanges(root: Root, sources: readonly EndpointRef[], localPositions?: ReadonlyMap<AnchorId, PointView>, patches?: ReadonlyMap<Element, Readonly<Record<string, unknown>>>): OwnerPropertyChange[];
 /** 当前 Port direction 是否接受 source endpoint 的连接角色。 */
 export declare function connectionPortAccepts(definition: ConnectionPortDefinition | undefined, role: EndpointConnectionRole): boolean;
 /** 当前 Port 对指定 source endpoint 是否仍有容量。 */
 export declare function hasConnectionPortCapacity(root: Root, target: ConnectionPortRef, definition: ConnectionPortDefinition | undefined, role: EndpointConnectionRole, excludeSource?: EndpointRef): boolean;
 /**
  * @internal 为一组 configured owner changes 补齐被删除 Port 的 source-owned
- * detach changes；无 detach 时借用原 changes 引用。
+ * detach changes。依赖解释使用同 owner 的最终 patch；无 ports 字段时借用原 changes。
  */
 export declare function resolveConnectionPortChanges(root: Root, changes: readonly OwnerPropertyChange[]): readonly OwnerPropertyChange[];
 /**

package/dist/connection/types.d.ts

@@ -29,7 +29,7 @@ export interface EndpointRelationSource {
     getEndpointRelation(anchorId: AnchorId): EndpointRelation | undefined;
     getEndpointRelationBindings(): readonly EndpointRelationBinding[];
     resolveConnectEndpointChange(anchorId: AnchorId, target: ConnectionPortRef): OwnerPropertyChange | null;
-    resolveDisconnectEndpointChange(anchorIds: readonly AnchorId[], localPositions?: ReadonlyMap<AnchorId, PointView>): OwnerPropertyChange | null;
+    resolveDisconnectEndpointChange(anchorIds: readonly AnchorId[], localPositions?: ReadonlyMap<AnchorId, PointView>, patch?: Readonly<Record<string, unknown>>): OwnerPropertyChange | null;
 }
 /** 判断 Element 是否直接拥有 endpoint relation 语义。 */
 export declare function isEndpointRelationSource(element: Element): element is Element & EndpointRelationSource;

package/dist/editor/transform.d.ts

@@ -1,8 +1,8 @@
 import { Element, type ElementOptionPatch, type ElementTransformBaseline, type OwnerPropertyChange, type ReparentTransformIntent, type TransformIntent } from "@fulate/core";
-import { type Rect } from "@fulate/share";
+import type { Rect } from "@fulate/share";
 /** @internal frame-authored provider 共用的纯 resolver。 */
 export declare function resolveFrameTransformChange(owner: Element, baseline: Readonly<ElementTransformBaseline>, intent: Readonly<TransformIntent | ReparentTransformIntent>): readonly OwnerPropertyChange[];
 /** @internal 捕获一次 owner reference；structured ownedState 直接保留原引用。 */
 export declare function captureElementTransformBaseline<Owned>(owner: Element, writeMode: "frame-authored" | "authored-geometry" | "pose-authored", ownedState: Owned): ElementTransformBaseline<Owned>;
 /** @internal Geometry reference 变化时保持当前 world pose 的最小 frame patch。 */
-export declare function resolveReferenceBoundsPosePatch(owner: Element, referenceBounds: Readonly<Rect>): Readonly<ElementOptionPatch>;
+export declare function resolveReferenceBoundsPosePatch(owner: Element, readBounds: () => readonly [Readonly<Rect>, Readonly<Rect>], patch?: Readonly<ElementOptionPatch>): Readonly<ElementOptionPatch>;

package/dist/index.js

@@ -1,5 +1,5 @@
 import { clearCache, layoutNextLineRange, layoutWithLines, materializeLineRange, measureLineStats, measureNaturalWidth, prepareWithSegments } from "@chenglou/pretext";
-import { ChangeImpact, CustomEvent, Element, ElementProperties, ElementTransform, SKIN_DEFAULTS, Shape, ShapeProperties, ShapeTransform, createAuthoredLineSubpath, createGeometrySnapshot, createLineSubpath, createPathLocalId, evaluatePathSegmentPoint, getElementConnectionPort, getElementConnectionPortPoint, isReparentTransformIntent, resolveAuthoredGeometryFramePatch, resolveAuthoredSubpath, resolveReferenceTransform, resolveReferenceTransformTarget, splitPathSegment } from "@fulate/core";
+import { ChangeImpact, CustomEvent, Element, ElementProperties, ElementTransform, SKIN_DEFAULTS, Shape, ShapeProperties, ShapeTransform, createAuthoredLineSubpath, createGeometrySnapshot, createLineSubpath, createPathLocalId, evaluatePathSegmentPoint, getElementConnectionPort, getElementConnectionPortPoint, isReparentTransformIntent, mergeOwnerPropertyChanges, resolveAuthoredGeometryFramePatch, resolveAuthoredSubpath, resolveReferenceBoundsTranslation, resolveReferenceTransform, resolveReferenceTransformTarget, splitPathSegment } from "@fulate/core";
 import { clamp, has, isFunction, isNil, isNull, isString, isUndefined, last } from "lodash-es";
 import { Bound, Intersection, createCanvasGradient, createPointView, isGradient, isIdentityMatrix, isPointWithinDistance, rectEdgePosition, transformPoint } from "@fulate/share";
 import { computePosition as computePosition$1, flip, offset, shift } from "@floating-ui/core";
@@ -1551,7 +1551,7 @@ function resolveConnectEndpointChange(root, source, target) {
 	return currentPort && connectionPortAccepts(currentPort.definition, role) && hasConnectionPortCapacity(root, target, currentPort.definition, role, source) ? change : null;
 }
 /** @internal 按 source owner 合并多个 detach 为每 owner 一个 final change。 */
-function resolveDisconnectEndpointChanges(root, sources, localPositions) {
+function resolveDisconnectEndpointChanges(root, sources, localPositions, patches) {
 	const anchorsByOwner = /* @__PURE__ */ new Map();
 	for (const source of sources) {
 		const owner = root.getByKey(source.elementKey);
@@ -1564,7 +1564,7 @@ function resolveDisconnectEndpointChanges(root, sources, localPositions) {
 	for (const [owner, anchors] of anchorsByOwner) {
 		const parent = owner.parent;
 		const relations = anchors.map((anchorId) => owner.getEndpointRelation(anchorId));
-		const change = owner.resolveDisconnectEndpointChange(anchors, localPositions);
+		const change = owner.resolveDisconnectEndpointChange(anchors, localPositions, patches?.get(owner));
 		if (change && root.getByKey(owner.key) === owner && owner.parent === parent && isEndpointRelationSource(owner) && anchors.every((anchorId, index) => owner.getEndpointRelation(anchorId) === relations[index])) changes.push(change);
 	}
 	return changes;
@@ -1583,18 +1583,21 @@ function resolveConfiguredPorts(value) {
 }
 /**
 * @internal 为一组 configured owner changes 补齐被删除 Port 的 source-owned
-* detach changes；无 detach 时借用原 changes 引用。
+* detach changes。依赖解释使用同 owner 的最终 patch；无 ports 字段时借用原 changes。
 */
 function resolveConnectionPortChanges(root, changes) {
+	if (!changes.some(({ patch }) => has(patch, "ports"))) return changes;
+	const patches = mergeOwnerPropertyChanges(changes);
 	let sources;
 	let index;
-	for (const { owner, patch } of changes) {
+	for (const [owner, patch] of patches) {
 		if (owner.activeRoot !== root || !has(patch, "ports")) continue;
+		const previous = Element.getConfiguredPropertyValue(owner, "ports");
 		const next = resolveConfiguredPorts(patch.ports);
-		if (Object.is(owner.ports, next)) continue;
-		const nextIds = new Set(next === false ? [] : next === true ? owner.resolveConnectionPorts(true).map(({ ref }) => ref.portId) : next.map(({ id }) => id));
+		if (Object.is(previous, next)) continue;
+		const nextIds = new Set(owner.resolveConnectionPortIds(next, patch));
 		index ??= getEndpointRelationIndex(root);
-		const previousPortIds = owner.ports === false ? [] : owner.ports === true ? owner.resolveConnectionPorts(true).map(({ ref }) => ref.portId) : owner.ports.map(({ id }) => id);
+		const previousPortIds = owner.resolveConnectionPortIds(previous);
 		for (const portId of previousPortIds) {
 			if (nextIds.has(portId)) continue;
 			const targeting = index.relationsTargetingPort({
@@ -1604,7 +1607,12 @@ function resolveConnectionPortChanges(root, changes) {
 			if (targeting.length > 0) (sources ??= []).push(...targeting);
 		}
 	}
-	return sources ? [...resolveDisconnectEndpointChanges(root, sources), ...changes] : changes;
+	if (sources) for (const { owner, patch } of resolveDisconnectEndpointChanges(root, sources, void 0, patches)) patches.set(owner, patch);
+	else if (patches.size === changes.length) return changes;
+	return Array.from(patches, ([owner, patch]) => ({
+		owner,
+		patch
+	}));
 }
 /**
 * @internal active Port owner 的 whole-value patch 与被删除 Port 的 detach
@@ -1613,7 +1621,7 @@ function resolveConnectionPortChanges(root, changes) {
 function commitConnectionPortPatch(owner, patch) {
 	const root = owner.activeRoot;
 	if (!root || !has(patch, "ports")) return false;
-	if (Object.is(owner.ports, resolveConfiguredPorts(patch.ports))) return false;
+	if (Object.is(Element.getConfiguredPropertyValue(owner, "ports"), resolveConfiguredPorts(patch.ports))) return false;
 	root.applyChangeBatch(resolveConnectionPortChanges(root, [{
 		owner,
 		patch
@@ -1712,20 +1720,22 @@ function captureElementTransformBaseline(owner, writeMode, ownedState) {
 	return readElementTransformBaseline(owner, writeMode, ownedState);
 }
 /** @internal Geometry reference 变化时保持当前 world pose 的最小 frame patch。 */
-function resolveReferenceBoundsPosePatch(owner, referenceBounds) {
-	const reference = readElementTransformBaseline(owner, "pose-authored", void 0).reference;
-	const center = {
-		x: referenceBounds.left + referenceBounds.width / 2,
-		y: referenceBounds.top + referenceBounds.height / 2
-	};
-	return resolveReferenceTransformTarget({
-		...reference,
-		referenceBounds
-	}, {
-		worldMatrix: reference.startWorldMatrix,
-		worldCenter: transformPoint(reference.startWorldMatrix, center),
-		parentInverseMatrix: reference.startParentWorldInverseMatrix
-	}).framePatch;
+function resolveReferenceBoundsPosePatch(owner, readBounds, patch) {
+	const frame = patch ? {
+		left: owner.left,
+		top: owner.top,
+		angle: owner.angle,
+		scaleX: owner.scaleX,
+		scaleY: owner.scaleY,
+		skewX: owner.skewX,
+		skewY: owner.skewY,
+		originX: owner.originX,
+		originY: owner.originY,
+		...patch
+	} : owner;
+	if ((frame.angle ?? 0) === 0 && (frame.skewX ?? 0) === 0 && (frame.skewY ?? 0) === 0 && (frame.scaleX ?? 1) === 1 && (frame.scaleY ?? 1) === 1) return {};
+	const [before, after] = readBounds();
+	return resolveReferenceBoundsTranslation(frame, before, after);
 }
 //#endregion
 //#region packages/ui/src/editor/shape.ts
@@ -2650,18 +2660,20 @@ var Polygon = class extends EditorShape {
 			end: createPointView(b.x, b.y)
 		};
 	}
-	getDefaultConnectionPortSchema() {
-		return this.contour.anchors.map((_, index) => {
-			const next = (index + 1) % this.contour.anchors.length;
-			return {
-				id: `edge_${index}`,
-				localPosition: () => {
-					const a = this.contour.anchors[index].point;
-					const b = this.contour.anchors[next].point;
-					return createPointView((a.x + b.x) / 2, (a.y + b.y) / 2);
-				}
-			};
-		});
+	getDefaultConnectionPortSchema(patch) {
+		const contour = patch && has(patch, "contour") ? patch.contour : this.contour;
+		const points = Array.isArray(contour) ? contour : void 0;
+		const anchors = points ? void 0 : contour?.anchors;
+		const count = points?.length ?? anchors?.length ?? 0;
+		return Array.from({ length: count }, (_, index) => ({
+			id: "edge_" + index,
+			localPosition: () => {
+				const next = (index + 1) % count;
+				const a = points ? points[index] : anchors[index].point;
+				const b = points ? points[next] : anchors[next].point;
+				return createPointView((a.x + b.x) / 2, (a.y + b.y) / 2);
+			}
+		}));
 	}
 };
 //#endregion
@@ -4891,7 +4903,7 @@ var BaseLine = class extends Element {
 		if (this.angle === 0 && this.scaleX === 1 && this.scaleY === 1 && this.skewX === 0 && this.skewY === 0) return { path };
 		const bounds = getAuthoredSubpathBounds(path);
 		return bounds ? {
-			...resolveReferenceBoundsPosePatch(this, bounds),
+			...resolveReferenceBoundsPosePatch(this, () => [this.transform.getLayoutReferenceBoundsView(), bounds]),
 			path
 		} : { path };
 	}
@@ -4996,25 +5008,35 @@ var BaseLine = class extends Element {
 			patch: { relations: head ? { head: relation } : { tail: relation } }
 		};
 	}
-	resolveDisconnectEndpointChange(anchorIds, localPositions) {
+	resolveDisconnectEndpointChange(anchorIds, localPositions, patch) {
+		const finalPatch = patch ? resolveLinePatch(patch) : void 0;
+		const beforePath = finalPatch && has(finalPatch, "path") ? finalPatch.path ?? createEmptyLinePath() : this.path;
+		const head = beforePath.anchors[0];
+		const tail = last(beforePath.anchors);
+		const headRelation = finalPatch && has(finalPatch, "headRelation") ? finalPatch.headRelation : this.headRelation;
+		const tailRelation = finalPatch && has(finalPatch, "tailRelation") ? finalPatch.tailRelation : this.tailRelation;
 		const removing = new Set(anchorIds);
-		const head = this.headAnchor;
-		const tail = this.tailAnchor;
-		const detachHead = !!head && !!this.headRelation && removing.has(head.anchorId);
-		const detachTail = !!tail && !!this.tailRelation && removing.has(tail.anchorId);
-		if (!detachHead && !detachTail) return null;
+		const detachHead = !!head && !!headRelation && removing.has(head.anchorId) && sameEndpointRelation(headRelation, this.getEndpointRelation(head.anchorId));
+		const detachTail = !!tail && !!tailRelation && removing.has(tail.anchorId) && sameEndpointRelation(tailRelation, this.getEndpointRelation(tail.anchorId));
+		if (!detachHead && !detachTail) return finalPatch ? {
+			owner: this,
+			patch: finalPatch
+		} : null;
 		const vertices = this.getEffectiveLineVerticesView();
-		let path = this.path;
+		let path = beforePath;
 		if (detachHead) path = replaceAuthoredAnchorPoint(path, head.anchorId, localPositions?.get(head.anchorId) ?? vertices[0].point);
 		if (detachTail && tail.anchorId !== head?.anchorId) path = replaceAuthoredAnchorPoint(path, tail.anchorId, localPositions?.get(tail.anchorId) ?? last(vertices).point);
+		const geometryPatch = finalPatch ? {
+			...resolveReferenceBoundsPosePatch(this, () => [getAuthoredSubpathBounds(beforePath), getAuthoredSubpathBounds(path)], finalPatch),
+			path
+		} : this.resolvePointPathPatch(path);
 		return {
 			owner: this,
 			patch: {
-				...this.resolvePointPathPatch(path),
-				relations: {
-					...detachHead ? { head: void 0 } : {},
-					...detachTail ? { tail: void 0 } : {}
-				}
+				...finalPatch,
+				...geometryPatch,
+				...detachHead ? { headRelation: void 0 } : {},
+				...detachTail ? { tailRelation: void 0 } : {}
 			}
 		};
 	}
@@ -5946,15 +5968,37 @@ var LineTree = class extends Element {
 			patch: { topology: moveLineTreePoint(this.topology, anchorId, point.point, relation) }
 		};
 	}
-	resolveDisconnectEndpointChange(anchorIds, localPositions) {
-		let topology = this.topology;
-		for (const anchorId of new Set(anchorIds)) {
-			if (!this.transform.getPoint(anchorId)?.relation) continue;
-			topology = moveLineTreePoint(topology, anchorId, localPositions?.get(anchorId) ?? this.transform.getResolvedPoint(anchorId).point, void 0);
+	resolveDisconnectEndpointChange(anchorIds, localPositions, patch) {
+		const finalPatch = patch ? prepareTopologyOption(patch) : void 0;
+		const beforeTopology = finalPatch && has(finalPatch, "topology") ? finalPatch.topology : this.topology;
+		const removing = new Set(anchorIds);
+		let points;
+		for (let index = 0; index < beforeTopology.points.length; index++) {
+			const point = beforeTopology.points[index];
+			const { anchorId } = point;
+			if (!removing.has(anchorId)) continue;
+			if (!point.relation || !sameEndpointRelation(point.relation, this.getEndpointRelation(anchorId))) continue;
+			points ??= [...beforeTopology.points];
+			points[index] = {
+				anchorId,
+				point: localPositions?.get(anchorId) ?? this.transform.getResolvedPoint(anchorId).point
+			};
 		}
-		return topology === this.topology ? null : {
+		if (!points) return finalPatch ? {
 			owner: this,
-			patch: { topology }
+			patch: finalPatch
+		} : null;
+		const topology = {
+			...beforeTopology,
+			points
+		};
+		return {
+			owner: this,
+			patch: {
+				...finalPatch,
+				...resolveReferenceBoundsPosePatch(this, () => [getLineTreeTopologyBounds(beforeTopology), getLineTreeTopologyBounds(topology)], finalPatch),
+				topology
+			}
 		};
 	}
 	resolvePointScope(point, current) {

package/dist/line/base.d.ts

@@ -120,7 +120,7 @@ export declare abstract class BaseLine extends Element<LineProperties, LineOptio
     getSegmentIndex(segmentId: SegmentId): number;
     getEndpointRelation(anchorId: AnchorId): EndpointRelation;
     resolveConnectEndpointChange(anchorId: AnchorId, target: ConnectionPortRef): OwnerPropertyChange | null;
-    resolveDisconnectEndpointChange(anchorIds: readonly AnchorId[], localPositions?: ReadonlyMap<AnchorId, PointView>): OwnerPropertyChange | null;
+    resolveDisconnectEndpointChange(anchorIds: readonly AnchorId[], localPositions?: ReadonlyMap<AnchorId, PointView>, patch?: Readonly<Record<string, unknown>>): OwnerPropertyChange | null;
     worldToLocal(x: number, y: number): PointView | null;
     /** 返回可独立修改的 world point 结果。 */
     getWorldLinePoints(): PointView[];

package/dist/line-tree/index.d.ts

@@ -50,7 +50,7 @@ export declare class LineTree extends Element<LineTreeProperties, LineTreeOption
     getEndpointRole(anchorId: AnchorId): "input" | "output";
     getEndpointRelation(anchorId: AnchorId): EndpointRelation;
     resolveConnectEndpointChange(anchorId: AnchorId, target: ConnectionPortRef): OwnerPropertyChange | null;
-    resolveDisconnectEndpointChange(anchorIds: readonly AnchorId[], localPositions?: ReadonlyMap<AnchorId, PointView>): OwnerPropertyChange | null;
+    resolveDisconnectEndpointChange(anchorIds: readonly AnchorId[], localPositions?: ReadonlyMap<AnchorId, PointView>, patch?: Readonly<Record<string, unknown>>): OwnerPropertyChange | null;
     resolvePointScope(point: PointView, current?: PointEditingScope): PointEditingScope | null;
     hasPointScope(scope: PointEditingScope): boolean;
     getPointControls(scope: PointEditingScope): import("..").PointControlDescriptor[];

package/dist/polygon.d.ts

@@ -44,7 +44,7 @@ export declare class Polygon extends EditorShape<PolygonProperties, PolygonOptio
         start: PointView;
         end: PointView;
     };
-    protected getDefaultConnectionPortSchema(): {
+    protected getDefaultConnectionPortSchema(patch?: Readonly<Record<string, unknown>>): {
         id: string;
         localPosition: () => PointView;
     }[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fulate/ui",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",