@viewfly/core 0.2.1 → 0.2.2

package/bundles/index.esm.js

@@ -1332,7 +1332,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
     }
     const commits = [];
     const changeCommits = {
-        updateComponent: (newAtom, reusedAtom, expectIndex, diffIndex) => {
+        updateComponent: (newAtom, reusedAtom, expectIndex, oldIndex) => {
             commits.push((offset) => {
                 const instance = reusedAtom.jsxNode;
                 const newProps = newAtom.jsxNode.props;
@@ -1341,7 +1341,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
                 instance.$$view = Object.assign({ atom: newAtom }, context);
                 newAtom.jsxNode = instance;
                 if (newTemplate === oldTemplate) {
-                    reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex !== diffIndex - offset);
+                    reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
                     updateView(nativeRenderer, instance);
                     return;
                 }
@@ -1349,7 +1349,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
                     linkTemplate(newTemplate, newAtom.jsxNode, newAtom);
                 }
                 if (newAtom.child) {
-                    diff(nativeRenderer, instance, newAtom.child, reusedAtom.child, context, expectIndex, diffIndex);
+                    diff(nativeRenderer, instance, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
                 }
                 else if (reusedAtom.child) {
                     let atom = reusedAtom.child;
@@ -1365,7 +1365,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
             commits.push((offset) => {
                 newAtom.nativeNode = oldAtom.nativeNode;
                 const host = context.host;
-                if (expectIndex !== oldIndex - offset) {
+                if (expectIndex - offset !== oldIndex) {
                     if (context.isParent) {
                         nativeRenderer.prependChild(host, newAtom.nativeNode);
                     }
@@ -1406,6 +1406,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         create: (start) => {
             commits.push(() => {
                 buildView(nativeRenderer, parentComponent, start, context);
+                offset++;
             });
         }
     };
@@ -1424,7 +1425,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         const commit = commits[i];
         while (firstDiffAtomIndexed) {
             if (firstDiffAtomIndexed.index <= i) {
-                offset++;
+                offset--;
                 firstDiffAtomIndexed = firstDiffAtomIndexed.next;
                 continue;
             }
@@ -1433,40 +1434,6 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         commit(offset);
     }
 }
-function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
-    let child = reusedAtom.child;
-    newAtom.child = child;
-    const children = [];
-    while (child) {
-        children.push(child);
-        child.parent = newAtom;
-        child = child.sibling;
-    }
-    const updateContext = (atom) => {
-        if (atom.jsxNode instanceof Component) {
-            let child = atom.child;
-            while (child) {
-                updateContext(child);
-                child = child.sibling;
-            }
-        }
-        else {
-            if (moveView) {
-                if (context.isParent) {
-                    nativeRenderer.prependChild(context.host, atom.nativeNode);
-                }
-                else {
-                    nativeRenderer.insertAfter(atom.nativeNode, context.host);
-                }
-            }
-            context.isParent = false;
-            context.host = atom.nativeNode;
-        }
-    };
-    for (const atom of children) {
-        updateContext(atom);
-    }
-}
 function createChanges(newAtom, expectIndex, diffAtomIndexed, changeCommits) {
     const startDiffAtom = diffAtomIndexed;
     while (diffAtomIndexed) {
@@ -1509,6 +1476,40 @@ function createChanges(newAtom, expectIndex, diffAtomIndexed, changeCommits) {
     changeCommits.create(newAtom);
     return startDiffAtom;
 }
+function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
+    let child = reusedAtom.child;
+    newAtom.child = child;
+    const children = [];
+    while (child) {
+        children.push(child);
+        child.parent = newAtom;
+        child = child.sibling;
+    }
+    const updateContext = (atom) => {
+        if (atom.jsxNode instanceof Component) {
+            let child = atom.child;
+            while (child) {
+                updateContext(child);
+                child = child.sibling;
+            }
+        }
+        else {
+            if (moveView) {
+                if (context.isParent) {
+                    nativeRenderer.prependChild(context.host, atom.nativeNode);
+                }
+                else {
+                    nativeRenderer.insertAfter(atom.nativeNode, context.host);
+                }
+            }
+            context.isParent = false;
+            context.host = atom.nativeNode;
+        }
+    };
+    for (const atom of children) {
+        updateContext(atom);
+    }
+}
 function cleanView(nativeRenderer, atom, isClean) {
     if (atom.nativeNode) {
         if (!isClean) {
@@ -1802,7 +1803,7 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
-const VERSION = "0.2.1";
+const VERSION = "0.2.2";
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];

package/bundles/index.js

@@ -1334,7 +1334,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
     }
     const commits = [];
     const changeCommits = {
-        updateComponent: (newAtom, reusedAtom, expectIndex, diffIndex) => {
+        updateComponent: (newAtom, reusedAtom, expectIndex, oldIndex) => {
             commits.push((offset) => {
                 const instance = reusedAtom.jsxNode;
                 const newProps = newAtom.jsxNode.props;
@@ -1343,7 +1343,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
                 instance.$$view = Object.assign({ atom: newAtom }, context);
                 newAtom.jsxNode = instance;
                 if (newTemplate === oldTemplate) {
-                    reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex !== diffIndex - offset);
+                    reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
                     updateView(nativeRenderer, instance);
                     return;
                 }
@@ -1351,7 +1351,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
                     linkTemplate(newTemplate, newAtom.jsxNode, newAtom);
                 }
                 if (newAtom.child) {
-                    diff(nativeRenderer, instance, newAtom.child, reusedAtom.child, context, expectIndex, diffIndex);
+                    diff(nativeRenderer, instance, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
                 }
                 else if (reusedAtom.child) {
                     let atom = reusedAtom.child;
@@ -1367,7 +1367,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
             commits.push((offset) => {
                 newAtom.nativeNode = oldAtom.nativeNode;
                 const host = context.host;
-                if (expectIndex !== oldIndex - offset) {
+                if (expectIndex - offset !== oldIndex) {
                     if (context.isParent) {
                         nativeRenderer.prependChild(host, newAtom.nativeNode);
                     }
@@ -1408,6 +1408,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         create: (start) => {
             commits.push(() => {
                 buildView(nativeRenderer, parentComponent, start, context);
+                offset++;
             });
         }
     };
@@ -1426,7 +1427,7 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         const commit = commits[i];
         while (firstDiffAtomIndexed) {
             if (firstDiffAtomIndexed.index <= i) {
-                offset++;
+                offset--;
                 firstDiffAtomIndexed = firstDiffAtomIndexed.next;
                 continue;
             }
@@ -1435,40 +1436,6 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         commit(offset);
     }
 }
-function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
-    let child = reusedAtom.child;
-    newAtom.child = child;
-    const children = [];
-    while (child) {
-        children.push(child);
-        child.parent = newAtom;
-        child = child.sibling;
-    }
-    const updateContext = (atom) => {
-        if (atom.jsxNode instanceof Component) {
-            let child = atom.child;
-            while (child) {
-                updateContext(child);
-                child = child.sibling;
-            }
-        }
-        else {
-            if (moveView) {
-                if (context.isParent) {
-                    nativeRenderer.prependChild(context.host, atom.nativeNode);
-                }
-                else {
-                    nativeRenderer.insertAfter(atom.nativeNode, context.host);
-                }
-            }
-            context.isParent = false;
-            context.host = atom.nativeNode;
-        }
-    };
-    for (const atom of children) {
-        updateContext(atom);
-    }
-}
 function createChanges(newAtom, expectIndex, diffAtomIndexed, changeCommits) {
     const startDiffAtom = diffAtomIndexed;
     while (diffAtomIndexed) {
@@ -1511,6 +1478,40 @@ function createChanges(newAtom, expectIndex, diffAtomIndexed, changeCommits) {
     changeCommits.create(newAtom);
     return startDiffAtom;
 }
+function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
+    let child = reusedAtom.child;
+    newAtom.child = child;
+    const children = [];
+    while (child) {
+        children.push(child);
+        child.parent = newAtom;
+        child = child.sibling;
+    }
+    const updateContext = (atom) => {
+        if (atom.jsxNode instanceof Component) {
+            let child = atom.child;
+            while (child) {
+                updateContext(child);
+                child = child.sibling;
+            }
+        }
+        else {
+            if (moveView) {
+                if (context.isParent) {
+                    nativeRenderer.prependChild(context.host, atom.nativeNode);
+                }
+                else {
+                    nativeRenderer.insertAfter(atom.nativeNode, context.host);
+                }
+            }
+            context.isParent = false;
+            context.host = atom.nativeNode;
+        }
+    };
+    for (const atom of children) {
+        updateContext(atom);
+    }
+}
 function cleanView(nativeRenderer, atom, isClean) {
     if (atom.nativeNode) {
         if (!isClean) {
@@ -1804,7 +1805,7 @@ class RootComponent extends Component {
 }
 
 const viewflyErrorFn = makeError('Viewfly');
-const VERSION = "0.2.1";
+const VERSION = "0.2.2";
 function viewfly(config) {
     const { context, nativeRenderer, autoUpdate, root } = Object.assign({ autoUpdate: true }, config);
     const appProviders = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "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",