@carbon/ibm-products 1.47.0 → 1.49.0

package/es/components/Datagrid/useSortableColumns.js

@@ -22,6 +22,7 @@ var ordering = {
 };
 var useSortableColumns = function useSortableColumns(hooks) {
   var sortableVisibleColumns = function sortableVisibleColumns(visibleColumns, _ref) {
+    var _instance$customizeCo;
     var instance = _ref.instance;
     var onSort = instance.onSort;
     var onSortClick = function onSortClick(column) {
@@ -37,27 +38,43 @@ var useSortableColumns = function useSortableColumns(hooks) {
     };
     var sortableColumns = visibleColumns.map(function (column) {
       var icon = function icon(col) {
-        if (col.isSorted) {
+        if (col !== null && col !== void 0 && col.isSorted) {
           switch (col.isSortedDesc) {
             case false:
-              return ArrowUp16;
+              return function () {
+                return /*#__PURE__*/React.createElement(ArrowUp16, {
+                  className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
+                });
+              };
             case true:
-              return ArrowUp16;
+              return function () {
+                return /*#__PURE__*/React.createElement(ArrowUp16, {
+                  className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
+                });
+              };
             default:
-              return Arrows16;
+              return function () {
+                return /*#__PURE__*/React.createElement(Arrows16, {
+                  className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
+                });
+              };
           }
         }
-        return Arrows16;
+        return function () {
+          return /*#__PURE__*/React.createElement(Arrows16, {
+            className: "".concat(blockClass, "__sortable-icon ").concat(carbon.prefix, "--btn__icon")
+          });
+        };
       };
       var Header = function Header(headerProp) {
         var _cx;
         return column.disableSortBy === true ? column.Header : /*#__PURE__*/React.createElement(Button, {
           onClick: function onClick() {
-            return onSortClick(headerProp.column);
+            return onSortClick(headerProp === null || headerProp === void 0 ? void 0 : headerProp.column);
           },
           kind: "ghost",
-          renderIcon: icon(headerProp.column),
-          className: cx("".concat(carbon.prefix, "--table-sort ").concat(blockClass, "--table-sort"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "--table-sort--desc"), headerProp.column.isSortedDesc), _defineProperty(_cx, "".concat(blockClass, "--table-sort--asc"), headerProp.column.isSortedDesc === false), _cx))
+          renderIcon: icon(headerProp === null || headerProp === void 0 ? void 0 : headerProp.column),
+          className: cx("".concat(carbon.prefix, "--table-sort ").concat(blockClass, "--table-sort"), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "--table-sort--desc"), headerProp === null || headerProp === void 0 ? void 0 : headerProp.column.isSortedDesc), _defineProperty(_cx, "".concat(blockClass, "--table-sort--asc"), (headerProp === null || headerProp === void 0 ? void 0 : headerProp.column.isSortedDesc) === false), _cx))
         }, column.Header);
       };
       return _objectSpread(_objectSpread({}, column), {}, {
@@ -65,7 +82,7 @@ var useSortableColumns = function useSortableColumns(hooks) {
         minWidth: column.disableSortBy === true ? 0 : 90
       });
     });
