@@ -22,6 +22,7 @@ import ReportActionsSkeletonView from '../../components/ReportActionsSkeletonVie
22
22
import reportActionPropTypes from './report/reportActionPropTypes' ;
23
23
import ArchivedReportFooter from '../../components/ArchivedReportFooter' ;
24
24
import toggleReportActionComposeView from '../../libs/toggleReportActionComposeView' ;
25
+ import addViewportResizeListener from '../../libs/VisualViewport' ;
25
26
import { withNetwork } from '../../components/OnyxProvider' ;
26
27
import compose from '../../libs/compose' ;
27
28
import networkPropTypes from '../../components/networkPropTypes' ;
@@ -118,7 +119,8 @@ class ReportScreen extends React.Component {
118
119
super ( props ) ;
119
120
120
121
this . onSubmitComment = this . onSubmitComment . bind ( this ) ;
121
- this . viewportOffsetTop = this . updateViewportOffsetTop . bind ( this ) ;
122
+ this . updateViewportOffsetTop = this . updateViewportOffsetTop . bind ( this ) ;
123
+ this . removeViewportResizeListener = ( ) => { } ;
122
124
123
125
this . state = {
124
126
skeletonViewContainerHeight : 0 ,
@@ -128,9 +130,7 @@ class ReportScreen extends React.Component {
128
130
129
131
componentDidMount ( ) {
130
132
this . storeCurrentlyViewedReport ( ) ;
131
- if ( window . visualViewport ) {
132
- window . visualViewport . addEventListener ( 'resize' , this . viewportOffsetTop ) ;
133
- }
133
+ this . removeViewportResizeListener = addViewportResizeListener ( this . updateViewportOffsetTop ) ;
134
134
}
135
135
136
136
componentDidUpdate ( prevProps ) {
@@ -142,9 +142,7 @@ class ReportScreen extends React.Component {
142
142
143
143
componentWillUnmount ( ) {
144
144
clearTimeout ( this . loadingTimerId ) ;
145
- if ( window . visualViewport ) {
146
- window . visualViewport . removeEventListener ( 'resize' , this . viewportOffsetTop ) ;
147
- }
145
+ this . removeViewportResizeListener ( ) ;
148
146
}
149
147
150
148
/**
0 commit comments