@elastic/eui 97.0.0-backport.0 → 97.1.0

package/lib/components/datagrid/body/header/draggable_columns.js

@@ -0,0 +1,308 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DroppableColumns = exports.DraggableColumn = exports.DragOverlay = exports.ConditionalDroppableColumns = exports.ConditionalDraggableColumn = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _services = require("../../../../services");
+var _drag_and_drop = require("../../../drag_and_drop");
+var _portal = require("../../../portal");
+var _focus = require("../../utils/focus");
+var _data_grid = require("../../data_grid.styles");
+var _draggable_columns = require("./draggable_columns.styles");
+var _react2 = require("@emotion/react");
+var _excluded = ["role", "tabIndex"],
+  _excluded2 = ["canDragAndDropColumns", "children"],
+  _excluded3 = ["canDragAndDropColumns", "children"];
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+/**
+ * Parent context + EuiDroppable wrapper
+ */
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+var DroppableColumns = exports.DroppableColumns = /*#__PURE__*/(0, _react.memo)(function (_ref) {
+  var columns = _ref.columns,
+    switchColumnPos = _ref.switchColumnPos,
+    indexOffset = _ref.indexOffset,
+    children = _ref.children;
+  var styles = (0, _services.useEuiMemoizedStyles)(_draggable_columns.euiDataGridDraggableHeaderStyles);
+  var droppableId = (0, _services.useGeneratedHtmlId)({
+    prefix: 'euiDataGridHeaderDroppable'
+  });
+  var _useContext = (0, _react.useContext)(_focus.DataGridFocusContext),
+    setFocusedCell = _useContext.setFocusedCell;
+  var handleOnDragEnd = (0, _react.useCallback)(function (_ref2) {
+    var source = _ref2.source,
+      destination = _ref2.destination;
+    if (!source) return;
+    if (destination && destination.index !== source.index) {
+      var sourceColumn = columns[source.index - indexOffset];
+      var destinationColumn = columns[destination.index - indexOffset];
+      if (sourceColumn && destinationColumn) {
+        switchColumnPos(sourceColumn.id, destinationColumn.id);
+      }
+    }
+    // Force focus the cell to prevent the datagrid body from become unfocusable, including on drag cancel
+    setTimeout(function () {
+      var cellToFocus = destination ? destination.index : source.index;
+      setFocusedCell([cellToFocus, -1], true);
+    });
+  }, [columns, indexOffset, switchColumnPos, setFocusedCell]);
+  return (0, _react2.jsx)(_drag_and_drop.EuiDragDropContext, {
+    onDragEnd: handleOnDragEnd
+  }, (0, _react2.jsx)(_drag_and_drop.EuiDroppable, {
+    droppableId: droppableId,
+    direction: "horizontal",
+    ignoreContainerClipping: true,
+    css: styles.euiDataGridHeaderDroppable,
+    "data-test-subj": "euiDataGridHeaderDroppable"
+  }, children));
+});
+DroppableColumns.propTypes = {
+  indexOffset: _propTypes.default.number.isRequired,
+  children: _propTypes.default.oneOfType([_propTypes.default.element.isRequired, _propTypes.default.arrayOf(_propTypes.default.element.isRequired).isRequired, _propTypes.default.any.isRequired]).isRequired
+};
+DroppableColumns.displayName = 'DroppableColumns';
+
+/**
+ * Individual EuiDraggable columns
+ */
+var DraggableColumn = exports.DraggableColumn = /*#__PURE__*/(0, _react.memo)(function (_ref3) {
+  var id = _ref3.id,
+    index = _ref3.index,
+    gridStyles = _ref3.gridStyles,
+    columnResizer = _ref3.columnResizer,
+    actionsPopoverToggle = _ref3.actionsPopoverToggle,
+    children = _ref3.children;
+  var dataGridStyles = (0, _services.useEuiMemoizedStyles)(_data_grid.euiDataGridStyles);
+  var styles = (0, _services.useEuiMemoizedStyles)(_draggable_columns.euiDataGridDraggableHeaderStyles);
+  // Manually re-apply background and border overrides, since
+  // the droppable zone sets its own and confuses :first-of-type CSS
+  var reapplyCellStyles = [styles[gridStyles.header], index !== 0 && styles.noLeadingBorder];
+
+  // Draggable prevents the cell from receiving focus on click.
+  // We manually ensure focus is set on cell mouseDown which
+  // also includes setting focus before dragging
+  var _useContext2 = (0, _react.useContext)(_focus.DataGridFocusContext),
+    setFocusedCell = _useContext2.setFocusedCell;
+  var handleOnMouseDown = (0, _react.useCallback)(function (e) {
+    var openFocusTrap = document.querySelector('[data-focus-lock-disabled="false"]');
+    if (!!openFocusTrap &&
+    // If a focus trap is open somewhere on the page
+    !openFocusTrap.contains(e.target) &&
+    // & the focus trap doesn't belong to this header
+    e.target !== actionsPopoverToggle // & we're not closing the actions popover toggle
+    ) {
+      // Trick the focus trap lib into registering an outside click -
+      // the drag/drop lib otherwise otherwise prevents the event 💀
+      document.dispatchEvent(new MouseEvent('mousedown'));
+    }
+    setTimeout(function () {
+      setFocusedCell([index, -1], true);
+    });
+  }, [setFocusedCell, index, actionsPopoverToggle]);
+
+  // Prevent any other keypresses when dragging
+  var isDraggingRef = (0, _react.useRef)(false);
+  var handleOnKeydown = (0, _react.useCallback)(function (e) {
+    if (isDraggingRef.current) {
+      e.preventDefault();
+      e.stopPropagation();
+      return false;
+    }
+  }, []);
+
+  // UX polish: add a slight animation frame delay to the dragging ref end
+  // which prevents re-running the hover animation of column header actions
+  var updateDraggingRef = (0, _react.useCallback)(function (isDragging) {
+    // Only update if the state has changed from before
+    if (isDragging !== isDraggingRef.current) {
+      if (!isDragging) {
+        requestAnimationFrame(function () {
+          isDraggingRef.current = false;
+        });
+      } else {
+        isDraggingRef.current = true;
+      }
+    }
+  }, []);
+  return (0, _react2.jsx)("div", {
+    css: styles.euiDataGridHeaderCellDraggableWrapper,
+    onMouseDown: handleOnMouseDown,
+    onKeyDownCapture: handleOnKeydown
+  }, columnResizer, (0, _react2.jsx)(_drag_and_drop.EuiDraggable, {
+    draggableId: id,
+    className: "euiDataGridHeaderCellDraggable",
+    css: styles.euiDataGridHeaderCellDraggable,
+    index: index,
+    customDragHandle: "custom",
+    hasInteractiveChildren: true,
+    usePortal: true
+  }, function (_ref4, _ref5) {
+    var dragHandleProps = _ref4.dragHandleProps;
+    var isDragging = _ref5.isDragging,
+      mode = _ref5.mode;
+    updateDraggingRef(isDragging);
+    var _ref6 = dragHandleProps !== null && dragHandleProps !== void 0 ? dragHandleProps : {},
+      role = _ref6.role,
+      tabIndex = _ref6.tabIndex,
+      restDragHandleProps = _objectWithoutProperties(_ref6, _excluded);
+    var passedProps = _objectSpread(_objectSpread({}, restDragHandleProps), {}, {
+      css: reapplyCellStyles,
+      'data-column-moving': isDraggingRef.current || undefined,
+      isDragging: isDragging
+    });
+
+    // since the cloned content is in a portal outside the datagrid
+    // we need to re-add styles to the cell as the scoped styles
+    // from the wrapper don't apply
+    var draggingStyles = [styles.euiDataGridHeaderCellDraggable,
+    // ensure height is maintained while dragging
+    dataGridStyles.cellPadding[gridStyles.cellPadding], dataGridStyles.fontSize[gridStyles.fontSize], dataGridStyles.borders[gridStyles.border], mode === 'SNAP' && styles.isKeyboardDragging];
+    return isDragging ? (0, _react2.jsx)("div", {
+      css: draggingStyles
+    }, (0, _react2.jsx)(DragOverlay, {
+      isDragging: true,
+      cursor: "grabbing"
+    }), children(passedProps)) : children(passedProps);
+  }));
+});
+DraggableColumn.propTypes = {
+  id: _propTypes.default.string.isRequired,
+  index: _propTypes.default.number.isRequired,
+  gridStyles: _propTypes.default.shape({
+    /**
+       * Size of fonts used within the row and column cells
+       * @default m
+       */
+    fontSize: _propTypes.default.oneOf(["s", "m", "l"]),
+    /**
+       * Defines the padding with the row and column cells
+       * @default m
+       */
+    cellPadding: _propTypes.default.oneOf(["s", "m", "l"]),
+    /**
+       * Border used for the row and column cells
+       * @default all
+       */
+    border: _propTypes.default.oneOf(["all", "horizontal", "none"]),
+    /**
+       * If set to true, rows will alternate zebra striping for clarity
+       * @default false
+       */
+    stripes: _propTypes.default.bool,
+    /**
+       * Visual style for the column headers. Recommendation is to use the `underline` style in times when #EuiDataGrid `toolbarVisibility` is set to `false`.
+       * @default shade
+       */
+    header: _propTypes.default.oneOf(["shade", "underline"]),
+    /**
+       * Visual style for the column footers.
+       * @default overline
+       */
+    footer: _propTypes.default.oneOf(["shade", "overline", "striped"]),
+    /**
+       * If set to true, the footer row will be sticky
+       * @default true
+       */
+    stickyFooter: _propTypes.default.bool,
+    /**
+       * Will define what visual style to show on row hover
+       * @default hover
+       */
+    rowHover: _propTypes.default.oneOf(["highlight", "none"]),
+    /**
+       * Optionally pass custom classes to highlight or customize certain rows
+       */
+    rowClasses: _propTypes.default.shape({}),
+    /**
+       * Optional callback returning the current `gridStyle` config when changes occur from user input (e.g. toolbar display controls).
+       * Can be used for, e.g. storing user `gridStyle` in a local storage object.
+       */
+    onChange: _propTypes.default.func
+  }).isRequired,
+  columnResizer: _propTypes.default.node,
+  actionsPopoverToggle: _propTypes.default.oneOfType([_propTypes.default.any.isRequired, _propTypes.default.oneOf([null])]),
+  children: _propTypes.default.func.isRequired
+};
+DraggableColumn.displayName = 'DraggableColumn';
+
+/**
+ * Components for conditionally rendering drag/drop wrappers
+ * Allows us to conditionally call hooks while not instantiating a bunch
+ * of extra state/etc., since draggable columns isn't yet(?) a default
+ */
+
+var ConditionalDroppableColumns = exports.ConditionalDroppableColumns = /*#__PURE__*/(0, _react.memo)(function (_ref7) {
+  var canDragAndDropColumns = _ref7.canDragAndDropColumns,
+    children = _ref7.children,
+    rest = _objectWithoutProperties(_ref7, _excluded2);
+  return canDragAndDropColumns ? (0, _react2.jsx)(DroppableColumns, rest, children) : (0, _react2.jsx)(_react.default.Fragment, null, children);
+});
+ConditionalDroppableColumns.propTypes = {
+  canDragAndDropColumns: _propTypes.default.bool.isRequired
+};
+ConditionalDroppableColumns.displayName = 'ConditionalDroppableColumns';
+var ConditionalDraggableColumn = exports.ConditionalDraggableColumn = /*#__PURE__*/(0, _react.memo)(function (_ref8) {
+  var canDragAndDropColumns = _ref8.canDragAndDropColumns,
+    children = _ref8.children,
+    rest = _objectWithoutProperties(_ref8, _excluded3);
+  return canDragAndDropColumns ? (0, _react2.jsx)(DraggableColumn, rest, children) : (0, _react2.jsx)(_react.default.Fragment, null, children());
+});
+ConditionalDraggableColumn.propTypes = {
+  canDragAndDropColumns: _propTypes.default.bool.isRequired
+};
+ConditionalDraggableColumn.displayName = 'ConditionalDraggableColumn';
+
+/**
+ * Creates an invisible overlay that prevents hover interactions/transitions
+ * on other elements that the dragged element is dragged over, and also maintains
+ * the intended drag cursor over any location.
+ *
+ * TODO: If this is useful elsewhere, consider moving it to `src/services`
+ */
+var _ref10 = process.env.NODE_ENV === "production" ? {
+  name: "q8wbl-DragOverlay",
+  styles: "position:fixed;inset:0;label:DragOverlay;"
+} : {
+  name: "q8wbl-DragOverlay",
+  styles: "position:fixed;inset:0;label:DragOverlay;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
+var DragOverlay = exports.DragOverlay = /*#__PURE__*/(0, _react.memo)(function (_ref9) {
+  var isDragging = _ref9.isDragging,
+    cursor = _ref9.cursor,
+    _ref9$zIndex = _ref9.zIndex,
+    zIndex = _ref9$zIndex === void 0 ? 9999 : _ref9$zIndex;
+  return isDragging ? (0, _react2.jsx)(_portal.EuiPortal, null, (0, _react2.jsx)("div", {
+    css: _ref10,
+    style: {
+      cursor: cursor,
+      zIndex: zIndex
+    }
+  })) : null;
+});
+DragOverlay.propTypes = {
+  isDragging: _propTypes.default.bool,
+  cursor: _propTypes.default.any,
+  zIndex: _propTypes.default.any
+};
+DragOverlay.displayName = 'DragOverlay';

package/lib/components/datagrid/body/header/draggable_columns.styles.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.euiDataGridDraggableHeaderStyles = void 0;
+var _react = require("@emotion/react");
+var _global_styling = require("../../../../global_styling");
+var _templateObject;
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
+function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; } /*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+var _ref = process.env.NODE_ENV === "production" ? {
+  name: "pfqu74-euiDataGridHeaderDroppable",
+  styles: "display:flex;label:euiDataGridHeaderDroppable;"
+} : {
+  name: "pfqu74-euiDataGridHeaderDroppable",
+  styles: "display:flex;label:euiDataGridHeaderDroppable;",
+  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+};
+var euiDataGridDraggableHeaderStyles = exports.euiDataGridDraggableHeaderStyles = function euiDataGridDraggableHeaderStyles(_ref2) {
+  var euiTheme = _ref2.euiTheme;
+  return {
+    euiDataGridHeaderDroppable: _ref,
+    // The resizer must be positioned outside the draggable component to ensure both work independently
+    euiDataGridHeaderCellDraggableWrapper: /*#__PURE__*/(0, _react.css)("position:relative;.euiDataGridColumnResizer::after{", (0, _global_styling.logicalCSS)('margin-left', "-".concat(euiTheme.border.width.thick)), ";};label:euiDataGridHeaderCellDraggableWrapper;"),
+    // override internal styling from @hello-pangea/dnd to ensure positioning
+    euiDataGridHeaderCellDraggable: /*#__PURE__*/(0, _react.css)("display:flex;", (0, _global_styling.logicalCSS)('height', '100%'), ";;label:euiDataGridHeaderCellDraggable;"),
+    // Add more visual affordance to keyboard drags (raises cell slightly to show green droppable bg)
+    // Using animation as transition doesn't seem to work (a tale as old as EuiDataGrid...)
+    isKeyboardDragging: /*#__PURE__*/(0, _react.css)("animation-name:", (0, _react.keyframes)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        from { transform: translateY(0); }\n        to { transform: translateY(-", "); }\n      "])), euiTheme.size.s), ";animation-iteration-count:1;animation-fill-mode:forwards;", _global_styling.euiCanAnimate, "{animation-duration:", euiTheme.animation.fast, ";};label:isKeyboardDragging;"),
+    // Ensure correct cell background colors on drag
+    underline: /*#__PURE__*/(0, _react.css)("background-color:", euiTheme.colors.emptyShade, ";;label:underline;"),
+    shade: /*#__PURE__*/(0, _react.css)("background-color:", euiTheme.colors.lightestShade, ";;label:shade;"),
+    noLeadingBorder: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('border-left', 'none !important'), ";;label:noLeadingBorder;")
+  };
+};

