{"body":"","parents":["627b583650078514eff22498514682a8522282b1"],"patch":"diff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/SuspenseTab\/ActivityList.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/SuspenseTab\/ActivityList.js\nindex 3a6935b4d0..acef66d3ed 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/SuspenseTab\/ActivityList.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/SuspenseTab\/ActivityList.js\n@@ -30,8 +30,6 @@ import {\n } from '..\/Components\/TreeContext';\n import {useHighlightHostInstance} from '..\/hooks';\n import {StoreContext} from '..\/context';\n-import ButtonIcon from '..\/ButtonIcon';\n-import Button from '..\/Button';\n \n export function useChangeActivitySliceAction(): (\n id: Element['id'] | null,\n@@ -118,6 +116,8 @@ export default function ActivityList({\n useTransition();\n const changeActivitySliceAction = useChangeActivitySliceAction();\n \n+ const includeAllOption = activityID !== null;\n+\n function handleKeyDown(event: SyntheticKeyboardEvent) {\n switch (event.key) {\n case 'Escape':\n@@ -128,15 +128,16 @@ export default function ActivityList({\n break;\n case 'Enter':\n case ' ':\n- if (inspectedElementID !== null) {\n- startActivitySliceSelection(() => {\n- changeActivitySliceAction(inspectedElementID);\n- });\n- }\n+ startActivitySliceSelection(() => {\n+ changeActivitySliceAction(inspectedElementID);\n+ });\n event.preventDefault();\n break;\n case 'Home':\n- treeDispatch({type: 'SELECT_ELEMENT_BY_ID', payload: activities[0].id});\n+ treeDispatch({\n+ type: 'SELECT_ELEMENT_BY_ID',\n+ payload: includeAllOption ? null : activities[0].id,\n+ });\n event.preventDefault();\n break;\n case 'End':\n@@ -150,15 +151,21 @@ export default function ActivityList({\n const currentIndex = activities.findIndex(\n activity => activity.id === selectedActivityID,\n );\n- if (currentIndex !== undefined) {\n- const nextIndex =\n- (currentIndex + activities.length - 1) % activities.length;\n-\n- treeDispatch({\n- type: 'SELECT_ELEMENT_BY_ID',\n- payload: activities[nextIndex].id,\n- });\n+ let nextIndex: number;\n+ if (currentIndex === -1) {\n+ \/\/ Currently selecting \"All\", wrap around to last Activity.\n+ nextIndex = activities.length - 1;\n+ } else {\n+ nextIndex = currentIndex - 1;\n+ if (!includeAllOption) {\n+ nextIndex = (nextIndex + activities.length) % activities.length;\n+ }\n }\n+\n+ treeDispatch({\n+ type: 'SELECT_ELEMENT_BY_ID',\n+ payload: nextIndex === -1 ? null : activities[nextIndex].id,\n+ });\n event.preventDefault();\n break;\n }\n@@ -166,14 +173,17 @@ export default function ActivityList({\n const currentIndex = activities.findIndex(\n activity => activity.id === selectedActivityID,\n );\n- if (currentIndex !== undefined) {\n- const nextIndex = (currentIndex + 1) % activities.length;\n-\n- treeDispatch({\n- type: 'SELECT_ELEMENT_BY_ID',\n- payload: activities[nextIndex].id,\n- });\n+ let nextIndex: number;\n+ if (includeAllOption && currentIndex === activities.length - 1) {\n+ \/\/ Currently selecting last Activity, wrap around to \"All\".\n+ nextIndex = -1;\n+ } else {\n+ nextIndex = (currentIndex + 1) % activities.length;\n }\n+ treeDispatch({\n+ type: 'SELECT_ELEMENT_BY_ID',\n+ payload: nextIndex === -1 ? null : activities[nextIndex].id,\n+ });\n event.preventDefault();\n break;\n }\n@@ -182,7 +192,7 @@ export default function ActivityList({\n }\n }\n \n- function handleClick(id: Element['id'], event: SyntheticMouseEvent) {\n+ function handleClick(id: Element['id'] | null, event: SyntheticMouseEvent) {\n event.preventDefault();\n treeDispatch({type: 'SELECT_ELEMENT_BY_ID', payload: id});\n }\n@@ -195,25 +205,24 @@ export default function ActivityList({\n \n return (\n

\n-

\n- {activityID !== null && (\n- \/\/ TODO: Obsolete once filtered Activities are included in this list.\n- \n- \n- <\/Button>\n- )}\n- <\/div>\n+

\n \n+ {includeAllOption && (\n+ \/\/ TODO: Obsolete once filtered Activities are included in this list.\n+ \n+ All\n+ <\/li>\n+ )}\n {activities.map(({id, depth}) => {\n const activity = store.getElementByID(id);\n if (activity === null) {\n@@ -244,7 +253,7 @@ export default function ActivityList({\n false,\n )}\n onPointerLeave={clearHighlightHostInstance}>\n- {'\\u00A0'.repeat(depth) + name}\n+ {'\\u00A0'.repeat(depth + (includeAllOption ? 1 : 0)) + name}\n <\/li>\n );\n })}\n","files":[{"status":"M","path":"packages\/react-devtools-shared\/src\/devtools\/views\/SuspenseTab\/ActivityList.js"}],"commit":{"subject":"[DevTools] Move \"Back to full tree view\" into Activity list item (#35164)","authorEmail":"sebastian.silbermann@vercel.com","authoredAt":"2025-11-26T10:42:18+01:00","revision":"74fa1667a7355fd55591d82b0e1e992909b1dca0","shortRevision":"74fa1667a7","authorName":"Sebastian \"Sebbie\" Silbermann"}}

dillon1000/react

Files changed