Skip to content
Draft

Fl/test #7721

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/actionbar-flicker-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

ActionBar: Fixed flickering on initial render by applying visibility:hidden during initial width calculations. This prevents items from briefly appearing and then disappearing on slower devices.
16 changes: 16 additions & 0 deletions packages/react/src/ActionBar/ActionBar.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ import {BoldIcon, ItalicIcon, CodeIcon} from '@primer/octicons-react'
import {implementsClassName} from '../utils/testing'
import classes from './ActionBar.module.css'

// Mock ResizeObserver to trigger callback immediately with a positive width
// This ensures isInitialRender becomes false and the toolbar is visible
const mockUnobserve = vi.fn()
const mockDisconnect = vi.fn()

globalThis.ResizeObserver = vi.fn().mockImplementation(function (callback) {
return {
observe: vi.fn().mockImplementation(() => {
// Trigger the callback synchronously when observe is called
callback([{contentRect: {width: 500, height: 40}} as ResizeObserverEntry])
}),
unobserve: mockUnobserve,
disconnect: mockDisconnect,
}
})

describe('ActionBar', () => {
implementsClassName(ActionBar, classes.Nav)
afterEach(() => {
Expand Down
4 changes: 4 additions & 0 deletions packages/react/src/ActionBar/ActionBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,10 @@ export const ActionBar: React.FC<React.PropsWithChildren<ActionBarProps>> = prop
const [childRegistry, setChildRegistry] = ActionBarItemsRegistry.useRegistryState()

const [menuItemIds, setMenuItemIds] = useState<Set<string>>(() => new Set())
const [isInitialRender, setIsInitialRender] = useState(true)

const navRef = useRef<HTMLDivElement>(null)

// measure gap after first render & whenever gap scale changes
useIsomorphicLayoutEffect(() => {
if (!listRef.current) return
Expand All @@ -322,6 +324,7 @@ export const ActionBar: React.FC<React.PropsWithChildren<ActionBarProps>> = prop
if (navWidth > 0) {
const newMenuItemIds = getMenuItems(navWidth, moreMenuWidth, childRegistry, hasActiveMenu, computedGap)
if (newMenuItemIds) setMenuItemIds(newMenuItemIds)
setIsInitialRender(false)
}
}, navRef as RefObject<HTMLElement>)

Expand Down Expand Up @@ -361,6 +364,7 @@ export const ActionBar: React.FC<React.PropsWithChildren<ActionBarProps>> = prop
aria-label={ariaLabel}
aria-labelledby={ariaLabelledBy}
data-gap={gap}
style={isInitialRender ? {visibility: 'hidden'} : undefined}
>
<ActionBarItemsRegistry.Provider setRegistry={setChildRegistry}>{children}</ActionBarItemsRegistry.Provider>
{menuItemIds.size > 0 && (
Expand Down
Loading