package/lib/components/datagrid/data_grid.js

@@ -410,7 +410,8 @@ var EuiDataGrid = exports.EuiDataGrid = /*#__PURE__*/(0, _react.memo)( /*#__PURE
     gridRef: gridRef,
     gridItemsRendered: gridItemsRendered,
     wrapperRef: contentRef,
-    renderCustomGridBody: renderCustomGridBody
+    renderCustomGridBody: renderCustomGridBody,
+    canDragAndDropColumns: columnVisibility.canDragAndDropColumns
   }))), showPagination && props['aria-labelledby'] && (0, _react2.jsx)("p", {
     id: ariaLabelledById,
     hidden: true

package/lib/components/datagrid/data_grid.stories.utils.js

@@ -122,9 +122,6 @@ var columns = [{
       "aria-label": "Send email to ".concat(value)
     }, "Send email");
   }]
-}, {
-  id: 'location',
-  displayAsText: 'Location'
 }, {
   id: 'account',
   displayAsText: 'Account',
@@ -159,6 +156,9 @@ var columns = [{
       "aria-label": "Send money to ".concat(value)
     }, "Send money");
   }]
+}, {
+  id: 'location',
+  displayAsText: 'Location'
 }, {
   id: 'date',
   displayAsText: 'Date',
@@ -239,7 +239,8 @@ var defaultStorybookArgs = exports.defaultStorybookArgs = {
   // setup for easier testing/QA
   columnVisibility: {
     visibleColumns: ['name', 'email', 'account', 'location', 'date', 'amount', 'phone', 'version'],
-    setVisibleColumns: function setVisibleColumns() {}
+    setVisibleColumns: function setVisibleColumns() {},
+    canDragAndDropColumns: false
   },
   inMemory: {
     level: 'sorting'
@@ -350,7 +351,8 @@ var StatefulDataGrid = exports.StatefulDataGrid = function StatefulDataGrid(prop
   return (0, _react2.jsx)(_data_grid.EuiDataGrid, _extends({}, rest, {
     columnVisibility: {
       visibleColumns: visibleColumns,
-      setVisibleColumns: setVisibleColumns
+      setVisibleColumns: setVisibleColumns,
+      canDragAndDropColumns: columnVisibility.canDragAndDropColumns
     },
     sorting: {
       columns: sortingColumns,
@@ -859,7 +861,8 @@ EuiDataGridToolbarPropsComponent.propTypes = {
     /**
        * A callback for when a column's visibility or order is modified by the user.
        */
-    setVisibleColumns: _propTypes.default.func.isRequired
+    setVisibleColumns: _propTypes.default.func.isRequired,
+    /** Enables reordering grid columns on drag and drop via the headers cells */canDragAndDropColumns: _propTypes.default.bool
   }).isRequired,
   /**
        * An array of custom #EuiDataGridSchemaDetector objects. You can inject custom schemas to the grid to define the classnames applied.

package/lib/components/datagrid/utils/col_widths.js

@@ -61,31 +61,35 @@ var useColumnWidths = exports.useColumnWidths = function useColumnWidths(_ref) {
     trailingControlColumns = _ref.trailingControlColumns,
     defaultColumnWidth = _ref.defaultColumnWidth,
     onColumnResize = _ref.onColumnResize;
-  var computeColumnWidths = (0, _react.useCallback)(function () {
-    return columns.filter(doesColumnHaveAnInitialWidth).reduce(function (initialWidths, column) {
-      return _objectSpread(_objectSpread({}, initialWidths), {}, _defineProperty({}, column.id, column.initialWidth));
-    }, {});
+  var getInitialWidths = (0, _react.useCallback)(function (prevColumnWidths) {
+    var columnWidths = _objectSpread({}, prevColumnWidths);
+    columns.filter(doesColumnHaveAnInitialWidth).forEach(function (_ref2) {
+      var id = _ref2.id,
+        initialWidth = _ref2.initialWidth;
+      if (columnWidths[id] == null) {
+        columnWidths[id] = initialWidth;
+      }
+    });
+    return columnWidths;
   }, [columns]);
 
   // Passes initializer function for performance, so computing only runs once on init
   // @see https://react.dev/reference/react/useState#examples-initializer
-  var _useState = (0, _react.useState)(computeColumnWidths),
+  var _useState = (0, _react.useState)(getInitialWidths),
     _useState2 = _slicedToArray(_useState, 2),
     columnWidths = _useState2[0],
     setColumnWidths = _useState2[1];
   (0, _services.useUpdateEffect)(function () {
-    setColumnWidths(computeColumnWidths());
-  }, [computeColumnWidths]);
+    setColumnWidths(getInitialWidths);
+  }, [columns]);
   var setColumnWidth = (0, _react.useCallback)(function (columnId, width) {
     setColumnWidths(function (prevColumnWidths) {
       return _objectSpread(_objectSpread({}, prevColumnWidths), {}, _defineProperty({}, columnId, width));
     });
-    if (onColumnResize) {
-      onColumnResize({
-        columnId: columnId,
-        width: width
-      });
-    }
+    onColumnResize === null || onColumnResize === void 0 || onColumnResize({
+      columnId: columnId,
+      width: width
+    });
   }, [onColumnResize]);
 
   // Used by react-window to determine actual column widths

package/lib/components/datagrid/utils/focus.js

@@ -51,11 +51,11 @@ var useFocus = exports.useFocus = function useFocus() {
     _useState4 = _slicedToArray(_useState3, 2),
     focusedCell = _useState4[0],
     _setFocusedCell = _useState4[1];
-  var setFocusedCell = (0, _react.useCallback)(function (nextFocusedCell) {
+  var setFocusedCell = (0, _react.useCallback)(function (nextFocusedCell, forceUpdate) {
     _setFocusedCell(function (prevFocusedCell) {
       // If the x/y coordinates remained the same, don't update. This keeps the focusedCell
       // reference stable, and allows it to be used in places that need reference equality.
-      if (nextFocusedCell[0] === (prevFocusedCell === null || prevFocusedCell === void 0 ? void 0 : prevFocusedCell[0]) && nextFocusedCell[1] === (prevFocusedCell === null || prevFocusedCell === void 0 ? void 0 : prevFocusedCell[1])) {
+      if (!forceUpdate && nextFocusedCell[0] === (prevFocusedCell === null || prevFocusedCell === void 0 ? void 0 : prevFocusedCell[0]) && nextFocusedCell[1] === (prevFocusedCell === null || prevFocusedCell === void 0 ? void 0 : prevFocusedCell[1])) {
         return prevFocusedCell;
       } else {
         setIsFocusedCellInView(true); // scrolling.ts ensures focused cells are fully in view

package/lib/components/datagrid/utils/scrolling.js

@@ -69,7 +69,8 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
     headerRowHeight = _ref.headerRowHeight,
     footerRowHeight = _ref.footerRowHeight,
     visibleRowCount = _ref.visibleRowCount,
-    hasStickyFooter = _ref.hasStickyFooter;
+    hasStickyFooter = _ref.hasStickyFooter,
+    canDragAndDropColumns = _ref.canDragAndDropColumns;
   var scrollCellIntoView = (0, _react.useCallback)(
   /*#__PURE__*/
   // Note: in order for this UX to work correctly with react-window's APIs,
