pass width and height as separate inputs

apache · Sep 18, 2018 · 86ee56c · 86ee56c
1 parent bafb382
commit 86ee56c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/superset/assets/src/utils/createAdaptor.jsx b/superset/assets/src/utils/createAdaptor.jsx
@@ -8,7 +8,11 @@ export default function createAdaptor(Component, transformProps = IDENTITY) {
   return function adaptor(slice, payload, setControlValue) {
     const basicChartInput = new BasicChartInput(slice, payload, setControlValue);
     ReactDOM.render(
-      <Component {...transformProps(basicChartInput)} />,
+      <Component
+        width={slice.width()}
+        height={slice.height()}
+        {...transformProps(basicChartInput)}
+      />,
       document.querySelector(slice.selector),
     );
   };

diff --git a/superset/assets/src/visualizations/WorldMap/transformProps.js b/superset/assets/src/visualizations/WorldMap/transformProps.js
@@ -1,10 +1,9 @@
 export default function transformProps(basicChartInput) {
-  const { height, formData, payload } = basicChartInput;
+  const { formData, payload } = basicChartInput;
   const { maxBubbleSize, showBubbles } = formData;
 
   return {
     data: payload.data,
-    height,
     maxBubbleSize: parseInt(maxBubbleSize, 10),
     showBubbles,
   };

diff --git a/superset/assets/src/visualizations/models/BasicChartInput.js b/superset/assets/src/visualizations/models/BasicChartInput.js
@@ -2,11 +2,8 @@ import convertKeysToCamelCase from '../../utils/convertKeysToCamelCase';
 
 export default class BasicChartInput {
   constructor(slice, payload, setControlValue) {
-    this.width = slice.width();
-    this.height = slice.height();
     this.annotationData = slice.annotationData;
     this.formData = convertKeysToCamelCase(slice.formData);
-
     this.payload = payload;
     this.setControlValue = setControlValue;
   }