From 7807449818fde9de4ca949e1f8dd522a74ae5ad2 Mon Sep 17 00:00:00 2001
From: Robert Monfera <monfera.robert@gmail.com>
Date: Fri, 6 Oct 2017 22:54:08 +0200
Subject: [PATCH 1/2] allow 1D header in `table`

---
 src/traces/table/defaults.js                 | 6 ++++++
 test/image/mocks/table_latex_multitrace.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/traces/table/defaults.js b/src/traces/table/defaults.js
index 161a8742802..4a4d13179ba 100644
--- a/src/traces/table/defaults.js
+++ b/src/traces/table/defaults.js
@@ -52,6 +52,12 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     Lib.coerceFont(coerce, 'cells.font', fontDflt);
 
     coerce('header.values');
+    for(var i = 0; i < traceOut.header.values.length; i++) {
+        if(!Array.isArray(traceOut.header.values[i])) {
+            traceOut.header.values[i] = [traceOut.header.values[i]];
+        }
+    }
+
     coerce('header.format');
     coerce('header.align');
 
diff --git a/test/image/mocks/table_latex_multitrace.json b/test/image/mocks/table_latex_multitrace.json
index 63282b9aa37..5bd392be6ff 100644
--- a/test/image/mocks/table_latex_multitrace.json
+++ b/test/image/mocks/table_latex_multitrace.json
@@ -19,7 +19,7 @@
             "columnorder": [0, 1, 2],
 
             "header": {
-                "values": [["<b>#</b>"], ["Half-angle form"], ["Equivalent"]],
+                "values": ["<b>#</b>", "Half-angle form", "Equivalent"],
                 "align": ["right", "center", "center"],
                 "line": {"width": 0.0},
                 "fill": {"color": ["dimgray", "grey"]},

From 37ba12a173225021679b0f9196e15055859a20a3 Mon Sep 17 00:00:00 2001
From: Robert Monfera <monfera.robert@gmail.com>
Date: Fri, 6 Oct 2017 23:39:18 +0200
Subject: [PATCH 2/2] downstream unification of cell data structures

---
 src/traces/table/data_preparation_helper.js | 15 +++++++++------
 src/traces/table/defaults.js                |  6 ------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/traces/table/data_preparation_helper.js b/src/traces/table/data_preparation_helper.js
index dea13914950..62e07a248cd 100644
--- a/src/traces/table/data_preparation_helper.js
+++ b/src/traces/table/data_preparation_helper.js
@@ -13,10 +13,13 @@ var extendFlat = require('../../lib/extend').extendFlat;
 
 // pure functions, don't alter but passes on `gd` and parts of `trace` without deep copying
 module.exports = function calc(gd, trace) {
+    var headerValues = trace.header.values.map(function(c) {
+        return Array.isArray(c) ? c : [c];
+    });
     var domain = trace.domain;
     var groupWidth = Math.floor(gd._fullLayout._size.w * (domain.x[1] - domain.x[0]));
     var groupHeight = Math.floor(gd._fullLayout._size.h * (domain.y[1] - domain.y[0]));
-    var headerRowHeights = trace.header.values[0].map(function() {return trace.header.height;});
+    var headerRowHeights = headerValues[0].map(function() {return trace.header.height;});
     var rowHeights = trace.cells.values[0].map(function() {return trace.cells.height;});
     var headerHeight = headerRowHeights.reduce(function(a, b) {return a + b;}, 0);
     var scrollHeight = groupHeight - headerHeight;
@@ -27,7 +30,7 @@ module.exports = function calc(gd, trace) {
     var rowBlocks = makeRowBlock(anchorToRowBlock, headerRowBlocks);
     var uniqueKeys = {};
     var columnOrder = trace._fullInput.columnorder;
-    var columnWidths = trace.header.values.map(function(d, i) {
+    var columnWidths = headerValues.map(function(d, i) {
         return Array.isArray(trace.columnwidth) ?
             trace.columnwidth[Math.min(i, trace.columnwidth.length - 1)] :
             isFinite(trace.columnwidth) && trace.columnwidth !== null ? trace.columnwidth : 1;
@@ -50,12 +53,12 @@ module.exports = function calc(gd, trace) {
         headerRowBlocks: headerRowBlocks,
         scrollY: 0, // will be mutated on scroll
         cells: trace.cells,
-        headerCells: trace.header,
-        gdColumns: trace.header.values.map(function(d) {return d[0];}),
-        gdColumnsOriginalOrder: trace.header.values.map(function(d) {return d[0];}),
+        headerCells: extendFlat({}, trace.header, {values: headerValues}),
+        gdColumns: headerValues.map(function(d) {return d[0];}),
+        gdColumnsOriginalOrder: headerValues.map(function(d) {return d[0];}),
         prevPages: [0, 0],
         scrollbarState: {scrollbarScrollInProgress: false},
-        columns: trace.header.values.map(function(label, i) {
+        columns: headerValues.map(function(label, i) {
             var foundKey = uniqueKeys[label];
             uniqueKeys[label] = (foundKey || 0) + 1;
             var key = label + '__' + uniqueKeys[label];
diff --git a/src/traces/table/defaults.js b/src/traces/table/defaults.js
index 4a4d13179ba..161a8742802 100644
--- a/src/traces/table/defaults.js
+++ b/src/traces/table/defaults.js
@@ -52,12 +52,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     Lib.coerceFont(coerce, 'cells.font', fontDflt);
 
     coerce('header.values');
-    for(var i = 0; i < traceOut.header.values.length; i++) {
-        if(!Array.isArray(traceOut.header.values[i])) {
-            traceOut.header.values[i] = [traceOut.header.values[i]];
-        }
-    }
-
     coerce('header.format');
     coerce('header.align');