Skip to content

fix(mapbox): guard against null viewport when canvas has zero dimensions #10076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pessimistress merged 12 commits into from
Mar 10, 2026
Merged

fix(mapbox): guard against null viewport when canvas has zero dimensions #10076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
daaeb0b
test(mapbox): expose null-viewport crash in drawLayer/drawLayerGroup
claude Mar 8, 2026
56991bf
fix(mapbox): guard against null viewport when canvas has zero dimensions
claude Mar 8, 2026
de1c523
revert(mapbox): remove null-viewport guard to expose test failure
claude Mar 8, 2026
bac3a7d
test(mapbox): use _render() to actually trigger drawLayer in zero-siz…
claude Mar 8, 2026
00621e8
test(mapbox): trigger _render() from onLoad to ensure deck.isInitialized
claude Mar 9, 2026
cae9e43
style(mapbox): fix prettier formatting in mapbox-layer.spec.ts
claude Mar 9, 2026
ffba80c
fix(mapbox): guard against null viewport when canvas has zero dimensions
claude Mar 9, 2026
cc0974c
Merge branch 'master' into claude/fix-mapbox-null-viewport-nsDGF
chrisgervang Mar 9, 2026
15d2540
fix(mapbox): guard against null viewport in afterRender
claude Mar 9, 2026
c7aafd8
revert(mapbox): remove afterRender null-viewport guard to expose failure
claude Mar 9, 2026
b03d72e
test(mapbox): fix afterRender zero-size test to use multiple views
claude Mar 9, 2026
97cecef
Merge branch 'master' into claude/fix-mapbox-null-viewport-nsDGF
chrisgervang Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion test/modules/mapbox/mapbox-gl-mock/map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,11 @@ export default class Map extends Evented {
}

_render() {
this.style.render();
try {
this.style.render();
} catch (e) {
this._renderError = e;
}
Copy link
Copy Markdown

@cursor cursor bot Mar 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stale _renderError never cleared between render calls

Low Severity

_renderError is only ever assigned on failure and never reset to null/undefined at the start of _render(). If _render() is called multiple times (e.g., via multiple triggerRepaint() calls queued by Deck's _customRender), an error from an earlier render persists even if a later render succeeds. The t.notOk(_renderError) assertion in the render handler would then report a stale error, producing a misleading or false test failure. Adding this._renderError = null before the try-catch would ensure the value always reflects the most recent render attempt.

Fix in Cursor Fix in Web

this.fire(new Event('render'));
}

Expand Down
2 changes: 2 additions & 0 deletions test/modules/mapbox/mapbox-layer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ test('MapboxLayer#external Deck multiple views supplied', t => {
map.addLayer(layerDefaultView);

map.on('render', () => {
t.notOk((map as any)._renderError, 'render should not throw');
t.deepEqual(
drawLog,
[
Expand Down Expand Up @@ -184,6 +185,7 @@ test('MapboxLayer#external Deck custom views', t => {

map.addLayer(new MapboxLayer({id: 'scatterplot'}));
map.on('render', () => {
t.notOk((map as any)._renderError, 'render should not throw');
t.deepEqual(
drawLog,
[
Expand Down
Loading