Merge branch 'main' into cass-gm-915-945

Codecademy · Jan 30, 2025 · 723d424 · 723d424
2 parents 10a8064 + 9537b3b
commit 723d424
Show file tree

Hide file tree

Showing 25 changed files with 315 additions and 186 deletions.
diff --git a/packages/gamut-kit/CHANGELOG.md b/packages/gamut-kit/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.6.464](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-01-29)
+
+**Note:** Version bump only for package @codecademy/gamut-kit
+
 ### [0.6.463](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-01-22)
 
 **Note:** Version bump only for package @codecademy/gamut-kit

diff --git a/packages/gamut-kit/package.json b/packages/gamut-kit/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@codecademy/gamut-kit",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "0.6.463",
+  "version": "0.6.464",
   "author": "Codecademy Engineering <[email protected]>",
   "dependencies": {
-    "@codecademy/gamut": "57.7.2",
+    "@codecademy/gamut": "57.7.3",
     "@codecademy/gamut-icons": "9.37.2",
     "@codecademy/gamut-illustrations": "0.51.0",
     "@codecademy/gamut-patterns": "0.10.2",

diff --git a/packages/gamut/CHANGELOG.md b/packages/gamut/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [57.7.3](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-01-29)
+
+### Bug Fixes
+
+- DataGrid reformatted to `table` and aria-sort added ([9903099](https://github.com/Codecademy/gamut/commit/99030998cba981215a56ce260c588385f78b398a))
+
 ### [57.7.2](https://github.com/Codecademy/gamut/compare/@codecademy/[email protected]...@codecademy/[email protected]) (2025-01-22)
 
 **Note:** Version bump only for package @codecademy/gamut

diff --git a/packages/gamut/__tests__/__snapshots__/gamut.test.ts.snap b/packages/gamut/__tests__/__snapshots__/gamut.test.ts.snap
@@ -63,7 +63,6 @@ exports[`Gamut Exported Keys 1`] = `
   "LayoutGrid",
   "List",
   "ListCol",
-  "ListHeader",
   "ListRow",
   "Logo",
   "LogoDefault",
@@ -99,6 +98,7 @@ exports[`Gamut Exported Keys 1`] = `
   "submitSuccessStatus",
   "Tab",
   "TabButton",
+  "TableHeader",
   "TabList",
   "TabNav",
   "TabNavLink",

diff --git a/packages/gamut/package.json b/packages/gamut/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/gamut",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "57.7.2",
+  "version": "57.7.3",
   "author": "Codecademy Engineering <[email protected]>",
   "dependencies": {
     "@codecademy/gamut-icons": "9.37.2",

diff --git a/packages/gamut/src/DataList/Controls/FilterControl.tsx b/packages/gamut/src/DataList/Controls/FilterControl.tsx
@@ -64,7 +64,6 @@ export const FilterControl: React.FC<FilterProps> = ({
       {menuOpen && (
         <PopoverContainer
           isOpen
-          inline
           targetRef={target as any}
           offset={0}
           alignment={justify === 'left' ? 'bottom-right' : 'bottom-left'}

diff --git a/packages/gamut/src/DataList/Controls/SortControl.tsx b/packages/gamut/src/DataList/Controls/SortControl.tsx
@@ -61,6 +61,13 @@ export const SortControl: React.FC<SortControlProps> = ({
 
   return (
     <SortAnchor
+      aria-sort={
+        direction === 'none'
+          ? 'none'
+          : direction === 'asc'
+          ? 'ascending'
+          : 'descending'
+      }
       variant="interface"
       onClick={() =>
         onSort?.({

diff --git a/packages/gamut/src/DataList/DataGrid.tsx b/packages/gamut/src/DataList/DataGrid.tsx
@@ -4,8 +4,8 @@ import { List } from '../List';
 import { EmptyRows } from './EmptyRows';
 import { ListControlContext, useListControls } from './hooks/useListControls';
 import { ListStateContext } from './hooks/useListState';
-import { HeaderRow } from './Rows/HeaderRow';
-import { DataRow, MarshaledColProps } from './Rows/Row';
+import { HeaderRow } from './Tables/Rows/TableHeaderRow';
+import { DataRow, MarshaledColProps } from './Tables/Rows/TableRow';
 import { ColumnConfig, DataListControls, IdentifiableKeys } from './types';
 
 export interface DataGridProps<
@@ -97,6 +97,7 @@ export function DataGrid<
       <ListControlContext.Provider value={listControls}>
         <List
           {...rest}
+          as="table"
           emptyMessage={emptyMessage ?? <EmptyRows />}
           header={
             header ? (

diff --git a/packages/gamut/src/DataList/EmptyRows.tsx b/packages/gamut/src/DataList/EmptyRows.tsx
@@ -1,5 +1,3 @@
-import { DotLoose } from '@codecademy/gamut-patterns';
-
 import { FlexBox } from '../Box';
 import { FillButton } from '../Button';
 import { Text } from '../Typography';
@@ -9,26 +7,27 @@ export const EmptyRows = () => {
   const { onResetQuery } = useControlContext();
 
   return (
-    <>
-      <FlexBox
-        bg="background-current"
-        center
-        column
-        gap={16}
-        left="calc(50% - 160px)"
-        p={32}
-        position="sticky"
-        top="calc(50% - 92px)"
-        width="320px"
-        zIndex={1}
-      >
-        <Text variant="title-sm">No Results Found</Text>
-        <Text variant="p-base">Remove filters to view</Text>
-        <FillButton onClick={onResetQuery}>Reset Filters</FillButton>
-      </FlexBox>
-      <FlexBox height={409} center width={1}>
-        <DotLoose position="absolute" inset={0} top={-2} />
+    <FlexBox
+      as="tbody"
+      bg="background-current"
+      left="calc(50% - 160px)"
+      p={32}
+      position="sticky"
+      top="calc(50% - 66px)"
+      width="320px"
+      zIndex={1}
+    >
+      <FlexBox as="tr" center column gap={16} width="100%">
+        <th>
+          <Text variant="title-sm">No Results Found</Text>
+        </th>
+        <th>
+          <Text variant="p-base">Remove filters to view</Text>
+        </th>
+        <th>
+          <FillButton onClick={onResetQuery}>Reset Filters</FillButton>
+        </th>
       </FlexBox>
-    </>
+    </FlexBox>
   );
 };
diff --git a/...ges/gamut/src/DataList/Rows/HeaderRow.tsx → ...c/DataList/Tables/Rows/TableHeaderRow.tsx b/...ges/gamut/src/DataList/Rows/HeaderRow.tsx → ...c/DataList/Tables/Rows/TableHeaderRow.tsx
@@ -1,15 +1,15 @@
 import { memo, ReactElement } from 'react';
 
-import { FlexBox } from '../..';
-import { ListCol, ListHeader } from '../../List';
+import { FlexBox } from '../../..';
+import { ListCol, TableHeader } from '../../../List';
 import {
   ExpandControl,
   FilterControl,
   SelectControl,
   SortControl,
-} from '../Controls';
-import { useControlContext } from '../hooks/useListControls';
-import { ColumnConfig, Query } from '../types';
+} from '../../Controls';
+import { useControlContext } from '../../hooks/useListControls';
+import { ColumnConfig, Query } from '../../types';
 
 interface HeaderComponent {
   <Row>(props: {
@@ -21,23 +21,17 @@ interface HeaderComponent {
   }): ReactElement<any, any>;
 }
 
-export const Header: HeaderComponent = ({
+export const TableHeaderRow: HeaderComponent = ({
   columns,
   selected = false,
   empty = false,
   hideSelectAll,
 }) => {
-  const {
-    expandable,
-    selectable,
-    onSelect,
-    onFilter,
-    onSort,
-    prefixId,
-  } = useControlContext();
+  const { expandable, selectable, onSelect, onFilter, onSort, prefixId } =
+    useControlContext();
 
   return (
-    <ListHeader>
+    <TableHeader>
       <>
         {selectable && (
           <ListCol size="content">
@@ -86,8 +80,8 @@ export const Header: HeaderComponent = ({
           </ListCol>
         )}
       </>
-    </ListHeader>
+    </TableHeader>
   );
 };
 
-export const HeaderRow = memo(Header) as HeaderComponent;
+export const HeaderRow = memo(TableHeaderRow) as HeaderComponent;
diff --git a/packages/gamut/src/DataList/Rows/Row.tsx → ...mut/src/DataList/Tables/Rows/TableRow.tsx b/packages/gamut/src/DataList/Rows/Row.tsx → ...mut/src/DataList/Tables/Rows/TableRow.tsx
@@ -1,12 +1,18 @@
-import { memo, ReactElement, ReactNode, useCallback } from 'react';
+import {
+  isValidElement,
+  memo,
+  ReactElement,
+  useCallback,
+  useMemo,
+} from 'react';
 
-import { Text } from '../..';
-import { ListCol, ListRow } from '../../List';
-import { ColProps } from '../../List/elements';
-import { Shimmer } from '../../Loading/Shimmer';
-import { ExpandControl, SelectControl } from '../Controls';
-import { useControlContext } from '../hooks/useListControls';
-import { ColumnConfig, IdentifiableKeys } from '../types';
+import { Text } from '../../..';
+import { ListCol, ListRow } from '../../../List';
+import { ColProps } from '../../../List/elements';
+import { Shimmer } from '../../../Loading/Shimmer';
+import { ExpandControl, SelectControl } from '../../Controls';
+import { useControlContext } from '../../hooks/useListControls';
+import { ColumnConfig, IdentifiableKeys } from '../../types';
 
 export type MarshaledColProps = Partial<Pick<ColProps, 'showOverflow'>>;
 
@@ -23,7 +29,7 @@ interface DataRow {
   ): ReactElement<any, any>;
 }
 
-export const Row: DataRow = ({
+export const TableRow: DataRow = ({
   id,
   columns,
   row,
@@ -50,8 +56,24 @@ export const Row: DataRow = ({
     });
   }, [onExpand, expandedContent, id, row]);
 
+  const numberOfColumns = useMemo(() => {
+    return columns.length;
+  }, [columns]);
+
+  const listRowProps = expandable
+    ? {
+        expanded,
+        renderExpanded: renderExpandedContent,
+      }
+    : {};
+
   return (
-    <ListRow expanded={expanded} renderExpanded={renderExpandedContent}>
+    <ListRow
+      as="tr"
+      numOfColumns={numberOfColumns}
+      selectable={selectable}
+      {...listRowProps}
+    >
       {selectable && (
         <ListCol
           {...listColProps}
@@ -70,18 +92,18 @@ export const Row: DataRow = ({
         </ListCol>
       )}
       {columns.map(({ key, render, size, justify, fill, type }) => {
+        const newKey = prefixId(`${id}-col-${String(key)}`);
         const colProps = {
           ...listColProps,
           size,
           justify,
           fill,
           type,
-          key: prefixId(`${id}-col-${String(key)}`),
         };
 
         if (loading) {
           return (
-            <ListCol {...colProps}>
+            <ListCol {...colProps} key={newKey}>
               <Shimmer
                 minHeight={24}
                 height="calc(100% - 1rem)"
@@ -92,22 +114,24 @@ export const Row: DataRow = ({
         }
 
         return (
-          <ListCol {...colProps}>
-            <>
-              {render ? (
-                render(row)
-              ) : typeof row[key] === 'string' ? (
-                <Text
-                  truncate="ellipsis"
-                  truncateLines={1}
-                  textAlign={justify ?? 'left'}
-                >
-                  {row[key] as ReactNode}
-                </Text>
-              ) : (
-                row[key]
-              )}
-            </>
+          <ListCol {...colProps} key={newKey}>
+            {render ? (
+              render(row)
+            ) : typeof row[key] === 'string' || typeof row[key] === 'number' ? (
+              <Text
+                truncate="ellipsis"
+                truncateLines={1}
+                textAlign={justify ?? 'left'}
+              >
+                {row[key] as string}
+              </Text>
+            ) : isValidElement(row[key]) ? (
+              (row[key] as ReactElement)
+            ) : !row[key] ? (
+              ''
+            ) : (
+              'Invalid data type'
+            )}
           </ListCol>
         );
       })}
@@ -125,4 +149,4 @@ export const Row: DataRow = ({
   );
 };
 
-export const DataRow = memo(Row) as DataRow;
+export const DataRow = memo(TableRow) as DataRow;