Merge pull request #12495 from github/repo-sync

repo sync

Author: Octomerger

components/article/ToolPicker.tsx

@@ -80,11 +80,15 @@ export const ToolPicker = ({ variant = 'subnav' }: Props) => {
     }
   }, [])
 
-  function onClickTool(tool: string) {
-    setCurrentTool(tool)
+  // Whenever the currentTool is changed, update the article content
+  useEffect(() => {
     preserveAnchorNodePosition(document, () => {
-      showToolSpecificContent(tool)
+      showToolSpecificContent(currentTool)
     })
+  }, [currentTool])
+
+  function onClickTool(tool: string) {
+    setCurrentTool(tool)
     sendEvent({
       type: EventType.preference,
       preference_name: 'application',