Skip to content

Commit 6595bed

Browse files
committed
merge check
1 parent 487ddc8 commit 6595bed

File tree

7 files changed

+39
-108
lines changed

7 files changed

+39
-108
lines changed

demo-app/src/client/Router.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ReactDOM.render(
1212
<BrowserRouter>
1313
<Nav />
1414
<Routes>
15-
<Route path="/tictactoe" element={<Board />}/>
16-
<Route path="/" element={<Home />}/>
17-
<Route path="/buttons" element={<Buttons />}/>
15+
<Route path="/tictactoe" element={<Board />}/>
16+
<Route path="/" element={<Home />}/>
17+
<Route path="/buttons" element={<Buttons />}/>
1818
</Routes>
1919
</BrowserRouter>, root);

src/backend/linkFiber.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,32 @@ function createTree(
183183
treeBaseDuration,
184184
} = currentFiber;
185185

186+
187+
// if (currentFiber.tag === 10) {
188+
// const queue = [currentFiber];
189+
// const result = [];
190+
// while (queue.length > 0) {
191+
// const tempFiber = queue.shift();
192+
// if (tempFiber.tag === 0 && tempFiber._debugHookTypes) result.push(tempFiber);
193+
// if (tempFiber.sibling) {
194+
// queue.push(tempFiber.sibling);
195+
// }
196+
// if (tempFiber.child) {
197+
// queue.push(tempFiber.child);
198+
// }
199+
// }
200+
// console.log('test', result);
201+
// }
202+
203+
// if(currentFiber.tag === 10) {
204+
// let stack = [currentFiber];
205+
206+
// while(stack > 0) {
207+
// let node = stack.pop();
208+
209+
210+
// }
211+
// }
186212
// check to see if we can get the information we were looking for
187213
if (tag === 5) {
188214
try {
@@ -244,6 +270,7 @@ function createTree(
244270
const hooksStates = traverseHooks(memoizedState);
245271
const hooksNames = getHooksNames(elementType.toString());
246272

273+
247274
hooksStates.forEach((state, i) => {
248275
hooksIndex = componentActionsRecord.saveNew(
249276
state.state,

src/backend/types/backendTypes.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,6 @@ export type Fiber = {
174174
// This value bubbles up during the "complete" phase.
175175
// This field is only set when the enableProfilerTimer flag is enabled.
176176
treeBaseDuration?: number;
177+
178+
_debugHookTypes?: string[] | null;
177179
};

www/src/pages/components/FeatureSlider.tsx

Lines changed: 0 additions & 93 deletions
This file was deleted.

www/src/pages/components/FeaturesSection.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default function FeaturesSection() {
5252
What makes Reactime so great?
5353
</p>
5454
<p className="mx-auto mt-5 max-w-prose text-xl text-gray-500">
55-
Reactime is chock full of features that make your life easier as a developer. From time-travel debugging to state snapshot display, check out how using Reactime will improve your developer experience.
55+
Reactime is full of features that make your life easier as a developer. From time-travel debugging to state snapshot display, check out how using Reactime will improve your developer experience.
5656
</p>
5757
<div className="mt-20">
5858
<div className="grid grid-cols-1 gap-12 sm:grid-cols-2 lg:grid-cols-3">

www/src/pages/components/NavBar.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ useEffect(() => {
2525
};
2626
}, []);
2727

28-
function NavBarSytling() {
28+
function NavBarSytle() {
2929
return scrollPosition === 0 ? "sticky top-0 bg-gray-50 w-screen z-20 border-b" : "sticky top-0 bg-gray-50 w-screen z-20 shadow-xl";
3030
}
3131
return (
32-
<Disclosure as="nav" className="bg-[#333333] fixed z-10 w-screen drop-shadow-20px">
32+
<Disclosure as="nav" className={NavBarSytle}>
3333
{({ open }) => (
3434
<>
3535
<div className="mx-auto max-w9xl px-4 sm:px-6 lg:px-8">
@@ -56,7 +56,6 @@ function NavBarSytling() {
5656

5757
<div className="hidden sm:ml-6 sm:block">
5858
<div className="flex space-x-4">
59-
{/* Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" */}
6059
<a
6160
href="http://github.com/open-source-labs/reactime"
6261
target="_blank"
@@ -78,7 +77,6 @@ function NavBarSytling() {
7877
<Disclosure.Panel className="sm:hidden">
7978
<div className="space-y-1 px-2 pt-2 pb-3">
8079
{/* Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" */}
81-
8280
<Disclosure.Button
8381
as="a"
8482
href="#"
@@ -91,21 +89,21 @@ function NavBarSytling() {
9189
href="#"
9290
className="block rounded-md px-3 py-2 text-base font-medium text-gray-300 hover:bg-gray-700 hover:text-white"
9391
>
94-
Projects
92+
Team
9593
</Disclosure.Button>
9694
<Disclosure.Button
9795
as="a"
9896
href="#"
9997
className="block rounded-md px-3 py-2 text-base font-medium text-gray-300 hover:bg-gray-700 hover:text-white"
10098
>
101-
Calendar
99+
Projects
102100
</Disclosure.Button>
103101
<Disclosure.Button
104102
as="a"
105103
href="#"
106-
className="block rounded-md bg-gray-900 px-3 py-2 text-base font-medium text-white"
104+
className="block rounded-md px-3 py-2 text-base font-medium text-gray-300 hover:bg-gray-700 hover:text-white"
107105
>
108-
Download
106+
Calendar
109107
</Disclosure.Button>
110108
</div>
111109
</Disclosure.Panel>

www/src/pages/index.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Link from "next/link";
44
import LandingPage from "./components/LandingPage";
55
import NavBar from "./components/NavBar";
66
import Blogs from "./components/Blogs";
7-
import FeatureSlider from './components/FeatureSlider'
87
import { trpc } from "../utils/trpc";
98

109
const Home: NextPage = () => {
@@ -14,8 +13,6 @@ const Home: NextPage = () => {
1413
<>
1514
<NavBar />
1615
<LandingPage />
17-
{/* <FeatureSlider/> */}
18-
{/* <Blogs /> */}
1916
</>
2017
);
2118
};

0 commit comments

Comments
 (0)