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

Revert Resize and FlotChart components to 6.0 #15717

Merged
merged 1 commit into from
Dec 21, 2017
Merged

Revert Resize and FlotChart components to 6.0 #15717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 21 additions & 11 deletions src/core_plugins/metrics/public/visualizations/components/flot_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { findDOMNode } from 'react-dom';
import _ from 'lodash';
import $ from 'ui/flot-charts';
import eventBus from '../lib/events';
Expand Down Expand Up @@ -174,10 +175,14 @@ class FlotChart extends Component {
return _.assign(opts, props.options);
}

handleResize(width, height) {
this.size = { width, height };
handleResize() {
const resize = findDOMNode(this.resize);
if (!this.rendered) {
this.renderChart();
return;
}

if (this.size.height > 0 && this.size.width > 0) {
if (resize && resize.clientHeight > 0 && resize.clientHeight > 0) {
if (!this.plot) return;
this.plot.resize();
this.plot.setupGrid();
Expand All @@ -187,15 +192,14 @@ class FlotChart extends Component {
}

renderChart() {
const resize = findDOMNode(this.resize);

if (this.size.height > 0 && this.size.width > 0) {

if (resize.clientWidth > 0 && resize.clientHeight > 0) {
this.rendered = true;
const { series } = this.props;
const data = this.calculateData(series, this.props.show);

this.plot = $.plot(this.target, data, this.getOptions(this.props));

this.handleDraw(this.plot);

_.defer(() => this.handleResize());
Expand Down Expand Up @@ -253,10 +257,16 @@ class FlotChart extends Component {

render() {
return (
<div className="rhythm_chart__timeseries-container">
<div ref={el => (this.target = el)} className="rhythm_chart__timeseries-container" />
<Resize onResize={this.handleResize} />
</div>
<Resize
onResize={this.handleResize}
ref={(el) => this.resize = el}
className="rhythm_chart__timeseries-container"
>
<div
ref={(el) => this.target = el}
className="rhythm_chart__timeseries-container"
/>
</Resize>
);
}
}
Expand Down
187 changes: 38 additions & 149 deletions src/core_plugins/metrics/public/visualizations/components/resize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,177 +1,66 @@
/*
* Please note: Much of this code is taken from the MIT licensed react-resize-detector module written by @maslianok
*/

import PropTypes from 'prop-types';
import React, { Component } from 'react';

const parentStyle = {
position: 'absolute',
left: 0,
top: 0,
right: 0,
bottom: 0,
overflow: 'hidden',
zIndex: -1,
visibility: 'hidden'
};

const shrinkChildStyle = {
position: 'absolute',
left: 0,
top: 0,
width: '200%',
height: '200%'
};

const expandChildStyle = {
position: 'absolute',
left: 0,
top: 0,
width: '100%',
height: '100%'
};

import { findDOMNode } from 'react-dom';
class Resize extends Component {
constructor() {
super();

this.state = {
expandChildHeight: 0,
expandChildWidth: 0,
expandScrollLeft: 0,
expandScrollTop: 0,
shrinkScrollTop: 0,
shrinkScrollLeft: 0,
lastWidth: 0,
lastHeight: 0
};

this.reset = this.reset.bind(this);
this.handleScroll = this.handleScroll.bind(this);
constructor(props) {
super(props);
this.state = {};
this.handleResize = this.handleResize.bind(this);
}

componentWillMount() {
this.forceUpdate();
checkSize() {
const el = findDOMNode(this.el);
if (!el) return;
this.timeout = setTimeout(() => {
const { currentHeight, currentWidth } = this.state;
if (currentHeight !== el.parentNode.clientHeight || currentWidth !== el.parentNode.clientWidth) {
this.setState({
currentWidth: el.parentNode.clientWidth,
currentHeight: el.parentNode.clientHeight
});
this.handleResize();
}
clearTimeout(this.timeout);
this.checkSize();
}, this.props.frequency);
}

componentDidMount() {
const [width, height] = this.containerSize();
this.reset(width, height);
this.props.onResize(width, height);
}

shouldComponentUpdate(nextProps, nextState) {
return this.props !== nextProps || this.state !== nextState;
}

componentDidUpdate() {
this.expand.scrollLeft = this.expand.scrollWidth;
this.expand.scrollTop = this.expand.scrollHeight;

this.shrink.scrollLeft = this.shrink.scrollWidth;
this.shrink.scrollTop = this.shrink.scrollHeight;
}

containerSize() {
return [
this.props.handleWidth && this.container.parentElement.offsetWidth,
this.props.handleHeight && this.container.parentElement.offsetHeight
];
this.checkSize();
}

reset(containerWidth, containerHeight) {
if (typeof window === 'undefined') {
return;
}

const parent = this.container.parentElement;

let position = 'static';
if (parent.currentStyle) {
position = parent.currentStyle.position;
} else if (window.getComputedStyle) {
position = window.getComputedStyle(parent).position;
}
if (position === 'static') {
parent.style.position = 'relative';
}

this.setState({
expandChildHeight: this.expand.offsetHeight + 10,
expandChildWidth: this.expand.offsetWidth + 10,
lastWidth: containerWidth,
lastHeight: containerHeight
});
componentWillUnmount() {
clearTimeout(this.timeout);
}

handleScroll(e) {
if (typeof window === 'undefined') {
return;
}

e.preventDefault();
e.stopPropagation();

const { state } = this;

const [width, height] = this.containerSize();
if (width !== state.lastWidth || height !== state.lastHeight) {
this.props.onResize(width, height);
}

this.reset(width, height);
handleResize() {
if (this.props.onResize) this.props.onResize();
}

render() {
const { state } = this;

const expandStyle = {
...expandChildStyle,
width: state.expandChildWidth,
height: state.expandChildHeight
};

return (
const style = this.props.style || {};
const className = this.props.className || '';
return(
<div
style={parentStyle}
ref={e => {
this.container = e;
}}
style={style}
className={className}
ref={(el) => this.el = el}
>
<div
style={parentStyle}
onScroll={this.handleScroll}
ref={e => {
this.expand = e;
}}
>
<div style={expandStyle} />
</div>
<div
style={parentStyle}
onScroll={this.handleScroll}
ref={e => {
this.shrink = e;
}}
>
<div style={shrinkChildStyle} />
</div>
{this.props.children}
</div>
);
}

}

Resize.propTypes = {
handleWidth: PropTypes.bool,
handleHeight: PropTypes.bool,
onResize: PropTypes.func
Resize.defaultProps = {
frequency: 500
};

Resize.defaultProps = {
handleWidth: true,
handleHeight: true,
onResize: e => e
Resize.propTypes = {
frequency: PropTypes.number,
onResize: PropTypes.func
};

export default Resize;