Bump BPMN and DMN modeling dependencies / integrate implicit keyboard binding #4620

jarekdanielak · 2024-10-18T10:20:53Z

Proposed Changes

Updates BPMN and DMN modeling dependencies, integrating implicit keyboard / focusable canvas into the modeler application, but also addressing various other issues in the process.

Formal parameters suggestions are available without reloading:

Closes #4544
Closes #4684
Closes #4310

Work log

Checklist

To ensure you provided everything we need to look at your PR:

Brief textual description of the changes present
Visual demo attached
Steps to try out present, i.e. using the @bpmn-io/sr tool
Related issue linked via Closes {LINK_TO_ISSUE} or Related to {LINK_TO_ISSUE}

Try out via better-actions feature branch + npm run dev, alternatively use this command:

npx @bpmn-io/sr camunda/camunda-modeler#better-actions

Child of https://github.com/bpmn-io/internal-docs/issues/1081

github-actions · 2024-10-18T10:21:08Z

This Pull Request targets develop branch, but contains fix commits.

Consider targeting main instead.

client/src/app/tabs/cloud-bpmn/BpmnEditor.js

jarekdanielak · 2024-10-27T14:26:05Z

Blockers:

Undo/Redo actions trigger twice and seem to trigger when focus is outside of canvas, despite being dependent on canvasFocused parameter.

Nice to have:

Edit label action can be triggered with keyboard (E) for multiple selected elements, despite being dependent on selectionLength === 1 and menu action being disabled.

client/src/app/tabs/getEditMenu.js

client/src/app/tabs/bpmn/BpmnEditor.js

jarekdanielak · 2024-11-21T08:49:18Z

Cleaned up git history.

barmac · 2024-11-21T08:55:54Z

client/src/app/tabs/bpmn/BpmnEditor.js

      dirty,
      distribute: selectionLength > 2,
-      editLabel: !inputActive && !!selectionLength,
+      editLabel: canvasFocused && selectionLength === 1,


A good one!

barmac · 2024-11-21T09:07:01Z

Not a big problem, but when I click outside of the canvas (tab bar), some of the menu items are enabled but don't do anything:

Screen.Recording.2024-11-21.at.10.05.30.mov

barmac · 2024-11-21T09:12:00Z

SelectAll does not work in the BPMN properties panel. It works in DMN though.

Screen.Recording.2024-11-21.at.10.11.31.mov

nikku · 2024-11-21T09:25:19Z

Cleaned up git history.

Standard pattern when combining commits is:

commit summary

  This is the body, indented

second commit summary

third commit summary
  
  some more details on the third commit
  
  Closes #102121

You may want to account for that. Also, you may want to remove transient things, i.e. stuff that fixes behavior on top of existing contributions on this branch from the summary:

feat: expose `canvasFocused` to menu actions

  This allows menu actions in plug-ins to properly react to the newly
  introduced canvas focused state, and make them activate only on
  canvas focus, not _any_ focus.

fix: only trigger core editor keyboard shortcuts on canvas focus

>>> REMOVE START
fix(dmn): remove decision table keyboard module

fix(bpmn): hook up to `canvas.focus.changed`

  We'd previously not properly update the keyboard shortcuts on focus
changes.
<<< REMOVE END

fix: focus canvas on attach

>>> FIX INDENT START
  This ensures that users can do modeling operations right away.
<<< FIX INDENT END

barmac · 2024-11-21T09:25:25Z

client/src/app/tabs/bpmn/BpmnEditor.js

