Skip to content
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

Jump to bottom

fix: remove double rendering #693

Merged
merged 12 commits into from
Jun 11, 2020
Merged

fix: remove double rendering #693

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1fd26fb
fix: remove double rendering
markov00 Jun 1, 2020
738818e
Merge branch 'master' into 2020_06_01-fix_double_rendering
markov00 Jun 1, 2020
2b0c472
fix: annotation markers render when parent size is computed
markov00 Jun 3, 2020
72b6c36
refactor: check w/h at chart state level
markov00 Jun 3, 2020
1ac18c1
Merge branch '2020_06_01-fix_double_rendering' of github.com:markov00…
markov00 Jun 3, 2020
5c7a317
refactor: resizeDebounce defined check
markov00 Jun 3, 2020
5f96a67
Merge branch 'master' into 2020_06_01-fix_double_rendering
markov00 Jun 9, 2020
1c77a00
fix: double rendering
markov00 Jun 9, 2020
582a58a
test: fix
markov00 Jun 10, 2020
387fecc
test: add missing snapshot
markov00 Jun 10, 2020
d77ba15
fix: add chart id to test
markov00 Jun 10, 2020
588bea8
Merge branch 'master' into 2020_06_01-fix_double_rendering
markov00 Jun 11, 2020
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
12 changes: 5 additions & 7 deletions src/components/chart_resizer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ interface ResizerDispatchProps {

type ResizerProps = ResizerStateProps & ResizerDispatchProps;

const DEFAULT_RESIZE_DEBOUNCE = 200;

class Resizer extends React.Component<ResizerProps> {
private initialResizeComplete = false;
private containerRef: RefObject<HTMLDivElement>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated but could be changed when this file needs an update, containerRef could be read only

Expand All @@ -53,10 +55,8 @@ class Resizer extends React.Component<ResizerProps> {
componentDidMount() {
this.onResizeDebounced = debounce(this.onResize, this.props.resizeDebounce);
if (this.containerRef.current) {
const { clientWidth, clientHeight } = this.containerRef.current;
this.props.updateParentDimensions({ width: clientWidth, height: clientHeight, top: 0, left: 0 });
markov00 marked this conversation as resolved.
Show resolved Hide resolved
this.ro.observe(this.containerRef.current as Element);
}
this.ro.observe(this.containerRef.current as Element);
}

componentWillUnmount() {
Expand Down Expand Up @@ -102,11 +102,9 @@ const mapDispatchToProps = (dispatch: Dispatch): ResizerDispatchProps =>
);

const mapStateToProps = (state: GlobalChartState): ResizerStateProps => {
const settings = getSettingsSpecSelector(state);
const resizeDebounce =
settings.resizeDebounce === undefined || settings.resizeDebounce === null ? 200 : settings.resizeDebounce;
const { resizeDebounce } = getSettingsSpecSelector(state);
return {
resizeDebounce,
resizeDebounce: resizeDebounce == null || Number.isNaN(resizeDebounce) ? DEFAULT_RESIZE_DEBOUNCE : resizeDebounce,
markov00 marked this conversation as resolved.
Show resolved Hide resolved
};
};

Expand Down