@@ -14,11 +14,8 @@ import {
14
14
import { ParentSize } from '@visx/responsive' ;
15
15
import Tree from './Tree' ;
16
16
import ComponentMap from './ComponentMap' ;
17
- // import PerfView from './PerfView';
18
17
import AtomsRelationship from './AtomsRelationship.jsx' ;
19
18
import PerformanceVisx from './PerformanceVisx' ;
20
- // import ZoomI from './zoomFt';
21
- // import History from './History'
22
19
23
20
import { changeView , changeSlider } from '../actions/actions' ;
24
21
import { useStoreContext } from '../store' ;
@@ -48,19 +45,17 @@ interface StateRouteProps {
48
45
49
46
const StateRoute = ( props : StateRouteProps ) => {
50
47
const { snapshot, hierarchy, snapshots, viewIndex } = props ;
48
+ < < << << < HEAD
51
49
const [ { tabs, currentTab } , dispatch ] = useStoreContext ( ) ;
52
50
const { hierarchy, sliderIndex, viewIndex } = tabs [ currentTab ] ;
51
+ = === ===
52
+
53
+ console . log ( hierarchy ) ;
54
+ > >>> >>> e938454e37a781e16248bb535d0850ea3a0020fd
53
55
54
56
const isRecoil = snapshot . atomsComponents ? true : false ;
55
57
const [ noRenderData , setNoRenderData ] = useState ( false ) ;
56
58
57
- // component map zoom state
58
- const [ { x, y, k } , setZoomState ] : any = useState ( {
59
- x : 150 ,
60
- y : 250 ,
61
- k : 1 ,
62
- } ) ;
63
-
64
59
// Map
65
60
const renderComponentMap = ( ) => {
66
61
if ( hierarchy ) {
@@ -72,13 +67,12 @@ const StateRoute = (props: StateRouteProps) => {
72
67
</ ParentSize >
73
68
) ;
74
69
}
75
- return < div className = " noState" > { NO_STATE_MSG } </ div > ;
70
+ return < div className = ' noState' > { NO_STATE_MSG } </ div > ;
76
71
} ;
77
72
78
73
// the hierarchy gets set on the first click in the page
79
74
// when the page is refreshed we may not have a hierarchy, so we need to check if hierarchy was initialized
80
- // if true involk render chart with hierarchy
81
- //* we wrap History in a ParentSize div, in order to make use of Visx's Zoom functionality
75
+ // if true invoke render chart with hierarchy
82
76
const renderHistory = ( ) => {
83
77
if ( hierarchy ) {
84
78
return (
@@ -90,7 +84,7 @@ const StateRoute = (props: StateRouteProps) => {
90
84
/>
91
85
) ;
92
86
}
93
- return < div className = " noState" > { NO_STATE_MSG } </ div > ;
87
+ return < div className = ' noState' > { NO_STATE_MSG } </ div > ;
94
88
} ;
95
89
96
90
const renderAtomsRelationship = ( ) => (
@@ -103,12 +97,12 @@ const StateRoute = (props: StateRouteProps) => {
103
97
104
98
// the hierarchy gets set on the first click in the page
105
99
// when the page is refreshed we may not have a hierarchy, so we need to check if hierarchy was initialized
106
- // if true involk render Tree with snapshot
100
+ // if true invoke render Tree with snapshot
107
101
const renderTree = ( ) => {
108
102
if ( hierarchy ) {
109
103
return < Tree snapshot = { snapshot } /> ;
110
104
}
111
- return < div className = " noState" > { NO_STATE_MSG } </ div > ;
105
+ return < div className = ' noState' > { NO_STATE_MSG } </ div > ;
112
106
} ;
113
107
114
108
const renderPerfView = ( ) => {
@@ -134,55 +128,55 @@ const StateRoute = (props: StateRouteProps) => {
134
128
// />
135
129
) ;
136
130
}
137
- return < div className = " noState" > { NO_STATE_MSG } </ div > ;
131
+ return < div className = ' noState' > { NO_STATE_MSG } </ div > ;
138
132
} ;
139
133
140
134
return (
141
135
< Router >
142
- < div className = " navbar" >
136
+ < div className = ' navbar' >
143
137
< NavLink
144
- className = " router-link"
145
- activeClassName = " is-active"
138
+ className = ' router-link'
139
+ activeClassName = ' is-active'
146
140
exact
147
- to = "/"
141
+ to = '/'
148
142
>
149
143
Tree
150
144
</ NavLink >
151
145
< NavLink
152
- className = " router-link"
153
- activeClassName = " is-active"
154
- to = " /history"
146
+ className = ' router-link'
147
+ activeClassName = ' is-active'
148
+ to = ' /history'
155
149
>
156
150
History
157
151
</ NavLink >
158
- < NavLink className = " router-link" activeClassName = " is-active" to = " /map" >
152
+ < NavLink className = ' router-link' activeClassName = ' is-active' to = ' /map' >
159
153
Map
160
154
</ NavLink >
161
155
162
156
{ isRecoil && (
163
157
< NavLink
164
- className = " router-link"
165
- activeClassName = " is-active"
166
- to = " /relationship"
158
+ className = ' router-link'
159
+ activeClassName = ' is-active'
160
+ to = ' /relationship'
167
161
>
168
162
AtomsRecoil
169
163
</ NavLink >
170
164
) }
171
165
172
166
< NavLink
173
- className = " router-link"
174
- activeClassName = " is-active"
175
- to = " /performance"
167
+ className = ' router-link'
168
+ activeClassName = ' is-active'
169
+ to = ' /performance'
176
170
>
177
171
Performance
178
172
</ NavLink >
179
173
</ div >
180
174
< Switch >
181
- < Route path = " /map" render = { renderComponentMap } />
182
- < Route path = " /history" render = { renderHistory } />
183
- < Route path = " /relationship" render = { renderAtomsRelationship } />
184
- < Route path = " /performance" render = { renderPerfView } />
185
- < Route path = "/" render = { renderTree } />
175
+ < Route path = ' /map' render = { renderComponentMap } />
176
+ < Route path = ' /history' render = { renderHistory } />
177
+ < Route path = ' /relationship' render = { renderAtomsRelationship } />
178
+ < Route path = ' /performance' render = { renderPerfView } />
179
+ < Route path = '/' render = { renderTree } />
186
180
</ Switch >
187
181
</ Router >
188
182
) ;
0 commit comments