Merge pull request #1597 from akvo/Dashboard-columns-not-flowing-full…

…-width-on-some-(every-fourth)-pixel-width-#1593 Dashboard columns not flowing full width on some (every fourth) pixel…
akvo · Aug 16, 2018 · 24bf80d · 24bf80d
2 parents 220fcea + 651e39e
commit 24bf80d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/client/package.json b/client/package.json
@@ -106,7 +106,7 @@
  "react-router-redux": "^4.0.8",
  "react-scroll": "^1.7.10",
  "react-select": "^1.0.0-rc.2",
- "react-window-size": "^1.2.0",
+ "react-window-size": "^1.2.1",
  "redux": "^3.6.0",
  "redux-actions": "^1.1.0",
  "redux-devtools": "^3.3.1",

diff --git a/client/src/components/dashboard/DashboardViewerItem.jsx b/client/src/components/dashboard/DashboardViewerItem.jsx
@@ -29,7 +29,11 @@ export default class DashboardViewerItem extends Component {
  display: 'inline-block',
  width: canvasWidth - (cMargin * 2),
  minHeight: MIN_HEIGHT,
- height: item.type === 'visualisation' && item.visualisation.visualisationType === 'map' ?
+ height: (
+ item.type === 'visualisation' &&
+ item.visualisation &&
+ item.visualisation.visualisationType === 'map'
+ ) ?
  MIN_HEIGHT :
  null,
  margin: cMargin,
@@ -41,7 +45,11 @@ export default class DashboardViewerItem extends Component {
  display: 'inline-block',
  width: (canvasWidth / 2) - (cMargin * 2),
  minHeight: MIN_HEIGHT,
- height: item.type === 'visualisation' && item.visualisation.visualisationType === 'map' ?
+ height: (
+ item.type === 'visualisation' &&
+ item.visualisation &&
+ item.visualisation.visualisationType === 'map'
+ ) ?
  MIN_HEIGHT :
  null,
  margin: cMargin,