@instructure/outcomes-ui 4.1.2 → 4.1.3

package/lib/translated/en-AU-x-unimelb/components/Gradebook/popovers/StudentPopover/index.stories.js

@@ -4,10 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.SingleSection = exports.NoSections = exports.NoScores = exports.ManySections = exports.LowPerformingStudent = exports.LongStudentName = exports.LongCourseName = exports.Loading = exports.HighPerformingStudent = exports.ErrorMessage = exports.Default = exports.CustomMasteryScores = exports.CustomMasteryLevelConfig = exports.CustomHeader = exports.CustomActions = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+exports.default = exports.WithLongMetaData = exports.WithLongDescription = exports.WithDescriptionOnly = exports.NoScores = exports.LowPerformingStudent = exports.LongStudentName = exports.Loading = exports.HighPerformingStudent = exports.ErrorMessage = exports.Default = exports.CustomMasteryScores = exports.CustomMasteryLevelConfig = exports.CustomHeader = exports.CustomActions = void 0;
 var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireDefault(require("react"));
 var _addonActions = require("@storybook/addon-actions");
 var _testingLibrary = require("@storybook/testing-library");
@@ -16,7 +16,8 @@ var _uiFlex = require("@instructure/ui-flex");
 var _uiText = require("@instructure/ui-text");
 var _uiButtons = require("@instructure/ui-buttons");
 var _decorators = require("../../storybook/decorators.js");
-var _mockData = require("../../__mocks__/mockData.js");
+var _mockData = require("../../gradebook-table/StudentCell/__mocks__/mockData.js");
+var _mockData2 = require("./__mocks__/mockData.js");
 var _index = require("../../../../index.js");
 // Storybook's args type (Partial<Props>) doesn't handle discriminated
 // unions in StudentPopoverProps so define a flatten version of it
@@ -33,14 +34,14 @@ var meta = {
 };
 var _default = exports.default = meta;
 var createStoryArgs = function createStoryArgs(student) {
-  var masteryScores = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _mockData.mockMasteryScores;
-  return {
+  var masteryScores = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _mockData2.mockMasteryScores;
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({
     student: student,
-    studentName: student.display_name,
-    userDetails: _mockData.mockUserDetailsDefault,
+    studentName: student.displayName
+  }, _mockData2.mockCaptionDefault), {}, {
     masteryScores: masteryScores,
     studentGradesUrl: "/courses/123/grades/".concat(student.id)
-  };
+  });
 };
 var openPopover = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regenerator2.default)().m(function _callee(_ref) {
@@ -70,42 +71,39 @@ var Default = exports.Default = {
   play: openPopover
 };
 var HighPerformingStudent = exports.HighPerformingStudent = {
-  args: createStoryArgs(_mockData.mockStudent, _mockData.highMasteryScores),
+  args: createStoryArgs(_mockData.mockStudent, _mockData2.highMasteryScores),
   play: openPopover
 };
 var LowPerformingStudent = exports.LowPerformingStudent = {
-  args: createStoryArgs(_mockData.mockStudent, _mockData.lowMasteryScores),
+  args: createStoryArgs(_mockData.mockStudent, _mockData2.lowMasteryScores),
   play: openPopover
 };
 var NoScores = exports.NoScores = {
-  args: createStoryArgs(_mockData.mockStudent, _mockData.unassessedMasteryScores),
+  args: createStoryArgs(_mockData.mockStudent, _mockData2.unassessedMasteryScores),
   play: openPopover
 };
 var LongStudentName = exports.LongStudentName = {
   args: createStoryArgs(_mockData.mockStudentLongName),
   play: openPopover
 };
-var LongCourseName = exports.LongCourseName = {
-  args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createStoryArgs((0, _mockData.createStudent)('4', 'Oliver', 'Brown'))), {}, {
-    userDetails: _mockData.mockUserDetailsLongCourseName
-  }),
-  play: openPopover
-};
-var ManySections = exports.ManySections = {
-  args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createStoryArgs((0, _mockData.createStudent)('3', 'Emma', 'Wilson'))), {}, {
-    userDetails: _mockData.mockUserDetailsManySections
+var WithDescriptionOnly = exports.WithDescriptionOnly = {
+  args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createStoryArgs(_mockData.mockStudent)), {}, {
+    description: 'Introduction to Computer Science',
+    metadata: void 0
   }),
   play: openPopover
 };
