From a3c6557fe6942052d899bd9724c6aa16ebc396cb Mon Sep 17 00:00:00 2001 From: David Godinez Date: Mon, 30 Dec 2024 09:44:04 -0700 Subject: [PATCH 1/3] DH-18089: Export Spectrum Menu and SubmenuTrigger --- packages/components/src/spectrum/collections.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/components/src/spectrum/collections.ts b/packages/components/src/spectrum/collections.ts index fbddbb3ebd..f95645799d 100644 --- a/packages/components/src/spectrum/collections.ts +++ b/packages/components/src/spectrum/collections.ts @@ -5,8 +5,12 @@ export { // the Spectrum props type for upstream consumers that need to compose prop types. type SpectrumComboBoxProps, // ListBox - we aren't planning to support this component + Menu, + type SpectrumMenuProps as MenuProps, MenuTrigger, type SpectrumMenuTriggerProps as MenuTriggerProps, + SubmenuTrigger, + type SpectrumSubmenuTriggerProps as SubmenuTriggerProps, // TableView - we aren't planning to support this component // Picker is exported from Picker.tsx as a custom DH component. Re-exporting // the Spectrum props type for upstream consumers that need to compose prop types. From 027e5a83bc2f4d1840d735092b0f96c6dcd6a7fa Mon Sep 17 00:00:00 2001 From: David Godinez Date: Mon, 30 Dec 2024 09:58:50 -0700 Subject: [PATCH 2/3] rename to SpectrumMenu for name collision --- packages/components/src/spectrum/collections.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/src/spectrum/collections.ts b/packages/components/src/spectrum/collections.ts index f95645799d..6735517125 100644 --- a/packages/components/src/spectrum/collections.ts +++ b/packages/components/src/spectrum/collections.ts @@ -5,8 +5,8 @@ export { // the Spectrum props type for upstream consumers that need to compose prop types. type SpectrumComboBoxProps, // ListBox - we aren't planning to support this component - Menu, - type SpectrumMenuProps as MenuProps, + Menu as SpectrumMenu, + type SpectrumMenuProps, MenuTrigger, type SpectrumMenuTriggerProps as MenuTriggerProps, SubmenuTrigger, From 1d5435bca6cc7eb3e85b570b93b33816caa682f2 Mon Sep 17 00:00:00 2001 From: David Godinez Date: Mon, 30 Dec 2024 12:06:22 -0700 Subject: [PATCH 3/3] add contextual help trigger --- packages/components/src/spectrum/collections.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/components/src/spectrum/collections.ts b/packages/components/src/spectrum/collections.ts index 6735517125..200ab06002 100644 --- a/packages/components/src/spectrum/collections.ts +++ b/packages/components/src/spectrum/collections.ts @@ -11,6 +11,8 @@ export { type SpectrumMenuTriggerProps as MenuTriggerProps, SubmenuTrigger, type SpectrumSubmenuTriggerProps as SubmenuTriggerProps, + ContextualHelpTrigger, + type SpectrumMenuDialogTriggerProps as ContextualHelpTriggerProps, // TableView - we aren't planning to support this component // Picker is exported from Picker.tsx as a custom DH component. Re-exporting // the Spectrum props type for upstream consumers that need to compose prop types.