@@ -78,7 +79,7 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
   function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var _adjustedScrollLeft;
-      var rowIndex, colIndex, getCell, cell, cellIsInView, _outerGridRef$current, scrollTop, scrollLeft, adjustedScrollTop, adjustedScrollLeft, cellRightPos, rightScrollBound, rightWidthOutOfView, cellLeftPos, leftScrollBound, leftWidthOutOfView, isStickyHeader, isStickyFooter, _adjustedScrollTop, parentRow, cellBottomPos, bottomScrollBound, bottomHeightOutOfView, cellTopPos, topScrollBound, topHeightOutOfView, _adjustedScrollLeft2, _adjustedScrollTop2;
+      var rowIndex, colIndex, getCell, cell, cellIsInView, isStickyHeader, isStickyFooter, isDraggableHeader, isDraggableHeaderCell, _outerGridRef$current, scrollTop, scrollLeft, adjustedScrollTop, adjustedScrollLeft, cellLeftPos, cellRightPos, rightScrollBound, rightWidthOutOfView, leftScrollBound, leftWidthOutOfView, _adjustedScrollTop, parentRow, cellBottomPos, bottomScrollBound, bottomHeightOutOfView, cellTopPos, topScrollBound, topHeightOutOfView, _adjustedScrollLeft2, _adjustedScrollTop2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -125,7 +126,10 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
             return _context.abrupt("return");
           case 15:
             // If for some reason we can't find a valid cell, short-circuit
-            // We now manually adjust scroll positioning around the cell to ensure it's
+            isStickyHeader = rowIndex === -1;
+            isStickyFooter = hasStickyFooter && rowIndex === visibleRowCount;
+            isDraggableHeader = canDragAndDropColumns && isStickyHeader;
+            isDraggableHeaderCell = isDraggableHeader && cell.offsetLeft === 0 && colIndex !== 0; // We now manually adjust scroll positioning around the cell to ensure it's
             // fully in view on all sides. A couple of notes on this:
             // 1. We're avoiding relying on react-window's scrollToItem for this because it also
             //    does not account for sticky items (see https://github.com/bvaughn/react-window/issues/586)
@@ -134,8 +138,10 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
             //    halfway there, but doesn't guarantee the *full* cell in view, or account for
             //    sticky positioned rows or OS scrollbars, hence these workarounds
             _outerGridRef$current = outerGridRef.current, scrollTop = _outerGridRef$current.scrollTop, scrollLeft = _outerGridRef$current.scrollLeft;
-            // Check if the cell's right side is outside the current scrolling bounds
-            cellRightPos = cell.offsetLeft + cell.offsetWidth;
+            // Draggable header columns are nested within EuiDraggables,
+            // and their offsetLeft needs to go up a wrapper as a result
+            cellLeftPos = isDraggableHeaderCell ? cell.offsetParent.offsetLeft : cell.offsetLeft; // Check if the cell's right side is outside the current scrolling bounds
+            cellRightPos = cellLeftPos + cell.offsetWidth;
             rightScrollBound = scrollLeft + outerGridRef.current.clientWidth; // Note: We specifically want clientWidth and not offsetWidth here to account for scrollbars
             rightWidthOutOfView = cellRightPos - rightScrollBound;
             if (rightWidthOutOfView > 0) {
@@ -143,7 +149,6 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
             }
 
             // Check if the cell's left side is outside the current scrolling bounds
