passed tests

frejs · Oct 24, 2019 · 39ea643 · 39ea643
1 parent 2a9b1d4
commit 39ea643
Show file tree

Hide file tree

Showing 6 changed files with 402 additions and 345 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -10,7 +10,7 @@
 
 <body>
   <div id="root"></div>
-  <script src="svg.js"></script>
+  <script src="vdom.js"></script>
 </body>
 
 </html>
diff --git a/demo/useEffect.js b/demo/useEffect.js
@@ -1,6 +1,6 @@
-import { h, render, useState, useEffect } from '../src'
-// import { render } from "react-dom"
-// import { createElement as h, useState, useEffect,useRef } from "react"
+// import { h, render, useState, useEffect } from '../src'
+import { render } from "react-dom"
+import { createElement as h, useState, useEffect,useRef } from "react"
 
 function Counter ({ id, remove }) {
   const [count, setCount] = useState(0)
@@ -12,7 +12,7 @@ function Counter ({ id, remove }) {
       return () => {
         console.log(`222`);
       }
-    }
+    },[]
   )
 
   return (
@@ -64,3 +64,32 @@ function App () {
 }
 
 render(<App />, document.body)
+
+
+// 111
+// useEffect.js:10 111
+// useEffect.js:10 111
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:35 (4) [1, 2, 3, 4]
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:10 111
+// useEffect.js:35 (3) [1, 2, 3]
+// useEffect.js:13 222
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:35 (2) [1, 3]
+// useEffect.js:13 222
+// useEffect.js:13 222
+// useEffect.js:10 111
+// useEffect.js:13 222
+// useEffect.js:10 111
diff --git a/demo/vdom.js b/demo/vdom.js
@@ -0,0 +1,16 @@
+import { h, render, useState, useEffect } from '../src'
+
+function Counter () {
+  const [vdom, setVdom] = useState(<div className='foo1' />)
+  useEffect(() => {
+    console.log([...document.getElementById('root').childNodes][0])
+  })
+  return (
+    <div>
+      {vdom}
+      <button onClick={() => setVdom(<div className='foo2' />)}>-</button>
+    </div>
+  )
+}
+
+render(<Counter />, document.getElementById('root'))
diff --git a/src/reconciler.js b/src/reconciler.js
@@ -143,7 +143,6 @@ function commitWork (fiber) {
 }
 
 function walk (fiber) {
-  console.log(fiber)
   commit(fiber)
   if (fiber.bastard) {
     commit(fiber.bastard)
@@ -164,7 +163,8 @@ function applyEffect (fiber) {
   for (const k in fiber.effect) {
     const pend = fiber.pending[k]
     pend && pend()
-    const after = fiber.effect[k]()
+    let after = null
+    after = fiber.effect[k]()
     after && (fiber.pending[k] = after)
   }
   fiber.effect = null