Unverified Commit afec9909 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

[segment explorer] hide for pages router (#81813)

Hide the segment explorer menu item in pages router 

Closes NEXT-4635
parent 8a8888ca
...@@ -96,26 +96,18 @@ function SegmentExplorerFooter({ ...@@ -96,26 +96,18 @@ function SegmentExplorerFooter({
) )
} }
export function PageSegmentTree({ export function PageSegmentTree({ page }: { page: string }) {
isAppRouter,
page,
}: {
isAppRouter: boolean
page: string
}) {
const tree = useSegmentTree() const tree = useSegmentTree()
// Count active boundaries for the badge // Count active boundaries for the badge
const activeBoundariesCount = useMemo(() => { const activeBoundariesCount = useMemo(() => {
return isAppRouter ? countActiveBoundaries(tree) : 0 return countActiveBoundaries(tree)
}, [tree, isAppRouter]) }, [tree])
// Global reset handler // Global reset handler
const handleGlobalReset = useCallback(() => { const handleGlobalReset = useCallback(() => {
if (isAppRouter) { traverseTreeAndResetBoundaries(tree)
traverseTreeAndResetBoundaries(tree) }, [tree])
}
}, [tree, isAppRouter])
return ( return (
<div <div
...@@ -126,7 +118,7 @@ export function PageSegmentTree({ ...@@ -126,7 +118,7 @@ export function PageSegmentTree({
height: '100%', height: '100%',
}} }}
> >
{isAppRouter && <PageRouteBar page={page} />} <PageRouteBar page={page} />
<div <div
className="segment-explorer-content" className="segment-explorer-content"
data-nextjs-devtool-segment-explorer data-nextjs-devtool-segment-explorer
...@@ -135,18 +127,12 @@ export function PageSegmentTree({ ...@@ -135,18 +127,12 @@ export function PageSegmentTree({
overflow: 'auto', overflow: 'auto',
}} }}
> >
{isAppRouter ? ( <PageSegmentTreeLayerPresentation node={tree} level={0} segment="" />
<PageSegmentTreeLayerPresentation node={tree} level={0} segment="" />
) : (
<p>Route Info currently is only available for the App Router.</p>
)}
</div> </div>
{isAppRouter && ( <SegmentExplorerFooter
<SegmentExplorerFooter activeBoundariesCount={activeBoundariesCount}
activeBoundariesCount={activeBoundariesCount} onGlobalReset={handleGlobalReset}
onGlobalReset={handleGlobalReset} />
/>
)}
</div> </div>
) )
} }
......
...@@ -34,6 +34,8 @@ const MenuPanel = () => { ...@@ -34,6 +34,8 @@ const MenuPanel = () => {
const { setPanel, setSelectedIndex } = usePanelRouterContext() const { setPanel, setSelectedIndex } = usePanelRouterContext()
const { state, dispatch } = useDevOverlayContext() const { state, dispatch } = useDevOverlayContext()
const { totalErrorCount } = useRenderErrorContext() const { totalErrorCount } = useRenderErrorContext()
const isAppRouter = state.routerType === 'app'
return ( return (
<DevtoolMenu <DevtoolMenu
items={[ items={[
...@@ -82,14 +84,15 @@ const MenuPanel = () => { ...@@ -82,14 +84,15 @@ const MenuPanel = () => {
value: <ChevronRight />, value: <ChevronRight />,
onClick: () => setPanel('turbo-info'), onClick: () => setPanel('turbo-info'),
}, },
!!process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER && { !!process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER &&
label: 'Route Info', isAppRouter && {
value: <ChevronRight />, label: 'Route Info',
onClick: () => setPanel('segment-explorer'), value: <ChevronRight />,
attributes: { onClick: () => setPanel('segment-explorer'),
'data-segment-explorer': true, attributes: {
'data-segment-explorer': true,
},
}, },
},
{ {
label: 'Preferences', label: 'Preferences',
value: <GearIcon />, value: <GearIcon />,
...@@ -137,6 +140,7 @@ export const PanelRouter = () => { ...@@ -137,6 +140,7 @@ export const PanelRouter = () => {
const { state } = useDevOverlayContext() const { state } = useDevOverlayContext()
const { triggerRef } = usePanelRouterContext() const { triggerRef } = usePanelRouterContext()
const toggleDevtools = useToggleDevtoolsVisibility() const toggleDevtools = useToggleDevtoolsVisibility()
const isAppRouter = state.routerType === 'app'
const [hideShortcut, setHideShortcut] = useHideShortcutStorage() const [hideShortcut, setHideShortcut] = useHideShortcutStorage()
useShortcuts( useShortcuts(
...@@ -206,7 +210,7 @@ export const PanelRouter = () => { ...@@ -206,7 +210,7 @@ export const PanelRouter = () => {
</DynamicPanel> </DynamicPanel>
</PanelRoute> </PanelRoute>
{process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER && ( {process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER && isAppRouter && (
<PanelRoute name="segment-explorer"> <PanelRoute name="segment-explorer">
<DynamicPanel <DynamicPanel
sharePanelSizeGlobally={false} sharePanelSizeGlobally={false}
...@@ -225,10 +229,7 @@ export const PanelRouter = () => { ...@@ -225,10 +229,7 @@ export const PanelRouter = () => {
}} }}
header={<DevToolsHeader title="Route Info" />} header={<DevToolsHeader title="Route Info" />}
> >
<PageSegmentTree <PageSegmentTree page={state.page} />
isAppRouter={state.routerType === 'app'}
page={state.page}
/>
</DynamicPanel> </DynamicPanel>
</PanelRoute> </PanelRoute>
)} )}
......
...@@ -73,9 +73,9 @@ describe('segment-explorer', () => { ...@@ -73,9 +73,9 @@ describe('segment-explorer', () => {
expect(await getSegmentExplorerRoute(browser)).toBe('/file-segments') expect(await getSegmentExplorerRoute(browser)).toBe('/file-segments')
}) })
it('should indicate segment explorer is not available for pages router', async () => { it('should not have route info panel for pages router', async () => {
const browser = await next.browser('/pages-router') const browser = await next.browser('/pages-router')
expect(await getSegmentExplorerContent(browser)).toMatchInlineSnapshot(`""`) expect(await browser.hasElementByCss('[data-segment-explorer]')).toBe(false)
}) })
it('should handle special built-in not-found segments', async () => { it('should handle special built-in not-found segments', async () => {
......
...@@ -142,7 +142,6 @@ describe('client-dev-overlay', () => { ...@@ -142,7 +142,6 @@ describe('client-dev-overlay', () => {
Static Static
Turbopack Turbopack
Enabled Enabled
Route Info
Preferences" Preferences"
`) `)
} else { } else {
...@@ -152,7 +151,6 @@ describe('client-dev-overlay', () => { ...@@ -152,7 +151,6 @@ describe('client-dev-overlay', () => {
Route Route
Static Static
Try Turbopack Try Turbopack
Route Info
Preferences" Preferences"
`) `)
} }
......
...@@ -375,6 +375,10 @@ export class Playwright<TCurrent = undefined> { ...@@ -375,6 +375,10 @@ export class Playwright<TCurrent = undefined> {
return this.waitForElementByCss(selector, 5_000) return this.waitForElementByCss(selector, 5_000)
} }
hasElementByCss(selector: string) {
return this.startChain(() => page.locator(selector).isVisible())
}
elementById(id: string) { elementById(id: string) {
return this.elementByCss(`#${id}`) return this.elementByCss(`#${id}`)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment