From a3aa6ae771a2d0a4d8cb6055c41efc0193b817ef Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Tue, 11 Jun 2024 21:57:14 +0200 Subject: [PATCH] Fix hydration of empty text nodes (#2505) --- packages/interpreter/src/js/core.js | 2 +- packages/interpreter/src/js/hash.txt | 2 +- packages/interpreter/src/ts/core.ts | 49 ++++++++++++++++++---------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/packages/interpreter/src/js/core.js b/packages/interpreter/src/js/core.js index c15a50557..173eaa733 100644 --- a/packages/interpreter/src/js/core.js +++ b/packages/interpreter/src/js/core.js @@ -1 +1 @@ -function setAttributeInner(node,field,value,ns){if(ns==="style"){node.style.setProperty(field,value);return}if(ns){node.setAttributeNS(ns,field,value);return}switch(field){case"value":if(node.value!==value)node.value=value;break;case"initial_value":node.defaultValue=value;break;case"checked":node.checked=truthy(value);break;case"initial_checked":node.defaultChecked=truthy(value);break;case"selected":node.selected=truthy(value);break;case"initial_selected":node.defaultSelected=truthy(value);break;case"dangerous_inner_html":node.innerHTML=value;break;default:if(!truthy(value)&&isBoolAttr(field))node.removeAttribute(field);else node.setAttribute(field,value)}}var truthy=function(val){return val==="true"||val===!0},isBoolAttr=function(field){switch(field){case"allowfullscreen":case"allowpaymentrequest":case"async":case"autofocus":case"autoplay":case"checked":case"controls":case"default":case"defer":case"disabled":case"formnovalidate":case"hidden":case"ismap":case"itemscope":case"loop":case"multiple":case"muted":case"nomodule":case"novalidate":case"open":case"playsinline":case"readonly":case"required":case"reversed":case"selected":case"truespeed":case"webkitdirectory":return!0;default:return!1}};class BaseInterpreter{global;local;root;handler;nodes;stack;templates;m;constructor(){}initialize(root,handler=null){if(this.global={},this.local={},this.root=root,this.nodes=[root],this.stack=[root],this.templates={},handler)this.handler=handler}createListener(event_name,element,bubbles){if(bubbles)if(this.global[event_name]===void 0)this.global[event_name]={active:1,callback:this.handler},this.root.addEventListener(event_name,this.handler);else this.global[event_name].active++;else{const id=element.getAttribute("data-dioxus-id");if(!this.local[id])this.local[id]={};element.addEventListener(event_name,this.handler)}}removeListener(element,event_name,bubbles){if(bubbles)this.removeBubblingListener(event_name);else this.removeNonBubblingListener(element,event_name)}removeBubblingListener(event_name){if(this.global[event_name].active--,this.global[event_name].active===0)this.root.removeEventListener(event_name,this.global[event_name].callback),delete this.global[event_name]}removeNonBubblingListener(element,event_name){const id=element.getAttribute("data-dioxus-id");if(delete this.local[id][event_name],Object.keys(this.local[id]).length===0)delete this.local[id];element.removeEventListener(event_name,this.handler)}removeAllNonBubblingListeners(element){const id=element.getAttribute("data-dioxus-id");delete this.local[id]}getNode(id){return this.nodes[id]}appendChildren(id,many){const root=this.nodes[id],els=this.stack.splice(this.stack.length-many);for(let k=0;k0;end--)node=node.nextSibling}return node}saveTemplate(nodes,tmpl_id){this.templates[tmpl_id]=nodes}hydrate(ids){const hydrateNodes=document.querySelectorAll("[data-node-hydration]");for(let i=0;i1){hydrateNode.listening=split.length-1,hydrateNode.setAttribute("data-dioxus-id",id.toString());for(let j=1;j1)this.nodes[ids[parseInt(split[1])]]=currentNode.nextSibling;currentNode=treeWalker.nextNode()}}setAttributeInner(node,field,value,ns){setAttributeInner(node,field,value,ns)}}export{BaseInterpreter}; +function setAttributeInner(node,field,value,ns){if(ns==="style"){node.style.setProperty(field,value);return}if(ns){node.setAttributeNS(ns,field,value);return}switch(field){case"value":if(node.value!==value)node.value=value;break;case"initial_value":node.defaultValue=value;break;case"checked":node.checked=truthy(value);break;case"initial_checked":node.defaultChecked=truthy(value);break;case"selected":node.selected=truthy(value);break;case"initial_selected":node.defaultSelected=truthy(value);break;case"dangerous_inner_html":node.innerHTML=value;break;default:if(!truthy(value)&&isBoolAttr(field))node.removeAttribute(field);else node.setAttribute(field,value)}}var truthy=function(val){return val==="true"||val===!0},isBoolAttr=function(field){switch(field){case"allowfullscreen":case"allowpaymentrequest":case"async":case"autofocus":case"autoplay":case"checked":case"controls":case"default":case"defer":case"disabled":case"formnovalidate":case"hidden":case"ismap":case"itemscope":case"loop":case"multiple":case"muted":case"nomodule":case"novalidate":case"open":case"playsinline":case"readonly":case"required":case"reversed":case"selected":case"truespeed":case"webkitdirectory":return!0;default:return!1}};class BaseInterpreter{global;local;root;handler;nodes;stack;templates;m;constructor(){}initialize(root,handler=null){if(this.global={},this.local={},this.root=root,this.nodes=[root],this.stack=[root],this.templates={},handler)this.handler=handler}createListener(event_name,element,bubbles){if(bubbles)if(this.global[event_name]===void 0)this.global[event_name]={active:1,callback:this.handler},this.root.addEventListener(event_name,this.handler);else this.global[event_name].active++;else{const id=element.getAttribute("data-dioxus-id");if(!this.local[id])this.local[id]={};element.addEventListener(event_name,this.handler)}}removeListener(element,event_name,bubbles){if(bubbles)this.removeBubblingListener(event_name);else this.removeNonBubblingListener(element,event_name)}removeBubblingListener(event_name){if(this.global[event_name].active--,this.global[event_name].active===0)this.root.removeEventListener(event_name,this.global[event_name].callback),delete this.global[event_name]}removeNonBubblingListener(element,event_name){const id=element.getAttribute("data-dioxus-id");if(delete this.local[id][event_name],Object.keys(this.local[id]).length===0)delete this.local[id];element.removeEventListener(event_name,this.handler)}removeAllNonBubblingListeners(element){const id=element.getAttribute("data-dioxus-id");delete this.local[id]}getNode(id){return this.nodes[id]}appendChildren(id,many){const root=this.nodes[id],els=this.stack.splice(this.stack.length-many);for(let k=0;k0;end--)node=node.nextSibling}return node}saveTemplate(nodes,tmpl_id){this.templates[tmpl_id]=nodes}hydrate(ids){const hydrateNodes=document.querySelectorAll("[data-node-hydration]");for(let i=0;i1){hydrateNode.listening=split.length-1,hydrateNode.setAttribute("data-dioxus-id",id.toString());for(let j=1;j1){let next=currentNode.nextSibling;if(next.nodeType===Node.COMMENT_NODE)next=next.parentElement.insertBefore(document.createTextNode(""),next);this.nodes[ids[parseInt(split[1])]]=next}currentNode=treeWalker.nextNode()}}setAttributeInner(node,field,value,ns){setAttributeInner(node,field,value,ns)}}export{BaseInterpreter}; diff --git a/packages/interpreter/src/js/hash.txt b/packages/interpreter/src/js/hash.txt index 70f987425..9a734cc29 100644 --- a/packages/interpreter/src/js/hash.txt +++ b/packages/interpreter/src/js/hash.txt @@ -1 +1 @@ -8520528080524713002 \ No newline at end of file +10168539550869061874 \ No newline at end of file diff --git a/packages/interpreter/src/ts/core.ts b/packages/interpreter/src/ts/core.ts index c0c91b640..a69df77e9 100644 --- a/packages/interpreter/src/ts/core.ts +++ b/packages/interpreter/src/ts/core.ts @@ -8,13 +8,13 @@ export type NodeId = number; export class BaseInterpreter { // non bubbling events listen at the element the listener was created at global: { - [key: string]: { active: number, callback: EventListener } + [key: string]: { active: number; callback: EventListener }; }; // bubbling events can listen at the root element local: { [key: string]: { - [key: string]: EventListener - } + [key: string]: EventListener; + }; }; root: HTMLElement; @@ -22,13 +22,13 @@ export class BaseInterpreter { nodes: Node[]; stack: Node[]; templates: { - [key: number]: Node[] + [key: number]: Node[]; }; // sledgehammer is generating this... m: any; - constructor() { } + constructor() {} initialize(root: HTMLElement, handler: EventListener | null = null) { this.global = {}; @@ -72,7 +72,10 @@ export class BaseInterpreter { removeBubblingListener(event_name: string) { this.global[event_name].active--; if (this.global[event_name].active === 0) { - this.root.removeEventListener(event_name, this.global[event_name].callback); + this.root.removeEventListener( + event_name, + this.global[event_name].callback + ); delete this.global[event_name]; } } @@ -123,12 +126,12 @@ export class BaseInterpreter { } hydrate(ids: { [key: number]: number }) { - const hydrateNodes = document.querySelectorAll('[data-node-hydration]'); + const hydrateNodes = document.querySelectorAll("[data-node-hydration]"); for (let i = 0; i < hydrateNodes.length; i++) { const hydrateNode = hydrateNodes[i] as HTMLElement; - const hydration = hydrateNode.getAttribute('data-node-hydration'); - const split = hydration!.split(','); + const hydration = hydrateNode.getAttribute("data-node-hydration"); + const split = hydration!.split(","); const id = ids[parseInt(split[0])]; this.nodes[id] = hydrateNode; @@ -136,12 +139,12 @@ export class BaseInterpreter { if (split.length > 1) { // @ts-ignore hydrateNode.listening = split.length - 1; - hydrateNode.setAttribute('data-dioxus-id', id.toString()); + hydrateNode.setAttribute("data-dioxus-id", id.toString()); for (let j = 1; j < split.length; j++) { const listener = split[j]; - const split2 = listener.split(':'); + const split2 = listener.split(":"); const event_name = split2[0]; - const bubbles = split2[1] === '1'; + const bubbles = split2[1] === "1"; this.createListener(event_name, hydrateNode, bubbles); } } @@ -149,25 +152,37 @@ export class BaseInterpreter { const treeWalker = document.createTreeWalker( document.body, - NodeFilter.SHOW_COMMENT, + NodeFilter.SHOW_COMMENT ); let currentNode = treeWalker.nextNode(); while (currentNode) { const id = currentNode.textContent!; - const split = id.split('node-id'); + const split = id.split("node-id"); if (split.length > 1) { - this.nodes[ids[parseInt(split[1])]] = currentNode.nextSibling; + let next = currentNode.nextSibling; + // If we are hydrating an empty text node, we may see two comment nodes in a row instead of a comment node, text node and then comment node + if (next.nodeType === Node.COMMENT_NODE) { + next = next.parentElement.insertBefore( + document.createTextNode(""), + next + ); + } + this.nodes[ids[parseInt(split[1])]] = next; } currentNode = treeWalker.nextNode(); } } - setAttributeInner(node: HTMLElement, field: string, value: string, ns: string) { + setAttributeInner( + node: HTMLElement, + field: string, + value: string, + ns: string + ) { setAttributeInner(node, field, value, ns); } } -