[ENG-1108] Canvas tool lock by trangdoan982 · Pull Request #851 · DiscourseGraphs/discourse-graph

trangdoan982 · 2026-03-03T06:10:51Z

https://www.loom.com/share/07b5bafb3bb54450bbe9a40862f9cd4a

linear · 2026-03-03T06:10:54Z

ENG-1108 make tool-lock work for discourse-tool in roam

supabase · 2026-03-03T06:10:57Z

This pull request has been ignored for the connected project zytfjzqyijgagqxrzbmz because there are no changes detected in packages/database/supabase directory. You can change this behaviour in Project Integrations Settings ↗︎.

Preview Branches by Supabase.
Learn more about Supabase Branching ↗︎.

trangdoan982 · 2026-03-05T20:05:46Z

apps/roam/src/components/canvas/Tldraw.tsx

  return (
    <div
      className="roamjs-tldraw-canvas-container relative z-10 h-full w-full overflow-hidden rounded-md border border-gray-300 bg-white"
+      data-page-uid={pageUid}


we need to add this back because i keep receiving error "No canvas page UID found"

mdroidian

It seems there was come confusion on what the task was requesting. Unfortunately, the ticket should have been more clear, sorry.

If a user:

selects dg tool
toggle lock on
creates a node

The dg tool/node should still be the current tool

If a user:

selects dg tool
toggles lock off (or leaves as default)
creates a node

The current tool should be the select tool

This follows the same behavior as all other tldraw tools.

https://www.loom.com/share/265d543710924f548202e006d033452b

trangdoan982 · 2026-03-09T22:04:35Z

@mdroidian is this the same behavior we want for ENG-1383: Stay at the relation arrow menu after creating a relation? Based on the description in this ticket I understood that once the discourse relation tool is selected, it should stay locked there without doing any extra lock tool operation.

In this latest push I had discourse node and relation tools to have the same behavior, but let me know if you interpret it differently.

mdroidian

https://www.loom.com/share/07aab48252a744f4ad016e00e619e7e1

cannot edit discourse nodes
changing default tldraw lock behavior unnecessarily (unlocking on choosing select tool)

apps/roam/src/components/canvas/Tldraw.tsx

apps/roam/src/components/canvas/toolLock.ts

trangdoan982 · 2026-03-19T17:24:48Z

https://www.loom.com/share/878e7f7432b645ceb310c914ed200d93

Here's my updated test with the bugs you pointed out. I couldn't reproduce the unable to edit bug. Can you try again?

devin-ai-integration

Devin Review found 2 new potential issues.

View 13 additional findings in Devin Review.

devin-ai-integration · 2026-03-19T17:32:26Z

apps/roam/src/components/canvas/uiOverrides.tsx

    initialText: string;
    imageUrl?: string;
  }) => {
+    editor.updateInstanceState({ isToolLocked: false });


🟡 Convert To action permanently destroys user's tool lock preference

In uiOverrides.tsx:160, editor.updateInstanceState({ isToolLocked: false }) unconditionally clears the global isToolLocked state as a side effect of using the "Convert To" context menu. This persists beyond the Convert To operation — after converting a text/image shape to a discourse node, the user's tool lock preference is permanently disabled for all future tool usage. The intent is to ensure the tool switches to "select" after conversion, but the implementation mutates global state rather than just calling editor.setCurrentTool("select") directly in the onSuccess callback at uiOverrides.tsx:198.

Prompt for agents

In apps/roam/src/components/canvas/uiOverrides.tsx, remove the line `editor.updateInstanceState({ isToolLocked: false });` at line 160 inside `openDialogAndCreateShape`. Then at line 198, replace `setCurrentToolToSelectIfUnlocked(editor);` with `editor.setCurrentTool("select");` since Convert To should always end on the select tool regardless of tool lock state, without clearing the user's global tool lock preference.

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

@trangdoan982 Why are we changing the lock state here? Wthat problem is this solving?

devin-ai-integration · 2026-03-19T17:32:27Z

apps/roam/src/components/canvas/DiscourseNodeUtil.tsx

+            if (action === "create") {
+              restoreToolState();
+            } else {
+              editor.setEditingShape(null);
+              dialogRenderedRef.current = false;
+            }


🟡 restoreToolState called twice on successful node creation, causing redundant tool re-entry

In DiscourseNodeUtil.tsx:587-588, when action === "create", restoreToolState() is called. Then ModifyNodeDialog.tsx:483 calls onClose() after await onSuccess(...) completes. The onClose handler at DiscourseNodeUtil.tsx:594-596 checks isCreating (which is true for new nodes) and calls restoreToolState() again. This causes editor.setCurrentTool(shape.type) to fire twice in succession when tool lock is active, which may trigger the tool's onEnter handler (setting cursor, etc.) redundantly. The onSuccess handler should not call restoreToolState() for create actions since onClose already handles it, or onClose should detect that restoration already happened.

Suggested change

if (action === "create") {

restoreToolState();

} else {

editor.setEditingShape(null);

dialogRenderedRef.current = false;

}

if (action === "create") {

restoreToolState();

} else {

editor.setEditingShape(null);

dialogRenderedRef.current = false;

}

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

mdroidian

There are some undesired changes that I am unclear why they are included in this PR.

Also, this devin comment is worth looking into: #851 (comment)

mdroidian · 2026-03-20T05:56:25Z

apps/roam/src/components/canvas/Tldraw.tsx

            ...position,
          },
        ]);
