@carbon/ibm-products 2.43.2-canary.170 → 2.43.2-canary.171
Sign up to get free protection for your applications and to get access to all the features.
@@ -19,6 +19,7 @@ import { getDevtoolsProps } from '../../global/js/utils/devtools.js';
|
|
19
19
|
import { getScrollbarWidth } from '../../global/js/utils/getScrollbarWidth.js';
|
20
20
|
import { handleEditSubmit } from './utils/handleEditSubmit.js';
|
21
21
|
import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection.js';
|
22
|
+
import { getNodeTextContent } from '../../global/js/utils/getNodeTextContent.js';
|
22
23
|
import { handleKeyPress } from './utils/commonEventHandlers.js';
|
23
24
|
import { pkg } from '../../settings.js';
|
24
25
|
import { removeCellSelections } from './utils/removeCellSelections.js';
|
@@ -205,7 +206,13 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
|
|
205
206
|
var currentHeaders = [];
|
206
207
|
if (Object.keys(currentColumns).length > 0) {
|
207
208
|
Object.keys(currentColumns).forEach(function (itemIndex) {
|
208
|
-
if (currentColumns[itemIndex].Header) {
|
209
|
+
if (_typeof(currentColumns[itemIndex].Header) === 'object') {
|
210
|
+
if (currentColumns[itemIndex].column_name) {
|
211
|
+
currentHeaders.push(currentColumns[itemIndex].column_name);
|
212
|
+
} else {
|
213
|
+
currentHeaders.push(getNodeTextContent(currentColumns[itemIndex].Header));
|
214
|
+
}
|
215
|
+
} else if (currentColumns[itemIndex].Header) {
|
209
216
|
currentHeaders.push(currentColumns[itemIndex].Header);
|
210
217
|
}
|
211
218
|
});
|
@@ -23,6 +23,7 @@ var devtools = require('../../global/js/utils/devtools.js');
|
|
23
23
|
var getScrollbarWidth = require('../../global/js/utils/getScrollbarWidth.js');
|
24
24
|
var handleEditSubmit = require('./utils/handleEditSubmit.js');
|
25
25
|
var handleHeaderCellSelection = require('./utils/handleHeaderCellSelection.js');
|
26
|
+
var getNodeTextContent = require('../../global/js/utils/getNodeTextContent.js');
|
26
27
|
var commonEventHandlers = require('./utils/commonEventHandlers.js');
|
27
28
|
var settings = require('../../settings.js');
|
28
29
|
var removeCellSelections = require('./utils/removeCellSelections.js');
|
@@ -214,7 +215,13 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
|
|
214
215
|
var currentHeaders = [];
|
215
216
|
if (Object.keys(currentColumns).length > 0) {
|
216
217
|
Object.keys(currentColumns).forEach(function (itemIndex) {
|
217
|
-
if (currentColumns[itemIndex].Header) {
|
218
|
+
if (_rollupPluginBabelHelpers["typeof"](currentColumns[itemIndex].Header) === 'object') {
|
219
|
+
if (currentColumns[itemIndex].column_name) {
|
220
|
+
currentHeaders.push(currentColumns[itemIndex].column_name);
|
221
|
+
} else {
|
222
|
+
currentHeaders.push(getNodeTextContent.getNodeTextContent(currentColumns[itemIndex].Header));
|
223
|
+
}
|
224
|
+
} else if (currentColumns[itemIndex].Header) {
|
218
225
|
currentHeaders.push(currentColumns[itemIndex].Header);
|
219
226
|
}
|
220
227
|
});
|
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@carbon/ibm-products",
|
3
3
|
"description": "Carbon for IBM Products",
|
4
|
-
"version": "2.43.2-canary.
|
4
|
+
"version": "2.43.2-canary.171+25e95bab0",
|
5
5
|
"license": "Apache-2.0",
|
6
6
|
"main": "lib/index.js",
|
7
7
|
"module": "es/index.js",
|
@@ -120,5 +120,5 @@
|
|
120
120
|
"react": "^16.8.6 || ^17.0.1 || ^18.2.0",
|
121
121
|
"react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
|
122
122
|
},
|
123
|
-
"gitHead": "
|
123
|
+
"gitHead": "25e95bab041d69b28cc8e2a1c15ddd78ea4ab311"
|
124
124
|
}
|