Skip to content
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

Jump to bottom

React + uirevision fixes #3394

Merged
merged 4 commits into from
Jan 4, 2019
Merged

React + uirevision fixes #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb85e65
fix uirevision behavior on gl3d subplots
etpinard Jan 3, 2019
8151197
fix uirevision behavior on geo subplots
etpinard Jan 3, 2019
4b8a05b
fix uirevision behavior on mapbox subplots
etpinard Jan 3, 2019
b880717
improve gl3d uirevision test
etpinard Jan 4, 2019
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: 4 additions & 2 deletions src/plots/geo/zoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,14 @@ function sync(geo, projection, cb) {
var fullLayout = gd._fullLayout;
var fullOpts = fullLayout[id];

var preGUI = {};
var eventData = {};

function set(propStr, val) {
var fullNp = Lib.nestedProperty(fullOpts, propStr);
preGUI[id + '.' + propStr] = Lib.nestedProperty(userOpts, propStr).get();
Registry.call('_storeDirectGUIEdit', layout, fullLayout._preGUI, preGUI);

var fullNp = Lib.nestedProperty(fullOpts, propStr);
if(fullNp.get() !== val) {
fullNp.set(val);
Lib.nestedProperty(userOpts, propStr).set(val);
Expand All @@ -67,7 +70,6 @@ function sync(geo, projection, cb) {

cb(set);
set('projection.scale', projection.scale() / geo.fitScale);
Registry.call('_storeDirectGUIEdit', layout, fullLayout._preGUI, eventData);
gd.emit('plotly_relayout', eventData);
}

Expand Down
12 changes: 8 additions & 4 deletions src/plots/gl3d/scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,7 @@ proto.setCamera = function setCamera(cameraData) {

// save camera to user layout (i.e. gd.layout)
proto.saveCamera = function saveCamera(layout) {
var fullLayout = this.fullLayout;
var cameraData = this.getCamera();
var cameraNestedProp = Lib.nestedProperty(layout, this.id + '.camera');
var cameraDataLastSave = cameraNestedProp.get();
Expand All @@ -713,8 +714,9 @@ proto.saveCamera = function saveCamera(layout) {
return y[vectors[i]] && (x[vectors[i]][components[j]] === y[vectors[i]][components[j]]);
}

if(cameraDataLastSave === undefined) hasChanged = true;
else {
if(cameraDataLastSave === undefined) {
hasChanged = true;
} else {
for(var i = 0; i < 3; i++) {
for(var j = 0; j < 3; j++) {
if(!same(cameraData, cameraDataLastSave, i, j)) {
Expand All @@ -726,12 +728,14 @@ proto.saveCamera = function saveCamera(layout) {
}

if(hasChanged) {
var preGUI = {};
preGUI[this.id + '.camera'] = cameraDataLastSave;
Registry.call('_storeDirectGUIEdit', layout, fullLayout._preGUI, preGUI);

cameraNestedProp.set(cameraData);

var fullLayout = this.fullLayout;
var cameraFullNP = Lib.nestedProperty(fullLayout, this.id + '.camera');
cameraFullNP.set(cameraData);
Registry.call('_storeDirectGUIEdit', layout, fullLayout._preGUI, cameraData);
}

return hasChanged;
Expand Down
74 changes: 37 additions & 37 deletions src/plots/mapbox/mapbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ function Mapbox(opts) {
// unique id for this Mapbox instance
this.uid = fullLayout._uid + '-' + this.id;

// full mapbox options (N.B. needs to be updated on every updates)
this.opts = fullLayout[this.id];
Copy link
Collaborator

Choose a reason for hiding this comment

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

Very nice simplification!


// create framework on instantiation for a smoother first plot call
this.div = null;
this.xaxis = null;
Expand All @@ -57,9 +54,7 @@ module.exports = function createMapbox(opts) {

proto.plot = function(calcData, fullLayout, promises) {
var self = this;

// feed in new mapbox options
var opts = self.opts = fullLayout[this.id];
var opts = fullLayout[self.id];

// remove map and create a new map if access token has change
if(self.map && (opts.accesstoken !== self.accessToken)) {
Expand Down Expand Up @@ -88,7 +83,7 @@ proto.plot = function(calcData, fullLayout, promises) {
proto.createMap = function(calcData, fullLayout, resolve, reject) {
var self = this;
var gd = self.gd;
var opts = self.opts;
var opts = fullLayout[self.id];

// store style id and URL or object
var styleObj = self.styleObj = getStyleObj(opts.style);
Expand Down Expand Up @@ -147,14 +142,16 @@ proto.createMap = function(calcData, fullLayout, resolve, reject) {
// duplicate 'plotly_relayout' events.

if(eventData.originalEvent || wheeling) {
var view = self.getView();
var optsNow = gd._fullLayout[self.id];
Registry.call('_storeDirectGUIEdit', gd.layout, gd._fullLayout._preGUI, self.getViewEdits(optsNow));

opts._input.center = opts.center = view.center;
opts._input.zoom = opts.zoom = view.zoom;
opts._input.bearing = opts.bearing = view.bearing;
opts._input.pitch = opts.pitch = view.pitch;
var viewNow = self.getView();
optsNow._input.center = optsNow.center = viewNow.center;
optsNow._input.zoom = optsNow.zoom = viewNow.zoom;
optsNow._input.bearing = optsNow.bearing = viewNow.bearing;
optsNow._input.pitch = optsNow.pitch = viewNow.pitch;

emitRelayoutFromView(view);
gd.emit('plotly_relayout', self.getViewEdits(viewNow));
}
wheeling = false;
});
Expand Down Expand Up @@ -186,35 +183,25 @@ proto.createMap = function(calcData, fullLayout, resolve, reject) {
map.on('zoomstart', unhover);

map.on('dblclick', function() {
gd.emit('plotly_doubleclick', null);
var optsNow = gd._fullLayout[self.id];
Registry.call('_storeDirectGUIEdit', gd.layout, gd._fullLayout._preGUI, self.getViewEdits(optsNow));

var viewInitial = self.viewInitial;

map.setCenter(convertCenter(viewInitial.center));
map.setZoom(viewInitial.zoom);
map.setBearing(viewInitial.bearing);
map.setPitch(viewInitial.pitch);

var viewNow = self.getView();
optsNow._input.center = optsNow.center = viewNow.center;
optsNow._input.zoom = optsNow.zoom = viewNow.zoom;
optsNow._input.bearing = optsNow.bearing = viewNow.bearing;
optsNow._input.pitch = optsNow.pitch = viewNow.pitch;

opts._input.center = opts.center = viewNow.center;
opts._input.zoom = opts.zoom = viewNow.zoom;
opts._input.bearing = opts.bearing = viewNow.bearing;
opts._input.pitch = opts.pitch = viewNow.pitch;

emitRelayoutFromView(viewNow);
gd.emit('plotly_doubleclick', null);
gd.emit('plotly_relayout', self.getViewEdits(viewNow));
});

function emitRelayoutFromView(view) {
var id = self.id;
var evtData = {};
for(var k in view) {
evtData[id + '.' + k] = view[k];
}
Registry.call('_storeDirectGUIEdit', gd.layout, gd._fullLayout._preGUI, evtData);
gd.emit('plotly_relayout', evtData);
}

// define event handlers on map creation, to keep one ref per map,
// so that map.on / map.off in updateFx works as expected
self.clearSelect = function() {
Expand Down Expand Up @@ -248,10 +235,11 @@ proto.createMap = function(calcData, fullLayout, resolve, reject) {
proto.updateMap = function(calcData, fullLayout, resolve, reject) {
var self = this;
var map = self.map;
var opts = fullLayout[this.id];

self.rejectOnError(reject);

var styleObj = getStyleObj(self.opts.style);
var styleObj = getStyleObj(opts.style);

if(self.styleObj.id !== styleObj.id) {
self.styleObj = styleObj;
Expand Down Expand Up @@ -309,14 +297,14 @@ proto.updateData = function(calcData) {

proto.updateLayout = function(fullLayout) {
var map = this.map;
var opts = this.opts;
var opts = fullLayout[this.id];

map.setCenter(convertCenter(opts.center));
map.setZoom(opts.zoom);
map.setBearing(opts.bearing);
map.setPitch(opts.pitch);

this.updateLayers();
this.updateLayers(fullLayout);
this.updateFramework(fullLayout);
this.updateFx(fullLayout);
this.map.resize();
Expand Down Expand Up @@ -463,8 +451,8 @@ proto.updateFramework = function(fullLayout) {
this.yaxis._length = size.h * (domain.y[1] - domain.y[0]);
};

proto.updateLayers = function() {
var opts = this.opts;
proto.updateLayers = function(fullLayout) {
var opts = fullLayout[this.id];
var layers = opts.layers;
var layerList = this.layerList;
var i;
Expand Down Expand Up @@ -519,7 +507,6 @@ proto.project = function(v) {
// get map's current view values in plotly.js notation
proto.getView = function() {
var map = this.map;

var mapCenter = map.getCenter();
var center = { lon: mapCenter.lng, lat: mapCenter.lat };

Expand All @@ -531,6 +518,19 @@ proto.getView = function() {
};
};

proto.getViewEdits = function(cont) {
var id = this.id;
var keys = ['center', 'zoom', 'bearing', 'pitch'];
var obj = {};

for(var i = 0; i < keys.length; i++) {
var k = keys[i];
obj[id + '.' + k] = cont[k];
}

return obj;
};

function getStyleObj(val) {
var styleValues = layoutAttributes.style.values;
var styleDflt = layoutAttributes.style.dflt;
Expand Down
Loading