Merge branch 'main' into fix/update-action-list

primer · Sep 13, 2023 · 31fb1a5 · 31fb1a5
2 parents 2dcfa74 + b90e547
commit 31fb1a5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/polite-hairs-switch.md b/.changeset/polite-hairs-switch.md
@@ -0,0 +1,7 @@
+---
+'@primer/react': minor
+---
+
+Add the Column type and createColumnHelper function to easily define columns for DataTable
+
+<!-- Changed components: DataTable -->
diff --git a/src/DataTable/index.ts b/src/DataTable/index.ts
@@ -49,3 +49,5 @@ export type {
   TableActionsProps,
   TableSkeletonProps,
 } from './Table'
+export {createColumnHelper} from './column'
+export type {Column} from './column'
diff --git a/src/__tests__/__snapshots__/exports.test.ts.snap b/src/__tests__/__snapshots__/exports.test.ts.snap
@@ -156,6 +156,7 @@ exports[`@primer/react/drafts should not update exports without a semver change
   "TreeView",
   "UnderlineNav",
   "callbackCancelledResult",
+  "createColumnHelper",
   "useCombobox",
   "useDynamicTextareaHeight",
   "useIgnoreKeyboardActionsWhileComposing",

diff --git a/src/drafts/index.ts b/src/drafts/index.ts
@@ -9,7 +9,7 @@
 export {Blankslate} from '../Blankslate'
 export type {BlankslateProps} from '../Blankslate'
 
-export {DataTable, Table} from '../DataTable'
+export {DataTable, Table, createColumnHelper} from '../DataTable'
 export type {
   DataTableProps,
   TableProps,
@@ -22,6 +22,7 @@ export type {
   TableTitleProps,
   TableSubtitleProps,
   TableActionsProps,
+  Column,
 } from '../DataTable'
 
 export * from '../Dialog/Dialog'