From 28bc19ecb787754b2f036b1a9d29aa1576cda832 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Mon, 23 Sep 2024 13:07:12 -0500 Subject: [PATCH 1/7] feat: promote Tooltip, Dialog, Stack to stable --- .../__snapshots__/exports.test.ts.snap | 20 ++++++------------- packages/react/src/experimental/index.ts | 6 ------ packages/react/src/index.ts | 7 +++---- packages/react/src/next/index.ts | 1 - 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap index 34c1b9f6533..0b51fd5e918 100644 --- a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap +++ b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap @@ -64,8 +64,11 @@ exports[`@primer/react should not update exports without a semver change 1`] = ` "Details", "type DetailsProps", "Dialog", + "type DialogButtonProps", "type DialogHeaderProps", + "type DialogHeight", "type DialogProps", + "type DialogWidth", "Flash", "type FlashProps", "type FocusTrapHookSettings", @@ -179,6 +182,8 @@ exports[`@primer/react should not update exports without a semver change 1`] = ` "Token", "type TokenProps", "Tooltip", + "TooltipContext", + "type TooltipDirection", "type TooltipProps", "type TouchOrMouseEvent", "TreeView", @@ -187,6 +192,7 @@ exports[`@primer/react should not update exports without a semver change 1`] = ` "type TreeViewProps", "type TreeViewSubTreeProps", "type TreeViewVisualProps", + "type TriggerPropsType", "Truncate", "type TruncateProps", "UnderlineNav", @@ -271,12 +277,6 @@ exports[`@primer/react/experimental should not update exports without a semver c "type DataTableProps", "default", "default", - "Dialog", - "type DialogButtonProps", - "type DialogHeaderProps", - "type DialogHeight", - "type DialogProps", - "type DialogWidth", "FeatureFlags", "type FeatureFlagsProps", "FilteredActionList", @@ -310,9 +310,6 @@ exports[`@primer/react/experimental should not update exports without a semver c "SkeletonBox", "SkeletonText", "type SlotConfig", - "Stack", - "type StackItemProps", - "type StackProps", "Table", "type TableActionsProps", "type TableBodyProps", @@ -325,11 +322,6 @@ exports[`@primer/react/experimental should not update exports without a semver c "type TableSubtitleProps", "type TableTitleProps", "type TitleProps", - "Tooltip", - "TooltipContext", - "type TooltipDirection", - "type TooltipProps", - "type TriggerPropsType", "UnderlinePanels", "type UnderlinePanelsPanelProps", "type UnderlinePanelsProps", diff --git a/packages/react/src/experimental/index.ts b/packages/react/src/experimental/index.ts index 939d1cdcd0b..7030a6562ca 100644 --- a/packages/react/src/experimental/index.ts +++ b/packages/react/src/experimental/index.ts @@ -30,8 +30,6 @@ export type { Column, } from '../DataTable' -export * from '../Dialog/Dialog' - export {InlineMessage} from '../InlineMessage' export type {InlineMessageProps} from '../InlineMessage' @@ -52,15 +50,11 @@ export type { NavListDividerProps, } from '../NavList' export * from './SelectPanel2' -export * from '../TooltipV2' export * from '../ActionBar' export {ScrollableRegion} from '../ScrollableRegion' export type {ScrollableRegionProps} from '../ScrollableRegion' -export {Stack} from '../Stack' -export type {StackProps, StackItemProps} from '../Stack' - export {Announce, AriaStatus, AriaAlert} from '../live-region' export type {AnnounceProps, AriaStatusProps, AriaAlertProps} from '../live-region' diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts index 24a4987c98a..5a35e5e7fb9 100644 --- a/packages/react/src/index.ts +++ b/packages/react/src/index.ts @@ -91,8 +91,8 @@ export {default as CounterLabel} from './CounterLabel' export type {CounterLabelProps} from './CounterLabel' export {default as Details} from './Details' export type {DetailsProps} from './Details' -export {default as Dialog} from './Dialog' -export type {DialogProps, DialogHeaderProps} from './Dialog' +export {Dialog} from './Dialog/Dialog' +export type {DialogProps, DialogHeaderProps, DialogButtonProps, DialogWidth, DialogHeight} from './Dialog/Dialog' export type {ConfirmationDialogProps} from './ConfirmationDialog/ConfirmationDialog' export {ConfirmationDialog} from './ConfirmationDialog/ConfirmationDialog' export {default as Flash} from './Flash' @@ -170,8 +170,7 @@ export type { } from './Timeline' export {default as Token, IssueLabelToken, AvatarToken} from './Token' export type {TokenProps} from './Token' -export {default as Tooltip} from './Tooltip/Tooltip' -export type {TooltipProps} from './Tooltip/Tooltip' +export * from './TooltipV2' export {default as Truncate} from './Truncate' export type {TruncateProps} from './Truncate' diff --git a/packages/react/src/next/index.ts b/packages/react/src/next/index.ts index cafa67c9ab8..a28696091ff 100644 --- a/packages/react/src/next/index.ts +++ b/packages/react/src/next/index.ts @@ -1,4 +1,3 @@ 'use client' // next entrypoint is used to export the latest version of the components that have conflicts with the main bundle. -export * from '../TooltipV2' From d429c4f950c175fac6b5f37e6850a0e1e9e9de4e Mon Sep 17 00:00:00 2001 From: Josh Black Date: Mon, 23 Sep 2024 13:07:58 -0500 Subject: [PATCH 2/7] chore: add changeset --- .changeset/khaki-dolls-reflect.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/khaki-dolls-reflect.md diff --git a/.changeset/khaki-dolls-reflect.md b/.changeset/khaki-dolls-reflect.md new file mode 100644 index 00000000000..5a173471881 --- /dev/null +++ b/.changeset/khaki-dolls-reflect.md @@ -0,0 +1,5 @@ +--- +'@primer/react': major +--- + +Promote Dialog, Tooltip, and Stack from @primer/react/experimental to @primer/react From 16ac7f73f7afb70396ca89704bfdfaf882c5230f Mon Sep 17 00:00:00 2001 From: Josh Black Date: Mon, 23 Sep 2024 13:09:38 -0500 Subject: [PATCH 3/7] chore: do not remove components from experimental until we update dotcom --- .../__tests__/__snapshots__/exports.test.ts.snap | 14 ++++++++++++++ packages/react/src/experimental/index.ts | 6 ++++++ packages/react/src/next/index.ts | 1 + 3 files changed, 21 insertions(+) diff --git a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap index 0b51fd5e918..7c4971d6e2e 100644 --- a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap +++ b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap @@ -277,6 +277,12 @@ exports[`@primer/react/experimental should not update exports without a semver c "type DataTableProps", "default", "default", + "Dialog", + "type DialogButtonProps", + "type DialogHeaderProps", + "type DialogHeight", + "type DialogProps", + "type DialogWidth", "FeatureFlags", "type FeatureFlagsProps", "FilteredActionList", @@ -310,6 +316,9 @@ exports[`@primer/react/experimental should not update exports without a semver c "SkeletonBox", "SkeletonText", "type SlotConfig", + "Stack", + "type StackItemProps", + "type StackProps", "Table", "type TableActionsProps", "type TableBodyProps", @@ -322,6 +331,11 @@ exports[`@primer/react/experimental should not update exports without a semver c "type TableSubtitleProps", "type TableTitleProps", "type TitleProps", + "Tooltip", + "TooltipContext", + "type TooltipDirection", + "type TooltipProps", + "type TriggerPropsType", "UnderlinePanels", "type UnderlinePanelsPanelProps", "type UnderlinePanelsProps", diff --git a/packages/react/src/experimental/index.ts b/packages/react/src/experimental/index.ts index 7030a6562ca..939d1cdcd0b 100644 --- a/packages/react/src/experimental/index.ts +++ b/packages/react/src/experimental/index.ts @@ -30,6 +30,8 @@ export type { Column, } from '../DataTable' +export * from '../Dialog/Dialog' + export {InlineMessage} from '../InlineMessage' export type {InlineMessageProps} from '../InlineMessage' @@ -50,11 +52,15 @@ export type { NavListDividerProps, } from '../NavList' export * from './SelectPanel2' +export * from '../TooltipV2' export * from '../ActionBar' export {ScrollableRegion} from '../ScrollableRegion' export type {ScrollableRegionProps} from '../ScrollableRegion' +export {Stack} from '../Stack' +export type {StackProps, StackItemProps} from '../Stack' + export {Announce, AriaStatus, AriaAlert} from '../live-region' export type {AnnounceProps, AriaStatusProps, AriaAlertProps} from '../live-region' diff --git a/packages/react/src/next/index.ts b/packages/react/src/next/index.ts index a28696091ff..cafa67c9ab8 100644 --- a/packages/react/src/next/index.ts +++ b/packages/react/src/next/index.ts @@ -1,3 +1,4 @@ 'use client' // next entrypoint is used to export the latest version of the components that have conflicts with the main bundle. +export * from '../TooltipV2' From 6b53d91e7537ecfbe00b4753719a8961917b32bd Mon Sep 17 00:00:00 2001 From: Josh Black Date: Thu, 3 Oct 2024 09:46:19 -0500 Subject: [PATCH 4/7] Updates from editor --- .changeset/khaki-dolls-reflect.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/khaki-dolls-reflect.md b/.changeset/khaki-dolls-reflect.md index 5a173471881..24f9e125038 100644 --- a/.changeset/khaki-dolls-reflect.md +++ b/.changeset/khaki-dolls-reflect.md @@ -1,5 +1,5 @@ --- -'@primer/react': major +'@primer/react': minor --- -Promote Dialog, Tooltip, and Stack from @primer/react/experimental to @primer/react +Promote Dialog, Tooltip, and Stack from `@primer/react/experimental` to `@primer/react` From e7b33d2b727bebd8e914c50f206f2fcfd96acd62 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Thu, 3 Oct 2024 09:47:41 -0500 Subject: [PATCH 5/7] chore: resolve merge conflicts --- .../react/src/__tests__/__snapshots__/exports.test.ts.snap | 6 ------ packages/react/src/index.ts | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap index 98e9abe58d4..b1b7b1bab2e 100644 --- a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap +++ b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap @@ -65,15 +65,12 @@ exports[`@primer/react should not update exports without a semver change 1`] = ` "createComponent", "Details", "type DetailsProps", -<<<<<<< HEAD "Dialog", "type DialogButtonProps", "type DialogHeaderProps", "type DialogHeight", "type DialogProps", "type DialogWidth", -======= ->>>>>>> b00874c31a9bfc569fa78f5d246bc552834f52c0 "Flash", "type FlashProps", "type FocusTrapHookSettings", @@ -182,13 +179,10 @@ exports[`@primer/react should not update exports without a semver change 1`] = ` "ToggleSwitch", "Token", "type TokenProps", -<<<<<<< HEAD "Tooltip", "TooltipContext", "type TooltipDirection", "type TooltipProps", -======= ->>>>>>> b00874c31a9bfc569fa78f5d246bc552834f52c0 "type TouchOrMouseEvent", "TreeView", "type TreeViewErrorDialogProps", diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts index 37baa53556d..b597fc7644b 100644 --- a/packages/react/src/index.ts +++ b/packages/react/src/index.ts @@ -165,12 +165,8 @@ export type { TimelineItemsProps, } from './Timeline' export {default as Token, IssueLabelToken, AvatarToken} from './Token' -<<<<<<< HEAD -export type {TokenProps} from './Token' -export * from './TooltipV2' -======= export type {TokenProps, IssueLabelTokenProps} from './Token' ->>>>>>> b00874c31a9bfc569fa78f5d246bc552834f52c0 +export * from './TooltipV2' export {default as Truncate} from './Truncate' export type {TruncateProps} from './Truncate' From f5ace97a5006eeda697028b9ba5ddc2044b35ac0 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Mon, 7 Oct 2024 10:40:02 -0500 Subject: [PATCH 6/7] chore: remove barrel exports from TooltipV2 --- packages/react/src/TooltipV2/index.ts | 3 ++- .../react/src/__tests__/__snapshots__/exports.test.ts.snap | 6 ------ packages/react/src/experimental/index.ts | 3 ++- packages/react/src/index.ts | 3 ++- packages/react/src/next/index.ts | 3 ++- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/react/src/TooltipV2/index.ts b/packages/react/src/TooltipV2/index.ts index ba15f407377..69e52a4f3d7 100644 --- a/packages/react/src/TooltipV2/index.ts +++ b/packages/react/src/TooltipV2/index.ts @@ -1 +1,2 @@ -export * from './Tooltip' +export {Tooltip} from './Tooltip' +export type {TooltipProps} from './Tooltip' diff --git a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap index b1b7b1bab2e..280b1e82f6e 100644 --- a/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap +++ b/packages/react/src/__tests__/__snapshots__/exports.test.ts.snap @@ -180,8 +180,6 @@ exports[`@primer/react should not update exports without a semver change 1`] = ` "Token", "type TokenProps", "Tooltip", - "TooltipContext", - "type TooltipDirection", "type TooltipProps", "type TouchOrMouseEvent", "TreeView", @@ -190,7 +188,6 @@ exports[`@primer/react should not update exports without a semver change 1`] = ` "type TreeViewProps", "type TreeViewSubTreeProps", "type TreeViewVisualProps", - "type TriggerPropsType", "Truncate", "type TruncateProps", "UnderlineNav", @@ -327,10 +324,7 @@ exports[`@primer/react/experimental should not update exports without a semver c "type TableTitleProps", "type TitleProps", "Tooltip", - "TooltipContext", - "type TooltipDirection", "type TooltipProps", - "type TriggerPropsType", "UnderlinePanels", "type UnderlinePanelsPanelProps", "type UnderlinePanelsProps", diff --git a/packages/react/src/experimental/index.ts b/packages/react/src/experimental/index.ts index f131cf11e6b..d4db2e4ccba 100644 --- a/packages/react/src/experimental/index.ts +++ b/packages/react/src/experimental/index.ts @@ -52,7 +52,8 @@ export type { NavListDividerProps, } from '../NavList' export * from './SelectPanel2' -export * from '../TooltipV2' +export {Tooltip} from '../TooltipV2' +export type {TooltipProps} from '../TooltipV2' export * from '../ActionBar' export {ScrollableRegion} from '../ScrollableRegion' diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts index b597fc7644b..a6188c13cee 100644 --- a/packages/react/src/index.ts +++ b/packages/react/src/index.ts @@ -166,7 +166,8 @@ export type { } from './Timeline' export {default as Token, IssueLabelToken, AvatarToken} from './Token' export type {TokenProps, IssueLabelTokenProps} from './Token' -export * from './TooltipV2' +export {Tooltip} from './TooltipV2' +export type {TooltipProps} from './TooltipV2' export {default as Truncate} from './Truncate' export type {TruncateProps} from './Truncate' diff --git a/packages/react/src/next/index.ts b/packages/react/src/next/index.ts index cafa67c9ab8..4b07c532265 100644 --- a/packages/react/src/next/index.ts +++ b/packages/react/src/next/index.ts @@ -1,4 +1,5 @@ 'use client' // next entrypoint is used to export the latest version of the components that have conflicts with the main bundle. -export * from '../TooltipV2' +export {Tooltip} from '../TooltipV2' +export type {TooltipProps} from '../TooltipV2' From f10009a039a820d9bf9cc0166e45a57dba9487d3 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Mon, 7 Oct 2024 11:01:59 -0500 Subject: [PATCH 7/7] fix: add TooltipDirection to Tooltip index module --- packages/react/src/TooltipV2/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/TooltipV2/index.ts b/packages/react/src/TooltipV2/index.ts index 69e52a4f3d7..9a336ded38c 100644 --- a/packages/react/src/TooltipV2/index.ts +++ b/packages/react/src/TooltipV2/index.ts @@ -1,2 +1,2 @@ export {Tooltip} from './Tooltip' -export type {TooltipProps} from './Tooltip' +export type {TooltipProps, TooltipDirection} from './Tooltip'