-
Notifications
You must be signed in to change notification settings - Fork 44
Add copy/paste specific attributes for nodes and edges #1316
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
Copilot
wants to merge
8
commits into
main
Choose a base branch
from
copilot/copy-paste-specific-attributes
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
8 commits
Select commit
Hold shift + click to select a range
fe3464a
Initial plan
Copilot b53b074
Add copy/paste specific attributes feature for nodes and edges
Copilot 055c590
Fix duplicate translation entries in JSON files
Copilot e7adc5d
Add saveVersion validation and fix edge paste logic per review feedback
Copilot a977d8e
Improve code comments and simplify roundCornerFactor check per code r…
Copilot 74217ed
Add Ctrl+Shift+C/V shortcuts for copy/paste specific attributes and u…
Copilot c5d5013
Merge branch 'main' into copilot/copy-paste-specific-attributes
thekingofcity 2d5bcbd
update translation
thekingofcity 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
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ import React from 'react'; | |
| import { MdDoubleArrow } from 'react-icons/md'; | ||
| import useEvent from 'react-use-event-hook'; | ||
| import { NODES_MOVE_DISTANCE } from '../constants/canvas'; | ||
| import { Events, Id, NodeId, RuntimeMode, StnId } from '../constants/constants'; | ||
| import { Events, Id, NodeId, RuntimeMode, StnId, LineId } from '../constants/constants'; | ||
| import { LinePathType } from '../constants/lines'; | ||
| import { MAX_MASTER_NODE_FREE } from '../constants/master'; | ||
| import { MiscNodeType } from '../constants/nodes'; | ||
|
|
@@ -25,7 +25,18 @@ import { | |
| showDetailsPanel, | ||
| } from '../redux/runtime/runtime-slice'; | ||
| import { checkAndChangeStationIntType } from '../util/change-types'; | ||
| import { exportSelectedNodesAndEdges, importSelectedNodesAndEdges } from '../util/clipboard'; | ||
| import { | ||
| exportSelectedNodesAndEdges, | ||
| importSelectedNodesAndEdges, | ||
| exportNodeSpecificAttrs, | ||
| exportEdgeSpecificAttrs, | ||
| parseClipboardData, | ||
| importNodeSpecificAttrs, | ||
| importEdgeSpecificAttrs, | ||
| getSelectedElementsType, | ||
| NodeSpecificAttrsClipboardData, | ||
| EdgeSpecificAttrsClipboardData, | ||
| } from '../util/clipboard'; | ||
| import { findEdgesConnectedByNodes, findNodesInRectangle } from '../util/graph'; | ||
| import { | ||
| getCanvasSize, | ||
|
|
@@ -323,6 +334,54 @@ const SvgWrapper = () => { | |
| const allElements = structuredClone(nodes) as Set<Id>; | ||
| edges.forEach(s => allElements.add(s)); | ||
| dispatch(setSelected(allElements)); | ||
| } else if (e.key === 'C' && (isMacClient ? e.metaKey && e.shiftKey : e.ctrlKey && e.shiftKey)) { | ||
| // Copy specific attributes (Ctrl+Shift+C or Cmd+Shift+C) | ||
| if (selected.size === 1) { | ||
| const [id] = selected; | ||
| if (graph.current.hasNode(id)) { | ||
| const s = exportNodeSpecificAttrs(graph.current, id as NodeId); | ||
| navigator.clipboard.writeText(s); | ||
| } else if (graph.current.hasEdge(id)) { | ||
| const s = exportEdgeSpecificAttrs(graph.current, id as LineId); | ||
| navigator.clipboard.writeText(s); | ||
| } | ||
| } | ||
| } else if (e.key === 'V' && (isMacClient ? e.metaKey && e.shiftKey : e.ctrlKey && e.shiftKey)) { | ||
|
||
| // Paste specific attributes (Ctrl+Shift+V or Cmd+Shift+V) | ||
| try { | ||
| const s = await navigator.clipboard.readText(); | ||
| const parsed = parseClipboardData(s); | ||
| if (!parsed) return; | ||
|
|
||
| const selectionInfo = getSelectedElementsType(graph.current, selected); | ||
| if (parsed.type === 'node-attrs' && selectionInfo.category === 'node') { | ||
| const nodeIds = new Set<NodeId>(); | ||
| selected.forEach(id => { | ||
| if (graph.current.hasNode(id)) { | ||
| nodeIds.add(id as NodeId); | ||
| } | ||
| }); | ||
| if ( | ||
| importNodeSpecificAttrs(graph.current, nodeIds, parsed.data as NodeSpecificAttrsClipboardData) | ||
| ) { | ||
| refreshAndSave(); | ||
| } | ||
| } else if (parsed.type === 'edge-attrs' && selectionInfo.category === 'edge') { | ||
| const edgeIds = new Set<LineId>(); | ||
| selected.forEach(id => { | ||
| if (graph.current.hasEdge(id)) { | ||
| edgeIds.add(id as LineId); | ||
| } | ||
| }); | ||
| if ( | ||
| importEdgeSpecificAttrs(graph.current, edgeIds, parsed.data as EdgeSpecificAttrsClipboardData) | ||
| ) { | ||
| refreshAndSave(); | ||
| } | ||
| } | ||
| } catch (error) { | ||
| console.warn('Failed to read clipboard:', error); | ||
| } | ||
| } else if ( | ||
| (isMacClient && e.key === 'z' && e.metaKey && e.shiftKey) || | ||
| (!isMacClient && e.key === 'y' && e.ctrlKey) | ||
|
|
||
Oops, something went wrong.
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 keyboard shortcut implementation is inconsistent with the existing pattern in this file. Line 386 uses lowercase 'z' with an explicit shiftKey check for the Cmd+Shift+Z shortcut. For consistency with the codebase conventions, consider using lowercase 'c' here:
e.key === 'c' && (isMacClient ? e.metaKey && e.shiftKey : e.ctrlKey && e.shiftKey). Note that using uppercase 'C' is technically more correct according to the KeyboardEvent spec, but lowercase with explicit shiftKey check matches the existing pattern in this file.