@viewfly/core 1.0.0-alpha.20 → 1.0.0-alpha.21

package/bundles/index.d.ts

@@ -293,7 +293,7 @@ declare class Component extends ReflectiveInjector {
         template: any;
         portalHost: NativeNode | undefined;
     };
-    update(newProps: Record<string, any>, forceUpdate?: boolean): any;
+    update(newProps: Record<string, any>): any;
     provide<T>(providers: Provider<T> | Provider<T>[]): void;
     rendered(): void;
     destroy(): void;

package/bundles/index.esm.js

@@ -740,17 +740,13 @@ class Component extends ReflectiveInjector {
             portalHost: this.instance.$portalHost
         };
     }
-    update(newProps, forceUpdate = false) {
+    update(newProps) {
         const oldProps = this.props;
-        if (!forceUpdate) {
+        if (newProps !== oldProps) {
             const { add, remove, replace } = getObjectChanges(newProps, oldProps);
             if (add.length || remove.length || replace.length) {
                 this.invokePropsChangedHooks(newProps);
             }
-            else if (!this.dirty) {
-                this.props = newProps;
-                return this.template;
-            }
             const newRefs = toRefs(newProps.ref);
             if (this.refs) {
                 for (const oldRef of this.refs) {
@@ -1353,14 +1349,14 @@ function updateView(nativeRenderer, component) {
 function applyChanges(nativeRenderer, component) {
     const { atom, host, isParent, rootHost } = componentViewCache.get(component);
     const diffAtom = atom.child;
-    const template = component.update(component.props, true);
+    const template = component.update(component.props);
     atom.child = createChildChain(template, atom.isSvg);
     const context = {
         host,
         isParent,
         rootHost
     };
-    diff(nativeRenderer, component, atom.child, diffAtom, context);
+    diff(nativeRenderer, component, atom.child, diffAtom, context, false);
     const next = atom.sibling;
     if (next && next.jsxNode instanceof Component) {
         const view = componentViewCache.get(next.jsxNode);
@@ -1368,7 +1364,7 @@ function applyChanges(nativeRenderer, component) {
         view.isParent = context.isParent;
     }
 }
-function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
+function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMove) {
     const commits = [];
     function changeOffset() {
         offset++;
@@ -1393,7 +1389,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
             }
             break;
         }
-        commit(offset);
+        commit(offset, needMove);
     }
 }
 function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
@@ -1433,10 +1429,10 @@ function createNewView(start, nativeRenderer, context, parentComponent, effect)
     };
 }
 function updateText(newAtom, oldAtom, nativeRenderer, context) {
-    return function (offset) {
+    return function (offset, needMove) {
         const nativeNode = oldAtom.nativeNode;
         newAtom.nativeNode = nativeNode;
-        if (newAtom.index - offset !== oldAtom.index) {
+        if (needMove || newAtom.index - offset !== oldAtom.index) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = nativeNode;
@@ -1444,9 +1440,9 @@ function updateText(newAtom, oldAtom, nativeRenderer, context) {
     };
 }
 function updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent) {
-    return function (offset) {
+    return function (offset, needMove) {
         newAtom.nativeNode = oldAtom.nativeNode;
-        if (newAtom.index - offset !== oldAtom.index) {
+        if (needMove || newAtom.index - offset !== oldAtom.index) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = newAtom.nativeNode;
@@ -1455,7 +1451,7 @@ function updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponen
     };
 }
 function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
-    return function (offset) {
+    return function (offset, needMove) {
         const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
         const oldTemplate = component.template;
@@ -1465,15 +1461,16 @@ function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
         componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
-            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, newAtom.index - offset !== reusedAtom.index);
-            updateView(nativeRenderer, component);
+            newAtom.child = reusedAtom.child;
+            reuseComponentView(nativeRenderer, newAtom.child, context, needMove || newAtom.index - offset !== reusedAtom.index);
+            component.rendered();
             return;
         }
         if (newTemplate) {
             newAtom.child = createChildChain(newTemplate, newAtom.isSvg);
         }
         if (newAtom.child) {
-            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, needMove || newAtom.index - offset !== reusedAtom.index);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
@@ -1485,9 +1482,7 @@ function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
         component.rendered();
     };
 }
-function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
-    let child = reusedAtom.child;
-    newAtom.child = child;
+function reuseComponentView(nativeRenderer, child, context, moveView) {
     const updateContext = (atom) => {
         if (atom.jsxNode instanceof Component) {
             let child = atom.child;
@@ -1792,7 +1787,7 @@ function updateElementChildren(newAtom, oldAtom, nativeRenderer, parentComponent
             host: newAtom.nativeNode,
             isParent: true,
             rootHost: context.rootHost
-        });
+        }, false);
     }
 }
 function applyRefs(refs, nativeNode, binding) {

package/bundles/index.js

@@ -742,17 +742,13 @@ class Component extends ReflectiveInjector {
             portalHost: this.instance.$portalHost
         };
     }
-    update(newProps, forceUpdate = false) {
+    update(newProps) {
         const oldProps = this.props;
-        if (!forceUpdate) {
+        if (newProps !== oldProps) {
             const { add, remove, replace } = getObjectChanges(newProps, oldProps);
             if (add.length || remove.length || replace.length) {
                 this.invokePropsChangedHooks(newProps);
             }
-            else if (!this.dirty) {
-                this.props = newProps;
-                return this.template;
-            }
             const newRefs = toRefs(newProps.ref);
             if (this.refs) {
                 for (const oldRef of this.refs) {
@@ -1355,14 +1351,14 @@ function updateView(nativeRenderer, component) {
 function applyChanges(nativeRenderer, component) {
     const { atom, host, isParent, rootHost } = componentViewCache.get(component);
     const diffAtom = atom.child;
-    const template = component.update(component.props, true);
+    const template = component.update(component.props);
     atom.child = createChildChain(template, atom.isSvg);
     const context = {
         host,
         isParent,
         rootHost
     };
-    diff(nativeRenderer, component, atom.child, diffAtom, context);
+    diff(nativeRenderer, component, atom.child, diffAtom, context, false);
     const next = atom.sibling;
     if (next && next.jsxNode instanceof Component) {
         const view = componentViewCache.get(next.jsxNode);
@@ -1370,7 +1366,7 @@ function applyChanges(nativeRenderer, component) {
         view.isParent = context.isParent;
     }
 }
-function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
+function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMove) {
     const commits = [];
     function changeOffset() {
         offset++;
@@ -1395,7 +1391,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
             }
             break;
         }
-        commit(offset);
+        commit(offset, needMove);
     }
 }
 function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
@@ -1435,10 +1431,10 @@ function createNewView(start, nativeRenderer, context, parentComponent, effect)
     };
 }
 function updateText(newAtom, oldAtom, nativeRenderer, context) {
-    return function (offset) {
+    return function (offset, needMove) {
         const nativeNode = oldAtom.nativeNode;
         newAtom.nativeNode = nativeNode;
-        if (newAtom.index - offset !== oldAtom.index) {
+        if (needMove || newAtom.index - offset !== oldAtom.index) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = nativeNode;
@@ -1446,9 +1442,9 @@ function updateText(newAtom, oldAtom, nativeRenderer, context) {
     };
 }
 function updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent) {
-    return function (offset) {
+    return function (offset, needMove) {
         newAtom.nativeNode = oldAtom.nativeNode;
-        if (newAtom.index - offset !== oldAtom.index) {
+        if (needMove || newAtom.index - offset !== oldAtom.index) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = newAtom.nativeNode;
@@ -1457,7 +1453,7 @@ function updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponen
     };
 }
 function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
-    return function (offset) {
+    return function (offset, needMove) {
         const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
         const oldTemplate = component.template;
@@ -1467,15 +1463,16 @@ function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
         componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
-            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, newAtom.index - offset !== reusedAtom.index);
-            updateView(nativeRenderer, component);
+            newAtom.child = reusedAtom.child;
+            reuseComponentView(nativeRenderer, newAtom.child, context, needMove || newAtom.index - offset !== reusedAtom.index);
+            component.rendered();
             return;
         }
         if (newTemplate) {
             newAtom.child = createChildChain(newTemplate, newAtom.isSvg);
         }
         if (newAtom.child) {
-            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, needMove || newAtom.index - offset !== reusedAtom.index);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
@@ -1487,9 +1484,7 @@ function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
         component.rendered();
     };
 }
-function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
-    let child = reusedAtom.child;
-    newAtom.child = child;
+function reuseComponentView(nativeRenderer, child, context, moveView) {
     const updateContext = (atom) => {
         if (atom.jsxNode instanceof Component) {
             let child = atom.child;
@@ -1794,7 +1789,7 @@ function updateElementChildren(newAtom, oldAtom, nativeRenderer, parentComponent
             host: newAtom.nativeNode,
             isParent: true,
             rootHost: context.rootHost
-        });
+        }, false);
     }
 }
 function applyRefs(refs, nativeNode, binding) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.20",
+  "version": "1.0.0-alpha.21",
   "description": "Viewfly is a simple and easy-to-use JavaScript framework with an intuitive development experience.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -50,7 +50,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "b66ca589f7662cd518fc2e5955b3e3ff9de83f94",
+  "gitHead": "35403802377a499822c8801a48e68f85f9446563",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }