Skip to content
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

Feature/4935 subgraph title margin config option #5041

Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b134766
Add subgraph title margin config options to schema.
mathbraga Nov 11, 2023
0bcd5d2
Create helper function for subgraph title margin fetching.
mathbraga Nov 11, 2023
52ed387
Fix nesting of getSubGraphTitleMargins test.
mathbraga Nov 11, 2023
8b0a5be
Include subgraph margin into label positioning
mathbraga Nov 11, 2023
56c3809
Add logic to add subgraph title margin on layout
mathbraga Nov 12, 2023
453c16d
Remove unnecessary code
mathbraga Nov 17, 2023
7e77433
Add tests for subgraph title margin
mathbraga Nov 17, 2023
42ac630
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 18, 2023
ad6c761
Modify getSubGraphTitleMargins to use null coalescing operator
mathbraga Nov 20, 2023
c0a43f5
Change getSubGraphTitleMargins to accept config object as parameter
mathbraga Nov 20, 2023
63c2d36
Rename file and update imports
mathbraga Nov 20, 2023
fc3018e
Move subgraph title margin tests to independent file
mathbraga Nov 20, 2023
d61bfde
Replace string concat with string templates
mathbraga Nov 21, 2023
a935380
Merge branch 'feature/4935_subgraph-title-margin-config-option' of ht…
mathbraga Nov 21, 2023
d79671e
Resolve lint issue
mathbraga Nov 21, 2023
997a377
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 21, 2023
3489fc4
Replace multiple calls of getConfig() for a single at top of the scope
mathbraga Nov 25, 2023
904be16
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 25, 2023
ce875c9
Move getConfig() call out of recursiveRender to its parent caller
mathbraga Nov 26, 2023
a807a58
Modify margin logic to avoid creating unnecessary space in subgraph
mathbraga Nov 28, 2023
7979b28
Add test for subgraphs with title margins and edge labels
mathbraga Nov 28, 2023
8e794e3
Merge branch 'feature/4935_subgraph-title-margin-config-option' of ht…
mathbraga Nov 28, 2023
5718be5
Merge branch 'develop' into feature/4935_subgraph-title-margin-config…
mathbraga Nov 28, 2023
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
Prev Previous commit
Next Next commit
Add test for subgraphs with title margins and edge labels
mathbraga committed Nov 28, 2023

Verified

This commit was signed with the committer’s verified signature.
targos Michaël Zasso
commit 7979b2830f7196097cb6c5d802b1cbfdaa00fe90
21 changes: 21 additions & 0 deletions cypress/integration/rendering/flowchart-v2.spec.js
Original file line number Diff line number Diff line change
@@ -941,5 +941,26 @@ end
}
);
});
it('Should render subgraphs with title margins and edge labels', () => {
imgSnapshotTest(
`flowchart LR

subgraph TOP
direction TB
subgraph B1
direction RL
i1 --lb1-->f1
end
subgraph B2
direction BT
i2 --lb2-->f2
end
end
A --lb3--> TOP --lb4--> B
B1 --lb5--> B2
`,
{ flowchart: { subGraphTitleMargin: { top: 10, bottom: 5 } } }
);
});
});
});