@viewfly/core 1.2.0 → 1.2.2

package/bundles/index.d.ts

@@ -487,11 +487,18 @@ declare function withAnnotation<T extends ComponentSetup>(annotation: ComponentA
 interface ContextProps extends Props {
     providers: Provider[];
 }
+/**
+ * @deprecated
+ * @param props
+ */
 declare function Context(props: ContextProps): () => ViewFlyNode<string | ComponentSetup<any>>;
 
 declare function withMemo<T extends Props = Props>(canUseMemo: ComponentInstance<T>['$useMemo'], render: () => JSXNode): ComponentInstance<T>;
 
-declare const ElementNamespaceMap: Record<string, string>;
+declare const ElementNamespaceMap: {
+    readonly svg: "svg";
+    readonly math: "mathml";
+};
 declare function createRenderer(component: Component, nativeRenderer: NativeRenderer, namespace: ElementNamespace): (host: NativeNode) => void;
 
 /**

package/bundles/index.esm.js

@@ -1301,11 +1301,20 @@ function withAnnotation(annotation, componentSetup) {
     return function (props) {
         const instance = getCurrentInstance();
         const parentInjector = injectMap.get(instance) || getInjector(instance.parentComponent);
-        const injector = new ReflectiveInjector(parentInjector, annotation.providers || [], annotation.scope);
+        const injector = new ReflectiveInjector(parentInjector, [{
+                provide: Injector,
+                useFactory() {
+                    return injector;
+                }
+            }, ...(annotation.providers || [])], annotation.scope);
         injectMap.set(instance, injector);
         return componentSetup(props);
     };
 }
+/**
+ * @deprecated
+ * @param props
+ */
 function Context(props) {
     function createContextComponent(providers) {
         return withAnnotation({
@@ -1693,6 +1702,12 @@ function insertNode(nativeRenderer, atom, context) {
         nativeRenderer.insertAfter(atom.nativeNode, context.host, atom.namespace);
     }
 }
+function createElementChildren(type, children, namespace) {
+    if (type === 'foreignObject' && namespace === ElementNamespaceMap.svg) {
+        return createChildChain(children, void 0);
+    }
+    return createChildChain(children, namespace);
+}
 function createElement(nativeRenderer, atom, parentComponent, context) {
     const { namespace, jsxNode } = atom;
     const nativeNode = nativeRenderer.createElement(jsxNode.type, namespace);
@@ -1700,7 +1715,7 @@ function createElement(nativeRenderer, atom, parentComponent, context) {
     let bindingRefs;
     for (const key in props) {
         if (key === 'children') {
-            atom.child = createChildChain(jsxNode.props.children, namespace);
+            atom.child = createElementChildren(jsxNode.type, props.children, namespace);
             continue;
         }
         if (key === 'class') {
@@ -1797,7 +1812,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         const [key, newValue, oldValue] = changes.replace[i];
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createChildChain(newValue, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, newValue, isSvg);
             if (!newAtom.child) {
                 cleanElementChildren(oldAtom, nativeRenderer);
             }
@@ -1844,7 +1859,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         const [key, value] = changes.add[i];
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createChildChain(value, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, value, isSvg);
             buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
             continue;
         }

package/bundles/index.js

@@ -1303,11 +1303,20 @@ function withAnnotation(annotation, componentSetup) {
     return function (props) {
         const instance = getCurrentInstance();
         const parentInjector = injectMap.get(instance) || getInjector(instance.parentComponent);
-        const injector = new ReflectiveInjector(parentInjector, annotation.providers || [], annotation.scope);
+        const injector = new ReflectiveInjector(parentInjector, [{
+                provide: Injector,
+                useFactory() {
+                    return injector;
+                }
+            }, ...(annotation.providers || [])], annotation.scope);
         injectMap.set(instance, injector);
         return componentSetup(props);
     };
 }
+/**
+ * @deprecated
+ * @param props
+ */
 function Context(props) {
     function createContextComponent(providers) {
         return withAnnotation({
@@ -1695,6 +1704,12 @@ function insertNode(nativeRenderer, atom, context) {
         nativeRenderer.insertAfter(atom.nativeNode, context.host, atom.namespace);
     }
 }
+function createElementChildren(type, children, namespace) {
+    if (type === 'foreignObject' && namespace === ElementNamespaceMap.svg) {
+        return createChildChain(children, void 0);
+    }
+    return createChildChain(children, namespace);
+}
 function createElement(nativeRenderer, atom, parentComponent, context) {
     const { namespace, jsxNode } = atom;
     const nativeNode = nativeRenderer.createElement(jsxNode.type, namespace);
@@ -1702,7 +1717,7 @@ function createElement(nativeRenderer, atom, parentComponent, context) {
     let bindingRefs;
     for (const key in props) {
         if (key === 'children') {
-            atom.child = createChildChain(jsxNode.props.children, namespace);
+            atom.child = createElementChildren(jsxNode.type, props.children, namespace);
             continue;
         }
         if (key === 'class') {
@@ -1799,7 +1814,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         const [key, newValue, oldValue] = changes.replace[i];
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createChildChain(newValue, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, newValue, isSvg);
             if (!newAtom.child) {
                 cleanElementChildren(oldAtom, nativeRenderer);
             }
@@ -1846,7 +1861,7 @@ function updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComp
         const [key, value] = changes.add[i];
         if (key === 'children') {
             updatedChildren = true;
-            newAtom.child = createChildChain(value, isSvg);
+            newAtom.child = createElementChildren(newVNode.type, value, isSvg);
             buildElementChildren(newAtom, nativeRenderer, parentComponent, context);
             continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.2.0",
+  "version": "1.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",
@@ -50,7 +50,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "8d13d8667f8875f24bc5218e9e4136d9efd9565a",
+  "gitHead": "84f994ca1bd19c075d9a142bbedfc10db14e7e93",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }