Merge pull request #413 from se7entyse7en/uast-viewer-pane-nodes-expa…

…nsion Fixes initialization of `UASTViewer`
src-d · Apr 19, 2019 · 8582449 · 8582449
2 parents 38074aa + 6271723
commit 8582449
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/frontend/src/components/UASTViewer.js b/frontend/src/components/UASTViewer.js
@@ -16,7 +16,7 @@ class UASTViewer extends Component {
 
     this.state = {
       loading: false,
-      flatUast: this.transform(props.uast),
+      initialFlatUast: this.transform(props.uast),
       showLocations: false,
       filter: '',
       error: null
@@ -65,9 +65,9 @@ class UASTViewer extends Component {
   }
 
   render() {
-    const { flatUast, error, loading } = this.state;
+    const { initialFlatUast, error, loading } = this.state;
     const { showLocations, filter } = this.state;
-    const uastViewerProps = { flatUast };
+    const uastViewerProps = { initialFlatUast };
 
     return (
       <div className="pg-uast-viewer">

diff --git a/frontend/src/components/UASTViewerPane.js b/frontend/src/components/UASTViewerPane.js
@@ -41,10 +41,11 @@ function UASTViewerPane({
 }) {
   let content = null;
 
+  const uast = uastViewerProps.flatUast || uastViewerProps.initialFlatUast;
   if (loading) {
     content = <div>loading...</div>;
-  } else if (uastViewerProps.flatUast) {
-    const searchResults = getSearchResults(uastViewerProps.flatUast);
+  } else if (uast) {
+    const searchResults = getSearchResults(uast);
     const rootIds = searchResults || [ROOT_ID];
 
     if (searchResults && !searchResults.length) {