+        setCurrentToolToSelectIfUnlocked(app);


Why are we changing the tool state here?

mdroidian · 2026-03-20T05:57:42Z

apps/roam/src/components/canvas/Tldraw.tsx

          },
        },
      ]);
+      setCurrentToolToSelectIfUnlocked(editor);


Why are we changing the tool here? This diverges from the regular tldraw pattern. eg
If tool = rectangle and I paste text that is not a dg shape, tool stays as rectangle.
If tool = rectangle and I paste text that is a dg shape, tool changes to select.

mdroidian · 2026-03-20T06:04:47Z

apps/roam/src/components/canvas/uiOverrides.tsx

    initialText: string;
    imageUrl?: string;
  }) => {
+    editor.updateInstanceState({ isToolLocked: false });


@trangdoan982 Why are we changing the lock state here? Wthat problem is this solving?

trangdoan982 changed the title ~~[ENG-1108] Tool lock~~ [ENG-1108] Canvas tool lock Mar 3, 2026

This comment was marked as resolved.

Sign in to view

trangdoan982 force-pushed the eng-1108-tool-lock branch from 81fc1d3 to b92b6cf Compare March 5, 2026 18:28

This comment was marked as resolved.

Sign in to view

trangdoan982 requested a review from mdroidian March 5, 2026 20:04

trangdoan982 commented Mar 5, 2026

View reviewed changes

mdroidian requested changes Mar 6, 2026

View reviewed changes

trangdoan982 force-pushed the eng-1108-tool-lock branch from 0211007 to faa17a5 Compare March 9, 2026 22:23

trangdoan982 requested a review from mdroidian March 9, 2026 22:23

This comment was marked as resolved.

Sign in to view

mdroidian requested changes Mar 11, 2026

View reviewed changes

apps/roam/src/components/canvas/Tldraw.tsx Outdated Show resolved Hide resolved

apps/roam/src/components/canvas/toolLock.ts Outdated Show resolved Hide resolved

apps/roam/src/components/canvas/toolLock.ts Outdated Show resolved Hide resolved

trangdoan982 added 8 commits March 19, 2026 12:58

wip

9a0cda3

lint

097c884

update

288dabb

address PR comments

4e666a9

new behavior

565f2be

address PR comment

eea13e4

lint

82b41c0

address PR comments

7a44a8c

trangdoan982 force-pushed the eng-1108-tool-lock branch from d0b007d to 7a44a8c Compare March 19, 2026 17:20

lint

c2aa3c8

trangdoan982 requested a review from mdroidian March 19, 2026 17:25

devin-ai-integration bot reviewed Mar 19, 2026

View reviewed changes

mdroidian requested changes Mar 20, 2026

View reviewed changes

Conversation

trangdoan982 commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

linear bot commented Mar 3, 2026

Uh oh!

supabase bot commented Mar 3, 2026

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

trangdoan982 Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

mdroidian left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trangdoan982 commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

mdroidian left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

trangdoan982 commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

devin-ai-integration bot left a comment

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration bot Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

mdroidian Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration bot Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

mdroidian left a comment

Choose a reason for hiding this comment

Uh oh!

mdroidian Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

mdroidian Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

mdroidian Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

trangdoan982 commented Mar 3, 2026 •

edited

Loading

mdroidian left a comment •

edited

Loading

trangdoan982 commented Mar 9, 2026 •

edited

Loading

trangdoan982 commented Mar 19, 2026 •

edited

Loading