-    return _toConsumableArray(sortableColumns);
+    return (_instance$customizeCo = instance.customizeColumnsProps) !== null && _instance$customizeCo !== void 0 && _instance$customizeCo.isTearsheetOpen ? visibleColumns : _toConsumableArray(sortableColumns);
   };
   var sortInstanceProps = function sortInstanceProps(instance) {
     var onSort = instance.onSort;

package/es/components/Datagrid/utils/getAutoSizedColumnWidth.js

@@ -0,0 +1,27 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+/**
+ * Copyright IBM Corp. 2023, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * Calculates the auto sized width of a column
+ * @param {Array<object>} rows - The datagrid rows
+ * @param {string} accessor - The accessor for the column
+ * @param {string} headerText - The header text for the column
+ */
+
+export var getAutoSizedColumnWidth = function getAutoSizedColumnWidth(rows, accessor, headerText) {
+  var maxWidth = 400;
+  var minWidth = 58;
+  var letterSpacing = 10;
+  var cellLength = Math.max.apply(Math, _toConsumableArray(rows.map(function (row) {
+    return ("".concat(row[accessor]) || '').length;
+  })).concat([headerText.length]));
+  if (cellLength <= 3) {
+    return minWidth;
+  }
+  return Math.min(maxWidth, cellLength * letterSpacing + 16);
+};

package/es/components/InlineEditV2/InlineEditV2.js

@@ -22,6 +22,7 @@ import { getDevtoolsProps } from '../../global/js/utils/devtools';
 var componentName = 'InlineEditV2';
 var blockClass = "".concat(pkg.prefix, "--inline-edit-v2");
 export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var _cx;
   var cancelLabel = _ref.cancelLabel,
     editLabel = _ref.editLabel,
     id = _ref.id,
@@ -128,7 +129,7 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
     ref: ref
   }, getDevtoolsProps(componentName)), /*#__PURE__*/React.createElement("div", {
-    className: cx(blockClass, _defineProperty({}, "".concat(blockClass, "-focused"), focused)),
+    className: cx(blockClass, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "--focused"), focused), _defineProperty(_cx, "".concat(blockClass, "--invalid"), invalid), _cx)),
     onFocus: onFocusHandler,
     onBlur: onBlurHandler
   }, /*#__PURE__*/React.createElement("label", {
@@ -144,7 +145,9 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
     // readOnly={readOnly}
     ,
     onKeyDown: onKeyHandler
-  }), focused ? /*#__PURE__*/React.createElement(React.Fragment, null, invalid && /*#__PURE__*/React.createElement(WarningFilled16, {
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__toolbar")
+  }, focused ? /*#__PURE__*/React.createElement(React.Fragment, null, invalid && /*#__PURE__*/React.createElement(WarningFilled16, {
     className: "".concat(blockClass, "__warning-icon")
   }), /*#__PURE__*/React.createElement(Button, {
     hasIconOnly: true,
@@ -181,7 +184,7 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
     kind: "ghost",
     tabIndex: 0,
     key: "edit"
-  })), focused && invalid && /*#__PURE__*/React.createElement("p", {
+  }))), focused && invalid && /*#__PURE__*/React.createElement("p", {
     className: "".concat(blockClass, "__warning-text")
   }, invalidLabel));
 });

package/es/components/NonLinearReading/NonLinearReading.js

@@ -0,0 +1,87 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["children", "className", "definition", "theme"];
+/**
+ * Copyright IBM Corp. 2023, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+import { ChevronUp16 } from '@carbon/icons-react';
+import { getDevtoolsProps } from '../../global/js/utils/devtools';
+import { pkg } from '../../settings';
+
+// The block part of our conventional BEM class names (blockClass__E--M).
+var blockClass = "".concat(pkg.prefix, "--non-linear-reading");
+var componentName = 'NonLinearReading';
+
+// Default values for props
+var defaults = {
+  theme: 'light'
+};
+
+/**
+ * Use non-linear reading when space is limited to share a
+ * brief, at-a-glance, summary of a concept that may require
+ * more explanation for some users.
+ */
+export var NonLinearReading = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var children = _ref.children,
+    className = _ref.className,
+    definition = _ref.definition,
+    _ref$theme = _ref.theme,
+    theme = _ref$theme === void 0 ? defaults.theme : _ref$theme,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isOpen = _useState2[0],
+    setOpen = _useState2[1];
+  var handleToggle = function handleToggle() {
+    setOpen(function (prevState) {
+      return !prevState;
+    });
+  };
+  return /*#__PURE__*/React.createElement("span", _extends({}, rest, {
+    className: cx(blockClass, className),
+    ref: ref,
+    role: "main"
+  }, getDevtoolsProps(componentName)), ' ', /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    "aria-expanded": isOpen,
+    className: cx("".concat(blockClass, "__term-").concat(theme), [isOpen ? ["".concat(blockClass, "__term-").concat(theme, "--open")] : ["".concat(blockClass, "__term-").concat(theme, "--closed")]]),
+    onClick: handleToggle
+  }, children, isOpen && /*#__PURE__*/React.createElement(ChevronUp16, null)), ' ', isOpen && /*#__PURE__*/React.createElement("span", {
+    className: "".concat(blockClass, "--body-").concat(theme)
+  }, definition), ' ');
+});
+
+// Return a placeholder if not released and not enabled by feature flag
+NonLinearReading = pkg.checkComponentEnabled(NonLinearReading, componentName);
+NonLinearReading.displayName = componentName;
+
+// The types and DocGen commentary for the component props,
+// in alphabetical order (for consistency).
+// See https://www.npmjs.com/package/prop-types#usage.
+NonLinearReading.propTypes = {
+  /**
+   * The term of the component appears as a pill.
+   */
+  children: PropTypes.node.isRequired,
+  /**
+   * Provide an optional class to be applied to the containing node.
+   */
+  className: PropTypes.string,
+  /**
+   * The content that appears when the term is toggled open.
+   */
+  definition: PropTypes.node.isRequired,
+  /**
+   * Determines the theme of the component.
+   */
+  theme: PropTypes.oneOf(['light', 'dark'])
+};

package/es/components/NonLinearReading/index.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright IBM Corp. 2023, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+export { NonLinearReading } from './NonLinearReading';

package/es/components/SidePanel/SidePanel.js

@@ -7,7 +7,7 @@ var _excluded = ["actionToolbarButtons", "actions", "animateTitle", "children",
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
- * Copyright IBM Corp. 2020, 2021
+ * Copyright IBM Corp. 2020, 2023
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -398,7 +398,6 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }, subtitle), actionToolbarButtons && actionToolbarButtons.length && /*#__PURE__*/React.createElement("div", {
       className: cx("".concat(blockClass, "__action-toolbar"), _defineProperty({}, "".concat(blockClass, "__action-toolbar-no-animation"), !animateTitle))
     }, actionToolbarButtons.map(function (_ref5) {
-      var _ref6;
       var label = _ref5.label,
         kind = _ref5.kind,
         icon = _ref5.icon,
@@ -416,10 +415,10 @@ export var SidePanel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         renderIcon: icon,
         iconDescription: label,
         tooltipPosition: tooltipPosition || 'bottom',
-        tooltipAlignment: tooltipAlignment || 'center',
+        tooltipAlignment: tooltipAlignment || 'start',
         hasIconOnly: !leading,
         disabled: disabled,
-        className: cx(["".concat(blockClass, "__action-toolbar-button"), className, (_ref6 = {}, _defineProperty(_ref6, "".concat(blockClass, "__action-toolbar-icon-only-button"), icon && !leading), _defineProperty(_ref6, "".concat(blockClass, "__action-toolbar-leading-button"), leading), _ref6)]),
+        className: cx(["".concat(blockClass, "__action-toolbar-button"), className, _defineProperty({}, "".concat(blockClass, "__action-toolbar-leading-button"), leading)]),
         onClick: onClick
       }), leading && label);
     })));

package/es/components/index.js

