-
-
Notifications
You must be signed in to change notification settings - Fork 23.1k
Main 11 05 2025 enhancements to sticky note feature #5425
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.
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
iokinpardo
wants to merge
9
commits into
FlowiseAI:main
Choose a base branch
from
iokinpardo:main-11-05-2025-enhancements-to-sticky-note-feature
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
77d8233
feat: enhance sticky note interactions
iokinpardo 4900c10
feat: enhance sticky note interactions
iokinpardo 3bf0bca
Normalize sticky note defaults
iokinpardo 71f8fdd
Fix sticky note layering
iokinpardo e9e0843
feat: enhance sticky note interactions
iokinpardo 830816b
Normalize sticky note defaults
iokinpardo 735a3a7
Fix sticky note layering
iokinpardo aacbb57
Fix sticky note selection highlight and resizing
iokinpardo 239c46a
Merge branch 'main-11-05-2025-enhancements-to-sticky-note-feature' of…
iokinpardo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,6 +1,62 @@ | ||||||||||||||
| import { uniq, get, isEqual } from 'lodash' | ||||||||||||||
| import moment from 'moment' | ||||||||||||||
|
|
||||||||||||||
| export const DEFAULT_STICKY_NOTE_COLOR = '#FFE770' | ||||||||||||||
| const DEFAULT_STICKY_NOTE_Z_INDEX = -1 | ||||||||||||||
| const DEFAULT_NODE_Z_INDEX = 1 | ||||||||||||||
|
|
||||||||||||||
| const isStickyNoteNode = (node) => { | ||||||||||||||
| if (!node) return false | ||||||||||||||
|
|
||||||||||||||
| const nodeName = node?.data?.name | ||||||||||||||
| return node.type === 'stickyNote' || nodeName === 'stickyNote' || nodeName === 'stickyNoteAgentflow' | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| export const normalizeStickyNoteNodes = (nodes = []) => | ||||||||||||||
| nodes.map((node) => { | ||||||||||||||
| if (!node) return node | ||||||||||||||
|
|
||||||||||||||
| if (isStickyNoteNode(node)) { | ||||||||||||||
| const color = node?.data?.color || DEFAULT_STICKY_NOTE_COLOR | ||||||||||||||
| const currentZIndex = node?.style?.zIndex | ||||||||||||||
|
|
||||||||||||||
| const needsColorUpdate = node?.data?.color !== color | ||||||||||||||
| const needsZIndexUpdate = currentZIndex !== DEFAULT_STICKY_NOTE_Z_INDEX | ||||||||||||||
|
|
||||||||||||||
| if (!needsColorUpdate && !needsZIndexUpdate) { | ||||||||||||||
| return node | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| return { | ||||||||||||||
| ...node, | ||||||||||||||
| data: needsColorUpdate | ||||||||||||||
| ? { | ||||||||||||||
| ...node.data, | ||||||||||||||
| color | ||||||||||||||
| } | ||||||||||||||
| : node.data, | ||||||||||||||
| style: needsZIndexUpdate | ||||||||||||||
| ? { | ||||||||||||||
| ...node.style, | ||||||||||||||
| zIndex: DEFAULT_STICKY_NOTE_Z_INDEX | ||||||||||||||
| } | ||||||||||||||
| : node.style | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| if (node?.style?.zIndex == null) { | ||||||||||||||
| return { | ||||||||||||||
| ...node, | ||||||||||||||
| style: { | ||||||||||||||
| ...node.style, | ||||||||||||||
| zIndex: DEFAULT_NODE_Z_INDEX | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| return node | ||||||||||||||
| }) | ||||||||||||||
|
|
||||||||||||||
| export const getUniqueNodeId = (nodeData, nodes) => { | ||||||||||||||
| let suffix = 0 | ||||||||||||||
|
|
||||||||||||||
|
|
@@ -223,6 +279,10 @@ export const initNode = (nodeData, newNodeId, isAgentflow) => { | |||||||||||||
|
|
||||||||||||||
| nodeData.id = newNodeId | ||||||||||||||
|
|
||||||||||||||
| if (nodeData.type === 'StickyNote') { | ||||||||||||||
| nodeData.color = nodeData.color || '#FFE770' | ||||||||||||||
| } | ||||||||||||||
|
Comment on lines
+282
to
+284
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The default color for sticky notes is hardcoded here, but a constant
Suggested change
|
||||||||||||||
|
|
||||||||||||||
| return nodeData | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The use of
!importantis generally considered an anti-pattern as it can make styles difficult to override and debug. Furthermore, thenormalizeStickyNoteNodesfunction ingenericHelper.jsalready sets thez-indexfor sticky notes via inline styles. Inline styles have higher specificity than CSS classes, making this rule redundant. It's recommended to remove this CSS block and rely solely on the JavaScript logic for managingz-indexto have a single source of truth.