archive-gh-me/react-map-gl
1
0
Fork 0
mirror of https://github.com/visgl/react-map-gl.git synced 2026-01-18 15:54:22 +00:00
Code Issues Projects Releases Wiki Activity

Invoke setter with default when prop missing (#2560)

Browse Source
This commit is contained in:
felixpalmer 2025-12-17 05:53:06 +01:00 committed by GitHub
parent 465bd4bbc7
commit e7d2ee7142
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/react-mapbox/src/mapbox/mapbox.ts
View File

@ -85,6 +85,16 @@ export type MapboxProps = Partial<ViewState> &
const DEFAULT_STYLE = {version: 8, sources: {}, layers: []} as StyleSpecification;
const DEFAULT_SETTINGS = {
minZoom: 0,
maxZoom: 22,
minPitch: 0,
maxPitch: 85,
maxBounds: [-180, -85.051129, 180, 85.051129],
projection: 'mercator',
renderWorldCopies: true
};
const pointerEvents = {
mousedown: 'onMouseDown',
mouseup: 'onMouseUp',
@ -461,10 +471,13 @@ export default class Mapbox {
const map = this._map;
let changed = false;
for (const propName of settingNames) {
if (propName in nextProps && !deepEqual(nextProps[propName], currProps[propName])) {
const propPresent = propName in nextProps || propName in currProps;
if (propPresent && !deepEqual(nextProps[propName], currProps[propName])) {
changed = true;
const nextValue = propName in nextProps ? nextProps[propName] : DEFAULT_SETTINGS[propName];
const setter = map[`set${propName[0].toUpperCase()}${propName.slice(1)}`];
setter?.call(map, nextProps[propName]);
setter?.call(map, nextValue);
}
}
return changed;

17
modules/react-maplibre/src/maplibre/maplibre.ts
View File

@ -80,6 +80,16 @@ export type MaplibreProps = Partial<ViewState> &
const DEFAULT_STYLE = {version: 8, sources: {}, layers: []} as StyleSpecification;
const DEFAULT_SETTINGS = {
minZoom: 0,
maxZoom: 22,
minPitch: 0,
maxPitch: 85,
maxBounds: [-180, -85.051129, 180, 85.051129],
projection: 'mercator',
renderWorldCopies: true
};
const pointerEvents = {
mousedown: 'onMouseDown',
mouseup: 'onMouseUp',
@ -413,10 +423,13 @@ export default class Maplibre {
const map = this._map;
let changed = false;
for (const propName of settingNames) {
if (propName in nextProps && !deepEqual(nextProps[propName], currProps[propName])) {
const propPresent = propName in nextProps || propName in currProps;
if (propPresent && !deepEqual(nextProps[propName], currProps[propName])) {
changed = true;
const nextValue = propName in nextProps ? nextProps[propName] : DEFAULT_SETTINGS[propName];
const setter = map[`set${propName[0].toUpperCase()}${propName.slice(1)}`];
setter?.call(map, nextProps[propName]);
setter?.call(map, nextValue);
}
}
return changed;