@instructure/outcomes-ui 4.1.1 → 4.1.3

package/lib/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/components/Gradebook/table/ColumnHeader/index.d.ts

@@ -7,6 +7,8 @@ export type ColumnHeaderProps = {
     isStacked?: boolean;
     'data-cell-id'?: string;
     'data-testid'?: string;
+    'data-row-index'?: number;
+    'data-col-key'?: string;
 } & Partial<DragDropConnectorProps> & Omit<ViewProps, 'onDragLeave' | 'onDragEnd'>;
-export declare const ColumnHeader: ({ children, isSticky, connectDragSource, connectDragPreview, connectDropTarget, isDragging, isStacked, "data-cell-id": dataCellId, ...viewProps }: ColumnHeaderProps) => React.JSX.Element;
+export declare const ColumnHeader: React.MemoExoticComponent<({ children, isSticky, connectDragSource, connectDragPreview, connectDropTarget, isDragging, isStacked, "data-cell-id": dataCellId, ...viewProps }: ColumnHeaderProps) => React.JSX.Element>;
 //# sourceMappingURL=index.d.ts.map

package/lib/components/Gradebook/table/ColumnHeader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/ColumnHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAA;AACxC,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAA;AAExF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,GAAG,OAAO,CAAC,sBAAsB,CAAC,GACjC,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,WAAW,CAAC,CAAA;AAE9C,eAAO,MAAM,YAAY,GAAI,mJAU1B,iBAAiB,sBA2DnB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/ColumnHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAA;AACxC,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAA;AAExF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,GAAG,OAAO,CAAC,sBAAsB,CAAC,GACjC,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,WAAW,CAAC,CAAA;AAkH9C,eAAO,MAAM,YAAY,gLApEtB,iBAAiB,uBAoEwD,CAAA"}

package/lib/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/components/Gradebook/table/Row/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/Row/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAA;AACnE,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAItD,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,WAAW,CAAC,GAAG;IACpE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAA;CAC3C,CAAA;AAED,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CA2BlC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/Row/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAA;AACnE,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAItD,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,WAAW,CAAC,GAAG;IACpE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAA;CAC3C,CAAA;AAED,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CA2BjC,CAAA"}

package/lib/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/components/Gradebook/table/RowHeader/index.d.ts

@@ -5,6 +5,8 @@ export type RowHeaderProps = ViewProps & {
     isSticky?: boolean;
     isStacked?: boolean;
     'data-cell-id'?: string;
+    'data-row-index'?: number;
+    'data-col-key'?: string;
 };
-export declare const RowHeader: ({ children, isSticky, isStacked, "data-cell-id": dataCellId, ...props }: RowHeaderProps) => React.JSX.Element;
+export declare const RowHeader: React.MemoExoticComponent<({ children, isSticky, isStacked, "data-cell-id": dataCellId, ...props }: RowHeaderProps) => React.JSX.Element>;
 //# sourceMappingURL=index.d.ts.map

package/lib/components/Gradebook/table/RowHeader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/RowHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG;IACvC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,yEAMvB,cAAc,sBAmBhB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/RowHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG;IACvC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,SAAS,sGAMnB,cAAc,uBAmBf,CAAA"}

package/lib/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/components/Gradebook/table/Table/index.d.ts

@@ -27,7 +27,7 @@ export type TableProps<TRow = Record<string, unknown>> = {
     caption?: string;
     columns: Array<Column<TRow>>;
     data: Array<TRow>;
-    renderAboveHeader?: (columns: Array<Column<TRow>>, handleKeyDown: (event: React.KeyboardEvent, rowIndex: number, colIndex: number) => void) => React.ReactNode;
+    renderAboveHeader?: (columns: Array<Column<TRow>>, handleKeyDown: (event: React.KeyboardEvent) => void) => React.ReactNode;
     dragDropConfig?: DragDropConfig;
 } & Omit<InstUITableProps, 'children' | 'data'>;
 export declare const TableComponent: <TRow extends Record<string, unknown> = Record<string, unknown>>({ id, columns, data, caption, renderAboveHeader, dragDropConfig, ...tableProps }: TableProps<TRow>) => React.JSX.Element;

package/lib/components/Gradebook/table/Table/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/Table/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAA;AAGlD,OAAO,EAAwB,KAAK,UAAU,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAKjG,OAAO,EAAQ,SAAS,EAAE,MAAM,SAAS,CAAA;AAGzC,OAAO,EAAgB,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEjE,MAAM,MAAM,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACnD,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,CAAA;IACxC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAA;IACjF,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,cAAc,CAAC,EAAE,iBAAiB,CAAA;CACnC,CAAA;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAA;IAChE,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACvD,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;IACjB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAC5B,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,KACpF,KAAK,CAAC,SAAS,CAAA;IACpB,cAAc,CAAC,EAAE,cAAc,CAAA;CAChC,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,MAAM,CAAC,CAAA;AAE/C,eAAO,MAAM,cAAc,GAAI,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,kFAQ5F,UAAU,CAAC,IAAI,CAAC,sBAuNlB,CAAA;AAED,eAAO,MAAM,KAAK,EAEb,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/Table/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAA;AAG7D,OAAO,EAAwB,KAAK,UAAU,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAKjG,OAAO,EAAQ,SAAS,EAAE,MAAM,SAAS,CAAA;AAGzC,OAAO,EAAgB,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEjE,MAAM,MAAM,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACnD,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,CAAA;IACxC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAA;IACjF,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,cAAc,CAAC,EAAE,iBAAiB,CAAA;CACnC,CAAA;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAA;IAChE,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACvD,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;IACjB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAC5B,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,KAAK,IAAI,KAChD,KAAK,CAAC,SAAS,CAAA;IACpB,cAAc,CAAC,EAAE,cAAc,CAAA;CAChC,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,MAAM,CAAC,CAAA;AAE/C,eAAO,MAAM,cAAc,GAAI,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,kFAQ5F,UAAU,CAAC,IAAI,CAAC,sBAyPlB,CAAA;AAED,eAAO,MAAM,KAAK,EAEb,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA"}

package/lib/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) {
         ;

package/lib/components/Gradebook/table/Table/index.stories.d.ts

@@ -17,6 +17,13 @@ export declare const Default: Story;
 export declare const WithStickyFirstColumn: Story;
 export declare const WithCustomHeaders: Story;
 export declare const WithCustomCell: Story;
-export declare const WithDraggableColumns: Story;
+export declare const WithDraggableColumns: {
+    parameters: {
+        storyshots: {
+            disable: boolean;
+        };
+    };
+    render: () => React.JSX.Element;
+};
 export declare const WithAboveHeaderRow: Story;
 //# sourceMappingURL=index.stories.d.ts.map

package/lib/components/Gradebook/table/Table/index.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/Table/index.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAOtD,OAAO,KAAK,EAAU,UAAU,EAAE,MAAM,GAAG,CAAA;AAE3C,UAAU,SAAU,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACjD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC7B,KAAK,EAAE,MAAM,CAAA;CACd;AAED,QAAA,MAAM,WAAW,EAAgC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;AAuD3F,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,WAAW,CAMlC,CAAA;AAED,eAAe,IAAI,CAAA;AACnB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA;AAEzC,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAA;AAED,eAAO,MAAM,qBAAqB,EAAE,KA0CnC,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,KAoC/B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,KAqB5B,CAAA;AAED,eAAO,MAAM,oBAAoB,EAAE,KA2DlC,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,KAsChC,CAAA"}
+{"version":3,"file":"index.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/Gradebook/table/Table/index.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAOtD,OAAO,KAAK,EAAU,UAAU,EAAE,MAAM,GAAG,CAAA;AAE3C,UAAU,SAAU,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACjD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC7B,KAAK,EAAE,MAAM,CAAA;CACd;AAED,QAAA,MAAM,WAAW,EAAgC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;AAuD3F,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,WAAW,CAMlC,CAAA;AAED,eAAe,IAAI,CAAA;AACnB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA;AAEzC,eAAO,MAAM,OAAO,EAAE,KAMrB,CAAA;AAED,eAAO,MAAM,qBAAqB,EAAE,KA0CnC,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,KAoC/B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,KAqB5B,CAAA;AA4CD,eAAO,MAAM,oBAAoB;;;;;;;CA2DhC,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,KAsChC,CAAA"}

package/lib/components/Gradebook/table/Table/index.stories.js

@@ -219,22 +219,66 @@ var WithCustomCell = exports.WithCustomCell = {
     data: sampleData
   }
 };
