@viewfly/core 0.5.1 → 0.5.4

package/bundles/foundation/component.d.ts

@@ -31,7 +31,10 @@ export declare class Component extends ReflectiveInjector implements JSXTypeof<J
     constructor(parentComponent: Injector | null, type: JSXInternal.ComponentSetup, props: Props, key?: Key | undefined);
     markAsDirtied(): void;
     markAsChanged(changedComponent?: Component): void;
-    render(): any;
+    render(): {
+        template: any;
+        portalHost: import("./injection-tokens").NativeNode | undefined;
+    };
     update(newProps: Props, forceUpdate?: boolean): any;
     provide<T>(providers: Provider<T> | Provider<T>[]): void;
     rendered(): void;

package/bundles/foundation/types.d.ts

@@ -1,10 +1,12 @@
 import { Key } from './jsx-element';
 import { ExtractInstanceType, DynamicRef } from './component';
 import { Scope } from '../di/injectable';
+import { NativeNode } from './injection-tokens';
 export type JSXNode = JSXInternal.JSXNode;
 export declare namespace JSXInternal {
     type ClassNames = string | Record<string, unknown> | false | null | undefined | ClassNames[];
     interface ComponentInstance<P> {
+        $portalHost?: NativeNode;
         $render(): JSXNode;
         $useMemo?(currentProps: P, prevProps: P): boolean;
     }

package/bundles/index.esm.js

@@ -732,7 +732,10 @@ class Component extends ReflectiveInjector {
             this.markAsDirtied();
         });
         this.template = template;
-        return template;
+        return {
+            template: template,
+            portalHost: this.instance.$portalHost
+        };
     }
     update(newProps, forceUpdate = false) {
         const oldProps = this.props;
@@ -1505,22 +1508,24 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
 }
 function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
     return function (offset) {
-        const instance = reusedAtom.jsxNode;
+        const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
-        const oldTemplate = instance.template;
-        const newTemplate = instance.update(newProps);
-        instance.$$view = Object.assign({ atom: newAtom }, context);
-        newAtom.jsxNode = instance;
+        const oldTemplate = component.template;
+        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);
+        newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
             reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
-            updateView(nativeRenderer, instance);
+            updateView(nativeRenderer, component);
             return;
         }
         if (newTemplate) {
             linkTemplate(newTemplate, newAtom.jsxNode, newAtom);
         }
         if (newAtom.child) {
-            diff(nativeRenderer, instance, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
@@ -1529,7 +1534,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
                 atom = atom.sibling;
             }
         }
-        instance.rendered();
+        component.rendered();
     };
 }
 function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
@@ -1584,6 +1589,9 @@ function cleanView(nativeRenderer, atom, isClean) {
     }
     let child = atom.child;
     while (child) {
+        if (child.jsxNode instanceof Component && child.jsxNode.instance.$portalHost) {
+            isClean = false;
+        }
         cleanView(nativeRenderer, child, isClean);
         child = child.sibling;
     }
@@ -1592,10 +1600,11 @@ function cleanView(nativeRenderer, atom, isClean) {
     }
 }
 function componentRender(nativeRenderer, component, from, context) {
-    const template = component.render();
+    const { template, portalHost } = component.render();
     if (template) {
         linkTemplate(template, component, from);
     }
+    context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
     component.$$view = Object.assign({ atom: from }, context);
     let child = from.child;
     while (child) {

package/bundles/index.js

@@ -734,7 +734,10 @@ class Component extends ReflectiveInjector {
             this.markAsDirtied();
         });
         this.template = template;
-        return template;
+        return {
+            template: template,
+            portalHost: this.instance.$portalHost
+        };
     }
     update(newProps, forceUpdate = false) {
         const oldProps = this.props;
@@ -1507,22 +1510,24 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
 }
 function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
     return function (offset) {
-        const instance = reusedAtom.jsxNode;
+        const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
-        const oldTemplate = instance.template;
-        const newTemplate = instance.update(newProps);
-        instance.$$view = Object.assign({ atom: newAtom }, context);
-        newAtom.jsxNode = instance;
+        const oldTemplate = component.template;
+        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);
+        newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
             reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
-            updateView(nativeRenderer, instance);
+            updateView(nativeRenderer, component);
             return;
         }
         if (newTemplate) {
             linkTemplate(newTemplate, newAtom.jsxNode, newAtom);
         }
         if (newAtom.child) {
-            diff(nativeRenderer, instance, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
@@ -1531,7 +1536,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
                 atom = atom.sibling;
             }
         }
-        instance.rendered();
+        component.rendered();
     };
 }
 function reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, moveView) {
@@ -1586,6 +1591,9 @@ function cleanView(nativeRenderer, atom, isClean) {
     }
     let child = atom.child;
     while (child) {
+        if (child.jsxNode instanceof Component && child.jsxNode.instance.$portalHost) {
+            isClean = false;
+        }
         cleanView(nativeRenderer, child, isClean);
         child = child.sibling;
     }
@@ -1594,10 +1602,11 @@ function cleanView(nativeRenderer, atom, isClean) {
     }
 }
 function componentRender(nativeRenderer, component, from, context) {
-    const template = component.render();
+    const { template, portalHost } = component.render();
     if (template) {
         linkTemplate(template, component, from);
     }
+    context = portalHost ? { isParent: true, host: portalHost, rootHost: portalHost } : context;
     component.$$view = Object.assign({ atom: from }, context);
     let child = from.child;
     while (child) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.5.1",
+  "version": "0.5.4",
   "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": "343b1bff988837e5e0a2acee63c18c3f4a3e8721",
+  "gitHead": "b66a751b23e5f9a336ac9f52438f9f9a27766762",
   "dependencies": {
     "reflect-metadata": "^0.1.13"
   }