Skip to content

Commit 96e3590

Browse files
committed
set various layout components via template
1 parent 5f8b280 commit 96e3590

File tree

9 files changed

+15
-4
lines changed

9 files changed

+15
-4
lines changed

src/components/annotations/defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var attributes = require('./attributes');
1919

2020
module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
2121
handleArrayContainerDefaults(layoutIn, layoutOut, {
22+
fromTemplate: (layoutOut._template || {}).annotations,
2223
name: 'annotations',
2324
handleItemDefaults: handleAnnotationDefaults
2425
});

src/components/annotations3d/defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ var attributes = require('./attributes');
1616

1717
module.exports = function handleDefaults(sceneLayoutIn, sceneLayoutOut, opts) {
1818
handleArrayContainerDefaults(sceneLayoutIn, sceneLayoutOut, {
19+
fromTemplate: (sceneLayoutOut._template || {}).annotations,
1920
name: 'annotations',
2021
handleItemDefaults: handleAnnotationDefaults,
2122
fullLayout: opts.fullLayout

src/components/grid/index.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,12 @@ function getAxes(layout, grid, axLetter) {
177177
// the shape of the grid - this needs to be done BEFORE supplyDataDefaults
178178
// so that non-subplot traces can place themselves in the grid
179179
function sizeDefaults(layoutIn, layoutOut) {
180-
var gridIn = layoutIn.grid || {};
181-
var xAxes = getAxes(layoutOut, gridIn, 'x');
182-
var yAxes = getAxes(layoutOut, gridIn, 'y');
180+
var gridIn = layoutIn.grid || ((layoutIn.template || {}).layout || {}).grid;
181+
var xAxes = getAxes(layoutOut, gridIn || {}, 'x');
182+
var yAxes = getAxes(layoutOut, gridIn || {}, 'y');
183183

184-
if(!layoutIn.grid && !xAxes && !yAxes) return;
184+
if(!gridIn && !xAxes && !yAxes) return;
185+
if(!gridIn) gridIn = {};
185186

186187
var hasSubplotGrid = Array.isArray(gridIn.subplots) && Array.isArray(gridIn.subplots[0]);
187188
var hasXaxes = Array.isArray(xAxes);

src/components/images/defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var name = 'images';
1717

1818
module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
1919
var opts = {
20+
fromTemplate: (layoutOut._template || {}).images,
2021
name: name,
2122
handleItemDefaults: imageDefaults
2223
};

src/components/rangeselector/defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module.exports = function handleDefaults(containerIn, containerOut, layout, coun
2626
}
2727

2828
var buttons = handleArrayContainerDefaults(selectorIn, selectorOut, {
29+
fromTemplate: (selectorOut._template || {}).buttons,
2930
name: 'buttons',
3031
handleItemDefaults: buttonDefaults,
3132
calendar: calendar

src/components/shapes/defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var helpers = require('./helpers');
1919

2020
module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
2121
handleArrayContainerDefaults(layoutIn, layoutOut, {
22+
fromTemplate: (layoutOut._template || {}).shapes,
2223
name: 'shapes',
2324
handleItemDefaults: handleShapeDefaults
2425
});

src/components/sliders/defaults.js

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var stepAttrs = attributes.steps;
2020

2121
module.exports = function slidersDefaults(layoutIn, layoutOut) {
2222
handleArrayContainerDefaults(layoutIn, layoutOut, {
23+
fromTemplate: (layoutOut._template || {}).sliders,
2324
name: name,
2425
handleItemDefaults: sliderDefaults
2526
});
@@ -31,6 +32,7 @@ function sliderDefaults(sliderIn, sliderOut, layoutOut) {
3132
}
3233

3334
var steps = handleArrayContainerDefaults(sliderIn, sliderOut, {
35+
fromTemplate: (layoutOut._template || {}).steps,
3436
name: 'steps',
3537
handleItemDefaults: stepDefaults
3638
});

src/components/updatemenus/defaults.js

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var buttonAttrs = attributes.buttons;
2020

2121
module.exports = function updateMenusDefaults(layoutIn, layoutOut) {
2222
var opts = {
23+
fromTemplate: (layoutOut._template || {}).updatemenus,
2324
name: name,
2425
handleItemDefaults: menuDefaults
2526
};
@@ -33,6 +34,7 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
3334
}
3435

3536
var buttons = handleArrayContainerDefaults(menuIn, menuOut, {
37+
fromTemplate: (layoutOut._template || {}).buttons,
3638
name: 'buttons',
3739
handleItemDefaults: buttonDefaults
3840
});

src/plots/mapbox/layout_defaults.js

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ function handleDefaults(containerIn, containerOut, coerce, opts) {
3535
coerce('pitch');
3636

3737
handleArrayContainerDefaults(containerIn, containerOut, {
38+
fromTemplate: (containerOut._template || {}).layers,
3839
name: 'layers',
3940
handleItemDefaults: handleLayerDefaults
4041
});

0 commit comments

Comments
 (0)