Fixed task reveal in sources tab

Author: smikhalevski

src/main/app/components/Button.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { Button as AriaButton } from 'react-aria-components';
+import { Button as _Button } from 'react-aria-components';
 import css from './Button.module.css';
 
 interface ButtonProps {
@@ -9,11 +9,11 @@ interface ButtonProps {
 }
 
 export const Button = (props: ButtonProps) => (
-  <AriaButton
+  <_Button
     className={css.Button}
     onPress={props.onPress}
     isDisabled={props.isDisabled}
   >
     {props.children}
-  </AriaButton>
+  </_Button>
 );

src/main/app/components/Tooltip.tsx

@@ -1,13 +1,13 @@
 import React, { ReactNode } from 'react';
-import { OverlayArrow, Tooltip as AriaTooltip } from 'react-aria-components';
+import { OverlayArrow, Tooltip as _Tooltip } from 'react-aria-components';
 import css from './Tooltip.module.css';
 
 interface TooltipProps {
   children: ReactNode;
 }
 
 export const Tooltip = ({ children }: TooltipProps) => (
-  <AriaTooltip className={css.Tooltip}>
+  <_Tooltip className={css.Tooltip}>
     {children}
     <OverlayArrow className={css.OverlayArrow}>
       <svg
@@ -18,5 +18,5 @@ export const Tooltip = ({ children }: TooltipProps) => (
         <path d="M0 0 L4 4 L8 0" />
       </svg>
     </OverlayArrow>
-  </AriaTooltip>
+  </_Tooltip>
 );

src/main/content_main.ts

@@ -140,7 +140,7 @@ function receivePanelMessage(message: PanelMessage): void {
       if (child !== undefined) {
         window.__REACT_EXECUTOR_DEVTOOLS__.inspectedValue = child[INSPECTED_VALUE];
 
-        sendContentMessage({ type: 'open_sources_tab', url: window.location.href });
+        sendContentMessage({ type: 'open_sources_tab' });
       }
       break;
     }

src/main/panel.tsx

@@ -12,10 +12,11 @@ import {
 } from './app/executors';
 import { ContentClient, ContentClientProvider } from './app/useContentClient';
 import { ContentMessage, ExecutorPart, PanelMessage } from './types';
+import { die } from './utils';
 
 chrome.runtime.onMessage.addListener((message, sender) => {
-  if (sender.documentId !== undefined && sender.tab?.id === chrome.devtools.inspectedWindow.tabId) {
-    receiveContentMessage(message, sender.documentId);
+  if (sender.tab?.id === chrome.devtools.inspectedWindow.tabId) {
+    receiveContentMessage(message, sender);
   }
 });
 
@@ -29,7 +30,7 @@ function sendMessage(message: PanelMessage): void {
   }
 }
 
-function receiveContentMessage(message: ContentMessage, documentId: string): void {
+function receiveContentMessage(message: ContentMessage, sender: chrome.runtime.MessageSender): void {
   switch (message.type) {
     case 'content_opened':
       sendMessage({ type: 'panel_opened' });
@@ -40,7 +41,7 @@ function receiveContentMessage(message: ContentMessage, documentId: string): voi
       const list = [];
 
       for (const item of listExecutor.get()) {
-        if (item.documentId !== documentId) {
+        if (item.documentId !== sender.documentId) {
           list.push(item);
         } else {
           executorManager.detach(getDetailsExecutor(item.executorId).key);
@@ -66,7 +67,7 @@ function receiveContentMessage(message: ContentMessage, documentId: string): voi
 
       list.push({
         executorId: message.executorId,
-        documentId,
+        documentId: sender.documentId || die("Sender doesn't have a documentId"),
         searchableString: message.details.keyPreview.toLowerCase(),
       });
 
@@ -121,9 +122,8 @@ function receiveContentMessage(message: ContentMessage, documentId: string): voi
         if (__REACT_EXECUTOR_DEVTOOLS__.inspectedValue !== undefined) {
           inspect(__REACT_EXECUTOR_DEVTOOLS__.inspectedValue);
           __REACT_EXECUTOR_DEVTOOLS__.inspectedValue = undefined;
-        }
-      `,
-        { frameURL: message.url }
+        }`,
+        { frameURL: sender.url }
       );
       break;
   }

src/main/types.ts

@@ -98,4 +98,4 @@ export type ContentMessage =
   | { source?: string; type: 'executor_detached'; executorId: string }
   | { source?: string; type: 'executor_state_changed'; executorId: string; stats: ExecutorStats }
   | { source?: string; type: 'executor_patched'; executorId: string; patch: ExecutorPatch }
-  | { source?: string; type: 'open_sources_tab'; url: string };
+  | { source?: string; type: 'open_sources_tab' };

src/main/utils.ts

@@ -73,3 +73,7 @@ export function getExecutorStats(executor: Executor): ExecutorStats {
     hasTask: executor.task !== null,
   };
 }
+
+export function die(message?: string): never {
+  throw new Error(message);
+}