@viewfly/core 1.2.3 → 1.2.6

package/bundles/index.esm.js

@@ -1349,11 +1349,8 @@ function deepUpdateByComponentDirtyTree(nativeRenderer, component, needMove) {
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMove) {
     const commits = [];
-    function changeOffset() {
-        offset++;
-    }
     while (newAtom) {
-        oldAtom = createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, changeOffset);
+        oldAtom = createChanges(newAtom, oldAtom, commits);
         newAtom = newAtom.sibling;
     }
     let dirtyDiffAtom = oldAtom;
@@ -1364,7 +1361,6 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMo
     let offset = 0;
     const len = commits.length;
     for (let i = 0; i < len; i++) {
-        const commit = commits[i];
         while (oldAtom) {
             if (oldAtom.index <= i) {
                 offset--;
@@ -1373,27 +1369,34 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMo
             }
             break;
         }
-        commit.callback(commit.params, offset, needMove);
+        const { dirtyAtom, newAtom } = commits[i];
+        if (dirtyAtom) {
+            switch (dirtyAtom.type) {
+                case ElementAtomType:
+                    updateElement(nativeRenderer, context, parentComponent, offset, needMove, newAtom, dirtyAtom);
+                    break;
+                case TextAtomType:
+                    updateText(nativeRenderer, context, offset, needMove, newAtom, dirtyAtom);
+                    break;
+                case ComponentAtomType:
+                    updateComponent(nativeRenderer, context, offset, needMove, newAtom, dirtyAtom);
+                    break;
+            }
+        }
+        else {
+            buildView(nativeRenderer, parentComponent, newAtom, context);
+            offset++;
+        }
     }
 }
-function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
+function createChanges(newAtom, oldAtom, commits) {
     const startDiffAtom = oldAtom;
     let prev = null;
     while (oldAtom) {
-        const newAtomType = newAtom.type;
-        if (oldAtom.type === newAtomType && oldAtom.nodeType === newAtom.nodeType && oldAtom.key === newAtom.key) {
+        if (oldAtom.type === newAtom.type && oldAtom.nodeType === newAtom.nodeType && oldAtom.key === newAtom.key) {
             commits.push({
-                callback: newAtomType === TextAtomType ? updateText :
-                    newAtomType === ComponentAtomType ? updateComponent :
-                        updateElement,
-                params: {
-                    oldAtom,
-                    newAtom,
-                    nativeRenderer,
-                    context,
-                    effect,
-                    parentComponent
-                }
+                dirtyAtom: oldAtom,
+                newAtom
             });
             const next = oldAtom.sibling;
             if (!prev) {
@@ -1406,25 +1409,12 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
         oldAtom = oldAtom.sibling;
     }
     commits.push({
-        callback: patchUpdate,
-        params: {
-            oldAtom: oldAtom,
-            newAtom,
-            nativeRenderer,
-            context,
-            effect,
-            parentComponent
-        }
+        dirtyAtom: null,
+        newAtom
     });
     return startDiffAtom;
 }
-function patchUpdate(params) {
-    const { nativeRenderer, parentComponent, newAtom, context, effect } = params;
-    buildView(nativeRenderer, parentComponent, newAtom, context);
-    effect();
-}
-function updateText(params, offset, needMove) {
-    const { oldAtom, newAtom, nativeRenderer, context } = params;
+function updateText(nativeRenderer, context, offset, needMove, newAtom, oldAtom) {
     const nativeNode = oldAtom.nativeNode;
     newAtom.nativeNode = nativeNode;
     if (needMove || newAtom.index - offset !== oldAtom.index) {
@@ -1433,23 +1423,21 @@ function updateText(params, offset, needMove) {
     context.host = nativeNode;
     context.isParent = false;
 }
-function updateElement(params, offset, needMove) {
-    const { nativeRenderer, newAtom, oldAtom, context, parentComponent } = params;
-    newAtom.nativeNode = oldAtom.nativeNode;
+function updateElement(nativeRenderer, context, parentComponent, offset, needMove, newAtom, oldAtom) {
+    const nativeNode = oldAtom.nativeNode;
+    newAtom.nativeNode = nativeNode;
     if (needMove || newAtom.index - offset !== oldAtom.index) {
         insertNode(nativeRenderer, newAtom, context);
     }
-    context.host = newAtom.nativeNode;
+    context.host = nativeNode;
     context.isParent = false;
     updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, {
-        host: newAtom.nativeNode,
+        host: nativeNode,
         isParent: true,
         rootHost: context.rootHost
     });
 }
-function updateComponent(params, offset, needMove) {
-    const { oldAtom, newAtom, nativeRenderer } = params;
-    let context = params.context;
+function updateComponent(nativeRenderer, context, offset, needMove, newAtom, oldAtom) {
     const component = oldAtom.jsxNode;
     const portalHost = component.instance.$portalHost;
     context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
@@ -1473,16 +1461,17 @@ function updateComponent(params, offset, needMove) {
     }
     else {
         newAtom.child = oldAtom.child;
-        reuseComponentView(nativeRenderer, newAtom.child, context, needMove, true);
+        reuseComponentView(nativeRenderer, newAtom.child, context, needMove, !canUpdate);
     }
     component.rendered();
 }
 function reuseComponentView(nativeRenderer, child, context, moveView, skipSubComponentDiff) {
     const updateContext = (atom) => {
-        if (atom.jsxNode instanceof Component) {
+        const jsxNode = atom.jsxNode;
+        if (jsxNode instanceof Component) {
             reuseComponentView(nativeRenderer, atom.child, context, moveView, skipSubComponentDiff);
             if (!skipSubComponentDiff) {
-                deepUpdateByComponentDirtyTree(nativeRenderer, atom.jsxNode, moveView);
+                deepUpdateByComponentDirtyTree(nativeRenderer, jsxNode, moveView);
             }
         }
         else {

package/bundles/index.js

@@ -1351,11 +1351,8 @@ function deepUpdateByComponentDirtyTree(nativeRenderer, component, needMove) {
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMove) {
     const commits = [];
-    function changeOffset() {
-        offset++;
-    }
     while (newAtom) {
-        oldAtom = createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, changeOffset);
+        oldAtom = createChanges(newAtom, oldAtom, commits);
         newAtom = newAtom.sibling;
     }
     let dirtyDiffAtom = oldAtom;
@@ -1366,7 +1363,6 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMo
     let offset = 0;
     const len = commits.length;
     for (let i = 0; i < len; i++) {
-        const commit = commits[i];
         while (oldAtom) {
             if (oldAtom.index <= i) {
                 offset--;
@@ -1375,27 +1371,34 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, needMo
             }
             break;
         }
-        commit.callback(commit.params, offset, needMove);
+        const { dirtyAtom, newAtom } = commits[i];
+        if (dirtyAtom) {
+            switch (dirtyAtom.type) {
+                case ElementAtomType:
+                    updateElement(nativeRenderer, context, parentComponent, offset, needMove, newAtom, dirtyAtom);
+                    break;
+                case TextAtomType:
+                    updateText(nativeRenderer, context, offset, needMove, newAtom, dirtyAtom);
+                    break;
+                case ComponentAtomType:
+                    updateComponent(nativeRenderer, context, offset, needMove, newAtom, dirtyAtom);
+                    break;
+            }
+        }
+        else {
+            buildView(nativeRenderer, parentComponent, newAtom, context);
+            offset++;
+        }
     }
 }
-function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
+function createChanges(newAtom, oldAtom, commits) {
     const startDiffAtom = oldAtom;
     let prev = null;
     while (oldAtom) {
-        const newAtomType = newAtom.type;
-        if (oldAtom.type === newAtomType && oldAtom.nodeType === newAtom.nodeType && oldAtom.key === newAtom.key) {
+        if (oldAtom.type === newAtom.type && oldAtom.nodeType === newAtom.nodeType && oldAtom.key === newAtom.key) {
             commits.push({
-                callback: newAtomType === TextAtomType ? updateText :
-                    newAtomType === ComponentAtomType ? updateComponent :
-                        updateElement,
-                params: {
-                    oldAtom,
-                    newAtom,
-                    nativeRenderer,
-                    context,
-                    effect,
-                    parentComponent
-                }
+                dirtyAtom: oldAtom,
+                newAtom
             });
             const next = oldAtom.sibling;
             if (!prev) {
@@ -1408,25 +1411,12 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
         oldAtom = oldAtom.sibling;
     }
     commits.push({
-        callback: patchUpdate,
-        params: {
-            oldAtom: oldAtom,
-            newAtom,
-            nativeRenderer,
-            context,
-            effect,
-            parentComponent
-        }
+        dirtyAtom: null,
+        newAtom
     });
     return startDiffAtom;
 }
-function patchUpdate(params) {
-    const { nativeRenderer, parentComponent, newAtom, context, effect } = params;
-    buildView(nativeRenderer, parentComponent, newAtom, context);
-    effect();
-}
-function updateText(params, offset, needMove) {
-    const { oldAtom, newAtom, nativeRenderer, context } = params;
+function updateText(nativeRenderer, context, offset, needMove, newAtom, oldAtom) {
     const nativeNode = oldAtom.nativeNode;
     newAtom.nativeNode = nativeNode;
     if (needMove || newAtom.index - offset !== oldAtom.index) {
@@ -1435,23 +1425,21 @@ function updateText(params, offset, needMove) {
     context.host = nativeNode;
     context.isParent = false;
 }
-function updateElement(params, offset, needMove) {
-    const { nativeRenderer, newAtom, oldAtom, context, parentComponent } = params;
-    newAtom.nativeNode = oldAtom.nativeNode;
+function updateElement(nativeRenderer, context, parentComponent, offset, needMove, newAtom, oldAtom) {
+    const nativeNode = oldAtom.nativeNode;
+    newAtom.nativeNode = nativeNode;
     if (needMove || newAtom.index - offset !== oldAtom.index) {
         insertNode(nativeRenderer, newAtom, context);
     }
-    context.host = newAtom.nativeNode;
+    context.host = nativeNode;
     context.isParent = false;
     updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, {
-        host: newAtom.nativeNode,
+        host: nativeNode,
         isParent: true,
         rootHost: context.rootHost
     });
 }
-function updateComponent(params, offset, needMove) {
-    const { oldAtom, newAtom, nativeRenderer } = params;
-    let context = params.context;
+function updateComponent(nativeRenderer, context, offset, needMove, newAtom, oldAtom) {
     const component = oldAtom.jsxNode;
     const portalHost = component.instance.$portalHost;
     context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
@@ -1475,16 +1463,17 @@ function updateComponent(params, offset, needMove) {
     }
     else {
         newAtom.child = oldAtom.child;
-        reuseComponentView(nativeRenderer, newAtom.child, context, needMove, true);
+        reuseComponentView(nativeRenderer, newAtom.child, context, needMove, !canUpdate);
     }
     component.rendered();
 }
 function reuseComponentView(nativeRenderer, child, context, moveView, skipSubComponentDiff) {
     const updateContext = (atom) => {
-        if (atom.jsxNode instanceof Component) {
+        const jsxNode = atom.jsxNode;
+        if (jsxNode instanceof Component) {
             reuseComponentView(nativeRenderer, atom.child, context, moveView, skipSubComponentDiff);
             if (!skipSubComponentDiff) {
-                deepUpdateByComponentDirtyTree(nativeRenderer, atom.jsxNode, moveView);
+                deepUpdateByComponentDirtyTree(nativeRenderer, jsxNode, moveView);
             }
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "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": "05b1bb582a192cf5dc4fded87091788f1e3f45d8",
+  "gitHead": "74a32054799e20584e3c9eb12c5bf28f7e20efc3",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }