@@ -22,7 +22,7 @@ if (canUseDOM) {
22
22
if ( typeof window . ResizeObserver !== 'undefined' ) {
23
23
resizeObserver = new window . ResizeObserver ( entries => {
24
24
entries . forEach ( ( { target } ) => {
25
- const instance = registry [ target . _onLayoutId ] ;
25
+ const instance = registry [ target . _layoutId ] ;
26
26
instance && instance . _handleLayout ( ) ;
27
27
} ) ;
28
28
} ) ;
@@ -52,24 +52,24 @@ const observe = instance => {
52
52
53
53
if ( resizeObserver ) {
54
54
const node = findNodeHandle ( instance ) ;
55
- node . _onLayoutId = id ;
55
+ node . _layoutId = id ;
56
56
resizeObserver . observe ( node ) ;
57
57
} else {
58
- instance . _onLayoutId = id ;
58
+ instance . _layoutId = id ;
59
59
setTimeout ( ( ) => {
60
60
instance . _handleLayout ( ) ;
61
61
} , 0 ) ;
62
62
}
63
63
} ;
64
64
65
65
const unobserve = instance => {
66
- delete registry [ instance . _onLayoutId ] ;
66
+ delete registry [ instance . _layoutId ] ;
67
67
if ( resizeObserver ) {
68
68
const node = findNodeHandle ( instance ) ;
69
- delete node . _onLayoutId ;
69
+ delete node . _layoutId ;
70
70
resizeObserver . unobserve ( node ) ;
71
71
} else {
72
- delete instance . _onLayoutId ;
72
+ delete instance . _layoutId ;
73
73
}
74
74
} ;
75
75
@@ -131,7 +131,12 @@ const applyLayout = Component => {
131
131
layout . height !== height
132
132
) {
133
133
this . _layoutState = { x, y, width, height } ;
134
- const nativeEvent = { layout : this . _layoutState } ;
134
+ const nativeEvent = {
135
+ layout : this . _layoutState ,
136
+ get target ( ) {
137
+ return findNodeHandle ( this ) ;
138
+ }
139
+ } ;
135
140
onLayout ( { nativeEvent, timeStamp : Date . now ( ) } ) ;
136
141
}
137
142
} ) ;
0 commit comments