@carbon/ibm-products 2.43.2-canary.170 → 2.43.2-canary.172

package/es/components/DataSpreadsheet/DataSpreadsheet.js

@@ -19,6 +19,7 @@ import { getDevtoolsProps } from '../../global/js/utils/devtools.js';
 import { getScrollbarWidth } from '../../global/js/utils/getScrollbarWidth.js';
 import { handleEditSubmit } from './utils/handleEditSubmit.js';
 import { handleHeaderCellSelection } from './utils/handleHeaderCellSelection.js';
+import { getNodeTextContent } from '../../global/js/utils/getNodeTextContent.js';
 import { handleKeyPress } from './utils/commonEventHandlers.js';
 import { pkg } from '../../settings.js';
 import { removeCellSelections } from './utils/removeCellSelections.js';
@@ -205,7 +206,13 @@ var DataSpreadsheet = /*#__PURE__*/React__default.forwardRef(function (_ref, ref
     var currentHeaders = [];
     if (Object.keys(currentColumns).length > 0) {
       Object.keys(currentColumns).forEach(function (itemIndex) {
-        if (currentColumns[itemIndex].Header) {
+        if (_typeof(currentColumns[itemIndex].Header) === 'object') {
+          if (currentColumns[itemIndex].column_name) {
+            currentHeaders.push(currentColumns[itemIndex].column_name);
+          } else {
+            currentHeaders.push(getNodeTextContent(currentColumns[itemIndex].Header));
+          }
+        } else if (currentColumns[itemIndex].Header) {
           currentHeaders.push(currentColumns[itemIndex].Header);
         }
       });

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -367,11 +367,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       return Calendar;
     }
   };
-  var renderRegularCell = function renderRegularCell() {
-    return /*#__PURE__*/React__default.createElement("span", _extends({}, inputProps, {
-      id: cellId
-    }));
-  };
   var renderDateCell = function renderDateCell() {
     var _config$inputProps, _outerButtonElement$c;
     var datePickerPreparedProps = prepareProps(config.inputProps, ['datePickerInputProps']);
@@ -531,7 +526,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       onClick: !nonEditCell ? handleInlineCellClick : addActiveState,
       onKeyDown: !nonEditCell ? handleKeyDown : null,
       className: cx("".concat(blockClass, "__inline-edit--outer-cell-button"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), inEditMode && (config === null || config === void 0 || (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue))), "".concat(blockClass, "__static--outer-cell"), !disabledCell))
-    }, !nonEditCell && !disabledCell && type !== 'checkbox' && renderRegularCell(), (!inEditMode || disabledCell) && type !== 'checkbox' && /*#__PURE__*/React__default.createElement(InlineEditButton, {
+    }, (!inEditMode || disabledCell) && type !== 'checkbox' && /*#__PURE__*/React__default.createElement(InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
       label: getLabel(),

package/lib/components/DataSpreadsheet/DataSpreadsheet.js

@@ -23,6 +23,7 @@ var devtools = require('../../global/js/utils/devtools.js');
 var getScrollbarWidth = require('../../global/js/utils/getScrollbarWidth.js');
 var handleEditSubmit = require('./utils/handleEditSubmit.js');
 var handleHeaderCellSelection = require('./utils/handleHeaderCellSelection.js');
+var getNodeTextContent = require('../../global/js/utils/getNodeTextContent.js');
 var commonEventHandlers = require('./utils/commonEventHandlers.js');
 var settings = require('../../settings.js');
 var removeCellSelections = require('./utils/removeCellSelections.js');
@@ -214,7 +215,13 @@ exports.DataSpreadsheet = /*#__PURE__*/React__default["default"].forwardRef(func
     var currentHeaders = [];
     if (Object.keys(currentColumns).length > 0) {
       Object.keys(currentColumns).forEach(function (itemIndex) {
-        if (currentColumns[itemIndex].Header) {
+        if (_rollupPluginBabelHelpers["typeof"](currentColumns[itemIndex].Header) === 'object') {
+          if (currentColumns[itemIndex].column_name) {
+            currentHeaders.push(currentColumns[itemIndex].column_name);
+          } else {
+            currentHeaders.push(getNodeTextContent.getNodeTextContent(currentColumns[itemIndex].Header));
+          }
+        } else if (currentColumns[itemIndex].Header) {
           currentHeaders.push(currentColumns[itemIndex].Header);
         }
       });

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -376,11 +376,6 @@ var InlineEditCell = function InlineEditCell(_ref) {
       return icons.Calendar;
     }
   };
-  var renderRegularCell = function renderRegularCell() {
-    return /*#__PURE__*/React__default["default"].createElement("span", _rollupPluginBabelHelpers["extends"]({}, inputProps, {
-      id: cellId
-    }));
-  };
   var renderDateCell = function renderDateCell() {
     var _config$inputProps, _outerButtonElement$c;
     var datePickerPreparedProps = propsHelper.prepareProps(config.inputProps, ['datePickerInputProps']);
@@ -540,7 +535,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       onClick: !nonEditCell ? handleInlineCellClick : addActiveState,
       onKeyDown: !nonEditCell ? handleKeyDown : null,
       className: cx__default["default"]("".concat(blockClass, "__inline-edit--outer-cell-button"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), inEditMode && (config === null || config === void 0 || (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue))), "".concat(blockClass, "__static--outer-cell"), !disabledCell))
-    }, !nonEditCell && !disabledCell && type !== 'checkbox' && renderRegularCell(), (!inEditMode || disabledCell) && type !== 'checkbox' && /*#__PURE__*/React__default["default"].createElement(InlineEditButton.InlineEditButton, {
+    }, (!inEditMode || disabledCell) && type !== 'checkbox' && /*#__PURE__*/React__default["default"].createElement(InlineEditButton.InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
       label: getLabel(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.43.2-canary.170+0d8601017",
+  "version": "2.43.2-canary.172+517e4f366",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -120,5 +120,5 @@
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "0d860101791e8587f8d1688348aae8438c4d0fc9"
+  "gitHead": "517e4f36631cf1cc81d6f21fd25a83b3c65da540"
 }