@@ -13,18 +13,12 @@ import {
13
13
} from 'react-router-dom' ;
14
14
import Tree from './Tree' ;
15
15
import ComponentMap from './ComponentMap' ;
16
- < < << << < HEAD
17
- import AtomsRelationship from './AtomsRelationship.jsx' ;
18
- import PerformanceVisx from './PerformanceVisx' ;
19
-
20
- = === ===
21
- >>> >>> > 2380810 a0290431d0f1fed0a54a092fb7164b85a
22
16
import { changeView , changeSlider } from '../actions/actions' ;
23
17
import { useStoreContext } from '../store' ;
24
18
import PerformanceVisx from './PerformanceVisx' ;
25
- import Legend from './AtomsRelationshipLegend'
19
+ import Legend from './AtomsRelationshipLegend' ;
26
20
import { ParentSize } from '@visx/responsive' ;
27
- import AtomsRelationship from './AtomsRelationship'
21
+ import AtomsRelationship from './AtomsRelationship' ;
28
22
29
23
const History = require ( './History' ) . default ;
30
24
const ErrorHandler = require ( './ErrorHandler' ) . default ;
@@ -50,13 +44,6 @@ export interface StateRouteProps {
50
44
51
45
const StateRoute = ( props : StateRouteProps ) => {
52
46
const { snapshot, hierarchy, snapshots, viewIndex } = props ;
53
- < < << << < HEAD
54
- const [ { tabs, currentTab } , dispatch ] = useStoreContext ( ) ;
55
- const { hierarchy, sliderIndex, viewIndex } = tabs [ currentTab ] ;
56
- = === ===
57
-
58
- >>> >>> > 2380810 a0290431d0f1fed0a54a092fb7164b85a
59
-
60
47
const [ { tabs, currentTab } , dispatch ] = useStoreContext ( ) ;
61
48
const { hierarchy, sliderIndex, viewIndex } = tabs [ currentTab ] ;
62
49
const isRecoil = snapshot . atomsComponents ? true : false ;
@@ -70,15 +57,11 @@ const StateRoute = (props: StateRouteProps) => {
70
57
71
58
// Map
72
59
const renderComponentMap = ( ) => {
73
-
74
60
if ( hierarchy ) {
75
61
return (
76
62
< ParentSize >
77
63
{ ( { width, height } ) => (
78
- < ComponentMap
79
- snapshots = { snapshots }
80
- width = { width }
81
- height = { height } />
64
+ < ComponentMap snapshots = { snapshots } width = { width } height = { height } />
82
65
) }
83
66
</ ParentSize >
84
67
) ;
@@ -104,14 +87,17 @@ const StateRoute = (props: StateRouteProps) => {
104
87
} ;
105
88
106
89
const renderAtomsRelationship = ( ) => (
107
- < ParentSize > { ( { width, height } ) =>
108
- < >
109
- < AtomsRelationship
110
- width = { width }
111
- height = { height }
112
- snapshots = { snapshots } />
113
- </ >
114
- } </ ParentSize >
90
+ < ParentSize >
91
+ { ( { width, height } ) => (
92
+ < >
93
+ < AtomsRelationship
94
+ width = { width }
95
+ height = { height }
96
+ snapshots = { snapshots }
97
+ />
98
+ </ >
99
+ ) }
100
+ </ ParentSize >
115
101
) ;
116
102
117
103
// the hierarchy gets set on the first click in the page
0 commit comments