-            cellLeftPos = cell.offsetLeft;
             leftScrollBound = (_adjustedScrollLeft = adjustedScrollLeft) !== null && _adjustedScrollLeft !== void 0 ? _adjustedScrollLeft : scrollLeft;
             leftWidthOutOfView = leftScrollBound - cellLeftPos;
             if (leftWidthOutOfView > 0) {
@@ -154,8 +159,6 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
 
             // Skip top/bottom scroll adjustments for sticky headers & footers
             // since they should always be in view vertically
-            isStickyHeader = rowIndex === -1;
-            isStickyFooter = hasStickyFooter && rowIndex === visibleRowCount;
             if (!isStickyHeader && !isStickyFooter) {
               parentRow = cell.parentNode; // Check if the cell's bottom side is outside the current scrolling bounds
               cellBottomPos = parentRow.offsetTop + cell.offsetHeight;
@@ -185,7 +188,7 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
                 scrollTop: (_adjustedScrollTop2 = adjustedScrollTop) !== null && _adjustedScrollTop2 !== void 0 ? _adjustedScrollTop2 : scrollTop
               });
             }
-          case 28:
+          case 30:
           case "end":
             return _context.stop();
         }
@@ -194,7 +197,7 @@ var useScrollCellIntoView = exports.useScrollCellIntoView = function useScrollCe
     return function (_x) {
       return _ref3.apply(this, arguments);
     };