@@ -37,9 +37,10 @@ export { WebTerminal, WebTerminalContentWrapper, useWebTerminal, WebTerminalProv
 export { EditSidePanel } from './EditSidePanel';
 export { OptionsTile } from './OptionsTile';
 export { DataSpreadsheet } from './DataSpreadsheet';
-export { Datagrid, useDatagrid, useInfiniteScroll, useNestedRows, useSelectRows, useExpandedRow, useOnRowClick, useSortableColumns, useRowIsMouseOver, useColumnCenterAlign, useColumnRightAlign, useDisableSelectRows, useStickyColumn, useActionsColumn, useCustomizeColumns, useSelectAllWithToggle, useColumnOrder, useInlineEdit, useFiltering } from './Datagrid';
+export { Datagrid, useDatagrid, useInfiniteScroll, useNestedRows, useSelectRows, useExpandedRow, useOnRowClick, useSortableColumns, useRowIsMouseOver, useColumnCenterAlign, useColumnRightAlign, useDisableSelectRows, useStickyColumn, useActionsColumn, useCustomizeColumns, useSelectAllWithToggle, useColumnOrder, useInlineEdit, useFiltering, getAutoSizedColumnWidth } from './Datagrid';
 export { EditTearsheet } from './EditTearsheet';
 export { EditTearsheetNarrow } from './EditTearsheetNarrow';
 export { EditFullPage } from './EditFullPage';
 export { EditUpdateCards } from './EditUpdateCards';
-export { InlineEdit } from './InlineEdit';
+export { InlineEdit } from './InlineEdit';
+export { NonLinearReading } from './NonLinearReading';

package/es/global/js/package-settings.js

@@ -69,7 +69,9 @@ var defaults = {
     EditTearsheetNarrow: false,
     EditFullPage: false,
     EditUpdateCards: false,
-    ButtonMenu: false
+    ButtonMenu: false,
+    // Novice to pro components not yet reviewed and released:
+    NonLinearReading: false
     /* new component flags here - comment used by generate CLI */
   },
 

package/es/global/js/utils/story-helper.js

@@ -77,4 +77,13 @@ CodesandboxLink.propTypes = {
    * directory withing examples codesandbox will be found
    */
   exampleDirectory: PropTypes.string
+};
+
+/**
+ * A helper function that finds the designated theme on the Storybook canvas.
+ * @returns "dark" or "light"
+ */
+export var getSelectedCarbonTheme = function getSelectedCarbonTheme() {
+  var themeId = document.querySelector('html').getAttribute('storybook-carbon-theme');
+  return themeId === 'g90' || themeId === 'g100' ? 'dark' : 'light';
 };

package/lib/components/AddSelect/AddSelectBreadcrumbs.js

@@ -24,7 +24,8 @@ var AddSelectBreadcrumbs = function AddSelectBreadcrumbs(_ref) {
   var multi = _ref.multi,
     onClick = _ref.onClick,
     path = _ref.path;
-  var clickHandler = function clickHandler(idx) {
+  var clickHandler = function clickHandler(e, idx) {
+    e.preventDefault();
     onClick(idx);
   };
   var classNames = (0, _classnames.default)(blockClass, (0, _defineProperty2.default)({}, "".concat(blockClass, "-multi"), multi));
@@ -36,9 +37,10 @@ var AddSelectBreadcrumbs = function AddSelectBreadcrumbs(_ref) {
     return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.BreadcrumbItem, {
       key: entry.id,
       isCurrentPage: isCurrentPage,
-      onClick: function onClick() {
-        return clickHandler(idx);
-      }
+      onClick: function onClick(e) {
+        return clickHandler(e, idx);
+      },
+      href: "#"
     }, entry.title);
   }));
 };

package/lib/components/AddSelect/AddSelectList.js

@@ -106,33 +106,22 @@ var AddSelectList = function AddSelectList(_ref) {
   };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(blockClass, "-wrapper"), (0, _defineProperty2.default)({}, "".concat(blockClass, "-wrapper-multi"), multi))
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.StructuredListWrapper, {
-    selection: true,
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass)
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.StructuredListBody, null, filteredItems.map(function (item) {
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "-body")
+  }, filteredItems.map(function (item) {
     var _cx2;
-    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.StructuredListRow, {
+    return /*#__PURE__*/_react.default.createElement("div", {
       key: item.id,
-      className: (0, _classnames.default)("".concat(blockClass, "-row"), (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "-row--selected"), isSelected(item.id)), (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "-row-meta--selected"), isInMetaPanel(item.id)), _cx2)),
-      onClick: function onClick(evt) {
-        return metaPanelHandler(item, evt);
-      },
-      label: true
+      className: (0, _classnames.default)("".concat(blockClass, "-row"), (_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "-row--selected"), isSelected(item.id)), (0, _defineProperty2.default)(_cx2, "".concat(blockClass, "-row-meta--selected"), isInMetaPanel(item.id)), _cx2))
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "-cell")
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "-cell-wrapper")
     }, multi ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "-checkbox")
-    },
-    /*#__PURE__*/
-    // hacky way to prevent checkbox from triggering the meta onclick handler
-    // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-    _react.default.createElement("div", {
-      onClick: function onClick(event) {
-        return event.stopPropagation();
-      }
-    }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Checkbox, {
+    }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Checkbox, {
       onChange: function onChange(value, id) {
         return handleMultiSelection(value, id);
       },
@@ -154,10 +143,9 @@ var AddSelectList = function AddSelectList(_ref) {
       id: "add-select-modifier-".concat(item.id),
       type: "inline",
       items: modifiers.options,
-      light: true,
       label: modifiers.label,
       disabled: !isSelected(item.id),
-      className: "".concat(blockClass, "-dropdown ").concat(blockClass, "-hidden-hover"),
+      className: "".concat(blockClass, "-dropdown"),
       initialSelectedItem: item[modifiers.id],
       onChange: function onChange(_ref5) {
         var selectedItem = _ref5.selectedItem;
@@ -185,9 +173,7 @@ var AddSelectList = function AddSelectList(_ref) {
       },
       kind: "ghost",
       size: "sm"
-    }), item.meta && /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(blockClass, "-hidden-hover")
-    }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
+    }), item.meta && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
       className: "".concat(blockClass, "-view-meta"),
       renderIcon: _iconsReact.View16,
       iconDescription: metaIconDescription,
@@ -195,8 +181,11 @@ var AddSelectList = function AddSelectList(_ref) {
       tooltipAlignment: "center",
       hasIconOnly: true,
       kind: "ghost",
-      size: "sm"
-    })))));
+      size: "sm",
+      onClick: function onClick() {
+        return metaPanelHandler(item);
+      }
+    }))));
   }))));
 };
 exports.AddSelectList = AddSelectList;

package/lib/components/CreateFullPage/CreateFullPage.js

@@ -200,7 +200,8 @@ var CreateFullPage = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
     kind: "secondary",
     onClick: function onClick() {
       setModalIsOpen(!modalIsOpen);
-    }
+    },
+    "data-modal-primary-focus": true
   }, modalSecondaryButtonText), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, {
     type: "button",
     kind: "danger",

package/lib/components/Datagrid/Datagrid/DatagridContent.js

@@ -100,9 +100,9 @@ var DatagridContent = function DatagridContent(_ref) {
         return (0, _handleGridKeyPress.handleGridKeyPress)({
           event: event,
           dispatch: dispatch,
-          inlineEditState: inlineEditState,
           instance: datagridState,
           keysPressedList: keysPressedList,
+          state: inlineEditState,
           usingMac: usingMac
         });
       } : null,

package/lib/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -118,7 +118,7 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
       setGlobalFilter(null);
     }
   }, !displayAllInMenu && toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
