addresses last bit of PR feedback

primer · Jul 5, 2024 · 2c2f814 · 2c2f814
1 parent 38c6643
commit 2c2f814
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
diff --git a/packages/react/src/ActionList/Item.tsx b/packages/react/src/ActionList/Item.tsx
@@ -395,6 +395,8 @@ export const Item = React.forwardRef<HTMLLIElement, ActionListItemProps>(
                     }}
                   >
                     {childrenWithoutSlots}
+                    {/* Loading message needs to be in here so it is read with the label */}
+                    {loading === true && <VisuallyHidden>Loading</VisuallyHidden>}
                   </Box>
                   {slots.inlineDescription}
                 </ConditionalWrapper>
@@ -429,7 +431,6 @@ export const Item = React.forwardRef<HTMLLIElement, ActionListItemProps>(
             </Box>
           </ItemWrapper>
           {!inactive && !loading && !menuContext && Boolean(slots.trailingAction) && slots.trailingAction}
-          {loading === true && <VisuallyHidden>Loading</VisuallyHidden>}
         </LiBox>
       </ItemContext.Provider>
     )

diff --git a/packages/react/src/NavList/NavList.stories.tsx b/packages/react/src/NavList/NavList.stories.tsx
@@ -225,31 +225,6 @@ export const WithInactiveItems: StoryFn = () => (
   </PageLayout>
 )
 
-export const WithLoadingItems: StoryFn = () => (
-  <PageLayout>
-    <PageLayout.Pane position="start">
-      <NavList>
-        <NavList.Item href="#" loading>
-          Item 1
-        </NavList.Item>
-        <NavList.Item>
-          Item 2
-          <NavList.SubNav>
-            <NavList.Item href="#" aria-current="page">
-              Sub item 1
-            </NavList.Item>
-            <NavList.Item href="#" loading>
-              Sub item 2
-            </NavList.Item>
-          </NavList.SubNav>
-        </NavList.Item>
-        <NavList.Item href="#">Item 3</NavList.Item>
-      </NavList>
-    </PageLayout.Pane>
-    <PageLayout.Content></PageLayout.Content>
-  </PageLayout>
-)
-
 export const WithGroup: StoryFn = () => (
   <PageLayout>
     <PageLayout.Pane position="start">

diff --git 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<HTMLAnchorElement, NavListItemProps>(