Skip to content

Make frame with nulls clear items & array containers #1118

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
merged 11 commits into from
Nov 11, 2016
Merged

Make frame with nulls clear items & array containers #1118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69bffe1
test: add cases for Lib.expandObjectPaths w/ array containers
etpinard Nov 7, 2016
4c49755
make clean data work for non-plain-object annotation / shape items
etpinard Nov 9, 2016
d21d782
add general array container defaults handler
etpinard Nov 9, 2016
138ac35
DRY layout array container defaults using handleArrayContainerDefaults
etpinard Nov 9, 2016
d0953a0
test: add cases for array container defaults
etpinard Nov 9, 2016
174b640
make sure array containers set to null in frames are honored
etpinard Nov 9, 2016
36859f1
make sure items inside array container set to null are honored in frames
etpinard Nov 9, 2016
66f8bb7
test: add cases for extendObjectWithContainers
etpinard Nov 9, 2016
8ed1957
Merge branch 'master' into frame-extend-with-nulls
etpinard Nov 10, 2016
9de2f77
make annotation/shapes cleanLayout blocks more robust
etpinard Nov 10, 2016
5de6ff0
split container opts from item opts in handleArrayContainerDefaults
etpinard Nov 10, 2016
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: 3 additions & 3 deletions src/components/annotations/annotation_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ var Axes = require('../../plots/cartesian/axes');
var attributes = require('./attributes');


module.exports = function handleAnnotationDefaults(annIn, fullLayout) {
var annOut = {};
module.exports = function handleAnnotationDefaults(annIn, annOut, fullLayout, opts) {
opts = opts || {};

function coerce(attr, dflt) {
return Lib.coerce(annIn, annOut, attributes, attr, dflt);
}

var visible = coerce('visible');
var visible = coerce('visible', !opts.itemIsNotPlainObject);

if(!visible) return annOut;

Expand Down
14 changes: 6 additions & 8 deletions src/components/annotations/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@

'use strict';

var handleArrayContainerDefaults = require('../../plots/array_container_defaults');
var handleAnnotationDefaults = require('./annotation_defaults');


module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
var containerIn = layoutIn.annotations || [],
containerOut = layoutOut.annotations = [];
var opts = {
name: 'annotations',
handleItemDefaults: handleAnnotationDefaults
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🌴

};

for(var i = 0; i < containerIn.length; i++) {
var annIn = containerIn[i] || {},
annOut = handleAnnotationDefaults(annIn, layoutOut);

containerOut.push(annOut);
}
handleArrayContainerDefaults(layoutIn, layoutOut, opts);
};
3 changes: 2 additions & 1 deletion src/components/annotations/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ function drawOne(gd, index, opt, value) {
optionsIn[axLetter] = position;
}

var options = handleAnnotationDefaults(optionsIn, fullLayout);
var options = {};
handleAnnotationDefaults(optionsIn, options, fullLayout);
fullLayout.annotations[index] = options;

var xa = Axes.getFromId(gd, options.xref),
Expand Down
20 changes: 8 additions & 12 deletions src/components/images/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,20 @@

'use strict';

var Axes = require('../../plots/cartesian/axes');
var Lib = require('../../lib');
var attributes = require('./attributes');
var Axes = require('../../plots/cartesian/axes');
var handleArrayContainerDefaults = require('../../plots/array_container_defaults');

var attributes = require('./attributes');
var name = 'images';

module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
var contIn = Array.isArray(layoutIn[name]) ? layoutIn[name] : [],
contOut = layoutOut[name] = [];
var opts = {
name: name,
handleItemDefaults: imageDefaults
};

for(var i = 0; i < contIn.length; i++) {
var itemIn = contIn[i] || {},
itemOut = {};

imageDefaults(itemIn, itemOut, layoutOut);

contOut.push(itemOut);
}
handleArrayContainerDefaults(layoutIn, layoutOut, opts);
};


Expand Down
14 changes: 6 additions & 8 deletions src/components/shapes/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@

'use strict';

var handleArrayContainerDefaults = require('../../plots/array_container_defaults');
var handleShapeDefaults = require('./shape_defaults');


module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
var containerIn = layoutIn.shapes || [],
containerOut = layoutOut.shapes = [];
var opts = {
name: 'shapes',
handleItemDefaults: handleShapeDefaults
};

for(var i = 0; i < containerIn.length; i++) {
var shapeIn = containerIn[i] || {},
shapeOut = handleShapeDefaults(shapeIn, layoutOut);

containerOut.push(shapeOut);
}
handleArrayContainerDefaults(layoutIn, layoutOut, opts);
};
3 changes: 2 additions & 1 deletion src/components/shapes/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ function updateShape(gd, index, opt, value) {
optionsIn[posAttr] = position;
}

var options = handleShapeDefaults(optionsIn, gd._fullLayout);
var options = {};
handleShapeDefaults(optionsIn, options, gd._fullLayout);
gd._fullLayout.shapes[index] = options;

var clipAxes;
Expand Down
7 changes: 4 additions & 3 deletions src/components/shapes/shape_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ var Axes = require('../../plots/cartesian/axes');
var attributes = require('./attributes');
var helpers = require('./helpers');

module.exports = function handleShapeDefaults(shapeIn, fullLayout) {
var shapeOut = {};

module.exports = function handleShapeDefaults(shapeIn, shapeOut, fullLayout, opts) {
opts = opts || {};

function coerce(attr, dflt) {
return Lib.coerce(shapeIn, shapeOut, attributes, attr, dflt);
}

var visible = coerce('visible');
var visible = coerce('visible', !opts.itemIsNotPlainObject);

if(!visible) return shapeOut;

Expand Down
22 changes: 6 additions & 16 deletions src/components/sliders/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'use strict';

var Lib = require('../../lib');
var handleArrayContainerDefaults = require('../../plots/array_container_defaults');

var attributes = require('./attributes');
var constants = require('./constants');
Expand All @@ -18,23 +19,12 @@ var stepAttrs = attributes.steps;


module.exports = function slidersDefaults(layoutIn, layoutOut) {
var contIn = Array.isArray(layoutIn[name]) ? layoutIn[name] : [],
contOut = layoutOut[name] = [];
var opts = {
name: name,
handleItemDefaults: sliderDefaults
};

for(var i = 0; i < contIn.length; i++) {
var sliderIn = contIn[i] || {},
sliderOut = {};

sliderDefaults(sliderIn, sliderOut, layoutOut);

// used on button click to update the 'active' field
sliderOut._input = sliderIn;

// used to determine object constancy
sliderOut._index = i;

contOut.push(sliderOut);
}
handleArrayContainerDefaults(layoutIn, layoutOut, opts);
};

function sliderDefaults(sliderIn, sliderOut, layoutOut) {
Expand Down
22 changes: 6 additions & 16 deletions src/components/updatemenus/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'use strict';

var Lib = require('../../lib');
var handleArrayContainerDefaults = require('../../plots/array_container_defaults');

var attributes = require('./attributes');
var constants = require('./constants');
Expand All @@ -18,23 +19,12 @@ var buttonAttrs = attributes.buttons;


module.exports = function updateMenusDefaults(layoutIn, layoutOut) {
var contIn = Array.isArray(layoutIn[name]) ? layoutIn[name] : [],
contOut = layoutOut[name] = [];
var opts = {
name: name,
handleItemDefaults: menuDefaults
};

for(var i = 0; i < contIn.length; i++) {
var menuIn = contIn[i] || {},
menuOut = {};

menuDefaults(menuIn, menuOut, layoutOut);

// used on button click to update the 'active' field
menuOut._input = menuIn;

// used to determine object constancy
menuOut._index = i;

contOut.push(menuOut);
}
handleArrayContainerDefaults(layoutIn, layoutOut, opts);
};

function menuDefaults(menuIn, menuOut, layoutOut) {
Expand Down