clear fix

ryansolid · Jun 25, 2019 · c4323e9 · c4323e9
1 parent 974a910
commit c4323e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dom-expressions",
   "description": "A Fine-Grained Runtime for Performant DOM Rendering",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {

diff --git a/template/runtime.ejs b/template/runtime.ejs
@@ -259,7 +259,7 @@ export function when(parent, accessor, expr, options, marker) {
     const value = condition();
     sample(() => {
       parent = (marker && marker.parentNode) || (beforeNode && beforeNode.parentNode) || parent;
-      clearAll(parent, current, marker, beforeNode && beforeNode.nextSibling);
+      clearAll(parent, current, marker !== undefined ? marker || (current ? step(current, FORWARD) : null) : marker, beforeNode && beforeNode.nextSibling);
       current = null;
       if (value == null || value === false) {
         afterRender && afterRender(current, marker);
@@ -286,7 +286,7 @@ export function switchWhen(parent, conditions, _, options, marker) {
     const index = evalConditions();
     sample(() => {
       parent = (marker && marker.parentNode) || (beforeNode && beforeNode.parentNode) || parent;
-      clearAll(parent, current, marker, beforeNode && beforeNode.nextSibling);
+      clearAll(parent, current, marker !== undefined ? marker || (current ? step(current, FORWARD) : null) : marker, beforeNode && beforeNode.nextSibling);
       current = null;
       if (index < 0) {
         if (fallback) {
@@ -645,7 +645,7 @@ export function suspend(parent, accessor, expr, options, marker) {
       if (options.initializing) addNode(parent, rendered, marker || (beforeNode && beforeNode.nextSibling), ++groupCounter, node => current = node);
       else {
         if (disposable) {
-          clearAll(parent, current, marker, beforeNode && beforeNode.nextSibling);
+          clearAll(parent, current, marker !== undefined ? marker || (current ? step(current, FORWARD) : null) : marker, beforeNode && beforeNode.nextSibling);
           disposable();
         }
         while (node = doc.body.firstChild) parent.insertBefore(node, marker);