@viewfly/core 1.0.0-alpha.13 → 1.0.0-alpha.15

package/bundles/index.d.ts

@@ -113,7 +113,7 @@ interface Prop {
 declare const Prop: PropDecorator;
 
 declare const THROW_IF_NOT_FOUND: any;
-declare class NullInjector extends Injector {
+declare class NullInjector implements Injector {
     parentInjector: null;
     get(token: any, notFoundValue?: any, _?: InjectFlags): any;
 }
@@ -167,9 +167,8 @@ declare function normalizeProvider(provider: Provider): NormalizedProvider;
 /**
  * 反射注入器
  */
-declare class ReflectiveInjector extends Injector {
+declare class ReflectiveInjector implements Injector {
     parentInjector: Injector | null;
-    protected staticProviders: Provider[];
     protected scope?: Scope | undefined;
     protected normalizedProviders: NormalizedProvider[];
     protected recordValues: Map<Type<any> | AbstractType<any> | InjectionToken<any>, any>;

package/bundles/index.esm.js

@@ -234,9 +234,8 @@ const THROW_IF_NOT_FOUND = {
 const nullInjectorErrorFn = (token) => {
     return makeError('NullInjector')(`No provide for \`${stringify(token)}\`!`);
 };
-class NullInjector extends Injector {
+class NullInjector {
     constructor() {
-        super(...arguments);
         this.parentInjector = null;
     }
     /* eslint-disable-next-line */
@@ -411,11 +410,9 @@ const provideScopeError = (token) => {
 /**
  * 反射注入器
  */
-class ReflectiveInjector extends Injector {
+class ReflectiveInjector {
     constructor(parentInjector, staticProviders, scope) {
-        super();
         this.parentInjector = parentInjector;
-        this.staticProviders = staticProviders;
         this.scope = scope;
         this.recordValues = new Map();
         this.normalizedProviders = staticProviders.map(provide => {
@@ -1404,7 +1401,6 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
     const key = newJsxNode.key;
     let prev = null;
     while (oldAtom) {
-        const diffIndex = oldAtom.index;
         if (type === oldAtom.type) {
             let commit;
             if (type === TextAtomType) {
@@ -1418,10 +1414,10 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
                     continue;
                 }
                 if (type === ComponentAtomType) {
-                    commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
+                    commit = updateComponent(newAtom, oldAtom, nativeRenderer, context);
                 }
                 else {
-                    commit = updateElement(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context, parentComponent);
+                    commit = updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent);
                 }
             }
             commits.push(commit);
@@ -1455,10 +1451,10 @@ function updateText(newAtom, oldAtom, nativeRenderer, context) {
         context.isParent = false;
     };
 }
-function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer, context, parentComponent) {
+function updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent) {
     return function (offset) {
         newAtom.nativeNode = oldAtom.nativeNode;
-        if (expectIndex - offset !== oldIndex) {
+        if (newAtom.index - offset !== oldAtom.index) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = newAtom.nativeNode;
@@ -1466,7 +1462,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
         updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context);
     };
 }
-function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
+function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
     return function (offset) {
         const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
@@ -1477,7 +1473,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
-            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
+            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, newAtom.index - offset !== reusedAtom.index);
             updateView(nativeRenderer, component);
             return;
         }

package/bundles/index.js

@@ -236,9 +236,8 @@ const THROW_IF_NOT_FOUND = {
 const nullInjectorErrorFn = (token) => {
     return makeError('NullInjector')(`No provide for \`${stringify(token)}\`!`);
 };
-class NullInjector extends Injector {
+class NullInjector {
     constructor() {
-        super(...arguments);
         this.parentInjector = null;
     }
     /* eslint-disable-next-line */
@@ -413,11 +412,9 @@ const provideScopeError = (token) => {
 /**
  * 反射注入器
  */
-class ReflectiveInjector extends Injector {
+class ReflectiveInjector {
     constructor(parentInjector, staticProviders, scope) {
-        super();
         this.parentInjector = parentInjector;
-        this.staticProviders = staticProviders;
         this.scope = scope;
         this.recordValues = new Map();
         this.normalizedProviders = staticProviders.map(provide => {
@@ -1406,7 +1403,6 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
     const key = newJsxNode.key;
     let prev = null;
     while (oldAtom) {
-        const diffIndex = oldAtom.index;
         if (type === oldAtom.type) {
             let commit;
             if (type === TextAtomType) {
@@ -1420,10 +1416,10 @@ function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, paren
                     continue;
                 }
                 if (type === ComponentAtomType) {
-                    commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
+                    commit = updateComponent(newAtom, oldAtom, nativeRenderer, context);
                 }
                 else {
-                    commit = updateElement(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context, parentComponent);
+                    commit = updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent);
                 }
             }
             commits.push(commit);
@@ -1457,10 +1453,10 @@ function updateText(newAtom, oldAtom, nativeRenderer, context) {
         context.isParent = false;
     };
 }
-function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer, context, parentComponent) {
+function updateElement(newAtom, oldAtom, nativeRenderer, context, parentComponent) {
     return function (offset) {
         newAtom.nativeNode = oldAtom.nativeNode;
-        if (expectIndex - offset !== oldIndex) {
+        if (newAtom.index - offset !== oldAtom.index) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = newAtom.nativeNode;
@@ -1468,7 +1464,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
         updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context);
     };
 }
-function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
+function updateComponent(newAtom, reusedAtom, nativeRenderer, context) {
     return function (offset) {
         const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
@@ -1479,7 +1475,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
-            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
+            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, newAtom.index - offset !== reusedAtom.index);
             updateView(nativeRenderer, component);
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.15",
   "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": "ef79169385a2b104fc58cb0b38123443e5baccd7",
+  "gitHead": "20910725ab3302fe98b04db6e6f6b44a3f5b64b5",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }