Merge pull request #726 from MetaCell/feature/netpyne-150

NETPYNE-150: python console height fixed

Author: ddelpiano

webapp/components/general/NetPyNEPythonConsole.js

@@ -1,27 +1,26 @@
 import React, { Component } from 'react';
-
+import ReactResizeDetector from 'react-resize-detector';
 import { PythonConsole } from '@metacell/geppetto-meta-ui/python-console/PythonConsole';
 
 export class NetPyNEPythonConsole extends Component {
-
   shouldComponentUpdate (nextProps) {
     if (this.props.extensionLoaded !== nextProps.extensionLoaded) {
       return true;
     }
     return false;
   }
 
-  componentWillUnmount() {
-    console.info("unmounting python console");
-  }
-
-  componentDidMount() {
-
+  componentWillUnmount () {
+    console.info('unmounting python console');
   }
 
-  render() {
+  render () {
     const notebookName = GEPPETTO_CONFIGURATION.notebookName || "notebook.ipynb";
-    return <PythonConsole pythonNotebookPath={`notebooks/${notebookName}`} extensionLoaded={this.props.extensionLoaded} />
+    return (
+      <ReactResizeDetector handleWidth handleHeight>
+        {({ width, height }) => <PythonConsole pythonNotebookPath={`notebooks/${notebookName}`} extensionLoaded={this.props.extensionLoaded} iframeHeight={height} />}
+      </ReactResizeDetector>
+    );
   }
 }
 

webapp/dev_package.json

@@ -35,6 +35,7 @@
     "react-dom": "^16.4.0",
     "react-json-view": "^1.21.3",
     "react-redux": "^7.2.0",
+    "react-resize-detector": "^6.7.4",
     "react-sortable-tree": "^2.8.0",
     "redux": "4.1.2",
     "sass": "^1.49.0",
@@ -78,7 +79,6 @@
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^0.7.0",
     "raw-loader": "^0.5.1",
-    "react-resize-detector": "^6.7.4",
     "style-loader": "^0.13.2",
     "three": ">=0.111.0",
     "typedoc": "^0.11.1",

webapp/package.bak

@@ -35,6 +35,7 @@
     "react-dom": "^16.4.0",
     "react-json-view": "^1.21.3",
     "react-redux": "^7.2.0",
+    "react-resize-detector": "^6.7.4",
     "react-sortable-tree": "^2.8.0",
     "redux": "4.1.2",
     "sass": "^1.49.0",
@@ -78,7 +79,6 @@
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^0.7.0",
     "raw-loader": "^0.5.1",
-    "react-resize-detector": "^6.7.4",
     "style-loader": "^0.13.2",
     "three": ">=0.111.0",
     "typedoc": "^0.11.1",

webapp/package.json

@@ -35,6 +35,7 @@
     "react-dom": "^16.4.0",
     "react-json-view": "^1.21.3",
     "react-redux": "^7.2.0",
+    "react-resize-detector": "^6.7.4",
     "react-sortable-tree": "^2.8.0",
     "redux": "4.1.2",
     "sass": "^1.49.0",
@@ -78,7 +79,6 @@
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^0.7.0",
     "raw-loader": "^0.5.1",
-    "react-resize-detector": "^6.7.4",
     "style-loader": "^0.13.2",
     "three": ">=0.111.0",
     "typedoc": "^0.11.1",