Rebase commits onto upstream #859

docs/api-reference/layers/selection-layer.md

@@ -81,6 +81,8 @@ Either `rectangle` or `polygon`
 
 Called when selection is completed.
 
-#### `layerIds` (String[], required)
+#### `layerIds` (String[], optional)
 
-Array of layer ids where we will search.
+- Default: `null`
+
+Array of layer ids where we will search. If not specified, then all pickable and visible layers are searched.

modules/editor/test/importer.test.ts

@@ -210,7 +210,7 @@ describe('parseImport()', () => {
         expect(importData.valid).toEqual(false);
         expect(importData.validationErrors).toEqual([
           'Error parsing GeoJSON',
-          'SyntaxError: Unexpected token a in JSON at position 1',
+          "SyntaxError: Expected property name or '}' in JSON at position 1",
         ]);
       });
     });

modules/layers/src/layers/selection-layer.ts

@@ -25,14 +25,14 @@ const MODE_CONFIG_MAP = {
 };
 
 interface SelectionLayerProps<DataT> extends CompositeLayerProps<DataT> {
-  layerIds: any[];
+  layerIds: any[] | null;
   onSelect: (info: any) => any;
   selectionType: string | null;
 }
 
 const defaultProps: DefaultProps<SelectionLayerProps<any>> = {
   selectionType: SELECTION_TYPE.RECTANGLE,
-  layerIds: [],
+  layerIds: null,
   onSelect: () => {},
 };
 
@@ -124,12 +124,22 @@ export default class SelectionLayer<DataT, ExtraPropsT> extends CompositeLayer<
 
     // HACK, find a better way
     setTimeout(() => {
+      let selectionLayerIds = layerIds;
+      if (!selectionLayerIds) {
+        // Provide all visible and pickable layers to pickObjects when layerIds is not provided.
+        selectionLayerIds = this.context.layerManager
+          .getLayers()
+          .filter((layer) => layer.props.pickable && layer.props.visible)
+          .map((layer) => layer.props.id);
+      }
+
+      // @ts-ignore
       const pickingInfos = this.context.deck.pickObjects({
         x,
         y,
         width: maxX - x,
         height: maxY - y,
-        layerIds: [blockerId, ...layerIds],
+        layerIds: [blockerId, ...selectionLayerIds],
       });
 
       onSelect({