Fixes Style#{get,set,remove}FeatureState with {target: {layerId}} so imported-layer targets resolve against their own fragment's sources instead of the root style's.

GitOrigin-RevId: fb28adb0ca3a17c4e0a49ac917a0d41ae0f27bf0

Author: dcoj

src/style/style.ts

@@ -3419,7 +3419,10 @@ class Style extends Evented<MapEvents> {
             } else if ('layerId' in target.target) {
                 const {layerId} = target.target;
                 const layer = this.getLayer(layerId);
-                this.setFeatureState({id: target.id, source: layer.source, sourceLayer: layer.sourceLayer}, state);
+                if (!layer) return;
+                const fragment = this.getFragmentStyle(layer.scope);
+                if (!fragment) return;
+                fragment.setFeatureState({id: target.id, source: layer.source, sourceLayer: layer.sourceLayer}, state);
             }
 
             return;
@@ -3465,7 +3468,10 @@ class Style extends Evented<MapEvents> {
             } else if ('layerId' in target.target) {
                 const {layerId} = target.target;
                 const layer = this.getLayer(layerId);
-                this.removeFeatureState({id: target.id, source: layer.source, sourceLayer: layer.sourceLayer}, key);
+                if (!layer) return;
+                const fragment = this.getFragmentStyle(layer.scope);
+                if (!fragment) return;
+                fragment.removeFeatureState({id: target.id, source: layer.source, sourceLayer: layer.sourceLayer}, key);
             }
 
             return;
@@ -3519,7 +3525,10 @@ class Style extends Evented<MapEvents> {
             } else if ('layerId' in target.target) {
                 const {layerId} = target.target;
                 const layer = this.getLayer(layerId);
-                finalState = this.getFeatureState({id: target.id, source: layer.source, sourceLayer: layer.sourceLayer});
+                if (!layer) return;
+                const fragment = this.getFragmentStyle(layer.scope);
+                if (!fragment) return;
+                finalState = fragment.getFeatureState({id: target.id, source: layer.source, sourceLayer: layer.sourceLayer});
             }
 
             return finalState;

test/unit/style/style_imports.test.ts

@@ -15,6 +15,8 @@ import {newStubStyle} from './utils';
 import browser from '../../../src/util/browser';
 import EvaluationParameters from '../../../src/style/evaluation_parameters';
 
+import type {StyleSpecification} from 'mapbox-gl';
+
 function createStyleJSON(properties) {
     return {version: 8,
         sources: {},
@@ -3851,3 +3853,40 @@ test('Style#getFragmentStyle', async () => {
     // Fragment should return itself when fragmentId is `undefined`
     expect(basemapFragment2.getFragmentStyle()).toBe(basemapFragment2);
 });
+
+describe('feature-state with imported layer targets', () => {
+    async function loadCollidingRootAndImport() {
+        const {style} = newStubStyle();
+        const fragment = createStyleJSON({
+            sources: {shared: {type: 'geojson', data: {type: 'FeatureCollection', features: []}}},
+            layers: [{id: 'fragment-layer', type: 'circle', source: 'shared'}]
+        }) as StyleSpecification;
+        const root = createStyleJSON({
+            sources: {shared: {type: 'geojson', data: {type: 'FeatureCollection', features: []}}},
+            layers: [{id: 'root-layer', type: 'circle', source: 'shared'}],
+            imports: [{id: 'fragment', url: '', data: fragment}]
+        }) as StyleSpecification;
+        style.loadJSON(root);
+        await waitFor(style, 'style.load');
+        return {style, fragmentStyle: style.getFragmentStyle('fragment')};
+    }
+
+    test('imported-layer setFeatureState writes to the fragment source, not the colliding root source', async () => {
+        const {style, fragmentStyle} = await loadCollidingRootAndImport();
+        const importedLayerId = makeFQID('fragment-layer', 'fragment');
+
+        style.setFeatureState({id: 1, target: {layerId: importedLayerId}}, {hover: true});
+
+        expect(fragmentStyle.getFeatureState({source: 'shared', id: 1})).toEqual({hover: true});
+        expect(style.getFeatureState({source: 'shared', id: 1})).toEqual({});
+    });
+
+    test('root-layer setFeatureState still writes to the root source', async () => {
+        const {style, fragmentStyle} = await loadCollidingRootAndImport();
+
+        style.setFeatureState({id: 2, target: {layerId: 'root-layer'}}, {hover: true});
+
+        expect(style.getFeatureState({source: 'shared', id: 2})).toEqual({hover: true});
+        expect(fragmentStyle.getFeatureState({source: 'shared', id: 2})).toEqual({});
+    });
+});