introduce gap between items and remove 4px padding around

primer · Oct 17, 2022 · 8f9bb3d · 8f9bb3d
1 parent 7ca16c9
commit 8f9bb3d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/src/UnderlineNav2/UnderlineNav.tsx b/src/UnderlineNav2/UnderlineNav.tsx
@@ -19,7 +19,8 @@ import {
   ulStyles,
   scrollStyles,
   moreMenuStyles,
-  menuItemStyles
+  menuItemStyles,
+  GAP
 } from './styles'
 import {ArrowButton} from './UnderlineNavArrowButton'
 import styled from 'styled-components'
@@ -146,7 +147,8 @@ const calculatePossibleItems = (childWidthArray: ChildWidthArray, navWidth: numb
       breakpoint = index - 1
       break
     } else {
-      sumsOfChildWidth = sumsOfChildWidth + childWidth.width
+      // The the gap between items into account when calculating the number of items possible
+      sumsOfChildWidth = sumsOfChildWidth + childWidth.width + GAP
     }
   }
 

diff --git a/src/UnderlineNav2/UnderlineNavItem.tsx b/src/UnderlineNav2/UnderlineNavItem.tsx
@@ -175,9 +175,18 @@ export const UnderlineNavItem = forwardRef(
                 {children}
               </Box>
             )}
-            <Box as="span" data-component="counter" sx={counterStyles}>
-              {loadingCounters ? <LoadingCounter /> : counter !== undefined && <CounterLabel>{counter}</CounterLabel>}
-            </Box>
+
+            {loadingCounters ? (
+              <Box as="span" data-component="counter" sx={counterStyles}>
+                <LoadingCounter />
+              </Box>
+            ) : (
+              counter !== undefined && (
+                <Box as="span" data-component="counter" sx={counterStyles}>
+                  <CounterLabel>{counter}</CounterLabel>
+                </Box>
+              )
+            )}
           </Box>
         </Box>
       </Box>

diff --git a/src/UnderlineNav2/styles.ts b/src/UnderlineNav2/styles.ts
@@ -2,6 +2,13 @@ import {Theme} from '../ThemeProvider'
 import {BetterSystemStyleObject} from '../sx'
 import {UnderlineNavProps} from './UnderlineNav'
 
+// The gap between the list items. It is a constant because the gap is used to calculate the possible number of items that can fit in the container.
+export const GAP = 8
+
+const focusRing = (theme?: Theme): BetterSystemStyleObject => ({
+  boxShadow: `inset 0 0 0 2px ${theme?.colors.accent.fg}`
+})
+
 export const iconWrapStyles = {
   alignItems: 'center',
   display: 'inline-flex',
@@ -48,7 +55,8 @@ export const ulStyles = {
   paddingX: 0,
   margin: '0',
   marginBottom: '-1px',
-  alignItems: 'center'
+  alignItems: 'center',
+  gap: `${GAP}px`
 }
 
 export const getDividerStyle = (theme?: Theme) => ({
@@ -106,15 +114,14 @@ export const getArrowBtnStyles = (theme?: Theme) => ({
   // To reset global focus styles because it doesn't support safari right now.
   '&:focus:not(:disabled)': {
     outline: 0,
-    boxShadow: `inset 0 0 0 2px ${theme?.colors.accent.fg}`
+    ...focusRing(theme)
   },
   // where focus-visible is supported, remove the focus box-shadow
   '&:not(:focus-visible)': {
     boxShadow: 'none'
   },
   '&:focus-visible:not(:disabled)': {
-    outline: 0,
-    boxShadow: `inset 0 0 0 2px ${theme?.colors.accent.fg}`
+    ...focusRing(theme)
   }
 })
 
@@ -129,7 +136,6 @@ export const getLinkStyles = (
   color: 'fg.default',
   textAlign: 'center',
   textDecoration: 'none',
-  paddingX: 1,
   ...(props?.variant === 'small' ? smallVariantLinkStyles : defaultVariantLinkStyles),
   '@media (hover:hover)': {
     '&:hover > div[data-component="wrapper"] ': {
@@ -140,15 +146,15 @@ export const getLinkStyles = (
   '&:focus': {
     outline: 0,
     '& > div[data-component="wrapper"]': {
-      boxShadow: `inset 0 0 0 2px ${theme?.colors.accent.fg}`
+      ...focusRing(theme)
     },
     // where focus-visible is supported, remove the focus box-shadow
     '&:not(:focus-visible) > div[data-component="wrapper"]': {
       boxShadow: 'none'
     }
   },
   '&:focus-visible > div[data-component="wrapper"]': {
-    boxShadow: `inset 0 0 0 2px ${theme?.colors.accent.fg}`
+    ...focusRing(theme)
   },
   // renders a visibly hidden "copy" of the label in bold, reserving box space for when label becomes bold on selected
   '& span[data-content]::before': {
@@ -164,7 +170,7 @@ export const getLinkStyles = (
     position: 'absolute',
     right: '50%',
     bottom: 0,
-    width: `calc(100% - 8px)`,
+    width: '100%',
     height: 2,
     content: '""',
     bg: selectedLink === ref ? theme?.colors.primer.border.active : 'transparent',