@viewfly/core 1.0.0-alpha.7 → 1.0.0-alpha.8

package/bundles/foundation/component.d.ts

@@ -1,6 +1,5 @@
 import { AbstractType, ExtractValueType, InjectFlags, InjectionToken, Injector, Provider, ReflectiveInjector, Type } from '../di/_api';
 import { Key, Props } from './jsx-element';
-import { ComponentView } from './_utils';
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */
@@ -14,7 +13,6 @@ export declare class Component extends ReflectiveInjector {
     changedSubComponents: Set<Component>;
     get dirty(): boolean;
     get changed(): boolean;
-    $$view: ComponentView;
     unmountedCallbacks?: LifeCycleCallback[] | null;
     mountCallbacks?: LifeCycleCallback[] | null;
     propsChangedCallbacks?: PropsChangedCallback<any>[] | null;

package/bundles/index.esm.js

@@ -1283,6 +1283,7 @@ function withMemo(canUseMemo, render) {
     };
 }
 
+const componentViewCache = new WeakMap();
 const listenerReg = /^on(?=[A-Z])/;
 function createRenderer(component, nativeRenderer) {
     let isInit = true;
@@ -1361,7 +1362,7 @@ function updateView(nativeRenderer, component) {
     }
 }
 function applyChanges(nativeRenderer, component) {
-    const { atom, host, isParent, rootHost } = component.$$view;
+    const { atom, host, isParent, rootHost } = componentViewCache.get(component);
     const diffAtom = atom.child;
     const template = component.update(component.props, true);
     atom.child = createChildChain(template, atom.isSvg);
@@ -1373,8 +1374,9 @@ function applyChanges(nativeRenderer, component) {
     diff(nativeRenderer, component, atom.child, diffAtom, context);
     const next = atom.sibling;
     if (next && next.jsxNode instanceof Component) {
-        next.jsxNode.$$view.host = context.host;
-        next.jsxNode.$$view.isParent = context.isParent;
+        const view = componentViewCache.get(next.jsxNode);
+        view.host = context.host;
+        view.isParent = context.isParent;
     }
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
@@ -1497,7 +1499,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         const newTemplate = component.update(newProps);
         const portalHost = component.instance.$portalHost;
         context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
-        component.$$view = Object.assign({ atom: newAtom }, context);
+        componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
             reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
@@ -1571,7 +1573,7 @@ function componentRender(nativeRenderer, component, from, context) {
     const { template, portalHost } = component.render();
     from.child = createChildChain(template, from.isSvg);
     context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
-    component.$$view = Object.assign({ atom: from }, context);
+    componentViewCache.set(component, Object.assign({ atom: from }, context));
     let child = from.child;
     while (child) {
         buildView(nativeRenderer, component, child, context);
@@ -1618,7 +1620,6 @@ function createChainByJSXElement(element, prevAtom, isSvg) {
     };
     prevAtom.sibling = atom;
     atom.child = createChildChain(element.props.children, isSvg);
-    element.props.children = null;
     return atom;
 }
 function createChainByNode(jsxNode, prevAtom, isSvg) {

package/bundles/index.js

@@ -1285,6 +1285,7 @@ function withMemo(canUseMemo, render) {
     };
 }
 
+const componentViewCache = new WeakMap();
 const listenerReg = /^on(?=[A-Z])/;
 function createRenderer(component, nativeRenderer) {
     let isInit = true;
@@ -1363,7 +1364,7 @@ function updateView(nativeRenderer, component) {
     }
 }
 function applyChanges(nativeRenderer, component) {
-    const { atom, host, isParent, rootHost } = component.$$view;
+    const { atom, host, isParent, rootHost } = componentViewCache.get(component);
     const diffAtom = atom.child;
     const template = component.update(component.props, true);
     atom.child = createChildChain(template, atom.isSvg);
@@ -1375,8 +1376,9 @@ function applyChanges(nativeRenderer, component) {
     diff(nativeRenderer, component, atom.child, diffAtom, context);
     const next = atom.sibling;
     if (next && next.jsxNode instanceof Component) {
-        next.jsxNode.$$view.host = context.host;
-        next.jsxNode.$$view.isParent = context.isParent;
+        const view = componentViewCache.get(next.jsxNode);
+        view.host = context.host;
+        view.isParent = context.isParent;
     }
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
@@ -1499,7 +1501,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         const newTemplate = component.update(newProps);
         const portalHost = component.instance.$portalHost;
         context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
-        component.$$view = Object.assign({ atom: newAtom }, context);
+        componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
             reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
@@ -1573,7 +1575,7 @@ function componentRender(nativeRenderer, component, from, context) {
     const { template, portalHost } = component.render();
     from.child = createChildChain(template, from.isSvg);
     context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
-    component.$$view = Object.assign({ atom: from }, context);
+    componentViewCache.set(component, Object.assign({ atom: from }, context));
     let child = from.child;
     while (child) {
         buildView(nativeRenderer, component, child, context);
@@ -1620,7 +1622,6 @@ function createChainByJSXElement(element, prevAtom, isSvg) {
     };
     prevAtom.sibling = atom;
     atom.child = createChildChain(element.props.children, isSvg);
-    element.props.children = null;
     return atom;
 }
 function createChainByNode(jsxNode, prevAtom, isSvg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "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",
@@ -47,7 +47,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "092e986d74477afb6246001ca58962172f926e73",
+  "gitHead": "95538a571b0d2e8a96dbfdc940959605ea06c252",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }