From 2c2f814498de6edeccabe7911d07f9ee6f2f9c15 Mon Sep 17 00:00:00 2001 From: Mike Perrotti Date: Fri, 5 Jul 2024 14:01:41 -0400 Subject: [PATCH] addresses last bit of PR feedback --- packages/react/src/ActionList/Item.tsx | 3 ++- .../react/src/NavList/NavList.stories.tsx | 25 ------------------- packages/react/src/NavList/NavList.tsx | 1 - 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/packages/react/src/ActionList/Item.tsx b/packages/react/src/ActionList/Item.tsx index d5521dd3dd4..d0fc3ed733e 100644 --- a/packages/react/src/ActionList/Item.tsx +++ b/packages/react/src/ActionList/Item.tsx @@ -395,6 +395,8 @@ export const Item = React.forwardRef( }} > {childrenWithoutSlots} + {/* Loading message needs to be in here so it is read with the label */} + {loading === true && Loading} {slots.inlineDescription} @@ -429,7 +431,6 @@ export const Item = React.forwardRef( {!inactive && !loading && !menuContext && Boolean(slots.trailingAction) && slots.trailingAction} - {loading === true && Loading} ) diff --git a/packages/react/src/NavList/NavList.stories.tsx b/packages/react/src/NavList/NavList.stories.tsx index f6160ce82f1..97403ba9d2d 100644 --- a/packages/react/src/NavList/NavList.stories.tsx +++ b/packages/react/src/NavList/NavList.stories.tsx @@ -225,31 +225,6 @@ export const WithInactiveItems: StoryFn = () => ( ) -export const WithLoadingItems: StoryFn = () => ( - - - - - Item 1 - - - Item 2 - - - Sub item 1 - - - Sub item 2 - - - - Item 3 - - - - -) - export const WithGroup: StoryFn = () => ( diff --git a/packages/react/src/NavList/NavList.tsx b/packages/react/src/NavList/NavList.tsx index 62b4647b770..2ba2fc0d2c0 100644 --- a/packages/react/src/NavList/NavList.tsx +++ b/packages/react/src/NavList/NavList.tsx @@ -61,7 +61,6 @@ export type NavListItemProps = { href?: string 'aria-current'?: 'page' | 'step' | 'location' | 'date' | 'time' | 'true' | 'false' | boolean inactiveText?: string - loading?: boolean } & SxProp const Item = React.forwardRef(