+
+// Performance test data generation
+
+// Stable render function for performance test cells (defined once, reused everywhere)
+var renderPerformanceCell = function renderPerformanceCell(cellData) {
+  return /*#__PURE__*/_react.default.createElement(_uiText.Text, null, cellData);
+};
+var generatePerformanceTestData = function generatePerformanceTestData(numRows, numCols) {
+  var data = Array.from({
+    length: numRows
+  }, function (_, i) {
+    var row = {
+      id: "".concat(i + 1),
+      student: "Student ".concat(i + 1)
+    };
+    // Dynamically add columns
+    for (var j = 1; j <= numCols; j++) {
+      row["col".concat(j)] = Math.floor(Math.random() * 100);
+    }
+    return row;
+  });
+  var columns = [{
+    key: 'student',
+    header: 'Student Name',
+    width: '150px',
+    isRowHeader: true,
+    draggable: false
+  }].concat((0, _toConsumableArray2.default)(Array.from({
+    length: numCols
+  }, function (_, i) {
+    return {
+      key: "col".concat(i + 1),
+      header: "Column ".concat(i + 1),
+      width: '120px',
+      draggable: true,
+      render: renderPerformanceCell // Use the stable function reference
+    };
+  })));
+  return {
+    data: data,
+    columns: columns
+  };
+};
 var WithDraggableColumns = exports.WithDraggableColumns = {
   parameters: {
     storyshots: {
       disable: true
     }
   },
-  render: function render(args) {
-    var _React$useState = _react.default.useState(basicColumns.map(function (col) {
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
-          draggable: col.key !== 'name' // All columns except name are draggable
-        });
-      })),
+  render: function render() {
+    var testData = _react.default.useMemo(function () {
+      return generatePerformanceTestData(100, 99);
+    }, []);
+    var _React$useState = _react.default.useState(function () {
+        return testData.columns;
+      }),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       columns = _React$useState2[0],
       setColumns = _React$useState2[1];
-    var handleMove = function handleMove(draggedId, hoverIndex) {
+    var handleMove = _react.default.useCallback(function (draggedId, hoverIndex) {
       setColumns(function (prevColumns) {
         // Get only draggable columns
         var draggableColumns = prevColumns.filter(function (col) {
@@ -262,28 +306,23 @@ var WithDraggableColumns = exports.WithDraggableColumns = {
         });
         return [].concat((0, _toConsumableArray2.default)(nonDraggableColumns), (0, _toConsumableArray2.default)(newDraggableColumns));
       });
-    };
-    var handleDragEnd = function handleDragEnd() {
-      // eslint-disable-next-line no-console
-      console.log('Drag ended - final column order:', columns.map(function (c) {
-        return c.key;
-      }));
-    };
+    }, []);
+    var dragDropConfig = _react.default.useMemo(function () {
+      return {
+        type: 'COLUMN',
+        enabled: true,
+        onMove: handleMove
+      };
+    }, [handleMove]);
     var DraggableTable = _index.Table;
-    return /*#__PURE__*/_react.default.createElement(DraggableTable, Object.assign({}, args, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("style", null, "\n            #performance-test-table {\n              border-spacing: 24px 0;\n              border-collapse: separate;\n            }\n          "), /*#__PURE__*/_react.default.createElement(DraggableTable, {
+      id: "performance-test-table",
+      caption: "Table with Draggable Columns (100\xD7100) - Drag columns to reorder",
       columns: columns,
+      data: testData.data,
       layout: "fixed",
-      dragDropConfig: {
-        type: 'COLUMN',
-        enabled: true,
-        onMove: handleMove,
-        onDragEnd: handleDragEnd
-      }
+      dragDropConfig: dragDropConfig
     }));
-  },
-  args: {
-    caption: 'Table with Draggable Columns (drag columns to reorder)',
-    data: sampleData
   }
 };
 var WithAboveHeaderRow = exports.WithAboveHeaderRow = {