frejs · yisar · Dec 30, 2020 · Dec 13, 2020 · Dec 13, 2020 · Dec 13, 2020
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <p align="center"><img src="http://wx2.sinaimg.cn/mw690/0060lm7Tly1ftpm5b3ihfj3096097aaj.jpg" alt="fre logo" width="150"></p>
 <h1 align="center">Fre</h1>
-<p align="center">:ghost: Tiny React like framework with Concurrent.</p>
+<p align="center">:ghost: Tiny Coroutine framework with Fiber.</p>
 <p align="center">
 <a href="https://github.com/yisar/fre/actions"><img src="https://img.shields.io/github/workflow/status/yisar/fre/main.svg" alt="Build Status"></a>
 <a href="https://codecov.io/gh/yisar/fre"><img src="https://img.shields.io/codecov/c/github/yisar/fre.svg" alt="Code Coverage"></a>
@@ -9,17 +9,12 @@
 <a href="https://bundlephobia.com/result?p=fre"><img src="http://img.badgesize.io/https://unpkg.com/fre/dist/fre.js?compression=brotli&label=brotli" alt="brotli"></a>
 </p>
 
-### Feature
 
-- :tada: Functional Component and hooks API
-- :confetti_ball: Time slicing and Algebraic effects
-- :telescope: keyed reconcilation algorithm
+- **Coroutine with Fiber** — This is an amazing idea, which implements the coroutine scheduler in JavaScript, and the rendering is asynchronous, which supports Time slicing and suspense components.
 
-### Real world
+- **Highly-optimized algorithm** — Fre has a better reconciliation algorithm, which traverses from both ends with O (n) complexity, and supports keyed.
 
-[clicli.me](https://www.clicli.me)
-
-Any other demos [click here](https://github.com/yisar/fre/tree/master/demo/src)
+- **Do more with less** — After tree shaking, project of hello world is only 1KB, but it has most fetures, virtual DOM, hooks API, functional component and more.
 
 ### Use
 
@@ -59,8 +54,6 @@ render(<App />, document.getElementById('root'))
 
 - [useRef](https://github.com/yisar/fre#useref)
 
-- [useContext](https://github.com/yisar/fre#usecontext)
-
 #### useState
 
 `useState` is a base API, It will receive initial state and return a Array
@@ -102,7 +95,7 @@ function App() {
     <div>
       {state.count}
       <button onClick={() => dispatch({ type: 'up' })}>+</button>
-      <button onClick={() => dispatch({ type: 'down' })}>+</button>
+      <button onClick={() => dispatch({ type: 'down' })}>-</button>
     </div>
   )
 }
@@ -138,15 +131,15 @@ If it return a function, the function can do cleanups:
 ```js
 useEffect(() => {
     document.title = 'count is ' + count
-    reutn () => {
+    return () => {
       store.unsubscribe()
     }
 }, [])
 ```
 
 #### useLayout
 
-More like useEffect, but useEffect queue in `requestAnimationFrame`, but useLayout is sync and block commitWork.
+More like useEffect, but useLayout is sync and blocking UI.
 
 ```js
 useLayout(() => {
@@ -156,7 +149,7 @@ useLayout(() => {
 
 #### useMemo
 
-`useMemo` has the same parameters as `useEffect`, but `useMemo` will return a cached value.
+`useMemo` has the same rules as `useEffect`, but `useMemo` will return a cached value.
 
 ```js
 function App() {
@@ -234,19 +227,5 @@ The above code needs babel plugin `@babel/plugin-transform-react-jsx`
 ]
 ```
 
-#### time slicing
-
-Time slicing is the scheduling of reconcilation, synchronous tasks, sacrifice CPU and reduce blocking time
-
-#### resumable exception
-
-resumable exception is a concept of algebraic effects. It can synchronously throw effects and then resume the execution of other logic of components.
-
-#### key-based reconcilation
-
-Fre implements a compact reconcilation algorithm support keyed, which also called diff.
-
-It uses hash to mark locations to reduce much size.
-
 #### License
 _MIT @yisar
diff --git a/demo/index.html b/demo/index.html
@@ -10,7 +10,7 @@
 
 <body>
   <div id="root"></div>
-  <script src="./src/use-state.tsx"></script>
+  <script src="./src/ref.tsx"></script>
 </body>
 
 </html>
diff --git a/demo/src/keys.tsx b/demo/src/keys.tsx
@@ -0,0 +1,56 @@
+import { h, render, useEffect, useState } from '../../src/index'
+
+// function App() {
+//   const [key, setKey] = useState(['a', 'b', 'c'])
+//   return [
+//     <button onClick={() => setKey(['a', 'c', 'b','d'])}>x</button>,
+//     <ul>
+//       {key.map((i) => (
+//         <li key={i}>{i}</li>
+//       ))}
+//     </ul>,
+//   ]
+// }
+
+// function App() {
+//   const [key, setKey] = useState(['a', 'b', 'c'])
+//   return [
+//     <button onClick={() => setKey(['b', 'c', 'a'])}>x</button>,
+//     <ul>
+//       {key.map((i) => (
+//         <li key={i}>{i}</li>
+//       ))}
+//     </ul>,
+//   ]
+// }
+
+// function App() {
+//   const [key, setKey] = useState(['a', 'b', 'c'])
+//   return [
+//     <button onClick={() => setKey(['c', 'b','a'])}>x</button>,
+//     <ul>
+//       {key.map((i) => (
+//         <li key={i}>{i}</li>
+//       ))}
+//     </ul>,
+//   ]
+// }
+
+function App() {
+  const [key, setKey] = useState([1, 2])
+  return [
+    <button onClick={() => setKey([3, 2, 1])}>x</button>,
+    <ul>
+      {key.map((i) => (
+        <Li i={i} key={i} />
+        // <li key={i}>{i}</li>
+      ))}
+    </ul>,
+  ]
+}
+
+function Li(props) {
+  return <li>{props.i}</li>
+}
+
+render(<App />, document.getElementById('root'))
diff --git a/demo/src/ref.tsx b/demo/src/ref.tsx
@@ -0,0 +1,43 @@
+/** @jsx h */
+
+// // preact:
+// import { render, createElement as h } from "preact/compat";
+// import { useState, useEffect } from "preact/hooks";
+
+// react:
+// import { createElement as h, useState, useEffect } from "react";
+// import { render } from "react-dom";
+
+// // fre:
+import { render, h, useState, useEffect, useRef } from '../../src'
+
+
+const Wrapper = () => {
+  const [showApp, setShowApp] = useState(true)
+
+  useEffect(()=>{
+    setTimeout(() => {
+      setShowApp(false)
+    }, 2000)
+  },[])
+
+  const p = dom => {
+    if (dom) {
+    } else {
+      console.log(111)
+    }
+  }
+  const c = dom => {
+    if (dom) {
+    } else {
+      console.log(222)
+    }
+  }
+  console.log(showApp)
+
+  return showApp ? <div ref={p}>
+    <p ref={c}>before</p>
+  </div> : <p>App removed...</p>
+}
+
+render(<Wrapper />, document.getElementById('root'))
diff --git a/demo/src/use-effect.tsx b/demo/src/use-effect.tsx
@@ -7,13 +7,12 @@ import { h, render, useState, useEffect } from '../../src'
 function Counter({ id, remove }) {
   const [count, setCount] = useState(0)
 
-  useEffect(() => {
-    console.log(`111`)
-
-    return () => {
-      console.log(`222`)
-    }
-  })
+  // useEffect(() => {
+  //   console.log(`111`)
+  //   return () => {
+  //     console.log(`222`)
+  //   }
+  // })
 
   return (
     <div>

diff --git a/demo/src/use-layout.tsx b/demo/src/use-layout.tsx
@@ -0,0 +1,24 @@
+import { h, render, useState, useEffect, useLayoutEffect } from '../../src'
+
+function App() {
+    const [count, setCount] = useState(0)
+    return (
+      <div>
+        {count < 5 && <A count={count < 1 ? count : 2} />}
+        <h1>{count}</h1>
+        <button onClick={() => setCount(count + 1)}>+</button>
+      </div>
+    )
+  }
+
+  function A(props) {
+      useLayoutEffect(() => {
+        console.log(333)
+        return () => {
+          console.log(444)
+        }
+      })
+    return <div>{props.count}</div>
+  }
+
+  render(<App />, document.body)
diff --git a/demo/src/use-state.tsx b/demo/src/use-state.tsx
@@ -5,7 +5,7 @@ function App() {
   // const [two, setTwo] = useState(0)
   return (
     <div>
-      <button onClick={() => setCount(count + 1)}>{count}</button>
+      <button onClick={() => setCount(count + 1)}>{count}{count}</button>
     </div>
   )
 }

diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
   ],
   "scripts": {
     "test": "jest --coverage",
+    "ref": "jest ./test/ref.test.tsx",
     "build": "rollup -c && gzip-size dist/fre.js",
     "build:compat": "rollup --config compat/rollup.config.js",
     "dev": "rollup -c --watch",

diff --git a/src/dom.ts b/src/dom.ts
@@ -21,12 +21,10 @@ export const updateElement = <P extends Attributes>(
       if (oldValue) dom.removeEventListener(name, oldValue)
       dom.addEventListener(name, newValue)
     } else if (name in dom && !(dom instanceof SVGElement)) {
-      // for property, such as className
       ;(dom as any)[name] = newValue || ''
     } else if (newValue == null || newValue === false) {
       dom.removeAttribute(name)
     } else {
-      // for attributes
       dom.setAttribute(name, newValue)
     }
   }
@@ -36,7 +34,7 @@ export const createElement = <P = Attributes>(fiber: IFiber) => {
   const dom =
     fiber.type === 'text'
       ? document.createTextNode('')
-      : fiber.op & (1 << 4)
+      : fiber.tag & (1 << 4)
       ? document.createElementNS(
           'http://www.w3.org/2000/svg',
           fiber.type as string

diff --git a/src/hooks.ts b/src/hooks.ts
@@ -15,9 +15,8 @@ export const useReducer = <S, A>(reducer?: Reducer<S, A>, initState?: S): [S, Di
   hook[0] = isFn(hook[1]) ? hook[1](hook[0]) : hook.length ? hook[1] : initState
   return [
     hook[0] as S,
-    (action: A | Dispatch<A>) => {
-      hook[1] = reducer ? reducer(hook[0], action as A) : action
-      hook[2] = reducer && (action as any).type[0] === '*' ? 0b1100 : 0b1000
+    (value: A | Dispatch<A>) => {
+      hook[1] = reducer || value
       dispatchUpdate(current)
     },
   ]
@@ -67,5 +66,5 @@ export const getHook = <S = Function | undefined, Dependency = any>(cursor: numb
 }
 
 export const isChanged = (a: DependencyList, b: DependencyList) => {
-  return !a || a.length !== b.length || b.some((arg, index) => arg !== a[index])
+  return !a || b.some((arg, index) => arg !== a[index])
 }