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.

Sign up for GitHub

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

feat: GroupTreePlot --- Refactor to typescript + better D3 and React integration + some small features #2367

Merged
merged 30 commits into from
Feb 3, 2025
Merged

feat: GroupTreePlot --- Refactor to typescript + better D3 and React integration + some small features #2367

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d296387
Installed react-transition-group package
Anders2303 Nov 13, 2024
37926c2
Recreated GroupTree component with a better mix of D3 and React
Anders2303 Nov 13, 2024
9dfb9d9
Tweaked story to make date changes easier
Anders2303 Nov 13, 2024
274adf1
refactor: remove event handling from DataAssembler and simplify hooks
Anders2303 Nov 13, 2024
8e0a2a3
fixed node childre show/hide toggle
Anders2303 Nov 14, 2024
6468a11
Added error overlay to GroupTreePlot
Anders2303 Nov 14, 2024
bf458af
Replaced cumbersom D3 typing with alias type
Anders2303 Nov 14, 2024
c989f3e
Made group tree renderer dynamically resize the plot to always fit th…
Anders2303 Nov 14, 2024
65bddbb
Deleted old plot componment files
Anders2303 Nov 14, 2024
ae46d53
Updated snapshots
Anders2303 Nov 14, 2024
d086029
Merge branch 'master' into group-tree-plot/typescript-refactor
Anders2303 Nov 15, 2024
f1dec0c
Added missing types
Anders2303 Nov 15, 2024
1879efc
Revert: Accidental smoketest screenshot change
Anders2303 Nov 15, 2024
25c9b18
Fixed error with storing previous tree
Anders2303 Nov 18, 2024
50fa2e4
Fixed "0 children" bug + added names to some anonymous functions
Anders2303 Nov 18, 2024
53bcc7f
Added prop to initialize tree with collapsed nodes
Anders2303 Nov 19, 2024
5fb4a00
Merge branch 'master' into group-tree-plot/typescript-refactor
Anders2303 Nov 19, 2024
dc3e2aa
Moved DataAssembler and hooks in same file. Moved to utils folder
Anders2303 Jan 15, 2025
c2a069b
Restructured project files
Anders2303 Jan 15, 2025
50f15be
Resolved review feedback
Anders2303 Jan 16, 2025
b2f762d
Made it so "previousTree" is never null. Instead defaults to a root-o…
Anders2303 Jan 17, 2025
5387b1d
Replaced "react-transition-group" with "motion" animation library
Anders2303 Jan 17, 2025
09bf214
Added missing docs + some more
Anders2303 Jan 17, 2025
646e566
Merge branch 'master' into group-tree-plot/typescript-refactor
Anders2303 Jan 17, 2025
96108d6
Fixed typos
Anders2303 Jan 28, 2025
41b0185
Simplified label and unit logic
Anders2303 Jan 28, 2025
7b45f62
Fixed method and filenames
Anders2303 Jan 28, 2025
a5dbc90
Merge branch 'master' into group-tree-plot/typescript-refactor
Anders2303 Jan 28, 2025
3acdf35
fixed typo
Anders2303 Jan 29, 2025
c69bcc2
Merge branch 'master' into group-tree-plot/typescript-refactor
Anders2303 Jan 31, 2025
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
67 changes: 66 additions & 1 deletion typescript/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion typescript/packages/group-tree-plot/example-data/dated-trees.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const secondDatedTree: DatedTree = {
},
edge_label: "VFP14",
edge_data: {
waterrate: [20, 30],
waterrate: [20, 0],
oilrate: [30, 40],
gasrate: [40, 50],
waterinjrate: [50, 60],
Expand Down
3 changes: 2 additions & 1 deletion typescript/packages/group-tree-plot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"license": "MPL-2.0",
"dependencies": {
"d3": "^7.8.2",
"lodash": "^4.17.21"
"lodash": "^4.17.21",
"motion": "^11.18.0"
Anders2303 marked this conversation as resolved.
Show resolved Hide resolved
},
"peerDependencies": {
"react": "^17 || ^18",
Expand Down
Loading