Some example fixes (visgl#1878)

jrzimmerman · Jun 1, 2018 · 323fc12 · 323fc12
1 parent f0204a6
commit 323fc12
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 30 deletions.
diff --git a/examples/website/arc/app.js b/examples/website/arc/app.js
@@ -67,11 +67,6 @@ class App extends Component {
     }
   }
 
-  componentDidMount() {
-    window.addEventListener('resize', this._onResize.bind(this));
-    this._onResize();
-  }
-
   componentWillReceiveProps(nextProps) {
     const arcsChanged =
       nextProps.data !== this.props.data ||
@@ -81,14 +76,6 @@ class App extends Component {
     }
   }
 
-  _onResize() {
-    const viewState = Object.assign(this.state.viewState, {
-      width: window.innerWidth,
-      height: window.innerHeight
-    });
-    this._onViewStateChange({viewState});
-  }
-
   _onViewStateChange({viewState}) {
     this.setState({
       viewState: {...this.state.viewState, ...viewState}
@@ -103,7 +90,7 @@ class App extends Component {
     // Clicked a county
     const selectedCounty = info.object;
     this.setState({selectedCounty});
-    this._recalculateArcs(this.props.data, selectedCounty);
+    this._recalculateArcs(this.props.data || this.state.counties, selectedCounty);
   }
 
   _recalculateArcs(data, selectedFeature) {
@@ -176,6 +163,7 @@ class App extends Component {
         viewState={viewState}
         onViewStateChange={onViewStateChange}
         controller={MapController}
+        pickingRadius={10}
       >
         <StaticMap
           viewId="map"

diff --git a/examples/website/icon/app.js b/examples/website/icon/app.js
@@ -85,7 +85,7 @@ class App extends Component {
   // the world, we can't use some fixed deltaLon and deltaLat
   _updateCluster({data, viewState}) {
     const oldViewState = this._oldViewState || {};
-    const oldData = this._data;
+    const oldData = this._oldData;
     const changed =
       data !== oldData ||
       viewState.width !== oldViewState.width ||
@@ -207,6 +207,8 @@ class App extends Component {
           mapboxApiAccessToken={mapboxApiAccessToken}
           preventStyleDiffing={true}
         />
+
+        <div>{this.props.children}</div>
       </DeckGL>
     );
   }

diff --git a/modules/react/src/deckgl.js b/modules/react/src/deckgl.js
@@ -141,7 +141,8 @@ export default class DeckGL extends React.Component {
         return child;
       }
 
-      const viewport = this.deck.layerManager.viewManager.getViewport(viewId);
+      const viewport =
+        this.deck.layerManager && this.deck.layerManager.viewManager.getViewport(viewId);
 
       // Drop (auto-hide) elements with viewId that are not matched by any current view
       if (!viewport) {

diff --git a/website/src/components/demos/icon-demo.js b/website/src/components/demos/icon-demo.js
@@ -77,8 +77,8 @@ export default class IconDemo extends Component {
       return;
     }
 
-    const {viewport, params} = this.props;
-    const z = Math.floor(viewport.zoom);
+    const {viewState, params} = this.props;
+    const z = Math.floor(viewState.zoom);
     const showCluster = params.cluster.value;
 
     let hoveredItems = null;
@@ -159,18 +159,20 @@ export default class IconDemo extends Component {
     }
 
     return (
-      <div className={`icon-demo ${hoveredItems ? 'clickable' : ''}`}>
-        <App
-          {...this.props}
-          data={data[0]}
-          iconAtlas="images/location-icon-atlas.png"
-          iconMapping={data[1]}
-          showCluster={params.cluster.value}
-          onHover={this._onHover}
-          onClick={this._onClick} />
-
-        { this._renderhoveredItems() }
-      </div>
+      <App
+        {...this.props}
+        data={data[0]}
+        iconAtlas="images/location-icon-atlas.png"
+        iconMapping={data[1]}
+        showCluster={params.cluster.value}
+        onHover={this._onHover}
+        onClick={this._onClick} >
+
+        <div className={`icon-demo ${hoveredItems ? 'clickable' : ''}`}>
+          { this._renderhoveredItems() }
+        </div>
+
+      </App>
     );
   }
 }