@viewfly/platform-browser 1.0.0-alpha.1 → 1.0.0-alpha.3

package/bundles/html-renderer.d.ts

@@ -1,16 +1,18 @@
 import { NativeRenderer } from '@viewfly/core';
-export declare class VDOMElement {
+export declare class VDOMNode {
+    parent: VDOMElement | null;
+    remove(): void;
+}
+export declare class VDOMElement extends VDOMNode {
     name: string;
     props: Map<string, any>;
     children: Array<VDOMElement | VDOMText>;
     style: Map<string, any>;
     className: string;
-    parent: VDOMElement | null;
     constructor(name: string);
 }
-export declare class VDOMText {
+export declare class VDOMText extends VDOMNode {
     text: string;
-    parent: VDOMElement | null;
     constructor(text: string);
 }
 /**

package/bundles/index.esm.js

@@ -168,20 +168,34 @@ function createPortal(childRender, host) {
     };
 }
 
-class VDOMElement {
+class VDOMNode {
+    constructor() {
+        this.parent = null;
+    }
+    remove() {
+        if (this.parent) {
+            const i = this.parent.children.indexOf(this);
+            if (i > -1) {
+                this.parent.children.splice(i, 1);
+            }
+        }
+        this.parent = null;
+    }
+}
+class VDOMElement extends VDOMNode {
     constructor(name) {
+        super();
         this.name = name;
         this.props = new Map();
         this.children = [];
         this.style = new Map();
         this.className = '';
-        this.parent = null;
     }
 }
-class VDOMText {
+class VDOMText extends VDOMNode {
     constructor(text) {
+        super();
         this.text = text;
-        this.parent = null;
     }
 }
 /**
@@ -198,10 +212,12 @@ class HTMLRenderer extends NativeRenderer {
         node.props.set(key, value);
     }
     appendChild(parent, newChild) {
+        newChild.remove();
         parent.children.push(newChild);
         newChild.parent = parent;
     }
     prependChild(parent, newChild) {
+        newChild.remove();
         parent.children.unshift(newChild);
         newChild.parent = parent;
     }
@@ -224,21 +240,17 @@ class HTMLRenderer extends NativeRenderer {
         //
     }
     remove(node) {
-        if (node.parent) {
-            const i = node.parent.children.indexOf(node);
-            if (i > -1) {
-                node.parent.children.splice(i, 1);
-            }
-        }
-        node.parent = null;
+        node.remove();
     }
     cleanChildren(node) {
+        node.children.forEach(i => i.parent = null);
         node.children = [];
     }
     syncTextContent(target, content) {
         target.text = content;
     }
     insertAfter(newNode, ref) {
+        newNode.remove();
         const parent = ref.parent;
         if (parent) {
             const i = parent.children.indexOf(ref);
@@ -284,7 +296,7 @@ class OutputTranslator {
         const attrs = Array.from(vDom.props.keys()).filter(key => key !== 'ref' && vDom.props.get(key) !== false).map(k => {
             const key = xssFilter.attrName(k);
             const value = vDom.props.get(k);
-            return (value === true ? `${key}` : `${key}="${xssFilter.attrValue(`${value}`)}"`);
+            return (value === true && /^\w+$/.test(key) ? `${key}` : `${key}="${xssFilter.attrValue(`${value}`)}"`);
         });
         if (styles) {
             attrs.push(`style="${styles}"`);
@@ -346,4 +358,4 @@ OutputTranslator.simpleXSSFilter = {
     }
 };
 
-export { DomRenderer, HTMLRenderer, OutputTranslator, VDOMElement, VDOMText, createApp, createPortal };
+export { DomRenderer, HTMLRenderer, OutputTranslator, VDOMElement, VDOMNode, VDOMText, createApp, createPortal };

package/bundles/index.js

@@ -170,20 +170,34 @@ function createPortal(childRender, host) {
     };
 }
 
-class VDOMElement {
+class VDOMNode {
+    constructor() {
+        this.parent = null;
+    }
+    remove() {
+        if (this.parent) {
+            const i = this.parent.children.indexOf(this);
+            if (i > -1) {
+                this.parent.children.splice(i, 1);
+            }
+        }
+        this.parent = null;
+    }
+}
+class VDOMElement extends VDOMNode {
     constructor(name) {
+        super();
         this.name = name;
         this.props = new Map();
         this.children = [];
         this.style = new Map();
         this.className = '';
-        this.parent = null;
     }
 }
-class VDOMText {
+class VDOMText extends VDOMNode {
     constructor(text) {
+        super();
         this.text = text;
-        this.parent = null;
     }
 }
 /**
@@ -200,10 +214,12 @@ class HTMLRenderer extends core.NativeRenderer {
         node.props.set(key, value);
     }
     appendChild(parent, newChild) {
+        newChild.remove();
         parent.children.push(newChild);
         newChild.parent = parent;
     }
     prependChild(parent, newChild) {
+        newChild.remove();
         parent.children.unshift(newChild);
         newChild.parent = parent;
     }
@@ -226,21 +242,17 @@ class HTMLRenderer extends core.NativeRenderer {
         //
     }
     remove(node) {
-        if (node.parent) {
-            const i = node.parent.children.indexOf(node);
-            if (i > -1) {
-                node.parent.children.splice(i, 1);
-            }
-        }
-        node.parent = null;
+        node.remove();
     }
     cleanChildren(node) {
+        node.children.forEach(i => i.parent = null);
         node.children = [];
     }
     syncTextContent(target, content) {
         target.text = content;
     }
     insertAfter(newNode, ref) {
+        newNode.remove();
         const parent = ref.parent;
         if (parent) {
             const i = parent.children.indexOf(ref);
@@ -286,7 +298,7 @@ class OutputTranslator {
         const attrs = Array.from(vDom.props.keys()).filter(key => key !== 'ref' && vDom.props.get(key) !== false).map(k => {
             const key = xssFilter.attrName(k);
             const value = vDom.props.get(k);
-            return (value === true ? `${key}` : `${key}="${xssFilter.attrValue(`${value}`)}"`);
+            return (value === true && /^\w+$/.test(key) ? `${key}` : `${key}="${xssFilter.attrValue(`${value}`)}"`);
         });
         if (styles) {
             attrs.push(`style="${styles}"`);
@@ -352,6 +364,7 @@ exports.DomRenderer = DomRenderer;
 exports.HTMLRenderer = HTMLRenderer;
 exports.OutputTranslator = OutputTranslator;
 exports.VDOMElement = VDOMElement;
+exports.VDOMNode = VDOMNode;
 exports.VDOMText = VDOMText;
 exports.createApp = createApp;
 exports.createPortal = createPortal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/platform-browser",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.3",
   "description": "This project is used to enable the Viewfly framework to run in a browser.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -12,7 +12,7 @@
   "license": "MIT",
   "keywords": [],
   "dependencies": {
-    "@viewfly/core": "^1.0.0-alpha.1",
+    "@viewfly/core": "^1.0.0-alpha.3",
     "csstype": "^3.1.2"
   },
   "devDependencies": {
@@ -33,5 +33,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "8a25e6e350ba9cade6036506e7fe2aba4e4396ac"
+  "gitHead": "ef47d49227def3f760cec535ba7867e0e624f339"
 }