Skip to content

use ResizeObserver to detect size change #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 25, 2019
Merged

use ResizeObserver to detect size change #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64431d3
remove duplicated keys
rinick Mar 24, 2019
c26968d
use ResizeObserver in modern browsers
rinick Mar 24, 2019
3efb889
use resize-observer-polyfill to detect size change
rinick Mar 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"raf": "^3.4.1",
"rc-hammerjs": "~0.6.0",
"rc-util": "^4.0.4",
"resize-observer-polyfill": "^1.5.1",
"warning": "^3.0.0"
}
}
10 changes: 5 additions & 5 deletions src/ScrollableTabBarNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import addEventListener from 'rc-util/lib/Dom/addEventListener';
import debounce from 'lodash/debounce';
import ResizeObserver from 'resize-observer-polyfill';
import { setTransform, isTransform3dSupported } from './utils';

export default class ScrollableTabBarNode extends React.Component {
Expand All @@ -22,7 +22,8 @@ export default class ScrollableTabBarNode extends React.Component {
this.setNextPrev();
this.scrollToActiveTab();
}, 200);
this.resizeEvent = addEventListener(window, 'resize', this.debouncedResize);
this.resizeObserver = new ResizeObserver(this.debouncedResize);
this.resizeObserver.observe(this.props.getRef('container'));
}

componentDidUpdate(prevProps) {
Expand All @@ -43,8 +44,8 @@ export default class ScrollableTabBarNode extends React.Component {
}

componentWillUnmount() {
if (this.resizeEvent) {
this.resizeEvent.remove();
if (this.resizeObserver) {
this.resizeObserver.disconnect();
}
if (this.debouncedResize && this.debouncedResize.cancel) {
this.debouncedResize.cancel();
Expand Down Expand Up @@ -323,7 +324,6 @@ ScrollableTabBarNode.propTypes = {
children: PropTypes.node,
prevIcon: PropTypes.node,
nextIcon: PropTypes.node,
activeKey: PropTypes.string,
};

ScrollableTabBarNode.defaultProps = {
Expand Down