-var NoSections = exports.NoSections = {
-  args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createStoryArgs((0, _mockData.createStudent)('6', 'Liam', 'Miller'))), {}, {
-    userDetails: _mockData.mockUserDetailsNoSections
+var WithLongDescription = exports.WithLongDescription = {
+  args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createStoryArgs(_mockData.mockStudent)), {}, {
+    description: 'Advanced Placement European History: Renaissance to Modern Era',
+    metadata: 'AP Section'
   }),
   play: openPopover
 };
-var SingleSection = exports.SingleSection = {
-  args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createStoryArgs((0, _mockData.createStudent)('2', 'Jane', 'Doe'))), {}, {
-    userDetails: _mockData.mockUserDetailsSingleSection
+var WithLongMetaData = exports.WithLongMetaData = {
+  args: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createStoryArgs(_mockData.mockStudent)), {}, {
+    description: 'World History',
+    metadata: 'Section A - Morning, Section B - Afternoon, Section C - Evening, Section D - Online'
   }),
   play: openPopover
 };
@@ -113,9 +111,10 @@ var CustomHeader = exports.CustomHeader = {
   args: createStoryArgs(_mockData.mockStudent),
   render: function render(args) {
     return /*#__PURE__*/_react.default.createElement(_index.StudentPopover, Object.assign({}, args, {
-      student: void 0,
+      avatarUrl: void 0,
       studentName: "John Doe",
-      userDetails: void 0,
+      description: void 0,
+      metadata: void 0,
       headerOverride: /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
         padding: "0 0 medium 0"
       }, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, null, /*#__PURE__*/_react.default.createElement(_uiText.Text, null, "Custom Header for ", args.studentName)))
@@ -161,7 +160,7 @@ var CustomActions = exports.CustomActions = {
 };
 var Loading = exports.Loading = {
   args: {
-    studentName: _mockData.mockStudent.display_name,
+    studentName: _mockData.mockStudent.displayName,
     studentGradesUrl: "/courses/123/grades/".concat(_mockData.mockStudent.id),
     isLoading: true
   },
@@ -169,7 +168,7 @@ var Loading = exports.Loading = {
 };
 var ErrorMessage = exports.ErrorMessage = {
   args: {
-    studentName: _mockData.mockStudent.display_name,
+    studentName: _mockData.mockStudent.displayName,
     studentGradesUrl: "/courses/123/grades/".concat(_mockData.mockStudent.id),
     error: 'Failed to load student details. Please try again.'
   },

package/lib/translated/en-AU-x-unimelb/components/Gradebook/storybook/decorators.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createStudentPopover = exports.StoryWrapper = exports.ExampleSettingsTrayContent = void 0;
+exports.StoryWrapper = exports.ExampleSettingsTrayContent = void 0;
 var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -13,26 +13,12 @@ var _addonActions = require("@storybook/addon-actions");
 var _uiCheckbox = require("@instructure/ui-checkbox");
 var _uiFlex = require("@instructure/ui-flex");
 var _NameDisplaySelector = require("../toolbar/SettingsTray/NameDisplaySelector.js");
-var _index = require("../popovers/StudentPopover/index.js");
 var _constants = require("../../../util/gradebook/constants.js");
 var _GradebookApp = require("../GradebookApp.js");
-var _index2 = require("../context/GradebookAppContext/index.js");
-var _mockData = require("../__mocks__/mockData.js");
-var createStudentPopover = exports.createStudentPopover = function createStudentPopover(_ref) {
-  var studentName = _ref.studentName,
-    student = _ref.student,
-    masteryScores = _ref.masteryScores;
-  return /*#__PURE__*/_react.default.createElement(_index.StudentPopover, {
-    student: student || (0, _mockData.createStudent)('1', 'John', 'Doe'),
-    studentName: studentName,
-    masteryScores: masteryScores,
-    studentGradesUrl: "/test-url",
-    userDetails: _mockData.mockUserDetailsDefault
-  });
-};
-var ExampleSettingsTrayContent = exports.ExampleSettingsTrayContent = function ExampleSettingsTrayContent(_ref2) {
-  var settings = _ref2.settings,
-    _onChange = _ref2.onChange;
+var _index = require("../context/GradebookAppContext/index.js");
+var ExampleSettingsTrayContent = exports.ExampleSettingsTrayContent = function ExampleSettingsTrayContent(_ref) {
+  var settings = _ref.settings,
+    _onChange = _ref.onChange;
   return /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, {
     direction: "column",
     gap: "large"
@@ -55,14 +41,14 @@ var ExampleSettingsTrayContent = exports.ExampleSettingsTrayContent = function E
     }
   }));
 };
-var StoryWrapper = exports.StoryWrapper = function StoryWrapper(_ref3) {
-  var children = _ref3.children,
-    masteryLevelConfig = _ref3.masteryLevelConfig;
+var StoryWrapper = exports.StoryWrapper = function StoryWrapper(_ref2) {
+  var children = _ref2.children,
+    masteryLevelConfig = _ref2.masteryLevelConfig;
   return /*#__PURE__*/_react.default.createElement(_GradebookApp.GradebookApp, {
     config: {
       masteryLevelConfig: masteryLevelConfig
     }
-  }, /*#__PURE__*/_react.default.createElement(_index2.GradebookAppProvider, {
+  }, /*#__PURE__*/_react.default.createElement(_index.GradebookAppProvider, {
     settings: {
       settings: {
         showStudentNames: true,

package/lib/translated/en-AU-x-unimelb/components/Gradebook/table/Cell/index.js

@@ -1,16 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Cell = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _uiView = require("@instructure/ui-view");
 var _excluded = ["id", "children", "width", "boxShadow", "isSticky", "isStacked", "header"];
-var Cell = exports.Cell = function Cell(_ref) {
+var CellComponent = function CellComponent(_ref) {
   var id = _ref.id,
     children = _ref.children,
     width = _ref.width,
@@ -19,19 +20,34 @@ var Cell = exports.Cell = function Cell(_ref) {
     isStacked = _ref.isStacked,
     header = _ref.header,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _React$useState = _react.default.useState(false),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    focus = _React$useState2[0],
-    setFocus = _React$useState2[1];
-  var cellRef = _react.default.useRef(null);
-  var handleBlur = function handleBlur(event) {
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    focus = _useState2[0],
+    setFocus = _useState2[1];
+  var cellRef = (0, _react.useRef)(null);
+  var handleBlur = (0, _react.useCallback)(function (event) {
     var _cellRef$current;
     var relatedTarget = event.relatedTarget;
     if (relatedTarget && (_cellRef$current = cellRef.current) !== null && _cellRef$current !== void 0 && _cellRef$current.contains(relatedTarget)) {
       return;
     }
     setFocus(false);
-  };
+  }, []);
+  var handleFocus = (0, _react.useCallback)(function () {
+    return setFocus(true);
+  }, []);
+  var elementRef = (0, _react.useCallback)(function (el) {
+    if (el instanceof HTMLElement) {
+      cellRef.current = el;
+    }
+  }, []);
+  var themeOverride = (0, _react.useMemo)(function () {
+    return function (_componentTheme, currentTheme) {
+      return {
+        shadowAbove: boxShadow !== null && boxShadow !== void 0 ? boxShadow : "2px 0 0 0 ".concat(currentTheme.colors.contrasts.grey1214)
+      };
+    };
+  }, [boxShadow]);
   return /*#__PURE__*/_react.default.createElement(_uiView.View, Object.assign({
     id: id,
     width: width,
@@ -45,20 +61,55 @@ var Cell = exports.Cell = function Cell(_ref) {
     insetInlineStart: isSticky ? '0' : void 0,
     background: isSticky && !props.background ? 'primary' : props.background,
     focusPosition: "inset",
-    elementRef: function elementRef(el) {
-      if (el instanceof HTMLElement) {
-        cellRef.current = el;
-      }
-    },
-    onFocus: function onFocus() {
-      return setFocus(true);
-    },
+    elementRef: elementRef,
+    onFocus: handleFocus,
     onBlur: handleBlur,
-    themeOverride: function themeOverride(_componentTheme, currentTheme) {
-      return {
-        shadowAbove: boxShadow !== null && boxShadow !== void 0 ? boxShadow : "2px 0 0 0 ".concat(currentTheme.colors.contrasts.grey1214)
-      };
-    }
+    themeOverride: themeOverride
   }, props), header ? typeof header === 'function' ? header() : header : null, typeof children === 'function' ? children(focus) : children);
 };
+
+// Custom comparison function for React.memo
+// We need to compare most props, but be smart about function props
+var arePropsEqual = function arePropsEqual(prevProps, nextProps) {
+  // If the id changed, definitely re-render
+  if (prevProps.id !== nextProps.id) return false;
+
+  // Check data attributes that affect keyboard navigation
+  if (prevProps['data-row-index'] !== nextProps['data-row-index']) return false;
+  if (prevProps['data-col-key'] !== nextProps['data-col-key']) return false;
+  if (prevProps['data-cell-id'] !== nextProps['data-cell-id']) return false;
+
+  // Check visual props
+  if (prevProps.width !== nextProps.width) return false;
+  if (prevProps.boxShadow !== nextProps.boxShadow) return false;
+  if (prevProps.isSticky !== nextProps.isSticky) return false;
+  if (prevProps.isStacked !== nextProps.isStacked) return false;
+
+  // Check other props that could change
+  if (prevProps.tabIndex !== nextProps.tabIndex) return false;
+
+  // onKeyDown should be stable (useCallback), but check just in case
+  if (prevProps.onKeyDown !== nextProps.onKeyDown) return false;
+
+  // For function children (render functions), we can't compare the function itself
+  // Instead, we rely on the fact that if all other props (especially data-cell-id
+  // which includes col.key and row data) are the same, the function would produce
+  // the same output. This is safe because:
+  // - row data doesn't change during column reorder
+  // - col.key is stable per column
+  // - The function just calls col.render with that data
+  var prevChildrenIsFunction = typeof prevProps.children === 'function';
+  var nextChildrenIsFunction = typeof nextProps.children === 'function';
+  if (prevChildrenIsFunction !== nextChildrenIsFunction) return false;
+
+  // For non-function children, compare directly
+  if (!nextChildrenIsFunction && prevProps.children !== nextProps.children) return false;
+
+  // For function children, skip comparison - they're always new references but produce same output
+  // when all other props are the same
+
+  return true;
+};
+var Cell = exports.Cell = /*#__PURE__*/_react.default.memo(CellComponent, arePropsEqual);
+Cell.displayName = 'Cell';
 var _default = exports.default = Cell;

package/lib/translated/en-AU-x-unimelb/components/Gradebook/table/ColumnHeader/index.js

@@ -11,7 +11,40 @@ var _react = _interopRequireWildcard(require("react"));
 var _uiView = require("@instructure/ui-view");
 var _excluded = ["children", "isSticky", "connectDragSource", "connectDragPreview", "connectDropTarget", "isDragging", "isStacked", "data-cell-id"],
   _excluded2 = ["onMove", "onDragEnd", "itemId", "index", "type", "component"];
-var ColumnHeader = exports.ColumnHeader = function ColumnHeader(_ref) {
+// Custom comparison function to prevent re-renders when column order changes
+// but individual column data hasn't changed
+var arePropsEqual = function arePropsEqual(prevProps, nextProps) {
+  // Check stable identifier
+  if (prevProps.id !== nextProps.id) return false;
+  if (prevProps['data-cell-id'] !== nextProps['data-cell-id']) return false;
+  if (prevProps['data-col-key'] !== nextProps['data-col-key']) return false;
+
+  // Check visual props
+  if (prevProps.width !== nextProps.width) return false;
+  if (prevProps.isSticky !== nextProps.isSticky) return false;
+  if (prevProps.isStacked !== nextProps.isStacked) return false;
+
+  // Check keyboard navigation
+  if (prevProps.onKeyDown !== nextProps.onKeyDown) return false;
+  if (prevProps.tabIndex !== nextProps.tabIndex) return false;
+
+  // Check drag-drop state (these should be stable via useCallback)
+  if (prevProps.connectDragSource !== nextProps.connectDragSource) return false;
+  if (prevProps.connectDragPreview !== nextProps.connectDragPreview) return false;
+  if (prevProps.connectDropTarget !== nextProps.connectDropTarget) return false;
+  if (prevProps.isDragging !== nextProps.isDragging) return false;
+
+  // onMove and onDragEnd should be stable (useCallback in stories/parent)
+  // but we don't need to check them since they're filtered out before DOM
+
+  // Skip children comparison - children might be new React elements on each render,
+  // but if all stable identifiers (id, data-cell-id, data-col-key) are the same,
+  // the column hasn't actually changed and we can safely skip re-rendering.
+  // This matches Cell's approach of relying on stable props rather than comparing children.
+
+  return true;
+};
+var ColumnHeaderComponent = function ColumnHeaderComponent(_ref) {
   var children = _ref.children,
     isSticky = _ref.isSticky,
     connectDragSource = _ref.connectDragSource,
@@ -43,13 +76,21 @@ var ColumnHeader = exports.ColumnHeader = function ColumnHeader(_ref) {
       });
     }
   }, [connectDragPreview]);
-  var headerContent = /*#__PURE__*/_react.default.createElement("div", {
-    style: {
+  var headerContentStyle = _react.default.useMemo(function () {
+    return {
       opacity: isDragging ? 0.5 : 1,
       transition: 'opacity 0.15s ease-in-out',
       width: cleanViewProps.width,
       cursor: connectDragSource ? 'grab' : 'default'
-    },
+    };
+  }, [isDragging, cleanViewProps.width, connectDragSource]);
+  var elementRef = _react.default.useCallback(function (ref) {
+    if (connectDropTarget && ref instanceof HTMLElement) {
+      connectDropTarget(ref);
+    }
+  }, [connectDropTarget]);
+  var headerContent = /*#__PURE__*/_react.default.createElement("div", {
+    style: headerContentStyle,
     "data-testid": "column-header-content"
   }, children);
   var content = /*#__PURE__*/_react.default.createElement(_uiView.View, Object.assign({
@@ -57,11 +98,7 @@ var ColumnHeader = exports.ColumnHeader = function ColumnHeader(_ref) {
     as: isStacked ? 'div' : 'th',
     scope: "col",
     focusPosition: "inset",
-    elementRef: function elementRef(ref) {
-      if (connectDropTarget && ref instanceof HTMLElement) {
-        connectDropTarget(ref);
-      }
-    },
+    elementRef: elementRef,
     position: isSticky ? 'sticky' : 'static',
     insetInlineStart: isSticky ? '0' : void 0,
     background: !cleanViewProps.background ? 'primary' : cleanViewProps.background,
@@ -69,4 +106,6 @@ var ColumnHeader = exports.ColumnHeader = function ColumnHeader(_ref) {
     stacking: "above"
   }, cleanViewProps), connectDragSource ? connectDragSource(headerContent) : headerContent);
   return content;
-};
+};
+var ColumnHeader = exports.ColumnHeader = /*#__PURE__*/_react.default.memo(ColumnHeaderComponent, arePropsEqual);
+ColumnHeader.displayName = 'ColumnHeader';

package/lib/translated/en-AU-x-unimelb/components/Gradebook/table/Row/index.js

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _uiView = require("@instructure/ui-view");
 var _uiTable = require("@instructure/ui-table");
 var _uiReactUtils = require("@instructure/ui-react-utils");
-var Row = exports.Row = function Row(_ref) {
+var Row = exports.Row = /*#__PURE__*/_react.default.memo(function (_ref) {
   var children = _ref.children,
     setRef = _ref.setRef;
   var context = (0, _react.useContext)(_uiTable.TableContext);
@@ -32,4 +32,5 @@ var Row = exports.Row = function Row(_ref) {
     }
     return child;
   }));
-};
+});
+Row.displayName = 'Row';

package/lib/translated/en-AU-x-unimelb/components/Gradebook/table/RowHeader/index.js

@@ -9,7 +9,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _uiView = require("@instructure/ui-view");
 var _excluded = ["children", "isSticky", "isStacked", "data-cell-id"];
-var RowHeader = exports.RowHeader = function RowHeader(_ref) {
+var RowHeader = exports.RowHeader = /*#__PURE__*/_react.default.memo(function (_ref) {
   var children = _ref.children,
     isSticky = _ref.isSticky,
     isStacked = _ref.isStacked,
@@ -28,4 +28,5 @@ var RowHeader = exports.RowHeader = function RowHeader(_ref) {
     focusPosition: "inset",
     "data-cell-id": dataCellId
   }, props), children);
-};
+});
+RowHeader.displayName = 'RowHeader';

package/lib/translated/en-AU-x-unimelb/components/Gradebook/table/Table/index.js

@@ -30,27 +30,47 @@ var TableComponent = exports.TableComponent = function TableComponent(_ref) {
     dragDropConfig = _ref.dragDropConfig,
     tableProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var tableRef = (0, _react.useRef)(null);
-  var getCellElement = (0, _react.useCallback)(function (rowIndex, colIndex) {
+  var columnsRef = (0, _react.useRef)(columns);
+
+  // Keep columnsRef in sync with latest columns
+  (0, _react.useEffect)(function () {
+    columnsRef.current = columns;
+  }, [columns]);
+  var getCellElement = (0, _react.useCallback)(function (rowIndex, colKey) {
     if (!tableRef.current) return null;
-    var cellId;
-    if (rowIndex === -1) {
-      cellId = "header-".concat(colIndex);
-    } else {
-      cellId = "cell-".concat(rowIndex, "-").concat(colIndex);
-    }
-    return tableRef.current.querySelector("[data-cell-id=\"".concat(cellId, "\"]"));
+    var selector = "[data-row-index=\"".concat(rowIndex, "\"][data-col-key=\"").concat(colKey, "\"]");
+    return tableRef.current.querySelector(selector);
   }, []);
-  var focusCell = (0, _react.useCallback)(function (rowIndex, colIndex) {
-    var cell = getCellElement(rowIndex, colIndex);
+  var focusCell = (0, _react.useCallback)(function (rowIndex, colKey) {
+    var cell = getCellElement(rowIndex, colKey);
     if (cell) {
+      if (rowIndex === -1) {
+        var focusable = cell.querySelector('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
+        if (focusable) {
+          focusable.focus();
+          return;
+        }
+      }
       cell.focus();
     }
   }, [getCellElement]);
-  var handleKeyDown = (0, _react.useCallback)(function (event, rowIndex, colIndex) {
-    if (event.target !== event.currentTarget) return;
+  var handleKeyDown = (0, _react.useCallback)(function (event) {
+    // Allow arrow key navigation from the cell itself or from buttons within the cell
+    // (e.g., header options menu), but prevent navigation from other interactive elements
+    // (e.g., chart components that have their own keyboard navigation)
+    if (event.target !== event.currentTarget) {
+      var _target = event.target;
+      var isButton = _target.tagName === 'BUTTON' || _target.getAttribute('role') === 'button';
+      if (!isButton) {
+        return;
+      }
+    }
+    var target = event.currentTarget;
+    var rowIndex = parseInt(target.dataset.rowIndex || '0', 10);
+    var colKey = target.dataset.colKey || '';
     var key = event.key;
     var newRowIndex = rowIndex;
-    var newColIndex = colIndex;
+    var newColKey = colKey;
     switch (key) {
       case 'ArrowUp':
         {
@@ -67,30 +87,44 @@ var TableComponent = exports.TableComponent = function TableComponent(_ref) {
         newRowIndex = Math.min(data.length - 1, rowIndex + 1);
         break;
       case 'ArrowLeft':
-        event.preventDefault();
-        newColIndex = Math.max(0, colIndex - 1);
-        break;
+        {
+          var _columnsRef$current$n;
+          event.preventDefault();
+          var currentColIndex = columnsRef.current.findIndex(function (col) {
+            return col.key === colKey;
+          });
+          var newColIndex = Math.max(0, currentColIndex - 1);
+          newColKey = ((_columnsRef$current$n = columnsRef.current[newColIndex]) === null || _columnsRef$current$n === void 0 ? void 0 : _columnsRef$current$n.key) || colKey;
+          break;
+        }
       case 'ArrowRight':
-        event.preventDefault();
-        newColIndex = Math.min(columns.length - 1, colIndex + 1);
-        break;
+        {
+          var _columnsRef$current$_;
+          event.preventDefault();
+          var _currentColIndex = columnsRef.current.findIndex(function (col) {
+            return col.key === colKey;
+          });
+          var _newColIndex = Math.min(columnsRef.current.length - 1, _currentColIndex + 1);
+          newColKey = ((_columnsRef$current$_ = columnsRef.current[_newColIndex]) === null || _columnsRef$current$_ === void 0 ? void 0 : _columnsRef$current$_.key) || colKey;
+          break;
+        }
       default:
         return;
     }
-    if (newRowIndex !== rowIndex || newColIndex !== colIndex) {
-      focusCell(newRowIndex, newColIndex);
+    if (newRowIndex !== rowIndex || newColKey !== colKey) {
+      focusCell(newRowIndex, newColKey);
     }
-  }, [data.length, columns.length, focusCell, renderAboveHeader]);
+  }, [data.length, focusCell, renderAboveHeader]);
   var renderColHeader = (0, _react.useCallback)(function (col, colIndex, draggableIndex, dragDropConfig) {
     var colHeaderProps = (0, _objectSpread2.default)({
       id: col.key,
       width: col.width,
       isSticky: col.isSticky,
-      'data-cell-id': "header-".concat(colIndex),
+      'data-cell-id': "header-".concat(col.key),
+      'data-row-index': -1,
+      'data-col-key': col.key,
       tabIndex: 0,
-      onKeyDown: function onKeyDown(e) {
-        return handleKeyDown(e, -1, colIndex);
-      }
+      onKeyDown: handleKeyDown
     }, col.colHeaderProps);
     var dragLabel = col.dragLabel || col.key;
     return col.draggable && dragDropConfig ? /*#__PURE__*/_react.default.createElement(_index2.default, Object.assign({
@@ -143,14 +177,14 @@ var TableComponent = exports.TableComponent = function TableComponent(_ref) {
     return /*#__PURE__*/_react.default.createElement(_uiTable.Table.Body, null, data.map(function (row, rowIndex) {
       return /*#__PURE__*/_react.default.createElement(_index5.Row, {
         key: rowIndex
-      }, columns.map(function (col, colIndex) {
+      }, columns.map(function (col) {
         var props = (0, _objectSpread2.default)({
           id: "".concat(rowIndex, "-").concat(col.key),
-          'data-cell-id': "cell-".concat(rowIndex, "-").concat(colIndex),
+          'data-cell-id': "cell-".concat(rowIndex, "-").concat(col.key),
+          'data-row-index': rowIndex,
+          'data-col-key': col.key,
           tabIndex: 0,
-          onKeyDown: function onKeyDown(e) {
-            return handleKeyDown(e, rowIndex, colIndex);
-          },
+          onKeyDown: handleKeyDown,
           isSticky: col.isSticky
         }, col.cellProps);
         if (col.isRowHeader) {
@@ -178,6 +212,7 @@ var TableComponent = exports.TableComponent = function TableComponent(_ref) {
   }), /*#__PURE__*/_react.default.createElement(_uiView.View, {
     as: "div",
     overflowX: "auto",
+    padding: "none none small none",
     elementRef: function elementRef(el) {
       if (el instanceof HTMLDivElement) {
         ;