-    if (index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length === 3) {
+    if (index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3) {
       return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TableBatchAction, {
         key: "".concat(batchAction.label, "-").concat(index),
         renderIcon: batchAction.renderIcon,

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -11,9 +11,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _reactWindow = require("react-window");
 var _carbonComponentsReact = require("carbon-components-react");
+var _layout = require("@carbon/layout");
+var _reactResizeDetector = require("react-resize-detector");
 var _settings = require("../../../settings");
 var _DatagridHead = _interopRequireDefault(require("./DatagridHead"));
-var _layout = require("@carbon/layout");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -49,10 +50,18 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     page = datagridState.page,
     handleResize = datagridState.handleResize,
     gridRef = datagridState.gridRef;
+  var handleVirtualGridResize = function handleVirtualGridResize() {
+    var gridRefElement = gridRef === null || gridRef === void 0 ? void 0 : gridRef.current;
+    gridRefElement.style.width = gridRefElement === null || gridRefElement === void 0 ? void 0 : gridRefElement.clientWidth;
+  };
+  (0, _reactResizeDetector.useResizeDetector)({
+    onResize: handleVirtualGridResize,
+    targetRef: gridRef
+  });
   var syncScroll = function syncScroll(e) {
     var virtualBody = e.target;
-    document.querySelector(".".concat(blockClass, "__head-warp")).scrollLeft = virtualBody.scrollLeft;
-    var spacerColumn = document.querySelector(".".concat(blockClass, "__head-warp thead th:last-child"));
+    document.querySelector(".".concat(blockClass, "__head-wrap")).scrollLeft = virtualBody.scrollLeft;
+    var spacerColumn = document.querySelector(".".concat(blockClass, "__head-wrap thead th:last-child"));
     spacerColumn.style.width = (0, _layout.px)(32 + (virtualBody.offsetWidth - virtualBody.clientWidth)); // scrollbar width to header column to fix header alignment
   };
 
@@ -65,7 +74,7 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
   }
   var visibleRows = DatagridPagination && page || rows;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(blockClass, "__head-warp"),
+    className: "".concat(blockClass, "__head-wrap"),
     style: {
       width: (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth,
       overflow: 'hidden'

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/ButtonWrapper.js

@@ -13,7 +13,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _iconsReact = require("@carbon/icons-react");
 var _carbonComponentsReact = require("carbon-components-react");
 var _settings = require("../../../../../settings");
-var _excluded = ["onClick", "setIsTearsheetOpen", "isTearsheetOpen", "iconTooltipLabel"];
+var _excluded = ["onClick", "setIsTearsheetOpen", "isTearsheetOpen", "iconTooltipLabel", "tooltipPosition"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
@@ -23,11 +23,13 @@ var ButtonWrapper = function ButtonWrapper(_ref) {
     isTearsheetOpen = _ref.isTearsheetOpen,
     _ref$iconTooltipLabel = _ref.iconTooltipLabel,
     iconTooltipLabel = _ref$iconTooltipLabel === void 0 ? 'Customize columns' : _ref$iconTooltipLabel,
+    _ref$tooltipPosition = _ref.tooltipPosition,
+    tooltipPosition = _ref$tooltipPosition === void 0 ? 'bottom' : _ref$tooltipPosition,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/React.createElement(_carbonComponentsReact.Button, (0, _extends2.default)({}, rest, {
     renderIcon: _iconsReact.Column16,
     iconDescription: iconTooltipLabel,
-    tooltipPosition: "left",
+    tooltipPosition: tooltipPosition,
     kind: "ghost",
     hasIconOnly: true,
     "test-id": "".concat(blockClass, "__customize-columns-trigger"),
@@ -43,7 +45,8 @@ ButtonWrapper.propTypes = {
   iconTooltipLabel: _propTypes.default.string,
   isTearsheetOpen: _propTypes.default.bool.isRequired,
   onClick: _propTypes.default.func.isRequired,
-  setIsTearsheetOpen: _propTypes.default.func.isRequired
+  setIsTearsheetOpen: _propTypes.default.func.isRequired,
+  tooltipPosition: _carbonComponentsReact.Button.propTypes.tooltipPosition
 };
 var _default = ButtonWrapper;
 exports.default = _default;

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/Columns.js

@@ -14,9 +14,8 @@ var _reactDndHtml5Backend = require("react-dnd-html5-backend");
 var _carbonComponentsReact = require("carbon-components-react");
 var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"));
 var _settings = require("../../../../../settings");
-var _DraggableElement = _interopRequireDefault(require("../../DraggableElement"));
-var _common = require("./common");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _DraggableItemsList = require("./DraggableItemsList");
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -43,7 +42,8 @@ var Columns = function Columns(_ref) {
     onSelectColumn = _ref.onSelectColumn,
     assistiveTextInstructionsLabel = _ref.assistiveTextInstructionsLabel,
     assistiveTextDisabledInstructionsLabel = _ref.assistiveTextDisabledInstructionsLabel,
-    selectAllLabel = _ref.selectAllLabel;
+    selectAllLabel = _ref.selectAllLabel,
+    isTableSortable = _ref.isTableSortable;
   var _React$useState = _react.default.useState(''),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     ariaRegionText = _React$useState2[0],
@@ -94,59 +94,17 @@ var Columns = function Columns(_ref) {
     },
     id: "".concat(blockClass, "__customization-column-select-all"),
     labelText: selectAllLabel
-  })), columns.filter(function (colDef) {
-    return filterString.length === 0 || colDef.Header.props.title.toLowerCase().includes(filterString);
-  }).map(function (colDef, i) {
-    var searchString = new RegExp('(' + filterString + ')');
-    var res = filterString.length ? colDef.Header.props.title.toLowerCase().split(searchString) : null;
-    var firstWord = res !== null ? res[0] === '' ? res[1].charAt(0).toUpperCase() + res[1].substring(1) : res[0].charAt(0).toUpperCase() + res[0].substring(1) : null;
-    var highlightedText = res !== null ? res[0] === '' ? "<strong>".concat(firstWord, "</strong>") + res[2] : firstWord + "<strong>".concat(res[1], "</strong>") + res[2] : colDef.Header.props.title;
-    var isFrozenColumn = !!colDef.sticky;
-    var listContents = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Checkbox, {
-      wrapperClassName: "".concat(blockClass, "__customize-columns-checkbox-wrapper"),
-      checked: (0, _common.isColumnVisible)(colDef),
-      disabled: isFrozenColumn,
-      onChange: onSelectColumn.bind(null, colDef),
-      id: "".concat(blockClass, "__customization-column-").concat(colDef.id),
-      labelText: colDef.Header.props.title,
-      title: colDef.Header.props.title,
-      className: "".concat(blockClass, "__customize-columns-checkbox"),
-      hideLabel: true
-    }), /*#__PURE__*/_react.default.createElement("div", {
-      dangerouslySetInnerHTML: {
-        __html: highlightedText
-      }
-    }));
-    return /*#__PURE__*/_react.default.createElement(_DraggableElement.default, {
-      key: colDef.id,
-      index: i,
-      listData: columns,
-      setListData: setColumnsObject,
-      id: "dnd-datagrid-columns-".concat(colDef.id),
-      type: "column-customization",
-      disabled: filterString.length > 0 || isFrozenColumn,
-      ariaLabel: colDef.Header.props.title,
-      onGrab: setAriaRegionText,
-      isFocused: focusIndex === i,
-      moveElement: moveElement,
-      onArrowKeyDown: function onArrowKeyDown(e, isGrabbed, currentIndex) {
-        if (isGrabbed) {
-          var _columns$nextIndex;
-          var nextIndex = getNextIndex(columns, currentIndex, e.key);
-          e.preventDefault();
-          e.stopPropagation();
-          if (nextIndex >= 0 && !((_columns$nextIndex = columns[nextIndex]) !== null && _columns$nextIndex !== void 0 && _columns$nextIndex.sticky)) {
-            setFocusIndex(nextIndex);
-            moveElement(currentIndex, nextIndex);
-            e.target.scrollIntoView({
-              block: 'center'
-            });
-          }
-        }
-      },
-      isSticky: isFrozenColumn,
-      selected: (0, _common.isColumnVisible)(colDef)
-    }, listContents);
+  })), /*#__PURE__*/_react.default.createElement(_DraggableItemsList.DraggableItemsList, {
+    columns: columns,
+    filterString: filterString,
+    focusIndex: focusIndex,
+    getNextIndex: getNextIndex,
+    isTableSortable: isTableSortable,
+    moveElement: moveElement,
+    onSelectColumn: onSelectColumn,
+    setAriaRegionText: setAriaRegionText,
+    setColumnsObject: setColumnsObject,
+    setFocusIndex: setFocusIndex
   }))));
 };
 Columns.propTypes = {
@@ -157,6 +115,7 @@ Columns.propTypes = {
   filterString: _propTypes.default.string.isRequired,
   getVisibleColumnsCount: _propTypes.default.func.isRequired,
   instructionsLabel: _propTypes.default.string,
+  isTableSortable: _propTypes.default.bool.isRequired,
   onSelectColumn: _propTypes.default.func.isRequired,
   selectAllLabel: _propTypes.default.string,
   setColumnStatus: _propTypes.default.func,