Skip to content

[ENG-1547] Relation creation via drag handle (Obsidian) #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trangdoan982 wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[ENG-1547] Relation creation via drag handle (Obsidian) #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0ebe9ce
drag handle works
trangdoan982 Mar 23, 2026
a61f515
fix: reset isDragging on early returns and use e.currentTarget for hover
trangdoan982 Mar 26, 2026
1a8bb8a
format and lint
trangdoan982 Mar 27, 2026
966d6e1
format
trangdoan982 Mar 27, 2026
6cf812d
address PR comment + fix z-position
trangdoan982 Mar 27, 2026
5dae9f7
some updates naming etc
trangdoan982 Mar 27, 2026
49471f4
address PR comments
trangdoan982 Mar 28, 2026
6873ad4
dry as much as possible
trangdoan982 Apr 6, 2026
ad197b1
further DRY and styling fixes
trangdoan982 Apr 6, 2026
9344191
prettier
trangdoan982 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 9 additions & 39 deletions apps/obsidian/src/components/canvas/DiscourseRelationTool.ts
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@devin-ai-integration devin-ai-integration bot Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Refers to lines 139-143)

📝 Info: Dead code: unreachable !target branch in DiscourseRelationTool

At line 139, the check if (!target) is unreachable because target was already validated as non-null at line 110 (if (!target || target.type !== 'discourse-node')), which returns early if null. This means this.createArrowShape() on line 140 can never be called from this branch. This is a pre-existing issue (not introduced by this PR), but since the surrounding code was modified by the refactoring, it's worth noting.

Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ import { StateNode, TLEventHandlers, TLStateNodeConstructor } from "tldraw";
import { createShapeId } from "tldraw";
import type { TFile } from "obsidian";
import DiscourseGraphPlugin from "~/index";
import { getRelationTypeById } from "~/utils/typeUtils";
import { getNodeTypeById, getRelationTypeById } from "~/utils/typeUtils";
import {
getCompatibleTargetNodeTypeIds,
getDiscourseNodeTypeId,
} from "~/components/canvas/utils/relationTypeUtils";
import { DiscourseRelationShape } from "./shapes/DiscourseRelationShape";
import { getNodeTypeById } from "~/utils/typeUtils";
import { showToast } from "./utils/toastUtils";
import { toTldrawColor } from "~/utils/tldrawColors";

Expand Down Expand Up @@ -88,38 +91,6 @@ class Pointing extends StateNode {
this.cancel();
};

private getCompatibleNodeTypes = (
plugin: DiscourseGraphPlugin,
relationTypeId: string,
sourceNodeTypeId: string,
): string[] => {
const compatibleTypes: string[] = [];

// Find all discourse relations that match the relation type and source
const relations = plugin.settings.discourseRelations.filter(
(relation) =>
relation.relationshipTypeId === relationTypeId &&
relation.sourceId === sourceNodeTypeId,
);

relations.forEach((relation) => {
compatibleTypes.push(relation.destinationId);
});

// Also check reverse relations (where current node is destination)
const reverseRelations = plugin.settings.discourseRelations.filter(
(relation) =>
relation.relationshipTypeId === relationTypeId &&
relation.destinationId === sourceNodeTypeId,
);

reverseRelations.forEach((relation) => {
compatibleTypes.push(relation.sourceId);
});

return [...new Set(compatibleTypes)]; // Remove duplicates
};

override onEnter = () => {
this.didTimeout = false;

Expand All @@ -141,20 +112,19 @@ class Pointing extends StateNode {
return;
}

const sourceNodeTypeId = (target as { props?: { nodeTypeId?: string } })
.props?.nodeTypeId;
const sourceNodeTypeId = getDiscourseNodeTypeId(target);
if (!sourceNodeTypeId) {
this.showWarning("Source node must have a valid node type");
return;
}

// Check if this source node type can create relations of this type
if (sourceNodeTypeId) {
const compatibleTargetTypes = this.getCompatibleNodeTypes(
plugin,
const compatibleTargetTypes = getCompatibleTargetNodeTypeIds({
discourseRelations: plugin.settings.discourseRelations,
relationTypeId,
sourceNodeTypeId,
);
});

if (compatibleTargetTypes.length === 0) {
const sourceNodeType = getNodeTypeById(plugin, sourceNodeTypeId);
Expand Down
6 changes: 5 additions & 1 deletion apps/obsidian/src/components/canvas/TldrawViewComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
} from "~/components/canvas/shapes/DiscourseRelationBinding";
import ToastListener from "./ToastListener";
import { RelationsOverlay } from "./overlays/RelationOverlay";
import { DragHandleOverlay } from "./overlays/DragHandleOverlay";
import { WHITE_LOGO_SVG } from "~/icons";
import { CustomContextMenu } from "./CustomContextMenu";
import {
Expand Down Expand Up @@ -474,7 +475,10 @@ export const TldrawPreviewComponent = ({
);
},
InFrontOfTheCanvas: () => (
<RelationsOverlay plugin={plugin} file={file} />
<>
<RelationsOverlay plugin={plugin} file={file} />
<DragHandleOverlay plugin={plugin} file={file} />
</>
),
}}
/>
Expand Down
Loading
Loading