@instructure/ui-table 11.7.3-snapshot-7 → 11.7.3-snapshot-26

package/es/Table/v1/Row/theme.js

@@ -28,25 +28,26 @@
  * @return {Object} The final theme object with the overrides and component variables
  */
 const generateComponentTheme = theme => {
-  var _colors$contrasts, _colors$contrasts2, _colors$contrasts3, _colors$contrasts4;
-  const colors = theme.colors,
-    typography = theme.typography,
-    spacing = theme.spacing,
-    themeName = theme.key;
+  const {
+    colors,
+    typography,
+    spacing,
+    key: themeName
+  } = theme;
   const themeSpecificStyle = {
     canvas: {
       hoverBorderColor: theme['ic-brand-primary']
     }
   };
   const componentVariables = {
-    fontSize: typography === null || typography === void 0 ? void 0 : typography.fontSizeMedium,
-    fontFamily: typography === null || typography === void 0 ? void 0 : typography.fontFamily,
-    fontWeight: typography === null || typography === void 0 ? void 0 : typography.fontWeightNormal,
-    color: colors === null || colors === void 0 ? void 0 : (_colors$contrasts = colors.contrasts) === null || _colors$contrasts === void 0 ? void 0 : _colors$contrasts.grey125125,
-    background: colors === null || colors === void 0 ? void 0 : (_colors$contrasts2 = colors.contrasts) === null || _colors$contrasts2 === void 0 ? void 0 : _colors$contrasts2.white1010,
-    borderColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts3 = colors.contrasts) === null || _colors$contrasts3 === void 0 ? void 0 : _colors$contrasts3.grey3045,
-    hoverBorderColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts4 = colors.contrasts) === null || _colors$contrasts4 === void 0 ? void 0 : _colors$contrasts4.blue4570,
-    padding: `${spacing === null || spacing === void 0 ? void 0 : spacing.xSmall} 0`
+    fontSize: typography?.fontSizeMedium,
+    fontFamily: typography?.fontFamily,
+    fontWeight: typography?.fontWeightNormal,
+    color: colors?.contrasts?.grey125125,
+    background: colors?.contrasts?.white1010,
+    borderColor: colors?.contrasts?.grey3045,
+    hoverBorderColor: colors?.contrasts?.blue4570,
+    padding: `${spacing?.xSmall} 0`
   };
   return {
     ...componentVariables,

package/es/Table/v1/RowHeader/index.js

@@ -1,4 +1,4 @@
-var _dec, _class, _RowHeader;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -38,32 +38,36 @@ id: Table.RowHeader
 ---
 **/
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-let RowHeader = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_RowHeader = class RowHeader extends Component {
+let RowHeader = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = class RowHeader extends Component {
+  static displayName = "RowHeader";
+  static componentId = 'Table.RowHeader';
+  static contextType = TableContext;
+  static allowedProps = allowedProps;
+  static defaultProps = {
+    textAlign: 'start',
+    children: null
+  };
   componentDidMount() {
-    var _this$props$makeStyle, _this$props;
-    (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
+    this.props.makeStyles?.();
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props2;
-    (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
+    this.props.makeStyles?.();
   }
   render() {
-    const _this$props3 = this.props,
-      children = _this$props3.children,
-      styles = _this$props3.styles;
+    const {
+      children,
+      styles
+    } = this.props;
     const isStacked = this.context.isStacked;
     return _jsx(View, {
       ...View.omitViewProps(omitProps(this.props, RowHeader.allowedProps), RowHeader),
       as: isStacked ? 'div' : 'th',
-      css: styles === null || styles === void 0 ? void 0 : styles.rowHeader,
+      css: styles?.rowHeader,
       scope: "row",
-      role: isStacked ? 'rowheader' : void 0,
+      role: isStacked ? 'rowheader' : undefined,
       children: callRenderProp(children)
     });
   }
-}, _RowHeader.displayName = "RowHeader", _RowHeader.componentId = 'Table.RowHeader', _RowHeader.contextType = TableContext, _RowHeader.allowedProps = allowedProps, _RowHeader.defaultProps = {
-  textAlign: 'start',
-  children: null
-}, _RowHeader)) || _class);
+}) || _class);
 export default RowHeader;
 export { RowHeader };

package/es/Table/v1/RowHeader/styles.js

@@ -33,7 +33,9 @@
  * @return {Object} The final style object, which will be used in the component
  */
 const generateStyle = (componentTheme, props) => {
-  const textAlign = props.textAlign;
+  const {
+    textAlign
+  } = props;
   return {
     rowHeader: {
       label: 'rowHeader',

package/es/Table/v1/RowHeader/theme.js

@@ -28,19 +28,20 @@
  * @return {Object} The final theme object with the overrides and component variables
  */
 const generateComponentTheme = theme => {
-  var _colors$contrasts, _colors$contrasts2, _colors$contrasts3;
-  const colors = theme.colors,
-    typography = theme.typography,
-    spacing = theme.spacing;
+  const {
+    colors,
+    typography,
+    spacing
+  } = theme;
   const componentVariables = {
-    fontSize: typography === null || typography === void 0 ? void 0 : typography.fontSizeMedium,
-    fontFamily: typography === null || typography === void 0 ? void 0 : typography.fontFamily,
-    fontWeight: typography === null || typography === void 0 ? void 0 : typography.fontWeightBold,
-    color: colors === null || colors === void 0 ? void 0 : (_colors$contrasts = colors.contrasts) === null || _colors$contrasts === void 0 ? void 0 : _colors$contrasts.grey125125,
-    background: colors === null || colors === void 0 ? void 0 : (_colors$contrasts2 = colors.contrasts) === null || _colors$contrasts2 === void 0 ? void 0 : _colors$contrasts2.white1010,
-    borderColor: colors === null || colors === void 0 ? void 0 : (_colors$contrasts3 = colors.contrasts) === null || _colors$contrasts3 === void 0 ? void 0 : _colors$contrasts3.grey4570,
-    lineHeight: typography === null || typography === void 0 ? void 0 : typography.lineHeightCondensed,
-    padding: `${spacing === null || spacing === void 0 ? void 0 : spacing.xSmall} ${spacing === null || spacing === void 0 ? void 0 : spacing.small}`
+    fontSize: typography?.fontSizeMedium,
+    fontFamily: typography?.fontFamily,
+    fontWeight: typography?.fontWeightBold,
+    color: colors?.contrasts?.grey125125,
+    background: colors?.contrasts?.white1010,
+    borderColor: colors?.contrasts?.grey4570,
+    lineHeight: typography?.lineHeightCondensed,
+    padding: `${spacing?.xSmall} ${spacing?.small}`
   };
   return {
     ...componentVariables

package/es/Table/v1/index.js

@@ -1,5 +1,4 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _dec, _class, _Table;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -47,34 +46,42 @@ category: components
 ---
 **/
 import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_Table = class Table extends Component {
-  constructor(...args) {
-    super(...args);
-    this.ref = null;
-    // Reference to hidden aria-live region for announcing caption changes to screen readers
-    this._liveRegionRef = null;
-    // Timeout for delayed announcement (workaround for Safari/VoiceOver caption update bug)
-    this._announcementTimeout = void 0;
-    this.handleRef = el => {
-      var _this$props$elementRe, _this$props;
-      this.ref = el;
-      (_this$props$elementRe = (_this$props = this.props).elementRef) === null || _this$props$elementRe === void 0 ? void 0 : _this$props$elementRe.call(_this$props, el);
-    };
-  }
+let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = class Table extends Component {
+  static displayName = "Table";
+  static componentId = 'Table';
+  static allowedProps = allowedProps;
+  static defaultProps = {
+    children: null,
+    hover: false,
+    layout: 'auto'
+  };
+  static Head = Head;
+  static Body = Body;
+  static Row = Row;
+  static ColHeader = ColHeader;
+  static RowHeader = RowHeader;
+  static Cell = Cell;
+  ref = null;
+  // Reference to hidden aria-live region for announcing caption changes to screen readers
+  _liveRegionRef = null;
+  // Timeout for delayed announcement (workaround for Safari/VoiceOver caption update bug)
+  _announcementTimeout;
+  handleRef = el => {
+    this.ref = el;
+    this.props.elementRef?.(el);
+  };
   componentDidMount() {
-    var _this$props$makeStyle, _this$props2;
-    (_this$props$makeStyle = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props2);
+    this.props.makeStyles?.();
   }
   componentDidUpdate(prevProps) {
-    var _this$props$makeStyle2, _this$props3;
-    (_this$props$makeStyle2 = (_this$props3 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props3);
+    this.props.makeStyles?.();
     // Announce caption changes for screen readers (especially VoiceOver)
     // Safari/VoiceOver has a known bug where dynamic <caption> updates aren't announced,
     // so we use an aria-live region as a workaround
     const prevSortInfo = this.getSortedHeaderInfo(prevProps);
     const currentSortInfo = this.getSortedHeaderInfo(this.props);
     // Only announce if sorting actually changed
-    const sortingChanged = (prevSortInfo === null || prevSortInfo === void 0 ? void 0 : prevSortInfo.header) !== (currentSortInfo === null || currentSortInfo === void 0 ? void 0 : currentSortInfo.header) || (prevSortInfo === null || prevSortInfo === void 0 ? void 0 : prevSortInfo.direction) !== (currentSortInfo === null || currentSortInfo === void 0 ? void 0 : currentSortInfo.direction);
+    const sortingChanged = prevSortInfo?.header !== currentSortInfo?.header || prevSortInfo?.direction !== currentSortInfo?.direction;
     if (sortingChanged && currentSortInfo && this._liveRegionRef) {
       // Clear any pending announcement
       clearTimeout(this._announcementTimeout);
@@ -96,33 +103,24 @@ let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
     clearTimeout(this._announcementTimeout);
   }
   getHeaders() {
-    const _Children$toArray = Children.toArray(this.props.children),
-      _Children$toArray2 = _slicedToArray(_Children$toArray, 1),
-      headChild = _Children$toArray2[0];
-    if (!headChild || ! /*#__PURE__*/isValidElement(headChild)) return void 0;
-    const _Children$toArray3 = Children.toArray(headChild.props.children),
-      _Children$toArray4 = _slicedToArray(_Children$toArray3, 1),
-      firstRow = _Children$toArray4[0];
-    if (!firstRow || ! /*#__PURE__*/isValidElement(firstRow)) return void 0;
+    const [headChild] = Children.toArray(this.props.children);
+    if (!headChild || ! /*#__PURE__*/isValidElement(headChild)) return undefined;
+    const [firstRow] = Children.toArray(headChild.props.children);
+    if (!firstRow || ! /*#__PURE__*/isValidElement(firstRow)) return undefined;
     return Children.map(firstRow.props.children, colHeader => {
-      if (! /*#__PURE__*/isValidElement(colHeader)) return void 0;
+      if (! /*#__PURE__*/isValidElement(colHeader)) return undefined;
       return colHeader.props.children;
     });
   }
   getSortedHeaderInfo(props) {
-    const _Children$toArray5 = Children.toArray(props.children),
-      _Children$toArray6 = _slicedToArray(_Children$toArray5, 1),
-      headChild = _Children$toArray6[0];
-    const _Children$toArray7 = Children.toArray(/*#__PURE__*/isValidElement(headChild) ? headChild.props.children : []),
-      _Children$toArray8 = _slicedToArray(_Children$toArray7, 1),
-      firstRow = _Children$toArray8[0];
+    const [headChild] = Children.toArray(props.children);
+    const [firstRow] = Children.toArray(/*#__PURE__*/isValidElement(headChild) ? headChild.props.children : []);
     const colHeaders = Children.toArray(/*#__PURE__*/isValidElement(firstRow) ? firstRow.props.children : []);
     // Find the column with an active sort direction
     for (const colHeader of colHeaders) {
       if (/*#__PURE__*/isValidElement(colHeader) && colHeader.props.sortDirection && colHeader.props.sortDirection !== 'none') {
-        var _colHeader$props$chil, _colHeader$props$chil2, _colHeader$props$chil3;
         // Extract header text (may be nested in child components)
-        const headerText = typeof colHeader.props.children === 'string' ? colHeader.props.children : (_colHeader$props$chil = (_colHeader$props$chil2 = colHeader.props.children) === null || _colHeader$props$chil2 === void 0 ? void 0 : (_colHeader$props$chil3 = _colHeader$props$chil2.props) === null || _colHeader$props$chil3 === void 0 ? void 0 : _colHeader$props$chil3.children) !== null && _colHeader$props$chil !== void 0 ? _colHeader$props$chil : '';
+        const headerText = typeof colHeader.props.children === 'string' ? colHeader.props.children : colHeader.props.children?.props?.children ?? '';
         return {
           header: headerText,
           direction: colHeader.props.sortDirection
@@ -139,14 +137,15 @@ let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
     return caption ? caption + sortText : sortText.trim();
   }
   render() {
-    const _this$props4 = this.props,
-      margin = _this$props4.margin,
-      layout = _this$props4.layout,
-      caption = _this$props4.caption,
-      children = _this$props4.children,
-      hover = _this$props4.hover,
-      styles = _this$props4.styles,
-      minWidth = _this$props4.minWidth;
+    const {
+      margin,
+      layout,
+      caption,
+      children,
+      hover,
+      styles,
+      minWidth
+    } = this.props;
     const isStacked = layout === 'stacked';
     const captionText = this.getCaptionText(this.props);
     if (!caption) {
@@ -156,7 +155,7 @@ let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
       value: {
         isStacked,
         hover: hover,
-        headers: isStacked ? this.getHeaders() : void 0
+        headers: isStacked ? this.getHeaders() : undefined
       },
       children: [_jsx("div", {
         ref: el => {
@@ -165,7 +164,7 @@ let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
         "aria-live": "polite",
         "aria-atomic": "true",
         role: "status",
-        css: styles === null || styles === void 0 ? void 0 : styles.liveRegion
+        css: styles?.liveRegion
       }), _jsxs(View
       // All HTML props, except the ones accepted by `View` and `Table`
       , {
@@ -174,8 +173,8 @@ let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
         as: isStacked ? 'div' : 'table',
         margin: margin,
         elementRef: this.handleRef,
-        css: styles === null || styles === void 0 ? void 0 : styles.table,
-        role: isStacked ? 'table' : void 0,
+        css: styles?.table,
+        role: isStacked ? 'table' : undefined,
         "aria-label": captionText,
         children: [!isStacked && caption && _jsx("caption", {
           children: _jsx(ScreenReaderContent, {
@@ -187,10 +186,6 @@ let Table = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
       })]
     });
   }
-}, _Table.displayName = "Table", _Table.componentId = 'Table', _Table.allowedProps = allowedProps, _Table.defaultProps = {
-  children: null,
-  hover: false,
-  layout: 'auto'
-}, _Table.Head = Head, _Table.Body = Body, _Table.Row = Row, _Table.ColHeader = ColHeader, _Table.RowHeader = RowHeader, _Table.Cell = Cell, _Table)) || _class);
+}) || _class);
 export default Table;
 export { Table };

package/es/Table/v1/styles.js

@@ -33,7 +33,9 @@
  * @return {Object} The final style object, which will be used in the component
  */
 const generateStyle = (componentTheme, props) => {
-  const layout = props.layout;
+  const {
+    layout
+  } = props;
   return {
     table: {
       label: 'table',

package/es/Table/v1/theme.js

@@ -28,21 +28,22 @@
  * @return {Object} The final theme object with the overrides and component variables
  */
 const generateComponentTheme = theme => {
-  var _colors$contrasts, _colors$contrasts2;
-  const colors = theme.colors,
-    typography = theme.typography,
-    themeName = theme.key;
+  const {
+    colors,
+    typography,
+    key: themeName
+  } = theme;
   const themeSpecificStyle = {
     canvas: {
       color: theme['ic-brand-font-color-dark']
     }
   };
   const componentVariables = {
-    fontSize: typography === null || typography === void 0 ? void 0 : typography.fontSizeMedium,
-    fontFamily: typography === null || typography === void 0 ? void 0 : typography.fontFamily,
-    fontWeight: typography === null || typography === void 0 ? void 0 : typography.fontWeightNormal,
-    color: colors === null || colors === void 0 ? void 0 : (_colors$contrasts = colors.contrasts) === null || _colors$contrasts === void 0 ? void 0 : _colors$contrasts.grey125125,
-    background: colors === null || colors === void 0 ? void 0 : (_colors$contrasts2 = colors.contrasts) === null || _colors$contrasts2 === void 0 ? void 0 : _colors$contrasts2.white1010
+    fontSize: typography?.fontSizeMedium,
+    fontFamily: typography?.fontFamily,
+    fontWeight: typography?.fontWeightNormal,
+    color: colors?.contrasts?.grey125125,
+    background: colors?.contrasts?.white1010
   };
   return {
     ...componentVariables,

package/es/Table/v2/Body/index.js

@@ -1,4 +1,4 @@
-var _dec, _class, _Body;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -37,25 +37,33 @@ id: Table.Body
 ---
 **/
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-let Body = (_dec = withStyle(generateStyle), _dec(_class = (_Body = class Body extends Component {
+let Body = (_dec = withStyle(generateStyle), _dec(_class = class Body extends Component {
+  static displayName = "Body";
+  static componentId = 'Table.Body';
+  static contextType = TableContext;
+  static allowedProps = allowedProps;
+  static defaultProps = {
+    children: null
+  };
   componentDidMount() {
-    var _this$props$makeStyle, _this$props;
-    (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
+    this.props.makeStyles?.();
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props2;
-    (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
+    this.props.makeStyles?.();
   }
   render() {
-    const _this$props3 = this.props,
-      children = _this$props3.children,
-      styles = _this$props3.styles;
-    const isStacked = this.context.isStacked;
+    const {
+      children,
+      styles
+    } = this.props;
+    const {
+      isStacked
+    } = this.context;
     return _jsx(View, {
       ...View.omitViewProps(omitProps(this.props, Body.allowedProps), Body),
       as: isStacked ? 'div' : 'tbody',
-      css: styles === null || styles === void 0 ? void 0 : styles.body,
-      role: isStacked ? 'rowgroup' : void 0,
+      css: styles?.body,
+      role: isStacked ? 'rowgroup' : undefined,
       children: Children.map(children, child => {
         if (/*#__PURE__*/isValidElement(child)) {
           return safeCloneElement(child, {
@@ -66,8 +74,6 @@ let Body = (_dec = withStyle(generateStyle), _dec(_class = (_Body = class Body e
       })
     });
   }
-}, _Body.displayName = "Body", _Body.componentId = 'Table.Body', _Body.contextType = TableContext, _Body.allowedProps = allowedProps, _Body.defaultProps = {
-  children: null
-}, _Body)) || _class);
+}) || _class);
 export default Body;
 export { Body };

package/es/Table/v2/Cell/index.js

@@ -1,4 +1,4 @@
-var _dec, _class, _Cell;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -37,32 +37,36 @@ id: Table.Cell
 ---
 **/
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-let Cell = (_dec = withStyle(generateStyle), _dec(_class = (_Cell = class Cell extends Component {
+let Cell = (_dec = withStyle(generateStyle), _dec(_class = class Cell extends Component {
+  static displayName = "Cell";
+  static componentId = 'Table.Cell';
+  static contextType = TableContext;
+  static allowedProps = allowedProps;
+  static defaultProps = {
+    textAlign: 'start',
+    children: null
+  };
   componentDidMount() {
-    var _this$props$makeStyle, _this$props;
-    (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
+    this.props.makeStyles?.();
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props2;
-    (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
+    this.props.makeStyles?.();
   }
   render() {
-    const _this$props3 = this.props,
-      children = _this$props3.children,
-      styles = _this$props3.styles,
-      header = _this$props3.header;
+    const {
+      children,
+      styles,
+      header
+    } = this.props;
     const isStacked = this.context.isStacked;
     return _jsxs(View, {
       ...View.omitViewProps(omitProps(this.props, Cell.allowedProps), Cell),
       as: isStacked ? 'div' : 'td',
-      css: styles === null || styles === void 0 ? void 0 : styles.cell,
-      role: isStacked ? 'cell' : void 0,
+      css: styles?.cell,
+      role: isStacked ? 'cell' : undefined,
       children: [header && callRenderProp(header), header && ': ', callRenderProp(children)]
     });
   }
-}, _Cell.displayName = "Cell", _Cell.componentId = 'Table.Cell', _Cell.contextType = TableContext, _Cell.allowedProps = allowedProps, _Cell.defaultProps = {
-  textAlign: 'start',
-  children: null
-}, _Cell)) || _class);
+}) || _class);
 export default Cell;
 export { Cell };

package/es/Table/v2/Cell/styles.js

@@ -32,7 +32,9 @@
  * @return {Object} The final style object, which will be used in the component
  */
 const generateStyle = (componentTheme, props) => {
-  const textAlign = props.textAlign;
+  const {
+    textAlign
+  } = props;
   return {
     cell: {
       label: 'cell',

package/es/Table/v2/ColHeader/index.js

@@ -1,4 +1,4 @@
-var _dec, _class, _ColHeader, _ChevronUpInstUIIcon, _ChevronDownInstUIIco, _ChevronsUpDownInstUI;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -37,61 +37,68 @@ id: Table.ColHeader
 ---
 **/
 import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-let ColHeader = (_dec = withStyle(generateStyle), _dec(_class = (_ColHeader = class ColHeader extends Component {
-  constructor(...args) {
-    super(...args);
-    this.handleClick = event => {
-      const _this$props = this.props,
-        id = _this$props.id,
-        onRequestSort = _this$props.onRequestSort;
-      onRequestSort && onRequestSort(event, {
-        id
-      });
-    };
-  }
+let ColHeader = (_dec = withStyle(generateStyle), _dec(_class = class ColHeader extends Component {
+  static displayName = "ColHeader";
+  static componentId = 'Table.ColHeader';
+  static allowedProps = allowedProps;
+  static defaultProps = {
+    textAlign: 'start',
+    sortDirection: 'none',
+    children: null,
+    scope: 'col'
+  };
   componentDidMount() {
-    var _this$props$makeStyle, _this$props2;
-    (_this$props$makeStyle = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props2);
+    this.props.makeStyles?.();
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props3;
-    (_this$props$makeStyle2 = (_this$props3 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props3);
+    this.props.makeStyles?.();
   }
+  handleClick = event => {
+    const {
+      id,
+      onRequestSort
+    } = this.props;
+    onRequestSort && onRequestSort(event, {
+      id
+    });
+  };
   renderSortArrow() {
-    const _this$props4 = this.props,
-      sortDirection = _this$props4.sortDirection,
-      onRequestSort = _this$props4.onRequestSort;
+    const {
+      sortDirection,
+      onRequestSort
+    } = this.props;
     if (sortDirection === 'ascending') {
-      return _ChevronUpInstUIIcon || (_ChevronUpInstUIIcon = _jsx(ChevronUpInstUIIcon, {
+      return _jsx(ChevronUpInstUIIcon, {
         color: "infoColor",
         size: "sm"
-      }));
+      });
     }
     if (sortDirection === 'descending') {
-      return _ChevronDownInstUIIco || (_ChevronDownInstUIIco = _jsx(ChevronDownInstUIIcon, {
+      return _jsx(ChevronDownInstUIIcon, {
         color: "infoColor",
         size: "sm"
-      }));
+      });
     }
     if (onRequestSort) {
-      return _ChevronsUpDownInstUI || (_ChevronsUpDownInstUI = _jsx(ChevronsUpDownInstUIIcon, {
+      return _jsx(ChevronsUpDownInstUIIcon, {
         color: "baseColor",
         size: "sm"
-      }));
+      });
     }
-    return void 0;
+    return undefined;
   }
   render() {
-    const _this$props5 = this.props,
-      onRequestSort = _this$props5.onRequestSort,
-      width = _this$props5.width,
-      children = _this$props5.children,
-      sortDirection = _this$props5.sortDirection,
-      scope = _this$props5.scope,
-      styles = _this$props5.styles;
+    const {
+      onRequestSort,
+      width,
+      children,
+      sortDirection,
+      scope,
+      styles
+    } = this.props;
     return _jsxs("th", {
       ...omitProps(this.props, ColHeader.allowedProps),
-      css: styles === null || styles === void 0 ? void 0 : styles.colHeader,
+      css: styles?.colHeader,
       style: {
         width
       },
@@ -99,19 +106,14 @@ let ColHeader = (_dec = withStyle(generateStyle), _dec(_class = (_ColHeader = cl
       "aria-sort": sortDirection,
       children: [onRequestSort && _jsx("button", {
         onClick: this.handleClick,
-        css: styles === null || styles === void 0 ? void 0 : styles.button,
+        css: styles?.button,
         children: _jsxs("div", {
-          css: styles === null || styles === void 0 ? void 0 : styles.buttonContent,
+          css: styles?.buttonContent,
           children: [callRenderProp(children), this.renderSortArrow()]
         })
       }), !onRequestSort && children, !onRequestSort && this.renderSortArrow()]
     });
   }
-}, _ColHeader.displayName = "ColHeader", _ColHeader.componentId = 'Table.ColHeader', _ColHeader.allowedProps = allowedProps, _ColHeader.defaultProps = {
-  textAlign: 'start',
-  sortDirection: 'none',
-  children: null,
-  scope: 'col'
-}, _ColHeader)) || _class);
+}) || _class);
 export default ColHeader;
 export { ColHeader };

package/es/Table/v2/ColHeader/styles.js

@@ -33,8 +33,10 @@
  * @return {Object} The final style object, which will be used in the component
  */
 const generateStyle = (componentTheme, props, sharedTokens) => {
-  const onRequestSort = props.onRequestSort,
-    textAlign = props.textAlign;
+  const {
+    onRequestSort,
+    textAlign
+  } = props;
   const headerStyle = {
     color: componentTheme.color,
     fontSize: componentTheme.fontSize,