Merge e58d242 into 3b45d23

docs/api-reference/composite-layer.md

@@ -81,6 +81,20 @@ new GeoJsonLayer({
 });
 ```
 
+## Members
+
+##### `isComposite`
+
+Always `true`.
+
+##### `isLoaded`
+
+`true` if all asynchronous assets are loaded, and all sublayers are also loaded.
+
+##### `parent`
+
+A `Layer` instance if this layer is rendered by a [CompositeLayer](/docs/api-reference/composite-layer.md)
+
 
 ## Methods
 

docs/api-reference/layer.md

@@ -489,6 +489,17 @@ The state object allows a layer to store persistent information cross rendering
 [Properties](/docs/api-reference/layer.md#constructor) of this layer.
 
 
+## Members
+
+##### `isLoaded`
+
+`true` if all asynchronous assets are loaded.
+
+##### `parent`
+
+A `Layer` instance if this layer is rendered by a [CompositeLayer](/docs/api-reference/composite-layer.md)
+
+
 ## Methods
 
 > Layer methods are designed to support the creation of new layers or layer sub-classing and are NOT intended to be called by applications.

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

@@ -28,6 +28,10 @@ export default class CompositeLayer extends Layer {
     return true;
   }
 
+  get isLoaded() {
+    return super.isLoaded && this.getSubLayers().every(layer => layer.isLoaded);
+  }
+
   getSubLayers() {
     return (this.internalState && this.internalState.subLayers) || [];
   }

modules/core/src/lib/layer.js

@@ -148,6 +148,10 @@ export default class Layer extends Component {
     return this.internalState.uniformTransitions.active;
   }
 
+  get isLoaded() {
+    return this.internalState && !this.internalState.isAsyncPropLoading();
+  }
+
   // Returns true if the layer is pickable and visible.
   isPickable() {
     return this.props.pickable && this.props.visible;

modules/core/src/lifecycle/component-state.js

@@ -79,12 +79,20 @@ export default class ComponentState {
   }
 
   isAsyncPropLoading(propName) {
-    const asyncProp = this.asyncProps[propName];
-    return Boolean(
-      asyncProp &&
-        asyncProp.pendingLoadCount > 0 &&
-        asyncProp.pendingLoadCount !== asyncProp.resolvedLoadCount
-    );
+    if (propName) {
+      const asyncProp = this.asyncProps[propName];
+      return Boolean(
+        asyncProp &&
+          asyncProp.pendingLoadCount > 0 &&
+          asyncProp.pendingLoadCount !== asyncProp.resolvedLoadCount
+      );
+    }
+    for (const key in this.asyncProps) {
+      if (this.isAsyncPropLoading(key)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   // Updates all async/overridden props (when new props come in)

modules/layers/src/icon-layer/icon-layer.js

@@ -175,6 +175,10 @@ export default class IconLayer extends Layer {
   }
   /* eslint-enable max-statements, complexity */
 
+  get isLoaded() {
+    return super.isLoaded && this.state.iconManager.isLoaded;
+  }
+
   finalizeState() {
     super.finalizeState();
     // Release resources held by the icon manager

modules/layers/src/icon-layer/icon-manager.js

@@ -244,7 +244,7 @@ export default class IconManager {
     }
   }
 
-  get loaded() {
+  get isLoaded() {
     return this._pendingCount === 0;
   }
 

modules/test-utils/src/snapshot-test-runner.js

@@ -29,7 +29,11 @@ const DEFAULT_TEST_OPTIONS = {
 const DEFAULT_TEST_CASE = {
   name: 'Unnamed snapshot test',
   props: {},
-  onAfterRender: ({deck, layers, done}) => done(),
+  onAfterRender: ({deck, layers, done}) => {
+    if (layers.every(layer => layer.isLoaded)) {
+      done(); // eslint-disable-line
+    }
+  },
   goldenImage: ''
 };
 

test/modules/core/lib/composite-layer.spec.js

@@ -20,7 +20,7 @@
 
 import test from 'tape-catch';
 import {LayerManager, CompositeLayer, Layer, COORDINATE_SYSTEM} from 'deck.gl';
-import {gl, testLayer} from '@deck.gl/test-utils';
+import {gl, testLayer, testInitializeLayer} from '@deck.gl/test-utils';
 
 const SUB_LAYER_ID = 'sub-layer-id';
 const BASE_LAYER_ID = 'composite-layer-id';
@@ -339,3 +339,17 @@ test('CompositeLayer#setState', t => {
 
   t.end();
 });
+
+test('CompositeLayer#isLoaded', t => {
+  const layer = new TestCompositeLayer({
+    data: Promise.resolve([]),
+    onDataLoad: () => {
+      t.ok(layer.isLoaded, 'data is loaded');
+      t.end();
+    }
+  });
+
+  testInitializeLayer({layer});
+
+  t.notOk(layer.isLoaded, 'is loading data');
+});

test/modules/core/lib/layer.spec.js

@@ -468,3 +468,17 @@ test('Layer#calculateInstancePickingColors', t => {
 
   t.end();
 });
+
+test('Layer#isLoaded', t => {
+  const layer = new SubLayer({
+    data: Promise.resolve([]),
+    onDataLoad: () => {
+      t.ok(layer.isLoaded, 'data is loaded');
+      t.end();
+    }
+  });
+
+  testInitializeLayer({layer});
+
+  t.notOk(layer.isLoaded, 'is loading data');
+});

test/render/test-cases/icon-layer.js

@@ -141,12 +141,6 @@ export default [
         }
       })
     ],
-    onAfterRender: ({layers, done}) => {
-      if (layers[0].state.iconManager.loaded) {
-        // data is loaded
-        done();
-      }
-    },
     goldenImage: './test/render/golden-images/icon-lnglat-large.png'
   },
   // This is based on last test case
@@ -190,12 +184,6 @@ export default [
         }
       })
     ],
-    onAfterRender: ({layers, done}) => {
-      if (layers[0].state.iconManager.loaded) {
-        // data is loaded
-        done();
-      }
-    },
     goldenImage: './test/render/golden-images/icon-lnglat-resize-texture.png'
   },
   {