From 1fbebd3dff4aa3c59708068893041fc6ed137ba3 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Thu, 10 Sep 2015 10:11:24 -0700 Subject: [PATCH] fix(scroll-region): Handle edge case where React nodes are not available (Sentry 2763) --- src/components/scroll-region.cjsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/scroll-region.cjsx b/src/components/scroll-region.cjsx index 52a0731fd..85af8f453 100644 --- a/src/components/scroll-region.cjsx +++ b/src/components/scroll-region.cjsx @@ -50,6 +50,7 @@ class Scrollbar extends React.Component _recomputeDimensions: ({avoidForcingLayout}) => if not avoidForcingLayout trackNode = React.findDOMNode(@refs.track) + return unless trackNode trackHeight = trackNode.clientHeight if trackHeight isnt @state.trackHeight @setState({trackHeight}) @@ -282,8 +283,9 @@ class ScrollRegion extends React.Component _recomputeDimensions: ({avoidForcingLayout}) => return unless @refs.content - contentNode = React.findDOMNode(@refs.content) + return unless contentNode + viewportScrollTop = contentNode.scrollTop # While we're scrolling, calls to contentNode.scrollHeight / clientHeight