Merge 6270881 into 150ca28

modules/core/package.json

@@ -37,7 +37,6 @@
     "gl-matrix": "^3.0.0",
     "math.gl": "^3.0.0",
     "mjolnir.js": "^2.1.2",
-    "probe.gl": "^3.1.1",
-    "seer": "^0.2.4"
+    "probe.gl": "^3.1.1"
   }
 }

modules/core/src/lib/layer-manager.js

@@ -20,7 +20,6 @@
 
 import assert from '../utils/assert';
 import {Timeline} from '@luma.gl/core';
-import seer from 'seer';
 import Layer from './layer';
 import {LIFECYCLE} from '../lifecycle/constants';
 import log from '../utils/log';
@@ -30,14 +29,6 @@ import {Stats} from 'probe.gl';
 import Viewport from '../viewports/viewport';
 import {createProgramManager} from '../shaderlib';
 
-import {
-  setPropOverrides,
-  layerEditListener,
-  seerInitListener,
-  initLayerInSeer,
-  updateLayerInSeer
-} from './seer-integration';
-
 const LOG_PRIORITY_LIFECYCLE = 2;
 const LOG_PRIORITY_LIFECYCLE_MINOR = 4;
 
@@ -94,26 +85,15 @@ export default class LayerManager {
 
     this.activateViewport = this.activateViewport.bind(this);
 
-    // Seer integration
-    this._initSeer = this._initSeer.bind(this);
-    this._editSeer = this._editSeer.bind(this);
-
     Object.seal(this);
-
-    seerInitListener(this._initSeer);
-    layerEditListener(this._editSeer);
   }
 
   // Method to call when the layer manager is not needed anymore.
-  // Currently used in the <DeckGL> componentWillUnmount lifecycle to unbind Seer listeners.
   finalize() {
     // Finalize all layers
     for (const layer of this.layers) {
       this._finalizeLayer(layer);
     }
-
-    seer.removeListener(this._initSeer);
-    seer.removeListener(this._editSeer);
   }
 
   // Check if a redraw is needed
@@ -310,12 +290,10 @@ export default class LayerManager {
         if (!oldLayer) {
           const err = this._initializeLayer(newLayer);
           error = error || err;
-          initLayerInSeer(newLayer); // Initializes layer in seer chrome extension (if connected)
         } else {
           this._transferLayerState(oldLayer, newLayer);
           const err = this._updateLayer(newLayer);
           error = error || err;
-          updateLayerInSeer(newLayer); // Updates layer in seer chrome extension (if connected)
         }
         generatedLayers.push(newLayer);
 
@@ -432,28 +410,4 @@ export default class LayerManager {
     log.log(LOG_PRIORITY_LIFECYCLE, `finalizing ${layerName(layer)}`)();
     return error;
   }
-
-  // SEER INTEGRATION
-
-  /**
-   * Called upon Seer initialization, manually sends layers data.
-   */
-  _initSeer() {
-    this.layers.forEach(layer => {
-      initLayerInSeer(layer);
-      updateLayerInSeer(layer);
-    });
-  }
-
-  /**
-   * On Seer property edition, set override and update layers.
-   */
-  _editSeer(payload) {
-    if (payload.type !== 'edit' || payload.valuePath[0] !== 'props') {
-      return;
-    }
-
-    setPropOverrides(payload.itemKey, payload.valuePath.slice(1), payload.value);
-    this.updateLayers();
-  }
 }

modules/core/src/lib/layer.js

@@ -21,7 +21,6 @@
 /* eslint-disable react/no-direct-mutation-state */
 import {COORDINATE_SYSTEM} from './constants';
 import AttributeManager from './attribute/attribute-manager';
-import {removeLayerInSeer} from './seer-integration';
 import UniformTransitionManager from './uniform-transition-manager';
 import {diffProps, validateProps} from '../lifecycle/props';
 import {count} from '../utils/count';
@@ -631,8 +630,6 @@ export default class Layer extends Component {
     for (const extension of this.props.extensions) {
       extension.finalizeState.call(this, extension);
     }
-    // End lifecycle method
-    removeLayerInSeer(this.id);
   }
 
   // Calculates uniforms

modules/core/src/lifecycle/create-props.js

@@ -1,4 +1,3 @@
-import {applyPropOverrides} from '../lib/seer-integration';
 import log from '../utils/log';
 import {isAsyncIterable} from '../utils/iterable-utils';
 import {parsePropTypes} from './prop-types';
@@ -43,9 +42,6 @@ export function createProps() {
   checkDeprecatedProps(layerName, propsInstance.updateTriggers, deprecatedProps);
   checkDeprecatedProps(layerName, propsInstance.transitions, deprecatedProps);
 
-  // SEER: Apply any overrides from the seer debug extension if it is active
-  applyPropOverrides(propsInstance);
-
   // Props must be immutable
   Object.freeze(propsInstance);
 

test/modules/core/lib/index.js

@@ -28,7 +28,6 @@ import './layer-manager.spec';
 import './tooltip.spec';
 import './transition-manager.spec';
 import './uniform-transition-manager.spec';
-import './seer-integration.spec';
 import './effect.spec';
 import './effect-manager.spec';
 import './picking.spec';