From 0b9e7dc29293c40d33129d12c3797fe31c9894a4 Mon Sep 17 00:00:00 2001 From: Mojtaba Samimi Date: Fri, 10 Nov 2023 11:33:20 -0500 Subject: [PATCH 1/2] bump mapbox-gl from v1.10.1 to v1.13.1 i.e. latest v1 --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- src/plots/mapbox/constants.js | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index b43d0525c32..0795b56ee95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", "is-mobile": "^4.0.0", - "mapbox-gl": "1.10.1", + "mapbox-gl": "1.13.1", "mouse-change": "^1.4.0", "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.2.0", @@ -8637,9 +8637,9 @@ "dev": true }, "node_modules/mapbox-gl": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.10.1.tgz", - "integrity": "sha512-0aHt+lFUpYfvh0kMIqXqNXqoYMuhuAsMlw87TbhWrw78Tx2zfuPI0Lx31/YPUgJ+Ire0tzQ4JnuBL7acDNXmMg==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.1.tgz", + "integrity": "sha512-GSyubcoSF5MyaP8z+DasLu5v7KmDK2pp4S5+VQ5WdVQUOaAqQY4jwl4JpcdNho3uWm2bIKs7x1l7q3ynGmW60g==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/geojson-types": "^1.0.2", @@ -8661,7 +8661,7 @@ "potpack": "^1.0.1", "quickselect": "^2.0.0", "rw": "^1.3.3", - "supercluster": "^7.0.0", + "supercluster": "^7.1.0", "tinyqueue": "^2.0.3", "vt-pbf": "^3.1.1" }, @@ -11686,9 +11686,9 @@ } }, "node_modules/supercluster": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.0.0.tgz", - "integrity": "sha512-8VuHI8ynylYQj7Qf6PBMWy1PdgsnBiIxujOgc9Z83QvJ8ualIYWNx2iMKyKeC4DZI5ntD9tz/CIwwZvIelixsA==", + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz", + "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==", "dependencies": { "kdbush": "^3.0.0" } @@ -19631,9 +19631,9 @@ "dev": true }, "mapbox-gl": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.10.1.tgz", - "integrity": "sha512-0aHt+lFUpYfvh0kMIqXqNXqoYMuhuAsMlw87TbhWrw78Tx2zfuPI0Lx31/YPUgJ+Ire0tzQ4JnuBL7acDNXmMg==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.1.tgz", + "integrity": "sha512-GSyubcoSF5MyaP8z+DasLu5v7KmDK2pp4S5+VQ5WdVQUOaAqQY4jwl4JpcdNho3uWm2bIKs7x1l7q3ynGmW60g==", "requires": { "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/geojson-types": "^1.0.2", @@ -19655,7 +19655,7 @@ "potpack": "^1.0.1", "quickselect": "^2.0.0", "rw": "^1.3.3", - "supercluster": "^7.0.0", + "supercluster": "^7.1.0", "tinyqueue": "^2.0.3", "vt-pbf": "^3.1.1" } @@ -22020,9 +22020,9 @@ } }, "supercluster": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.0.0.tgz", - "integrity": "sha512-8VuHI8ynylYQj7Qf6PBMWy1PdgsnBiIxujOgc9Z83QvJ8ualIYWNx2iMKyKeC4DZI5ntD9tz/CIwwZvIelixsA==", + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz", + "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==", "requires": { "kdbush": "^3.0.0" } diff --git a/package.json b/package.json index 1f359509659..02c19a6d1c5 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", "is-mobile": "^4.0.0", - "mapbox-gl": "1.10.1", + "mapbox-gl": "1.13.1", "mouse-change": "^1.4.0", "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.2.0", diff --git a/src/plots/mapbox/constants.js b/src/plots/mapbox/constants.js index d26430d721f..53804475757 100644 --- a/src/plots/mapbox/constants.js +++ b/src/plots/mapbox/constants.js @@ -2,7 +2,7 @@ var sortObjectKeys = require('../../lib/sort_object_keys'); -var requiredVersion = '1.10.1'; +var requiredVersion = '1.13.1'; var OSM = '© OpenStreetMap contributors'; var carto = [ From 1331b6ced3be00bc1fed2877860291c1a3da0251 Mon Sep 17 00:00:00 2001 From: Mojtaba Samimi Date: Fri, 10 Nov 2023 12:06:34 -0500 Subject: [PATCH 2/2] provide buttons option when simulate mapbox-gl mousemove - required after github.com/mapbox/mapbox-gl-js/pull/9512 --- test/jasmine/tests/mapbox_test.js | 4 +++- test/jasmine/tests/plot_api_react_test.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/jasmine/tests/mapbox_test.js b/test/jasmine/tests/mapbox_test.js index 1d0056a0028..25784aa8840 100644 --- a/test/jasmine/tests/mapbox_test.js +++ b/test/jasmine/tests/mapbox_test.js @@ -1693,7 +1693,9 @@ describe('mapbox plots', function() { function _mouseEvent(type, pos, cb) { return new Promise(function(resolve) { - mouseEvent(type, pos[0], pos[1]); + mouseEvent(type, pos[0], pos[1], { + buttons: 1 // left button + }); setTimeout(function() { cb(); diff --git a/test/jasmine/tests/plot_api_react_test.js b/test/jasmine/tests/plot_api_react_test.js index 7ed140a4ebf..15840446a5e 100644 --- a/test/jasmine/tests/plot_api_react_test.js +++ b/test/jasmine/tests/plot_api_react_test.js @@ -2303,7 +2303,9 @@ describe('Test Plotly.react + interactions under uirevision:', function() { // see mapbox_test.js for rationale function _mouseEvent(type, pos) { return new Promise(function(resolve) { - mouseEvent(type, pos[0], pos[1]); + mouseEvent(type, pos[0], pos[1], { + buttons: 1 // left button + }); setTimeout(resolve, 100); }); }