@deck.gl/react - npm Package Compare versions

Comparing version 5.3.0-alpha.1 to 5.3.0-alpha.2

dist/deckgl.js

@@ -66,2 +66,4 @@ "use strict";
       canvas: this.deckCanvas,
+      viewState: this._getViewState(this.props),
+      // Note: If Deck event handling changes size, it calls onResize to update
       onResize: size => this.forceUpdate()
@@ -96,2 +98,18 @@ }));
 
+  pickMultipleObjects({
+    x,
+    y,
+    radius = 0,
+    layerIds = null,
+    depth = 10
+  }) {
+    return this.deck.pickMultipleObjects({
+      x,
+      y,
+      radius,
+      layerIds,
+      depth
+    });
+  }
+
   pickObjects({
@@ -128,8 +146,40 @@ x,
   _updateFromProps(nextProps) {
-    // Support old "geospatial view state as separate props" style (React only!)
+    // extract any deck.gl layers masquerading as react elements from props.children
+    const {
+      layers,
+      children
+    } = this._extractJSXLayers(nextProps.children);
+
+    if (this.deck) {
+      this.deck.setProps(Object.assign({}, nextProps, {
+        views: this._getViews(nextProps),
+        viewState: this._getViewState(nextProps),
+        // Avoid modifying layers array if no JSX layers were found
+        layers: layers ? [...layers, ...nextProps.layers] : nextProps.layers
+      }));
+    }
+
+    this.children = children;
+  } // Support old `viewports` prop (React only!)
+
+
+  _getViews(props) {
+    if (props.viewports) {
+      log.deprecated('DeckGL.viewports', 'DeckGL.views')();
+    }
+
+    if (props.viewport) {
+      log.deprecated('DeckGL.viewport', 'DeckGL.views')();
+    }
+
+    return props.views || props.viewports || props.viewport && [props.viewport];
+  } // Supports old "geospatial view state as separate props" style (React only!)
+
+
+  _getViewState(props) {
     let {
       viewState
-    } = nextProps;
+    } = props;
 
-    if (!viewState) {
+    if (!viewState && 'latitude' in props && 'longitude' in props && 'zoom' in props) {
       const {
@@ -139,6 +189,6 @@ latitude,
         zoom,
-        pitch,
-        bearing
-      } = nextProps;
-      viewState = nextProps.viewState || {
+        pitch = 0,
+        bearing = 0
+      } = props;
+      viewState = props.viewState || {
         latitude,
@@ -150,31 +200,5 @@ longitude,
       };
-    } // Support old `viewports` prop (React only!)
-
-
-    const views = nextProps.views || nextProps.viewports || nextProps.viewport && [nextProps.viewport];
-
-    if (nextProps.viewports) {
-      log.deprecated('DeckGL.viewports', 'DeckGL.views')();
     }
 
-    if (nextProps.viewport) {
-      log.deprecated('DeckGL.viewport', 'DeckGL.views')();
-    } // extract any deck.gl layers masquerading as react elements from props.children
-
-
-    const {
-      layers,
-      children
-    } = this._extractJSXLayers(nextProps.children);
-
-    if (this.deck) {
-      this.deck.setProps(Object.assign({}, nextProps, {
-        views,
-        viewState,
-        // Avoid modifying layers array if no JSX layers were found
-        layers: layers ? [...layers, ...nextProps.layers] : nextProps.layers
-      }));
-    }
-
-    this.children = children;
+    return viewState;
   } // extracts any deck.gl layers masquerading as react elements from props.children
@@ -317,2 +341,2 @@
 DeckGL.defaultProps = defaultProps;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/deckgl.js"],"names":["log","propTypes","Object","assign","getPropTypes","viewports","array","viewport","object","defaultProps","DeckGL","Component","constructor","props","state","children","componentDidMount","deck","canvas","deckCanvas","onResize","size","forceUpdate","_updateFromProps","componentWillReceiveProps","nextProps","componentWillUnmount","finalize","pickObject","x","y","radius","layerIds","pickObjects","width","height","queryObject","opts","deprecated","queryVisibleObjects","viewState","latitude","longitude","zoom","pitch","bearing","views","layers","_extractJSXLayers","setProps","reactChildren","Children","forEach","reactElement","LayerType","type","layer","push","_renderChildrenUnderViews","getViewports","viewMap","view","id","map","child","i","viewId","_positionChild","viewportId","newProps","getMercatorParams","visible","isMapSynched","clone","style","position","left","top","key","render","ref","c"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport React, {createElement, cloneElement} from 'react';\nimport PropTypes from 'prop-types';\nimport autobind from './utils/autobind';\nimport {inheritsFrom} from './utils/inherits-from';\nimport {Deck, Layer, experimental} from '@deck.gl/core';\nconst {log} = experimental;\n\nconst propTypes = Object.assign({}, Deck.getPropTypes(PropTypes), {\n  viewports: PropTypes.array, // Deprecated\n  viewport: PropTypes.object // Deprecated\n});\n\nconst defaultProps = Deck.defaultProps;\n\nexport default class DeckGL extends React.Component {\n  constructor(props) {\n    super(props);\n    this.state = {};\n    this.children = [];\n    autobind(this);\n  }\n\n  componentDidMount() {\n    this.deck = new Deck(\n      Object.assign({}, this.props, {\n        canvas: this.deckCanvas,\n        onResize: size => this.forceUpdate()\n      })\n    );\n    this._updateFromProps(this.props);\n  }\n\n  componentWillReceiveProps(nextProps) {\n    this._updateFromProps(nextProps);\n  }\n\n  componentWillUnmount() {\n    this.deck.finalize();\n  }\n\n  // Public API\n\n  pickObject({x, y, radius = 0, layerIds = null}) {\n    return this.deck.pickObject({x, y, radius, layerIds});\n  }\n\n  pickObjects({x, y, width = 1, height = 1, layerIds = null}) {\n    return this.deck.pickObjects({x, y, width, height, layerIds});\n  }\n\n  queryObject(opts) {\n    log.deprecated('queryObject', 'pickObject')();\n    return this.deck.pickObject(opts);\n  }\n\n  queryVisibleObjects(opts) {\n    log.deprecated('queryVisibleObjects', 'pickObjects')();\n    return this.pickObjects(opts);\n  }\n\n  // Private Helpers\n\n  // 1. Extract any JSX layers from the react children\n  // 2. Handle any backwards compatiblity props for React layer\n  // Needs to be called both from initial mount, and when new props arrive\n  _updateFromProps(nextProps) {\n    // Support old \"geospatial view state as separate props\" style (React only!)\n    let {viewState} = nextProps;\n    if (!viewState) {\n      const {latitude, longitude, zoom, pitch, bearing} = nextProps;\n      viewState = nextProps.viewState || {latitude, longitude, zoom, pitch, bearing};\n    }\n\n    // Support old `viewports` prop (React only!)\n    const views =\n      nextProps.views || nextProps.viewports || (nextProps.viewport && [nextProps.viewport]);\n    if (nextProps.viewports) {\n      log.deprecated('DeckGL.viewports', 'DeckGL.views')();\n    }\n    if (nextProps.viewport) {\n      log.deprecated('DeckGL.viewport', 'DeckGL.views')();\n    }\n\n    // extract any deck.gl layers masquerading as react elements from props.children\n    const {layers, children} = this._extractJSXLayers(nextProps.children);\n\n    if (this.deck) {\n      this.deck.setProps(\n        Object.assign({}, nextProps, {\n          views,\n          viewState,\n          // Avoid modifying layers array if no JSX layers were found\n          layers: layers ? [...layers, ...nextProps.layers] : nextProps.layers\n        })\n      );\n    }\n\n    this.children = children;\n  }\n\n  // extracts any deck.gl layers masquerading as react elements from props.children\n  _extractJSXLayers(children) {\n    const reactChildren = []; // extract real react elements (i.e. not deck.gl layers)\n    let layers = null; // extracted layer from react children, will add to deck.gl layer array\n\n    React.Children.forEach(children, reactElement => {\n      if (reactElement) {\n        // For some reason Children.forEach doesn't filter out `null`s\n        const LayerType = reactElement.type;\n        if (inheritsFrom(LayerType, Layer)) {\n          const layer = new LayerType(reactElement.props);\n          layers = layers || [];\n          layers.push(layer);\n        } else {\n          reactChildren.push(reactElement);\n        }\n      }\n    });\n\n    return {layers, children: reactChildren};\n  }\n\n  // Iterate over views and reposition children associated with views\n  // TODO - Can we supply a similar function for the non-React case?\n  _renderChildrenUnderViews(children) {\n    // Flatten out nested views array\n    const views = this.deck ? this.deck.getViewports() : [];\n\n    // Build a view id to view index\n    const viewMap = {};\n    views.forEach(view => {\n      if (view.id) {\n        viewMap[view.id] = view;\n      }\n    });\n\n    return children.map(\n      // If child specifies props.viewId, position under view, otherwise render as normal\n      (child, i) =>\n        child.props.viewId || child.props.viewId ? this._positionChild({child, viewMap, i}) : child\n    );\n  }\n\n  _positionChild({child, viewMap, i}) {\n    const {viewId, viewportId} = child.props;\n    if (viewportId) {\n      log.deprecated('viewportId', 'viewId')();\n    }\n    const view = viewMap[viewId || viewportId];\n\n    // Drop (auto-hide) elements with viewId that are not matched by any current view\n    if (!view) {\n      return null;\n    }\n\n    // Resolve potentially relative dimensions using the deck.gl container size\n    const {x, y, width, height} = view;\n\n    // Clone the element with width and height set per view\n    const newProps = Object.assign({}, child.props, {width, height});\n\n    // Inject map properties\n    // TODO - this is too react-map-gl specific\n    Object.assign(newProps, view.getMercatorParams(), {\n      visible: view.isMapSynched()\n    });\n\n    const clone = cloneElement(child, newProps);\n\n    // Wrap it in an absolutely positioning div\n    const style = {position: 'absolute', left: x, top: y, width, height};\n    const key = `view-child-${viewId}-${i}`;\n    return createElement('div', {key, id: key, style}, clone);\n  }\n\n  render() {\n    // Render the background elements (typically react-map-gl instances)\n    // using the view descriptors\n    const children = this._renderChildrenUnderViews(this.children);\n\n    // Note that width and height are handled by deck.gl\n    const {id} = this.props;\n    // TODO - this styling is enforced for correct positioning with children\n    // It can override the styling set by `Deck`, this should be consolidated.\n    const style = Object.assign({}, {position: 'absolute', left: 0, top: 0}, this.props.style);\n\n    const canvas = createElement('canvas', {\n      ref: c => (this.deckCanvas = c),\n      key: 'deck-canvas',\n      id,\n      style\n    });\n\n    // Render deck.gl as last child\n    children.push(canvas);\n\n    return createElement('div', {id: 'deckgl-wrapper'}, children);\n  }\n}\n\nDeckGL.propTypes = propTypes;\nDeckGL.defaultProps = defaultProps;\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/deckgl.js"],"names":["log","propTypes","Object","assign","getPropTypes","viewports","array","viewport","object","defaultProps","DeckGL","Component","constructor","props","state","children","componentDidMount","deck","canvas","deckCanvas","viewState","_getViewState","onResize","size","forceUpdate","_updateFromProps","componentWillReceiveProps","nextProps","componentWillUnmount","finalize","pickObject","x","y","radius","layerIds","pickMultipleObjects","depth","pickObjects","width","height","queryObject","opts","deprecated","queryVisibleObjects","layers","_extractJSXLayers","setProps","views","_getViews","latitude","longitude","zoom","pitch","bearing","reactChildren","Children","forEach","reactElement","LayerType","type","layer","push","_renderChildrenUnderViews","getViewports","viewMap","view","id","map","child","i","viewId","_positionChild","viewportId","newProps","getMercatorParams","visible","isMapSynched","clone","style","position","left","top","key","render","ref","c"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport React, {createElement, cloneElement} from 'react';\nimport PropTypes from 'prop-types';\nimport autobind from './utils/autobind';\nimport {inheritsFrom} from './utils/inherits-from';\nimport {Deck, Layer, experimental} from '@deck.gl/core';\nconst {log} = experimental;\n\nconst propTypes = Object.assign({}, Deck.getPropTypes(PropTypes), {\n  viewports: PropTypes.array, // Deprecated\n  viewport: PropTypes.object // Deprecated\n});\n\nconst defaultProps = Deck.defaultProps;\n\nexport default class DeckGL extends React.Component {\n  constructor(props) {\n    super(props);\n    this.state = {};\n    this.children = [];\n    autobind(this);\n  }\n\n  componentDidMount() {\n    this.deck = new Deck(\n      Object.assign({}, this.props, {\n        canvas: this.deckCanvas,\n        viewState: this._getViewState(this.props),\n        // Note: If Deck event handling changes size, it calls onResize to update\n        onResize: size => this.forceUpdate()\n      })\n    );\n    this._updateFromProps(this.props);\n  }\n\n  componentWillReceiveProps(nextProps) {\n    this._updateFromProps(nextProps);\n  }\n\n  componentWillUnmount() {\n    this.deck.finalize();\n  }\n\n  // Public API\n\n  pickObject({x, y, radius = 0, layerIds = null}) {\n    return this.deck.pickObject({x, y, radius, layerIds});\n  }\n\n  pickMultipleObjects({x, y, radius = 0, layerIds = null, depth = 10}) {\n    return this.deck.pickMultipleObjects({x, y, radius, layerIds, depth});\n  }\n\n  pickObjects({x, y, width = 1, height = 1, layerIds = null}) {\n    return this.deck.pickObjects({x, y, width, height, layerIds});\n  }\n\n  queryObject(opts) {\n    log.deprecated('queryObject', 'pickObject')();\n    return this.deck.pickObject(opts);\n  }\n\n  queryVisibleObjects(opts) {\n    log.deprecated('queryVisibleObjects', 'pickObjects')();\n    return this.pickObjects(opts);\n  }\n\n  // Private Helpers\n\n  // 1. Extract any JSX layers from the react children\n  // 2. Handle any backwards compatiblity props for React layer\n  // Needs to be called both from initial mount, and when new props arrive\n  _updateFromProps(nextProps) {\n    // extract any deck.gl layers masquerading as react elements from props.children\n    const {layers, children} = this._extractJSXLayers(nextProps.children);\n\n    if (this.deck) {\n      this.deck.setProps(\n        Object.assign({}, nextProps, {\n          views: this._getViews(nextProps),\n          viewState: this._getViewState(nextProps),\n          // Avoid modifying layers array if no JSX layers were found\n          layers: layers ? [...layers, ...nextProps.layers] : nextProps.layers\n        })\n      );\n    }\n\n    this.children = children;\n  }\n\n  // Support old `viewports` prop (React only!)\n  _getViews(props) {\n    if (props.viewports) {\n      log.deprecated('DeckGL.viewports', 'DeckGL.views')();\n    }\n    if (props.viewport) {\n      log.deprecated('DeckGL.viewport', 'DeckGL.views')();\n    }\n    return props.views || props.viewports || (props.viewport && [props.viewport]);\n  }\n\n  // Supports old \"geospatial view state as separate props\" style (React only!)\n  _getViewState(props) {\n    let {viewState} = props;\n\n    if (!viewState && 'latitude' in props && 'longitude' in props && 'zoom' in props) {\n      const {latitude, longitude, zoom, pitch = 0, bearing = 0} = props;\n      viewState = props.viewState || {latitude, longitude, zoom, pitch, bearing};\n    }\n\n    return viewState;\n  }\n\n  // extracts any deck.gl layers masquerading as react elements from props.children\n  _extractJSXLayers(children) {\n    const reactChildren = []; // extract real react elements (i.e. not deck.gl layers)\n    let layers = null; // extracted layer from react children, will add to deck.gl layer array\n\n    React.Children.forEach(children, reactElement => {\n      if (reactElement) {\n        // For some reason Children.forEach doesn't filter out `null`s\n        const LayerType = reactElement.type;\n        if (inheritsFrom(LayerType, Layer)) {\n          const layer = new LayerType(reactElement.props);\n          layers = layers || [];\n          layers.push(layer);\n        } else {\n          reactChildren.push(reactElement);\n        }\n      }\n    });\n\n    return {layers, children: reactChildren};\n  }\n\n  // Iterate over views and reposition children associated with views\n  // TODO - Can we supply a similar function for the non-React case?\n  _renderChildrenUnderViews(children) {\n    // Flatten out nested views array\n    const views = this.deck ? this.deck.getViewports() : [];\n\n    // Build a view id to view index\n    const viewMap = {};\n    views.forEach(view => {\n      if (view.id) {\n        viewMap[view.id] = view;\n      }\n    });\n\n    return children.map(\n      // If child specifies props.viewId, position under view, otherwise render as normal\n      (child, i) =>\n        child.props.viewId || child.props.viewId ? this._positionChild({child, viewMap, i}) : child\n    );\n  }\n\n  _positionChild({child, viewMap, i}) {\n    const {viewId, viewportId} = child.props;\n    if (viewportId) {\n      log.deprecated('viewportId', 'viewId')();\n    }\n    const view = viewMap[viewId || viewportId];\n\n    // Drop (auto-hide) elements with viewId that are not matched by any current view\n    if (!view) {\n      return null;\n    }\n\n    // Resolve potentially relative dimensions using the deck.gl container size\n    const {x, y, width, height} = view;\n\n    // Clone the element with width and height set per view\n    const newProps = Object.assign({}, child.props, {width, height});\n\n    // Inject map properties\n    // TODO - this is too react-map-gl specific\n    Object.assign(newProps, view.getMercatorParams(), {\n      visible: view.isMapSynched()\n    });\n\n    const clone = cloneElement(child, newProps);\n\n    // Wrap it in an absolutely positioning div\n    const style = {position: 'absolute', left: x, top: y, width, height};\n    const key = `view-child-${viewId}-${i}`;\n    return createElement('div', {key, id: key, style}, clone);\n  }\n\n  render() {\n    // Render the background elements (typically react-map-gl instances)\n    // using the view descriptors\n    const children = this._renderChildrenUnderViews(this.children);\n\n    // Note that width and height are handled by deck.gl\n    const {id} = this.props;\n    // TODO - this styling is enforced for correct positioning with children\n    // It can override the styling set by `Deck`, this should be consolidated.\n    const style = Object.assign({}, {position: 'absolute', left: 0, top: 0}, this.props.style);\n\n    const canvas = createElement('canvas', {\n      ref: c => (this.deckCanvas = c),\n      key: 'deck-canvas',\n      id,\n      style\n    });\n\n    // Render deck.gl as last child\n    children.push(canvas);\n\n    return createElement('div', {id: 'deckgl-wrapper'}, children);\n  }\n}\n\nDeckGL.propTypes = propTypes;\nDeckGL.defaultProps = defaultProps;\n"]}

package.json

@@ -5,3 +5,3 @@ {
   "license": "MIT",
-  "version": "5.3.0-alpha.1",
+  "version": "5.3.0-alpha.2",
   "publishConfig": {
@@ -26,3 +26,3 @@ "access": "public"
   "dependencies": {
-    "@deck.gl/core": "^5.3.0-alpha.1",
+    "@deck.gl/core": "^5.3.0-alpha.2",
     "prop-types": "^15.6.0"
@@ -29,0 +29,0 @@ },

src/deckgl.js

@@ -47,2 +47,4 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc.
         canvas: this.deckCanvas,
+        viewState: this._getViewState(this.props),
+        // Note: If Deck event handling changes size, it calls onResize to update
         onResize: size => this.forceUpdate()
@@ -68,2 +70,6 @@ })
 
+  pickMultipleObjects({x, y, radius = 0, layerIds = null, depth = 10}) {
+    return this.deck.pickMultipleObjects({x, y, radius, layerIds, depth});
+  }
+
   pickObjects({x, y, width = 1, height = 1, layerIds = null}) {
@@ -89,19 +95,2 @@ return this.deck.pickObjects({x, y, width, height, layerIds});
   _updateFromProps(nextProps) {
-    // Support old "geospatial view state as separate props" style (React only!)
-    let {viewState} = nextProps;
-    if (!viewState) {
-      const {latitude, longitude, zoom, pitch, bearing} = nextProps;
-      viewState = nextProps.viewState || {latitude, longitude, zoom, pitch, bearing};
-    }
-
-    // Support old `viewports` prop (React only!)
-    const views =
-      nextProps.views || nextProps.viewports || (nextProps.viewport && [nextProps.viewport]);
-    if (nextProps.viewports) {
-      log.deprecated('DeckGL.viewports', 'DeckGL.views')();
-    }
-    if (nextProps.viewport) {
-      log.deprecated('DeckGL.viewport', 'DeckGL.views')();
-    }
-
     // extract any deck.gl layers masquerading as react elements from props.children
@@ -113,4 +102,4 @@ const {layers, children} = this._extractJSXLayers(nextProps.children);
         Object.assign({}, nextProps, {
-          views,
-          viewState,
+          views: this._getViews(nextProps),
+          viewState: this._getViewState(nextProps),
           // Avoid modifying layers array if no JSX layers were found
@@ -125,2 +114,25 @@ layers: layers ? [...layers, ...nextProps.layers] : nextProps.layers
 
+  // Support old `viewports` prop (React only!)
+  _getViews(props) {
+    if (props.viewports) {
+      log.deprecated('DeckGL.viewports', 'DeckGL.views')();
+    }
+    if (props.viewport) {
+      log.deprecated('DeckGL.viewport', 'DeckGL.views')();
+    }
+    return props.views || props.viewports || (props.viewport && [props.viewport]);
+  }
+
+  // Supports old "geospatial view state as separate props" style (React only!)
+  _getViewState(props) {
+    let {viewState} = props;
+
+    if (!viewState && 'latitude' in props && 'longitude' in props && 'zoom' in props) {
+      const {latitude, longitude, zoom, pitch = 0, bearing = 0} = props;
+      viewState = props.viewState || {latitude, longitude, zoom, pitch, bearing};
+    }
+
+    return viewState;
+  }
+
   // extracts any deck.gl layers masquerading as react elements from props.children
@@ -127,0 +139,0 @@ _extractJSXLayers(children) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

93046

increased by2.49%

Lines of code

1155

increased by2.76%

Dependency changes

• [e-mail]/core@^5.3.0-alpha.2