Skip to content

Refactored discovery initialization #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exdis wants to merge 1 commit into
base: discovery
Choose a base branch
from
Open

Refactored discovery initialization #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 11 additions & 27 deletions src/ui/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import Details from "./components/details/Details";
import StatusBar from "./components/statusbar/StatusBar";
import WaitingForReady from "./components/misc/WaitingForReady";
import FiberTreeKeyboardNav from "./components/misc/FiberTreeKeyboardNav";
import { Widget, navButtons } from "@discoveryjs/discovery/dist/discovery";

function App() {
return (
Expand All @@ -33,30 +32,6 @@ function App() {
);
}

declare let __DISCOVERY_CSS__: string;
const discovery = new Widget(null, null, {
styles: [__DISCOVERY_CSS__],
extensions: [{ ...navButtons, loadData: undefined }],
});
function Discovery() {
const { allEvents, setPaused } = useEventsContext();
const ref = React.useCallback(el => {
discovery.setPage("report");
discovery.setContainer(el);
}, []);

React.useEffect(() => {
setPaused(true);
discovery.setData(allEvents, { name: "React Render Tracker" });

return () => {
setPaused(false);
};
}, []);

return <div className="app__discovery-wrapper" ref={ref} />;
}

function Layout() {
const [groupByParent, setGroupByParent] = React.useState(false);
const [showUnmounted, setShowUnmounted] = React.useState(true);
Expand All @@ -65,6 +40,17 @@ function Layout() {
const { selectedId } = useSelectedId();
const { pinnedId } = usePinnedId();

const { allEvents, setPaused } = useEventsContext();

React.useEffect(() => {
setPaused(discoveryMode);

const discoveryIFrame: HTMLIFrameElement | null = document.querySelector('iframe[name=discovery]');
if (discoveryIFrame && discoveryIFrame.contentWindow) {
discoveryIFrame.contentWindow.postMessage({ allEvents, discoveryMode }, '*');
}
}, [discoveryMode]);

return (
<div
className={
Expand All @@ -73,8 +59,6 @@ function Layout() {
(discoveryMode ? " app_discovery-mode" : "")
}
>
{discoveryMode && <Discovery />}

<FindMatchContextProvider>
<Toolbar
onGroupingChange={setGroupByParent}
Expand Down
9 changes: 9 additions & 0 deletions src/ui/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,12 @@ body {
color: #333;
background-color: transparent;
}

iframe[name=discovery] {
border: none;
position: absolute;
top: 0;
width: 100vw;
height: calc(100vh - 21px);
display: none;
}
37 changes: 36 additions & 1 deletion src/ui/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,48 @@
import * as React from "react";
import ReactDOM from "react-dom";
import { Widget, navButtons, router } from '@discoveryjs/discovery/dist/discovery';
import App from "./App";

// bootstrap HTML document
declare let __CSS__: string;
const rootEl = document.createElement("div");
document.head.appendChild(document.createElement("style")).append(__CSS__);

const rootEl = document.createElement("div");
document.body.appendChild(rootEl);

const discoveryEl = document.createElement("iframe");
discoveryEl.name = 'discovery';
const blob = new Blob(
['<html><style>html,body{margin:0;padding:0}</style><body></body></html>'],
{type : 'text/html'}
);
discoveryEl.src = window.URL.createObjectURL(blob);
document.body.appendChild(discoveryEl);

declare let __DISCOVERY_CSS__: string;

discoveryEl.addEventListener('load', () => {
if (discoveryEl.contentDocument && discoveryEl.contentWindow) {
const discovery = new Widget(null, null, {
styles: [__DISCOVERY_CSS__],
extensions: [{ ...navButtons, router, loadData: undefined }],
});

const wrapper = document.createElement('div');
wrapper.classList.add('app__discovery-wrapper');
discoveryEl.contentDocument.body.appendChild(wrapper);

discovery.setData({}, { name: "React Render Tracker" });
discovery.setPage("report");
discovery.setContainer(wrapper);

discoveryEl.contentWindow.addEventListener('message', ({ data }) => {
discovery.setData(data.allEvents);
discoveryEl.style.display = data.discoveryMode ? 'initial' : 'none';
})
}
})

// That's actually a hack.
// React add 2x listeners for all known events (one for capture and one for bubbling phases),
// and perform search for a proper fiber and event handlers on it. It turns out that
Expand Down