-  }(), [gridRef, outerGridRef, hasGridScrolling, headerRowHeight, footerRowHeight, visibleRowCount, hasStickyFooter]);
+  }(), [gridRef, outerGridRef, hasGridScrolling, headerRowHeight, footerRowHeight, visibleRowCount, hasStickyFooter, canDragAndDropColumns]);
   return {
     scrollCellIntoView: scrollCellIntoView
   };

package/lib/components/drag_and_drop/draggable.js

@@ -58,6 +58,7 @@ var EuiDraggable = exports.EuiDraggable = function EuiDraggable(_ref) {
     cloneItems = _useContext.cloneItems;
   var euiTheme = (0, _services.useEuiTheme)();
   var styles = (0, _draggable.euiDraggableStyles)(euiTheme);
+  var hasCustomDragHandle = customDragHandle !== false;
   return (0, _react2.jsx)(_dnd.Draggable, _extends({
     draggableId: draggableId,
     index: index,
@@ -65,13 +66,14 @@ var EuiDraggable = exports.EuiDraggable = function EuiDraggable(_ref) {
   }, rest), function (provided, snapshot, rubric) {
     var _provided$dragHandleP, _provided$dragHandleP2;
     var isDragging = snapshot.isDragging;
+    var isFullyCustomDragHandle = customDragHandle === 'custom';
     var cssStyles = [styles.euiDraggable, cloneItems && !isDragging && styles.hasClone, isDragging && styles.isDragging, isRemovable && styles.isRemovable, styles.spacing[spacing]];
     var classes = (0, _classnames.default)('euiDraggable', className);
     var childClasses = (0, _classnames.default)('euiDraggable__item', {
       'euiDraggable__item-isDisabled': isDragDisabled
     });
     var DraggableElement = typeof children === 'function' ? children(provided, snapshot, rubric) : children;
-    var content = (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("div", _extends({}, provided.draggableProps, !customDragHandle ? provided.dragHandleProps : {}, {
+    var content = (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("div", _extends({}, provided.draggableProps, !hasCustomDragHandle ? provided.dragHandleProps : {}, {
       ref: provided.innerRef,
       "data-test-subj": dataTestSubj,
       className: classes,
@@ -81,11 +83,14 @@ var EuiDraggable = exports.EuiDraggable = function EuiDraggable(_ref) {
       // interactive element. Screen readers will cue users that this is a container
       // and has one or more elements inside that are part of a related group.
       ,
-      role: hasInteractiveChildren ? 'group' : (_provided$dragHandleP = provided.dragHandleProps) === null || _provided$dragHandleP === void 0 ? void 0 : _provided$dragHandleP.role
+      role: isFullyCustomDragHandle ? undefined // prevent wrapper role from removing semantics of the children
+      : hasInteractiveChildren ? 'group' : (_provided$dragHandleP = provided.dragHandleProps) === null || _provided$dragHandleP === void 0 ? void 0 : _provided$dragHandleP.role
       // If the container includes an interactive element, we remove the tabindex=0
       // because [role="group"] does not permit or warrant a tab stop
+      // additionally we remove the tabindex when the child is a fully custom handle
+      // that has its own tabindex and handle props
       ,
-      tabIndex: hasInteractiveChildren ? undefined : (_provided$dragHandleP2 = provided.dragHandleProps) === null || _provided$dragHandleP2 === void 0 ? void 0 : _provided$dragHandleP2.tabIndex
+      tabIndex: hasInteractiveChildren || isFullyCustomDragHandle ? undefined : (_provided$dragHandleP2 = provided.dragHandleProps) === null || _provided$dragHandleP2 === void 0 ? void 0 : _provided$dragHandleP2.tabIndex
     }), (0, _services.cloneElementWithCss)(DraggableElement, {
       className: (0, _classnames.default)(DraggableElement.props.className, childClasses),
       css: [_draggable.euiDraggableItemStyles.euiDraggable__item, isDragDisabled && _draggable.euiDraggableItemStyles.disabled]
@@ -103,9 +108,12 @@ EuiDraggable.propTypes = {
   children: _propTypes.default.oneOfType([_propTypes.default.element.isRequired, _propTypes.default.any.isRequired]).isRequired,
   className: _propTypes.default.string,
   /**
-     * Whether the `children` will provide and set up its own drag handle
+     * Whether the `children` will provide and set up its own drag handle.
+     * The `custom` value additionally removes the `role` from the draggable container.
+     * Use this if the `children` element is focusable and should keep its
+     * semantic role for accessibility purposes.
      */
-  customDragHandle: _propTypes.default.bool,
+  customDragHandle: _propTypes.default.oneOfType([_propTypes.default.bool.isRequired, _propTypes.default.oneOf(["custom"])]),
   /**
      * Whether the container has interactive children and should have `role="group"` instead of `"button"`.
      * Setting this flag ensures your drag & drop container is keyboard and screen reader accessible.