Merge pull request #838 from vadimshvetsov/fix-set-port

Fix CI failure on master and bug `Cannot read property 'reportedPosition' of null on link.setSourcePort and link.setSourceTarget`
projectstorm · Jun 4, 2021 · abadce1 · abadce1
2 parents d2f0543 + 63a41c6
commit abadce1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/react-diagrams-core/src/entities/link/LinkModel.ts b/packages/react-diagrams-core/src/entities/link/LinkModel.ts
@@ -215,7 +215,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics>
 		return this.points[this.points.length - 1];
 	}
 
-	setSourcePort(port: PortModel) {
+	setSourcePort(port: PortModel | null) {
 		if (port !== null) {
 			port.addLink(this);
 		}
@@ -224,7 +224,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics>
 		}
 		this.sourcePort = port;
 		this.fireEvent({ port }, 'sourcePortChanged');
-		if (port.reportedPosition) {
+		if (port?.reportedPosition) {
 			this.getPointForPort(port).setPosition(port.getCenter());
 		}
 	}
@@ -237,7 +237,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics>
 		return this.targetPort;
 	}
 
-	setTargetPort(port: PortModel) {
+	setTargetPort(port: PortModel | null) {
 		if (port !== null) {
 			port.addLink(this);
 		}
@@ -246,7 +246,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics>
 		}
 		this.targetPort = port;
 		this.fireEvent({ port }, 'targetPortChanged');
-		if (port.reportedPosition) {
+		if (port?.reportedPosition) {
 			this.getPointForPort(port).setPosition(port.getCenter());
 		}
 	}

diff --git a/packages/react-diagrams-routing/tests/PathFinding.test.tsx b/packages/react-diagrams-routing/tests/PathFinding.test.tsx
@@ -1,4 +1,4 @@
-import PathFinding from '../src/engine/PathFinding';
+import { PathFinding } from '../src/engine/PathFinding';
 
 describe('calculating start and end points', function () {
 	beforeEach(() => {