Compare commits

...

2 Commits

3 changed files with 9 additions and 6 deletions

View File

@@ -48,7 +48,7 @@ class DataTable extends React.PureComponent {
dimension2.forEach((dim2) => { dimension2.forEach((dim2) => {
measurements.forEach((measure) => { measurements.forEach((measure) => {
for (index = 0; index < injectSeparatorsArray.length; index++) { for (index = 0; index < injectSeparatorsArray.length; index++) {
if (dimension1[dimIndex].displayValue === injectSeparatorsArray[index].parents.dimension1.header) { if (injectSeparatorsArray[index].parents && dimension1[dimIndex].displayValue === injectSeparatorsArray[index].parents.dimension1.header) {
if (dim2.displayValue === injectSeparatorsArray[index].parents.dimension2.header) { if (dim2.displayValue === injectSeparatorsArray[index].parents.dimension2.header) {
if (measure.name === injectSeparatorsArray[index].parents.measurement.header) { if (measure.name === injectSeparatorsArray[index].parents.measurement.header) {
measurementDataRow.push(injectSeparatorsArray[index]); measurementDataRow.push(injectSeparatorsArray[index]);

View File

@@ -33,7 +33,7 @@ class LinkedScrollWrapper extends React.PureComponent {
unlinkComponent (component) { unlinkComponent (component) {
const componentIndex = this.scrollElements.map(element => element.component).indexOf(component); const componentIndex = this.scrollElements.map(element => element.component).indexOf(component);
if (componentIndex !== -1) { if (componentIndex !== -1) {
this.scrollElements.removeAt(componentIndex); this.scrollElements.splice(componentIndex, 1);
// eslint-disable-next-line react/no-find-dom-node // eslint-disable-next-line react/no-find-dom-node
const node = ReactDOM.findDOMNode(component); const node = ReactDOM.findDOMNode(component);
node.onscroll = null; node.onscroll = null;

View File

@@ -12,9 +12,12 @@ class Root extends React.PureComponent {
} }
componentDidUpdate () { componentDidUpdate () {
const tableWidth = this.dataTableRef.getBoundingClientRect().width; let tableWidth;
if (this.renderedTableWidth !== tableWidth) { if (this.dataTableRef) {
this.forceUpdate(); tableWidth = this.dataTableRef.getBoundingClientRect().width;
if (this.renderedTableWidth !== tableWidth) {
this.forceUpdate();
}
} }
} }
@@ -66,7 +69,7 @@ class Root extends React.PureComponent {
return ( return (
<div className="root"> <div className="root">
{error ? ( {error ? (
<div className="error"> <div className={`error ${editmodeClass}`}>
{state.layout.errormessage} {state.layout.errormessage}
</div> </div>
) : ( ) : (