@@ -432,45 +434,46 @@ export class BpmnEditor extends CachedComponent {

    const selectionLength = selection.get().length;

-    const inputActive = isInputActive();


This is breaking for all plugins relying on inputActive. I'd say let's leave the state property as is, but the shortcuts don't need to rely on it.

Also, as just discovered with @jarekdanielak, the getEditMenu still depends on inputActive.

Isn't backwards compatibility covered via https://github.com/camunda/camunda-modeler/pull/4620/files/725723408e34c74c5ab7ccb2cefb2cf3b2f2d766#diff-8d663070a9293c2317ca1a7dff4fa8a7004cbd6855d29d128635aad4fa20d67cR475?

If it had been, the properties panel select all wouldn't have broken #4620 (comment)

barmac · 2024-11-21T09:27:01Z

client/src/app/tabs/bpmn/BpmnEditor.js

      save: true,
-      selectAll: true,
+      selectAll: canvasFocused,


Suggested change

selectAll: canvasFocused,

selectAll: canvasFocused || inputActive,

Or we keep it as is, but adjust in the getEditMenu.

nikku · 2024-11-21T09:27:44Z

client/src/app/tabs/bpmn/__tests__/BpmnEditorSpec.js

@@ -635,7 +617,6 @@ describe('<BpmnEditor>', function() {
          find: true,
          globalConnectTool: true,
          handTool: true,
-          inputActive: false,


Should still indicate inputActive, right?

Related to bpmn-io/internal-docs#1081 feat: expose `canvasFocused` to menu actions This allows menu actions in plug-ins to properly react to the newly introduced canvas focused state, and make them activate only on canvas focus, not _any_ focus. fix: only trigger core editor keyboard shortcuts on canvas focus fix: focus canvas on attach This ensures that users can do modeling operations right away.

Makes the panel focusable. deps: bump to `[email protected]` Related to #4590

jarekdanielak · 2024-11-21T09:49:03Z

Brought back inputActive into menu state for the sake of compatibility and selectAll. Works as intended now both on canvas and in properties panel.

Fix git history once again.

barmac · 2024-11-21T10:14:24Z

This commit contains a merge conflict in package-lock 86ddafa: 86ddafa#diff-053150b640a7ce75eff69d1a22cae7f0f94ad64ce9a855db544dda0929316519R41585

barmac · 2024-11-21T10:20:19Z

Besides the comment above, I believe the PR is ready to merge. We could squash the modeling deps updates to mitigate #4620 (comment)

Makes the panel focusable, following along 23c9e6a.

jarekdanielak · 2024-11-21T10:35:50Z

Fixed package-lock.

Leaving it up to you how we want to squash dependencies updates together.

@philippfromme can you give it a quick run on Windows?

@nikku waiting for the final thumbs up and we can merge.

nikku

Good to have this wrapped up!

jarekdanielak requested review from nikku and barmac October 18, 2024 10:20

bpmn-io-tasks bot added the in progress Currently worked on label Oct 18, 2024

bpmn-io-tasks bot assigned jarekdanielak Oct 18, 2024

jarekdanielak added the enhancement New feature or request label Oct 18, 2024

nikku reviewed Oct 18, 2024

View reviewed changes

client/src/app/tabs/cloud-bpmn/BpmnEditor.js Outdated Show resolved Hide resolved

nikku requested a review from lmbateman November 4, 2024 21:33

jarekdanielak mentioned this pull request Nov 14, 2024

deps: update dependency diagram-js to v15 #4665

Closed

1 task

jarekdanielak changed the title ~~Better modeler menu actions with new diagram-js~~ Integrate implicit keyboard binding into BPMN & DMN editors Nov 15, 2024

jarekdanielak force-pushed the better-actions branch 3 times, most recently from 56ae8f1 to 8ed2972 Compare November 18, 2024 10:38

nikku force-pushed the better-actions branch from b3f757a to a2ceba8 Compare November 18, 2024 16:30

nikku reviewed Nov 18, 2024

View reviewed changes

client/src/app/tabs/getEditMenu.js Outdated Show resolved Hide resolved

nikku reviewed Nov 18, 2024

View reviewed changes

client/src/app/tabs/bpmn/BpmnEditor.js Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

nikku mentioned this pull request Nov 19, 2024

deps: update dependency camunda-bpmn-js to v5 #4700

Closed

1 task

nikku added the dependencies Updates a dependency label Nov 19, 2024

This comment was marked as outdated.

Sign in to view

jarekdanielak marked this pull request as ready for review November 19, 2024 12:47

bpmn-io-tasks bot added needs review Review pending and removed in progress Currently worked on labels Nov 19, 2024

barmac mentioned this pull request Nov 19, 2024

Support user task listeners #4590

Closed

11 tasks

This comment was marked as outdated.

Sign in to view

nikku reviewed Nov 19, 2024

View reviewed changes

client/src/app/tabs/bpmn/BpmnEditor.js Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

jarekdanielak force-pushed the better-actions branch from 0eb28f0 to 7257234 Compare November 21, 2024 08:48

barmac reviewed Nov 21, 2024

View reviewed changes

jarekdanielak requested review from nikku, barmac and philippfromme November 21, 2024 08:59

barmac reviewed Nov 21, 2024

View reviewed changes

nikku reviewed Nov 21, 2024

View reviewed changes

jarekdanielak and others added 2 commits November 21, 2024 10:45

deps: update to [email protected]

86ddafa

Makes the panel focusable. deps: bump to `[email protected]` Related to #4590

jarekdanielak force-pushed the better-actions branch from 7257234 to a1e415c Compare November 21, 2024 09:47

jarekdanielak requested review from barmac and nikku November 21, 2024 09:51

barmac approved these changes Nov 21, 2024

View reviewed changes

nikku and others added 2 commits November 21, 2024 11:32

deps: update to [email protected]

14d1a74

Makes the panel focusable, following along 23c9e6a.

chore(CHANGELOG): update

a84b093

jarekdanielak force-pushed the better-actions branch from a1e415c to a84b093 Compare November 21, 2024 10:34

nikku added this to the M83 milestone Nov 21, 2024

nikku approved these changes Nov 21, 2024

View reviewed changes

nikku merged commit 1fdf4fd into develop Nov 21, 2024
12 checks passed

bpmn-io-tasks bot removed the needs review Review pending label Nov 21, 2024

nikku deleted the better-actions branch November 21, 2024 12:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump BPMN and DMN modeling dependencies / integrate implicit keyboard binding #4620

Bump BPMN and DMN modeling dependencies / integrate implicit keyboard binding #4620

jarekdanielak commented Oct 18, 2024 •

edited by nikku

Loading

github-actions bot commented Oct 18, 2024

jarekdanielak commented Oct 27, 2024 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

jarekdanielak commented Nov 21, 2024

barmac Nov 21, 2024

barmac commented Nov 21, 2024

barmac commented Nov 21, 2024

nikku commented Nov 21, 2024 •

edited

Loading

barmac Nov 21, 2024

barmac Nov 21, 2024

nikku Nov 21, 2024

barmac Nov 21, 2024

barmac Nov 21, 2024

barmac Nov 21, 2024

nikku Nov 21, 2024

jarekdanielak commented Nov 21, 2024

barmac commented Nov 21, 2024 •

edited

Loading

barmac commented Nov 21, 2024

jarekdanielak commented Nov 21, 2024

nikku left a comment

		@@ -432,45 +434,46 @@ export class BpmnEditor extends CachedComponent {

		const selectionLength = selection.get().length;

		const inputActive = isInputActive();

	selectAll: canvasFocused,
	selectAll: canvasFocused \|\| inputActive,

Bump BPMN and DMN modeling dependencies / integrate implicit keyboard binding #4620

Bump BPMN and DMN modeling dependencies / integrate implicit keyboard binding #4620

Conversation

jarekdanielak commented Oct 18, 2024 • edited by nikku Loading

Proposed Changes

Work log

Checklist

github-actions bot commented Oct 18, 2024

jarekdanielak commented Oct 27, 2024 • edited Loading

Blockers:

Nice to have:

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

jarekdanielak commented Nov 21, 2024

Choose a reason for hiding this comment

barmac commented Nov 21, 2024

barmac commented Nov 21, 2024

nikku commented Nov 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jarekdanielak commented Nov 21, 2024

barmac commented Nov 21, 2024 • edited Loading

barmac commented Nov 21, 2024

jarekdanielak commented Nov 21, 2024

nikku left a comment

Choose a reason for hiding this comment

jarekdanielak commented Oct 18, 2024 •

edited by nikku

Loading

jarekdanielak commented Oct 27, 2024 •

edited

Loading

nikku commented Nov 21, 2024 •

edited

Loading

barmac commented Nov 21, 2024 •

edited

Loading