Skip to content

Commit 2b412a7

Browse files
Merge branch 'master' into cleanup
2 parents eeb3f2f + 2380810 commit 2b412a7

23 files changed

+1198
-510
lines changed

package.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"@babel/preset-env": "^7.10.4",
6767
"@babel/preset-react": "^7.10.4",
6868
"@types/chrome": "^0.0.119",
69+
"@types/d3-scale-chromatic": "^2.0.0",
6970
"@types/jest": "^26.0.4",
7071
"@types/node": "^12.12.50",
7172
"@typescript-eslint/eslint-plugin": "^3.6.1",
@@ -107,21 +108,26 @@
107108
},
108109
"dependencies": {
109110
"@visx/axis": "^1.0.0",
111+
"@visx/clip-path": "^1.0.0",
112+
"@visx/event": "^1.0.0",
113+
"@visx/glyph": "^1.0.0",
114+
"@visx/gradient": "^1.0.0",
110115
"@visx/grid": "^1.0.0",
116+
"@visx/group": "^1.0.0",
117+
"@visx/hierarchy": "^1.0.0",
111118
"@visx/legend": "^1.0.0",
112119
"@visx/responsive": "^1.0.0",
113120
"@visx/scale": "^1.0.0",
114-
"@visx/tooltip": "^1.0.0",
115-
"@visx/gradient": "^1.0.0",
116-
"@visx/group": "^1.0.0",
117-
"@visx/hierarchy": "^1.0.0",
118-
"@visx/glyph": "^1.0.0",
119121
"@visx/shape": "^1.0.0",
122+
"@visx/text": "^1.0.0",
123+
"@visx/tooltip": "^1.0.0",
124+
"@visx/zoom": "^1.0.0",
120125
"acorn": "^7.3.1",
121126
"acorn-jsx": "^5.2.0",
122127
"bower": "^1.8.8",
123128
"cookie": "^0.4.1",
124129
"d3": "^5.16.0",
130+
"d3-scale-chromatic": "^2.0.0",
125131
"d3-shape": "^2.0.0",
126132
"d3-zoom": "^1.8.3",
127133
"flatted": "^3.0.4",

src/app/actions/actions.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,13 @@ export const resetSlider = () => ({
7878
type: types.SLIDER_ZERO,
7979
});
8080

81-
export const onHover = () => ({
81+
export const onHover = (rtid) => ({
8282
type: types.ON_HOVER,
8383
//the payload should be something to relate the component we're hovering and highlight that component on the DOM
84-
payload: 'PAYLOAD FROM onHover inside of action.ts'
84+
payload: rtid
85+
})
86+
87+
export const onHoverExit = (rtid) => ({
88+
type: types.ON_HOVER_EXIT,
89+
payload: rtid
8590
})

src/app/components/AtomsRelationship.jsx

Lines changed: 0 additions & 186 deletions
This file was deleted.

0 commit comments

Comments
 (0)