fix: connector issues (#12308)

Fixes [BS-3161](https://linear.app/affine-design/issue/BS-3161/发现已连接的connector会响应对齐线)
Fixes [BS-3337](https://linear.app/affine-design/issue/BS-3337/connector你肿么了)
Fixes [BS-3334](https://linear.app/affine-design/issue/BS-3334/connector-不应该能够被拖拽)

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

- **Bug Fixes**
	- Corrected typos related to label editing state, ensuring more reliable label editing and display for connectors.
	- Fixed logic in the auto-complete overlay, improving when overlays appear during hover actions.

- **New Features**
	- Improved connector label handling by ensuring label state is preserved and restored during editing.
	- Enhanced connector movement behavior, allowing connectors to be moved only when appropriate elements are selected.

- **Tests**
	- Added end-to-end tests to verify connector movement and selection behaviors for improved reliability.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
doouding
2025-05-16 09:49:22 +00:00
parent 8ed4f14380
commit 5eca722edf
6 changed files with 80 additions and 5 deletions
@@ -36,6 +36,8 @@ export class ConnectorFilter extends InteractivityExtension {
elements.sort((a, _) => (a instanceof ConnectorElementModel ? -1 : 1));
}
context.elements = elements;
return {};
});
}
@@ -188,6 +188,8 @@ export class EdgelessConnectorLabelEditor extends WithDisposable(
});
this._resizeObserver.observe(this.richText);
this.connector.stash('labelXYWH');
this.updateComplete
.then(() => {
if (!this.inlineEditor) return;
@@ -257,7 +259,8 @@ export class EdgelessConnectorLabelEditor extends WithDisposable(
}
}
connector.lableEditing = false;
connector.labelEditing = false;
connector.pop('labelXYWH');
selection.set({
elements: [],
@@ -293,7 +296,7 @@ export class EdgelessConnectorLabelEditor extends WithDisposable(
}
);
connector.lableEditing = true;
connector.labelEditing = true;
})
.catch(console.error);
}
@@ -278,7 +278,13 @@ export class ConnectorElementModel extends GfxPrimitiveElementModel<ConnectorEle
}
hasLabel() {
return Boolean(!this.lableEditing && this.labelDisplay && this.labelXYWH);
return Boolean(
!this.labelEditing &&
this.labelDisplay &&
this.labelXYWH &&
this.text &&
this.text.length
);
}
override includesPoint(
@@ -450,7 +456,7 @@ export class ConnectorElementModel extends GfxPrimitiveElementModel<ConnectorEle
* Local control display and hide, mainly used in editing scenarios.
*/
@local()
accessor lableEditing: boolean = false;
accessor labelEditing: boolean = false;
@field()
accessor mode: ConnectorMode = DEFAULT_CONNECTOR_MODE;
@@ -744,7 +744,7 @@ export class EdgelessAutoComplete extends WithDisposable(LitElement) {
if (
this._isMoving ||
(this._isHover && !isShape && this._canAutoComplete())
(this._isHover && !isShape && !this._canAutoComplete())
) {
this.removeOverlay();
return nothing;
@@ -26,6 +26,7 @@ import {
assertConnectorPath,
assertEdgelessNonSelectedRect,
assertEdgelessSelectedRect,
getSelectedRect,
} from '../../utils/asserts.js';
import { test } from '../../utils/playwright.js';
@@ -373,4 +374,66 @@ test.describe('quick connect', () => {
});
}
});
test('connector can not be moved directly if the source or target is not selected', async ({
page,
}) => {
await commonSetup(page);
const normalConnectorId = await createConnectorElement(
page,
[0, 0],
[100, 100]
);
await selectElementInEdgeless(page, [normalConnectorId]);
const normalRect1 = await getSelectedRect(page);
// connector with no source and target can be moved
await dragBetweenViewCoords(page, [50, 50], [100, 100]);
const normalRect2 = await getSelectedRect(page);
expect(normalRect2).toEqual({
x: normalRect1.x + 50,
y: normalRect1.y + 50,
width: normalRect1.width,
height: normalRect1.height,
});
const shape1 = await createShapeElement(
page,
[150, 150],
[200, 200],
Shape.Square
);
const shape2 = await createShapeElement(
page,
[250, 250],
[300, 300],
Shape.Square
);
const connectorWithShapes = await createConnectorElement(
page,
[190, 175],
[260, 275]
);
await selectElementInEdgeless(page, [connectorWithShapes]);
// cannot be moved because the source and target are not selected
const initialShapeConnectorRect = await getSelectedRect(page);
await dragBetweenViewCoords(page, [225, 200], [275, 250]);
const shapeConnectorRect1 = await getSelectedRect(page);
expect(shapeConnectorRect1).toEqual(initialShapeConnectorRect);
// can be moved because the source and target are selected
await selectElementInEdgeless(page, [shape1, shape2, connectorWithShapes]);
await dragBetweenViewCoords(page, [225, 200], [275, 250]);
await selectElementInEdgeless(page, [connectorWithShapes]);
const shapeConnectorRect2 = await getSelectedRect(page);
expect(shapeConnectorRect2).toEqual({
x: initialShapeConnectorRect.x + 50,
y: initialShapeConnectorRect.y + 50,
width: initialShapeConnectorRect.width,
height: initialShapeConnectorRect.height,
});
});
});
@@ -1886,6 +1886,7 @@ export async function createConnectorElement(
{ x: start[0], y: start[1] },
{ x: end[0], y: end[1] }
);
return (await getSelectedIds(page))[0];
}
export async function createFrameElement(