@hotwired/turbo 8.0.12 → 8.0.13

package/dist/turbo.es2017-umd.js

@@ -1,6 +1,6 @@
 /*!
-Turbo 8.0.12
-Copyright © 2024 37signals LLC
+Turbo 8.0.13
+Copyright © 2025 37signals LLC
  */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -2032,838 +2032,1311 @@ Copyright © 2024 37signals LLC
     }
   }
 
+  /**
+   * @typedef {object} ConfigHead
+   *
+   * @property {'merge' | 'append' | 'morph' | 'none'} [style]
+   * @property {boolean} [block]
+   * @property {boolean} [ignore]
+   * @property {function(Element): boolean} [shouldPreserve]
+   * @property {function(Element): boolean} [shouldReAppend]
+   * @property {function(Element): boolean} [shouldRemove]
+   * @property {function(Element, {added: Node[], kept: Element[], removed: Element[]}): void} [afterHeadMorphed]
+   */
+
+  /**
+   * @typedef {object} ConfigCallbacks
+   *
+   * @property {function(Node): boolean} [beforeNodeAdded]
+   * @property {function(Node): void} [afterNodeAdded]
+   * @property {function(Element, Node): boolean} [beforeNodeMorphed]
+   * @property {function(Element, Node): void} [afterNodeMorphed]
+   * @property {function(Element): boolean} [beforeNodeRemoved]
+   * @property {function(Element): void} [afterNodeRemoved]
+   * @property {function(string, Element, "update" | "remove"): boolean} [beforeAttributeUpdated]
+   */
+
+  /**
+   * @typedef {object} Config
+   *
+   * @property {'outerHTML' | 'innerHTML'} [morphStyle]
+   * @property {boolean} [ignoreActive]
+   * @property {boolean} [ignoreActiveValue]
+   * @property {boolean} [restoreFocus]
+   * @property {ConfigCallbacks} [callbacks]
+   * @property {ConfigHead} [head]
+   */
+
+  /**
+   * @typedef {function} NoOp
+   *
+   * @returns {void}
+   */
+
+  /**
+   * @typedef {object} ConfigHeadInternal
+   *
+   * @property {'merge' | 'append' | 'morph' | 'none'} style
+   * @property {boolean} [block]
+   * @property {boolean} [ignore]
+   * @property {(function(Element): boolean) | NoOp} shouldPreserve
+   * @property {(function(Element): boolean) | NoOp} shouldReAppend
+   * @property {(function(Element): boolean) | NoOp} shouldRemove
+   * @property {(function(Element, {added: Node[], kept: Element[], removed: Element[]}): void) | NoOp} afterHeadMorphed
+   */
+
+  /**
+   * @typedef {object} ConfigCallbacksInternal
+   *
+   * @property {(function(Node): boolean) | NoOp} beforeNodeAdded
+   * @property {(function(Node): void) | NoOp} afterNodeAdded
+   * @property {(function(Node, Node): boolean) | NoOp} beforeNodeMorphed
+   * @property {(function(Node, Node): void) | NoOp} afterNodeMorphed
+   * @property {(function(Node): boolean) | NoOp} beforeNodeRemoved
+   * @property {(function(Node): void) | NoOp} afterNodeRemoved
+   * @property {(function(string, Element, "update" | "remove"): boolean) | NoOp} beforeAttributeUpdated
+   */
+
+  /**
+   * @typedef {object} ConfigInternal
+   *
+   * @property {'outerHTML' | 'innerHTML'} morphStyle
+   * @property {boolean} [ignoreActive]
+   * @property {boolean} [ignoreActiveValue]
+   * @property {boolean} [restoreFocus]
+   * @property {ConfigCallbacksInternal} callbacks
+   * @property {ConfigHeadInternal} head
+   */
+
+  /**
+   * @typedef {Object} IdSets
+   * @property {Set<string>} persistentIds
+   * @property {Map<Node, Set<string>>} idMap
+   */
+
+  /**
+   * @typedef {Function} Morph
+   *
+   * @param {Element | Document} oldNode
+   * @param {Element | Node | HTMLCollection | Node[] | string | null} newContent
+   * @param {Config} [config]
+   * @returns {undefined | Node[]}
+   */
+
   // base IIFE to define idiomorph
+  /**
+   *
+   * @type {{defaults: ConfigInternal, morph: Morph}}
+   */
   var Idiomorph = (function () {
 
-          //=============================================================================
-          // AND NOW IT BEGINS...
-          //=============================================================================
-          let EMPTY_SET = new Set();
-
-          // default configuration values, updatable by users now
-          let defaults = {
-              morphStyle: "outerHTML",
-              callbacks : {
-                  beforeNodeAdded: noOp,
-                  afterNodeAdded: noOp,
-                  beforeNodeMorphed: noOp,
-                  afterNodeMorphed: noOp,
-                  beforeNodeRemoved: noOp,
-                  afterNodeRemoved: noOp,
-                  beforeAttributeUpdated: noOp,
-
-              },
-              head: {
-                  style: 'merge',
-                  shouldPreserve: function (elt) {
-                      return elt.getAttribute("im-preserve") === "true";
-                  },
-                  shouldReAppend: function (elt) {
-                      return elt.getAttribute("im-re-append") === "true";
-                  },
-                  shouldRemove: noOp,
-                  afterHeadMorphed: noOp,
-              }
-          };
+    /**
+     * @typedef {object} MorphContext
+     *
+     * @property {Element} target
+     * @property {Element} newContent
+     * @property {ConfigInternal} config
+     * @property {ConfigInternal['morphStyle']} morphStyle
+     * @property {ConfigInternal['ignoreActive']} ignoreActive
+     * @property {ConfigInternal['ignoreActiveValue']} ignoreActiveValue
+     * @property {ConfigInternal['restoreFocus']} restoreFocus
+     * @property {Map<Node, Set<string>>} idMap
+     * @property {Set<string>} persistentIds
+     * @property {ConfigInternal['callbacks']} callbacks
+     * @property {ConfigInternal['head']} head
+     * @property {HTMLDivElement} pantry
+     */
 
-          //=============================================================================
-          // Core Morphing Algorithm - morph, morphNormalizedContent, morphOldNodeTo, morphChildren
-          //=============================================================================
-          function morph(oldNode, newContent, config = {}) {
+    //=============================================================================
+    // AND NOW IT BEGINS...
+    //=============================================================================
 
-              if (oldNode instanceof Document) {
-                  oldNode = oldNode.documentElement;
-              }
+    const noOp = () => {};
+    /**
+     * Default configuration values, updatable by users now
+     * @type {ConfigInternal}
+     */
+    const defaults = {
+      morphStyle: "outerHTML",
+      callbacks: {
+        beforeNodeAdded: noOp,
+        afterNodeAdded: noOp,
+        beforeNodeMorphed: noOp,
+        afterNodeMorphed: noOp,
+        beforeNodeRemoved: noOp,
+        afterNodeRemoved: noOp,
+        beforeAttributeUpdated: noOp,
+      },
+      head: {
+        style: "merge",
+        shouldPreserve: (elt) => elt.getAttribute("im-preserve") === "true",
+        shouldReAppend: (elt) => elt.getAttribute("im-re-append") === "true",
+        shouldRemove: noOp,
+        afterHeadMorphed: noOp,
+      },
+      restoreFocus: true,
+    };
 
-              if (typeof newContent === 'string') {
-                  newContent = parseContent(newContent);
-              }
+    /**
+     * Core idiomorph function for morphing one DOM tree to another
+     *
+     * @param {Element | Document} oldNode
+     * @param {Element | Node | HTMLCollection | Node[] | string | null} newContent
+     * @param {Config} [config]
+     * @returns {Promise<Node[]> | Node[]}
+     */
+    function morph(oldNode, newContent, config = {}) {
+      oldNode = normalizeElement(oldNode);
+      const newNode = normalizeParent(newContent);
+      const ctx = createMorphContext(oldNode, newNode, config);
+
+      const morphedNodes = saveAndRestoreFocus(ctx, () => {
+        return withHeadBlocking(
+          ctx,
+          oldNode,
+          newNode,
+          /** @param {MorphContext} ctx */ (ctx) => {
+            if (ctx.morphStyle === "innerHTML") {
+              morphChildren(ctx, oldNode, newNode);
+              return Array.from(oldNode.childNodes);
+            } else {
+              return morphOuterHTML(ctx, oldNode, newNode);
+            }
+          },
+        );
+      });
 
-              let normalizedContent = normalizeContent(newContent);
+      ctx.pantry.remove();
+      return morphedNodes;
+    }
 
-              let ctx = createMorphContext(oldNode, normalizedContent, config);
+    /**
+     * Morph just the outerHTML of the oldNode to the newContent
+     * We have to be careful because the oldNode could have siblings which need to be untouched
+     * @param {MorphContext} ctx
+     * @param {Element} oldNode
+     * @param {Element} newNode
+     * @returns {Node[]}
+     */
+    function morphOuterHTML(ctx, oldNode, newNode) {
+      const oldParent = normalizeParent(oldNode);
+
+      // basis for calulating which nodes were morphed
+      // since there may be unmorphed sibling nodes
+      let childNodes = Array.from(oldParent.childNodes);
+      const index = childNodes.indexOf(oldNode);
+      // how many elements are to the right of the oldNode
+      const rightMargin = childNodes.length - (index + 1);
+
+      morphChildren(
+        ctx,
+        oldParent,
+        newNode,
+        // these two optional params are the secret sauce
+        oldNode, // start point for iteration
+        oldNode.nextSibling, // end point for iteration
+      );
 
-              return morphNormalizedContent(oldNode, normalizedContent, ctx);
-          }
+      // return just the morphed nodes
+      childNodes = Array.from(oldParent.childNodes);
+      return childNodes.slice(index, childNodes.length - rightMargin);
+    }
 
-          function morphNormalizedContent(oldNode, normalizedNewContent, ctx) {
-              if (ctx.head.block) {
-                  let oldHead = oldNode.querySelector('head');
-                  let newHead = normalizedNewContent.querySelector('head');
-                  if (oldHead && newHead) {
-                      let promises = handleHeadElement(newHead, oldHead, ctx);
-                      // when head promises resolve, call morph again, ignoring the head tag
-                      Promise.all(promises).then(function () {
-                          morphNormalizedContent(oldNode, normalizedNewContent, Object.assign(ctx, {
-                              head: {
-                                  block: false,
-                                  ignore: true
-                              }
-                          }));
-                      });
-                      return;
-                  }
-              }
+    /**
+     * @param {MorphContext} ctx
+     * @param {Function} fn
+     * @returns {Promise<Node[]> | Node[]}
+     */
+    function saveAndRestoreFocus(ctx, fn) {
+      if (!ctx.config.restoreFocus) return fn();
+      let activeElement =
+        /** @type {HTMLInputElement|HTMLTextAreaElement|null} */ (
+          document.activeElement
+        );
 
-              if (ctx.morphStyle === "innerHTML") {
-
-                  // innerHTML, so we are only updating the children
-                  morphChildren(normalizedNewContent, oldNode, ctx);
-                  return oldNode.children;
-
-              } else if (ctx.morphStyle === "outerHTML" || ctx.morphStyle == null) {
-                  // otherwise find the best element match in the new content, morph that, and merge its siblings
-                  // into either side of the best match
-                  let bestMatch = findBestNodeMatch(normalizedNewContent, oldNode, ctx);
-
-                  // stash the siblings that will need to be inserted on either side of the best match
-                  let previousSibling = bestMatch?.previousSibling;
-                  let nextSibling = bestMatch?.nextSibling;
-
-                  // morph it
-                  let morphedNode = morphOldNodeTo(oldNode, bestMatch, ctx);
-
-                  if (bestMatch) {
-                      // if there was a best match, merge the siblings in too and return the
-                      // whole bunch
-                      return insertSiblings(previousSibling, morphedNode, nextSibling);
-                  } else {
-                      // otherwise nothing was added to the DOM
-                      return []
-                  }
-              } else {
-                  throw "Do not understand how to morph style " + ctx.morphStyle;
+      // don't bother if the active element is not an input or textarea
+      if (
+        !(
+          activeElement instanceof HTMLInputElement ||
+          activeElement instanceof HTMLTextAreaElement
+        )
+      ) {
+        return fn();
+      }
+
+      const { id: activeElementId, selectionStart, selectionEnd } = activeElement;
+
+      const results = fn();
+
+      if (activeElementId && activeElementId !== document.activeElement?.id) {
+        activeElement = ctx.target.querySelector(`#${activeElementId}`);
+        activeElement?.focus();
+      }
+      if (activeElement && !activeElement.selectionEnd && selectionEnd) {
+        activeElement.setSelectionRange(selectionStart, selectionEnd);
+      }
+
+      return results;
+    }
+
+    const morphChildren = (function () {
+      /**
+       * This is the core algorithm for matching up children.  The idea is to use id sets to try to match up
+       * nodes as faithfully as possible.  We greedily match, which allows us to keep the algorithm fast, but
+       * by using id sets, we are able to better match up with content deeper in the DOM.
+       *
+       * Basic algorithm:
+       * - for each node in the new content:
+       *   - search self and siblings for an id set match, falling back to a soft match
+       *   - if match found
+       *     - remove any nodes up to the match:
+       *       - pantry persistent nodes
+       *       - delete the rest
+       *     - morph the match
+       *   - elsif no match found, and node is persistent
+       *     - find its match by querying the old root (future) and pantry (past)
+       *     - move it and its children here
+       *     - morph it
+       *   - else
+       *     - create a new node from scratch as a last result
+       *
+       * @param {MorphContext} ctx the merge context
+       * @param {Element} oldParent the old content that we are merging the new content into
+       * @param {Element} newParent the parent element of the new content
+       * @param {Node|null} [insertionPoint] the point in the DOM we start morphing at (defaults to first child)
+       * @param {Node|null} [endPoint] the point in the DOM we stop morphing at (defaults to after last child)
+       */
+      function morphChildren(
+        ctx,
+        oldParent,
+        newParent,
+        insertionPoint = null,
+        endPoint = null,
+      ) {
+        // normalize
+        if (
+          oldParent instanceof HTMLTemplateElement &&
+          newParent instanceof HTMLTemplateElement
+        ) {
+          // @ts-ignore we can pretend the DocumentFragment is an Element
+          oldParent = oldParent.content;
+          // @ts-ignore ditto
+          newParent = newParent.content;
+        }
+        insertionPoint ||= oldParent.firstChild;
+
+        // run through all the new content
+        for (const newChild of newParent.childNodes) {
+          // once we reach the end of the old parent content skip to the end and insert the rest
+          if (insertionPoint && insertionPoint != endPoint) {
+            const bestMatch = findBestMatch(
+              ctx,
+              newChild,
+              insertionPoint,
+              endPoint,
+            );
+            if (bestMatch) {
+              // if the node to morph is not at the insertion point then remove/move up to it
+              if (bestMatch !== insertionPoint) {
+                removeNodesBetween(ctx, insertionPoint, bestMatch);
               }
+              morphNode(bestMatch, newChild, ctx);
+              insertionPoint = bestMatch.nextSibling;
+              continue;
+            }
           }
 
-
-          /**
-           * @param possibleActiveElement
-           * @param ctx
-           * @returns {boolean}
-           */
-          function ignoreValueOfActiveElement(possibleActiveElement, ctx) {
-              return ctx.ignoreActiveValue && possibleActiveElement === document.activeElement && possibleActiveElement !== document.body;
+          // if the matching node is elsewhere in the original content
+          if (newChild instanceof Element && ctx.persistentIds.has(newChild.id)) {
+            // move it and all its children here and morph
+            const movedChild = moveBeforeById(
+              oldParent,
+              newChild.id,
+              insertionPoint,
+              ctx,
+            );
+            morphNode(movedChild, newChild, ctx);
+            insertionPoint = movedChild.nextSibling;
+            continue;
           }
 
-          /**
-           * @param oldNode root node to merge content into
-           * @param newContent new content to merge
-           * @param ctx the merge context
-           * @returns {Element} the element that ended up in the DOM
-           */
-          function morphOldNodeTo(oldNode, newContent, ctx) {
-              if (ctx.ignoreActive && oldNode === document.activeElement) ; else if (newContent == null) {
-                  if (ctx.callbacks.beforeNodeRemoved(oldNode) === false) return oldNode;
-
-                  oldNode.remove();
-                  ctx.callbacks.afterNodeRemoved(oldNode);
-                  return null;
-              } else if (!isSoftMatch(oldNode, newContent)) {
-                  if (ctx.callbacks.beforeNodeRemoved(oldNode) === false) return oldNode;
-                  if (ctx.callbacks.beforeNodeAdded(newContent) === false) return oldNode;
-
-                  oldNode.parentElement.replaceChild(newContent, oldNode);
-                  ctx.callbacks.afterNodeAdded(newContent);
-                  ctx.callbacks.afterNodeRemoved(oldNode);
-                  return newContent;
-              } else {
-                  if (ctx.callbacks.beforeNodeMorphed(oldNode, newContent) === false) return oldNode;
-
-                  if (oldNode instanceof HTMLHeadElement && ctx.head.ignore) ; else if (oldNode instanceof HTMLHeadElement && ctx.head.style !== "morph") {
-                      handleHeadElement(newContent, oldNode, ctx);
-                  } else {
-                      syncNodeFrom(newContent, oldNode, ctx);
-                      if (!ignoreValueOfActiveElement(oldNode, ctx)) {
-                          morphChildren(newContent, oldNode, ctx);
-                      }
-                  }
-                  ctx.callbacks.afterNodeMorphed(oldNode, newContent);
-                  return oldNode;
-              }
+          // last resort: insert the new node from scratch
+          const insertedNode = createNode(
+            oldParent,
+            newChild,
+            insertionPoint,
+            ctx,
+          );
+          // could be null if beforeNodeAdded prevented insertion
+          if (insertedNode) {
+            insertionPoint = insertedNode.nextSibling;
           }
+        }
 
-          /**
-           * This is the core algorithm for matching up children.  The idea is to use id sets to try to match up
-           * nodes as faithfully as possible.  We greedily match, which allows us to keep the algorithm fast, but
-           * by using id sets, we are able to better match up with content deeper in the DOM.
-           *
-           * Basic algorithm is, for each node in the new content:
-           *
-           * - if we have reached the end of the old parent, append the new content
-           * - if the new content has an id set match with the current insertion point, morph
-           * - search for an id set match
-           * - if id set match found, morph
-           * - otherwise search for a "soft" match
-           * - if a soft match is found, morph
-           * - otherwise, prepend the new node before the current insertion point
-           *
-           * The two search algorithms terminate if competing node matches appear to outweigh what can be achieved
-           * with the current node.  See findIdSetMatch() and findSoftMatch() for details.
-           *
-           * @param {Element} newParent the parent element of the new content
-           * @param {Element } oldParent the old content that we are merging the new content into
-           * @param ctx the merge context
-           */
-          function morphChildren(newParent, oldParent, ctx) {
-
-              let nextNewChild = newParent.firstChild;
-              let insertionPoint = oldParent.firstChild;
-              let newChild;
-
-              // run through all the new content
-              while (nextNewChild) {
-
-                  newChild = nextNewChild;
-                  nextNewChild = newChild.nextSibling;
-
-                  // if we are at the end of the exiting parent's children, just append
-                  if (insertionPoint == null) {
-                      if (ctx.callbacks.beforeNodeAdded(newChild) === false) return;
-
-                      oldParent.appendChild(newChild);
-                      ctx.callbacks.afterNodeAdded(newChild);
-                      removeIdsFromConsideration(ctx, newChild);
-                      continue;
-                  }
-
-                  // if the current node has an id set match then morph
-                  if (isIdSetMatch(newChild, insertionPoint, ctx)) {
-                      morphOldNodeTo(insertionPoint, newChild, ctx);
-                      insertionPoint = insertionPoint.nextSibling;
-                      removeIdsFromConsideration(ctx, newChild);
-                      continue;
-                  }
-
-                  // otherwise search forward in the existing old children for an id set match
-                  let idSetMatch = findIdSetMatch(newParent, oldParent, newChild, insertionPoint, ctx);
-
-                  // if we found a potential match, remove the nodes until that point and morph
-                  if (idSetMatch) {
-                      insertionPoint = removeNodesBetween(insertionPoint, idSetMatch, ctx);
-                      morphOldNodeTo(idSetMatch, newChild, ctx);
-                      removeIdsFromConsideration(ctx, newChild);
-                      continue;
-                  }
-
-                  // no id set match found, so scan forward for a soft match for the current node
-                  let softMatch = findSoftMatch(newParent, oldParent, newChild, insertionPoint, ctx);
-
-                  // if we found a soft match for the current node, morph
-                  if (softMatch) {
-                      insertionPoint = removeNodesBetween(insertionPoint, softMatch, ctx);
-                      morphOldNodeTo(softMatch, newChild, ctx);
-                      removeIdsFromConsideration(ctx, newChild);
-                      continue;
-                  }
-
-                  // abandon all hope of morphing, just insert the new child before the insertion point
-                  // and move on
-                  if (ctx.callbacks.beforeNodeAdded(newChild) === false) return;
-
-                  oldParent.insertBefore(newChild, insertionPoint);
-                  ctx.callbacks.afterNodeAdded(newChild);
-                  removeIdsFromConsideration(ctx, newChild);
-              }
+        // remove any remaining old nodes that didn't match up with new content
+        while (insertionPoint && insertionPoint != endPoint) {
+          const tempNode = insertionPoint;
+          insertionPoint = insertionPoint.nextSibling;
+          removeNode(ctx, tempNode);
+        }
+      }
 
-              // remove any remaining old nodes that didn't match up with new content
-              while (insertionPoint !== null) {
+      /**
+       * This performs the action of inserting a new node while handling situations where the node contains
+       * elements with persistent ids and possible state info we can still preserve by moving in and then morphing
+       *
+       * @param {Element} oldParent
+       * @param {Node} newChild
+       * @param {Node|null} insertionPoint
+       * @param {MorphContext} ctx
+       * @returns {Node|null}
+       */
+      function createNode(oldParent, newChild, insertionPoint, ctx) {
+        if (ctx.callbacks.beforeNodeAdded(newChild) === false) return null;
+        if (ctx.idMap.has(newChild)) {
+          // node has children with ids with possible state so create a dummy elt of same type and apply full morph algorithm
+          const newEmptyChild = document.createElement(
+            /** @type {Element} */ (newChild).tagName,
+          );
+          oldParent.insertBefore(newEmptyChild, insertionPoint);
+          morphNode(newEmptyChild, newChild, ctx);
+          ctx.callbacks.afterNodeAdded(newEmptyChild);
+          return newEmptyChild;
+        } else {
+          // optimisation: no id state to preserve so we can just insert a clone of the newChild and its descendants
+          const newClonedChild = document.importNode(newChild, true); // importNode to not mutate newParent
+          oldParent.insertBefore(newClonedChild, insertionPoint);
+          ctx.callbacks.afterNodeAdded(newClonedChild);
+          return newClonedChild;
+        }
+      }
 
-                  let tempNode = insertionPoint;
-                  insertionPoint = insertionPoint.nextSibling;
-                  removeNode(tempNode, ctx);
+      //=============================================================================
+      // Matching Functions
+      //=============================================================================
+      const findBestMatch = (function () {
+        /**
+         * Scans forward from the startPoint to the endPoint looking for a match
+         * for the node. It looks for an id set match first, then a soft match.
+         * We abort softmatching if we find two future soft matches, to reduce churn.
+         * @param {Node} node
+         * @param {MorphContext} ctx
+         * @param {Node | null} startPoint
+         * @param {Node | null} endPoint
+         * @returns {Node | null}
+         */
+        function findBestMatch(ctx, node, startPoint, endPoint) {
+          let softMatch = null;
+          let nextSibling = node.nextSibling;
+          let siblingSoftMatchCount = 0;
+
+          let cursor = startPoint;
+          while (cursor && cursor != endPoint) {
+            // soft matching is a prerequisite for id set matching
+            if (isSoftMatch(cursor, node)) {
+              if (isIdSetMatch(ctx, cursor, node)) {
+                return cursor; // found an id set match, we're done!
               }
-          }
 
-          //=============================================================================
-          // Attribute Syncing Code
-          //=============================================================================
-
-          /**
-           * @param attr {String} the attribute to be mutated
-           * @param to {Element} the element that is going to be updated
-           * @param updateType {("update"|"remove")}
-           * @param ctx the merge context
-           * @returns {boolean} true if the attribute should be ignored, false otherwise
-           */
-          function ignoreAttribute(attr, to, updateType, ctx) {
-              if(attr === 'value' && ctx.ignoreActiveValue && to === document.activeElement){
-                  return true;
+              // we haven't yet saved a soft match fallback
+              if (softMatch === null) {
+                // the current soft match will hard match something else in the future, leave it
+                if (!ctx.idMap.has(cursor)) {
+                  // save this as the fallback if we get through the loop without finding a hard match
+                  softMatch = cursor;
+                }
               }
-              return ctx.callbacks.beforeAttributeUpdated(attr, to, updateType) === false;
-          }
-
-          /**
-           * syncs a given node with another node, copying over all attributes and
-           * inner element state from the 'from' node to the 'to' node
-           *
-           * @param {Element} from the element to copy attributes & state from
-           * @param {Element} to the element to copy attributes & state to
-           * @param ctx the merge context
-           */
-          function syncNodeFrom(from, to, ctx) {
-              let type = from.nodeType;
-
-              // if is an element type, sync the attributes from the
-              // new node into the new node
-              if (type === 1 /* element type */) {
-                  const fromAttributes = from.attributes;
-                  const toAttributes = to.attributes;
-                  for (const fromAttribute of fromAttributes) {
-                      if (ignoreAttribute(fromAttribute.name, to, 'update', ctx)) {
-                          continue;
-                      }
-                      if (to.getAttribute(fromAttribute.name) !== fromAttribute.value) {
-                          to.setAttribute(fromAttribute.name, fromAttribute.value);
-                      }
-                  }
-                  // iterate backwards to avoid skipping over items when a delete occurs
-                  for (let i = toAttributes.length - 1; 0 <= i; i--) {
-                      const toAttribute = toAttributes[i];
-                      if (ignoreAttribute(toAttribute.name, to, 'remove', ctx)) {
-                          continue;
-                      }
-                      if (!from.hasAttribute(toAttribute.name)) {
-                          to.removeAttribute(toAttribute.name);
-                      }
-                  }
+            }
+            if (
+              softMatch === null &&
+              nextSibling &&
+              isSoftMatch(cursor, nextSibling)
+            ) {
+              // The next new node has a soft match with this node, so
+              // increment the count of future soft matches
+              siblingSoftMatchCount++;
+              nextSibling = nextSibling.nextSibling;
+
+              // If there are two future soft matches, block soft matching for this node to allow
+              // future siblings to soft match. This is to reduce churn in the DOM when an element
+              // is prepended.
+              if (siblingSoftMatchCount >= 2) {
+                softMatch = undefined;
               }
+            }
 
-              // sync text nodes
-              if (type === 8 /* comment */ || type === 3 /* text */) {
-                  if (to.nodeValue !== from.nodeValue) {
-                      to.nodeValue = from.nodeValue;
-                  }
-              }
+            // if the current node contains active element, stop looking for better future matches,
+            // because if one is found, this node will be moved to the pantry, reparenting it and thus losing focus
+            if (cursor.contains(document.activeElement)) break;
 
-              if (!ignoreValueOfActiveElement(to, ctx)) {
-                  // sync input values
-                  syncInputValue(from, to, ctx);
-              }
+            cursor = cursor.nextSibling;
           }
 
-          /**
-           * @param from {Element} element to sync the value from
-           * @param to {Element} element to sync the value to
-           * @param attributeName {String} the attribute name
-           * @param ctx the merge context
-           */
-          function syncBooleanAttribute(from, to, attributeName, ctx) {
-              if (from[attributeName] !== to[attributeName]) {
-                  let ignoreUpdate = ignoreAttribute(attributeName, to, 'update', ctx);
-                  if (!ignoreUpdate) {
-                      to[attributeName] = from[attributeName];
-                  }
-                  if (from[attributeName]) {
-                      if (!ignoreUpdate) {
-                          to.setAttribute(attributeName, from[attributeName]);
-                      }
-                  } else {
-                      if (!ignoreAttribute(attributeName, to, 'remove', ctx)) {
-                          to.removeAttribute(attributeName);
-                      }
-                  }
-              }
-          }
+          return softMatch || null;
+        }
 
-          /**
-           * NB: many bothans died to bring us information:
-           *
-           *  https://github.com/patrick-steele-idem/morphdom/blob/master/src/specialElHandlers.js
-           *  https://github.com/choojs/nanomorph/blob/master/lib/morph.jsL113
-           *
-           * @param from {Element} the element to sync the input value from
-           * @param to {Element} the element to sync the input value to
-           * @param ctx the merge context
-           */
-          function syncInputValue(from, to, ctx) {
-              if (from instanceof HTMLInputElement &&
-                  to instanceof HTMLInputElement &&
-                  from.type !== 'file') {
-
-                  let fromValue = from.value;
-                  let toValue = to.value;
-
-                  // sync boolean attributes
-                  syncBooleanAttribute(from, to, 'checked', ctx);
-                  syncBooleanAttribute(from, to, 'disabled', ctx);
-
-                  if (!from.hasAttribute('value')) {
-                      if (!ignoreAttribute('value', to, 'remove', ctx)) {
-                          to.value = '';
-                          to.removeAttribute('value');
-                      }
-                  } else if (fromValue !== toValue) {
-                      if (!ignoreAttribute('value', to, 'update', ctx)) {
-                          to.setAttribute('value', fromValue);
-                          to.value = fromValue;
-                      }
-                  }
-              } else if (from instanceof HTMLOptionElement) {
-                  syncBooleanAttribute(from, to, 'selected', ctx);
-              } else if (from instanceof HTMLTextAreaElement && to instanceof HTMLTextAreaElement) {
-                  let fromValue = from.value;
-                  let toValue = to.value;
-                  if (ignoreAttribute('value', to, 'update', ctx)) {
-                      return;
-                  }
-                  if (fromValue !== toValue) {
-                      to.value = fromValue;
-                  }
-                  if (to.firstChild && to.firstChild.nodeValue !== fromValue) {
-                      to.firstChild.nodeValue = fromValue;
-                  }
-              }
+        /**
+         *
+         * @param {MorphContext} ctx
+         * @param {Node} oldNode
+         * @param {Node} newNode
+         * @returns {boolean}
+         */
+        function isIdSetMatch(ctx, oldNode, newNode) {
+          let oldSet = ctx.idMap.get(oldNode);
+          let newSet = ctx.idMap.get(newNode);
+
+          if (!newSet || !oldSet) return false;
+
+          for (const id of oldSet) {
+            // a potential match is an id in the new and old nodes that
+            // has not already been merged into the DOM
+            // But the newNode content we call this on has not been
+            // merged yet and we don't allow duplicate IDs so it is simple
+            if (newSet.has(id)) {
+              return true;
+            }
           }
+          return false;
+        }
 
-          //=============================================================================
-          // the HEAD tag can be handled specially, either w/ a 'merge' or 'append' style
-          //=============================================================================
-          function handleHeadElement(newHeadTag, currentHead, ctx) {
+        /**
+         *
+         * @param {Node} oldNode
+         * @param {Node} newNode
+         * @returns {boolean}
+         */
+        function isSoftMatch(oldNode, newNode) {
+          // ok to cast: if one is not element, `id` and `tagName` will be undefined and we'll just compare that.
+          const oldElt = /** @type {Element} */ (oldNode);
+          const newElt = /** @type {Element} */ (newNode);
+
+          return (
+            oldElt.nodeType === newElt.nodeType &&
+            oldElt.tagName === newElt.tagName &&
+            // If oldElt has an `id` with possible state and it doesn't match newElt.id then avoid morphing.
+            // We'll still match an anonymous node with an IDed newElt, though, because if it got this far,
+            // its not persistent, and new nodes can't have any hidden state.
+            (!oldElt.id || oldElt.id === newElt.id)
+          );
+        }
 
-              let added = [];
-              let removed = [];
-              let preserved = [];
-              let nodesToAppend = [];
+        return findBestMatch;
+      })();
 
-              let headMergeStyle = ctx.head.style;
+      //=============================================================================
+      // DOM Manipulation Functions
+      //=============================================================================
+
+      /**
+       * Gets rid of an unwanted DOM node; strategy depends on nature of its reuse:
+       * - Persistent nodes will be moved to the pantry for later reuse
+       * - Other nodes will have their hooks called, and then are removed
+       * @param {MorphContext} ctx
+       * @param {Node} node
+       */
+      function removeNode(ctx, node) {
+        // are we going to id set match this later?
+        if (ctx.idMap.has(node)) {
+          // skip callbacks and move to pantry
+          moveBefore(ctx.pantry, node, null);
+        } else {
+          // remove for realsies
+          if (ctx.callbacks.beforeNodeRemoved(node) === false) return;
+          node.parentNode?.removeChild(node);
+          ctx.callbacks.afterNodeRemoved(node);
+        }
+      }
 
-              // put all new head elements into a Map, by their outerHTML
-              let srcToNewHeadNodes = new Map();
-              for (const newHeadChild of newHeadTag.children) {
-                  srcToNewHeadNodes.set(newHeadChild.outerHTML, newHeadChild);
-              }
+      /**
+       * Remove nodes between the start and end nodes
+       * @param {MorphContext} ctx
+       * @param {Node} startInclusive
+       * @param {Node} endExclusive
+       * @returns {Node|null}
+       */
+      function removeNodesBetween(ctx, startInclusive, endExclusive) {
+        /** @type {Node | null} */
+        let cursor = startInclusive;
+        // remove nodes until the endExclusive node
+        while (cursor && cursor !== endExclusive) {
+          let tempNode = /** @type {Node} */ (cursor);
+          cursor = cursor.nextSibling;
+          removeNode(ctx, tempNode);
+        }
+        return cursor;
+      }
+
+      /**
+       * Search for an element by id within the document and pantry, and move it using moveBefore.
+       *
+       * @param {Element} parentNode - The parent node to which the element will be moved.
+       * @param {string} id - The ID of the element to be moved.
+       * @param {Node | null} after - The reference node to insert the element before.
+       *                              If `null`, the element is appended as the last child.
+       * @param {MorphContext} ctx
+       * @returns {Element} The found element
+       */
+      function moveBeforeById(parentNode, id, after, ctx) {
+        const target =
+          /** @type {Element} - will always be found */
+          (
+            ctx.target.querySelector(`#${id}`) ||
+              ctx.pantry.querySelector(`#${id}`)
+          );
+        removeElementFromAncestorsIdMaps(target, ctx);
+        moveBefore(parentNode, target, after);
+        return target;
+      }
+
+      /**
+       * Removes an element from its ancestors' id maps. This is needed when an element is moved from the
+       * "future" via `moveBeforeId`. Otherwise, its erstwhile ancestors could be mistakenly moved to the
+       * pantry rather than being deleted, preventing their removal hooks from being called.
+       *
+       * @param {Element} element - element to remove from its ancestors' id maps
+       * @param {MorphContext} ctx
+       */
+      function removeElementFromAncestorsIdMaps(element, ctx) {
+        const id = element.id;
+        /** @ts-ignore - safe to loop in this way **/
+        while ((element = element.parentNode)) {
+          let idSet = ctx.idMap.get(element);
+          if (idSet) {
+            idSet.delete(id);
+            if (!idSet.size) {
+              ctx.idMap.delete(element);
+            }
+          }
+        }
+      }
 
-              // for each elt in the current head
-              for (const currentHeadElt of currentHead.children) {
-
-                  // If the current head element is in the map
-                  let inNewContent = srcToNewHeadNodes.has(currentHeadElt.outerHTML);
-                  let isReAppended = ctx.head.shouldReAppend(currentHeadElt);
-                  let isPreserved = ctx.head.shouldPreserve(currentHeadElt);
-                  if (inNewContent || isPreserved) {
-                      if (isReAppended) {
-                          // remove the current version and let the new version replace it and re-execute
-                          removed.push(currentHeadElt);
-                      } else {
-                          // this element already exists and should not be re-appended, so remove it from
-                          // the new content map, preserving it in the DOM
-                          srcToNewHeadNodes.delete(currentHeadElt.outerHTML);
-                          preserved.push(currentHeadElt);
-                      }
-                  } else {
-                      if (headMergeStyle === "append") {
-                          // we are appending and this existing element is not new content
-                          // so if and only if it is marked for re-append do we do anything
-                          if (isReAppended) {
-                              removed.push(currentHeadElt);
-                              nodesToAppend.push(currentHeadElt);
-                          }
-                      } else {
-                          // if this is a merge, we remove this content since it is not in the new head
-                          if (ctx.head.shouldRemove(currentHeadElt) !== false) {
-                              removed.push(currentHeadElt);
-                          }
-                      }
-                  }
-              }
+      /**
+       * Moves an element before another element within the same parent.
+       * Uses the proposed `moveBefore` API if available (and working), otherwise falls back to `insertBefore`.
+       * This is essentialy a forward-compat wrapper.
+       *
+       * @param {Element} parentNode - The parent node containing the after element.
+       * @param {Node} element - The element to be moved.
+       * @param {Node | null} after - The reference node to insert `element` before.
+       *                              If `null`, `element` is appended as the last child.
+       */
+      function moveBefore(parentNode, element, after) {
+        // @ts-ignore - use proposed moveBefore feature
+        if (parentNode.moveBefore) {
+          try {
+            // @ts-ignore - use proposed moveBefore feature
+            parentNode.moveBefore(element, after);
+          } catch (e) {
+            // fall back to insertBefore as some browsers may fail on moveBefore when trying to move Dom disconnected nodes to pantry
+            parentNode.insertBefore(element, after);
+          }
+        } else {
+          parentNode.insertBefore(element, after);
+        }
+      }
 
-              // Push the remaining new head elements in the Map into the
-              // nodes to append to the head tag
-              nodesToAppend.push(...srcToNewHeadNodes.values());
-
-              let promises = [];
-              for (const newNode of nodesToAppend) {
-                  let newElt = document.createRange().createContextualFragment(newNode.outerHTML).firstChild;
-                  if (ctx.callbacks.beforeNodeAdded(newElt) !== false) {
-                      if (newElt.href || newElt.src) {
-                          let resolve = null;
-                          let promise = new Promise(function (_resolve) {
-                              resolve = _resolve;
-                          });
-                          newElt.addEventListener('load', function () {
-                              resolve();
-                          });
-                          promises.push(promise);
-                      }
-                      currentHead.appendChild(newElt);
-                      ctx.callbacks.afterNodeAdded(newElt);
-                      added.push(newElt);
-                  }
-              }
+      return morphChildren;
+    })();
+
+    //=============================================================================
+    // Single Node Morphing Code
+    //=============================================================================
+    const morphNode = (function () {
+      /**
+       * @param {Node} oldNode root node to merge content into
+       * @param {Node} newContent new content to merge
+       * @param {MorphContext} ctx the merge context
+       * @returns {Node | null} the element that ended up in the DOM
+       */
+      function morphNode(oldNode, newContent, ctx) {
+        if (ctx.ignoreActive && oldNode === document.activeElement) {
+          // don't morph focused element
+          return null;
+        }
 
-              // remove all removed elements, after we have appended the new elements to avoid
-              // additional network requests for things like style sheets
-              for (const removedElement of removed) {
-                  if (ctx.callbacks.beforeNodeRemoved(removedElement) !== false) {
-                      currentHead.removeChild(removedElement);
-                      ctx.callbacks.afterNodeRemoved(removedElement);
-                  }
-              }
+        if (ctx.callbacks.beforeNodeMorphed(oldNode, newContent) === false) {
+          return oldNode;
+        }
 
-              ctx.head.afterHeadMorphed(currentHead, {added: added, kept: preserved, removed: removed});
-              return promises;
+        if (oldNode instanceof HTMLHeadElement && ctx.head.ignore) ; else if (
+          oldNode instanceof HTMLHeadElement &&
+          ctx.head.style !== "morph"
+        ) {
+          // ok to cast: if newContent wasn't also a <head>, it would've got caught in the `!isSoftMatch` branch above
+          handleHeadElement(
+            oldNode,
+            /** @type {HTMLHeadElement} */ (newContent),
+            ctx,
+          );
+        } else {
+          morphAttributes(oldNode, newContent, ctx);
+          if (!ignoreValueOfActiveElement(oldNode, ctx)) {
+            // @ts-ignore newContent can be a node here because .firstChild will be null
+            morphChildren(ctx, oldNode, newContent);
           }
-
-          function noOp() {
+        }
+        ctx.callbacks.afterNodeMorphed(oldNode, newContent);
+        return oldNode;
+      }
+
+      /**
+       * syncs the oldNode to the newNode, copying over all attributes and
+       * inner element state from the newNode to the oldNode
+       *
+       * @param {Node} oldNode the node to copy attributes & state to
+       * @param {Node} newNode the node to copy attributes & state from
+       * @param {MorphContext} ctx the merge context
+       */
+      function morphAttributes(oldNode, newNode, ctx) {
+        let type = newNode.nodeType;
+
+        // if is an element type, sync the attributes from the
+        // new node into the new node
+        if (type === 1 /* element type */) {
+          const oldElt = /** @type {Element} */ (oldNode);
+          const newElt = /** @type {Element} */ (newNode);
+
+          const oldAttributes = oldElt.attributes;
+          const newAttributes = newElt.attributes;
+          for (const newAttribute of newAttributes) {
+            if (ignoreAttribute(newAttribute.name, oldElt, "update", ctx)) {
+              continue;
+            }
+            if (oldElt.getAttribute(newAttribute.name) !== newAttribute.value) {
+              oldElt.setAttribute(newAttribute.name, newAttribute.value);
+            }
           }
+          // iterate backwards to avoid skipping over items when a delete occurs
+          for (let i = oldAttributes.length - 1; 0 <= i; i--) {
+            const oldAttribute = oldAttributes[i];
 
-          /*
-            Deep merges the config object and the Idiomoroph.defaults object to
-            produce a final configuration object
-           */
-          function mergeDefaults(config) {
-              let finalConfig = {};
-              // copy top level stuff into final config
-              Object.assign(finalConfig, defaults);
-              Object.assign(finalConfig, config);
-
-              // copy callbacks into final config (do this to deep merge the callbacks)
-              finalConfig.callbacks = {};
-              Object.assign(finalConfig.callbacks, defaults.callbacks);
-              Object.assign(finalConfig.callbacks, config.callbacks);
-
-              // copy head config into final config  (do this to deep merge the head)
-              finalConfig.head = {};
-              Object.assign(finalConfig.head, defaults.head);
-              Object.assign(finalConfig.head, config.head);
-              return finalConfig;
-          }
+            // toAttributes is a live NamedNodeMap, so iteration+mutation is unsafe
+            // e.g. custom element attribute callbacks can remove other attributes
+            if (!oldAttribute) continue;
 
-          function createMorphContext(oldNode, newContent, config) {
-              config = mergeDefaults(config);
-              return {
-                  target: oldNode,
-                  newContent: newContent,
-                  config: config,
-                  morphStyle: config.morphStyle,
-                  ignoreActive: config.ignoreActive,
-                  ignoreActiveValue: config.ignoreActiveValue,
-                  idMap: createIdMap(oldNode, newContent),
-                  deadIds: new Set(),
-                  callbacks: config.callbacks,
-                  head: config.head
+            if (!newElt.hasAttribute(oldAttribute.name)) {
+              if (ignoreAttribute(oldAttribute.name, oldElt, "remove", ctx)) {
+                continue;
               }
+              oldElt.removeAttribute(oldAttribute.name);
+            }
           }
 
-          function isIdSetMatch(node1, node2, ctx) {
-              if (node1 == null || node2 == null) {
-                  return false;
-              }
-              if (node1.nodeType === node2.nodeType && node1.tagName === node2.tagName) {
-                  if (node1.id !== "" && node1.id === node2.id) {
-                      return true;
-                  } else {
-                      return getIdIntersectionCount(ctx, node1, node2) > 0;
-                  }
-              }
-              return false;
+          if (!ignoreValueOfActiveElement(oldElt, ctx)) {
+            syncInputValue(oldElt, newElt, ctx);
           }
+        }
 
-          function isSoftMatch(node1, node2) {
-              if (node1 == null || node2 == null) {
-                  return false;
-              }
-              return node1.nodeType === node2.nodeType && node1.tagName === node2.tagName
+        // sync text nodes
+        if (type === 8 /* comment */ || type === 3 /* text */) {
+          if (oldNode.nodeValue !== newNode.nodeValue) {
+            oldNode.nodeValue = newNode.nodeValue;
           }
+        }
+      }
 
-          function removeNodesBetween(startInclusive, endExclusive, ctx) {
-              while (startInclusive !== endExclusive) {
-                  let tempNode = startInclusive;
-                  startInclusive = startInclusive.nextSibling;
-                  removeNode(tempNode, ctx);
-              }
-              removeIdsFromConsideration(ctx, endExclusive);
-              return endExclusive.nextSibling;
+      /**
+       * NB: many bothans died to bring us information:
+       *
+       *  https://github.com/patrick-steele-idem/morphdom/blob/master/src/specialElHandlers.js
+       *  https://github.com/choojs/nanomorph/blob/master/lib/morph.jsL113
+       *
+       * @param {Element} oldElement the element to sync the input value to
+       * @param {Element} newElement the element to sync the input value from
+       * @param {MorphContext} ctx the merge context
+       */
+      function syncInputValue(oldElement, newElement, ctx) {
+        if (
+          oldElement instanceof HTMLInputElement &&
+          newElement instanceof HTMLInputElement &&
+          newElement.type !== "file"
+        ) {
+          let newValue = newElement.value;
+          let oldValue = oldElement.value;
+
+          // sync boolean attributes
+          syncBooleanAttribute(oldElement, newElement, "checked", ctx);
+          syncBooleanAttribute(oldElement, newElement, "disabled", ctx);
+
+          if (!newElement.hasAttribute("value")) {
+            if (!ignoreAttribute("value", oldElement, "remove", ctx)) {
+              oldElement.value = "";
+              oldElement.removeAttribute("value");
+            }
+          } else if (oldValue !== newValue) {
+            if (!ignoreAttribute("value", oldElement, "update", ctx)) {
+              oldElement.setAttribute("value", newValue);
+              oldElement.value = newValue;
+            }
+          }
+          // TODO: QUESTION(1cg): this used to only check `newElement` unlike the other branches -- why?
+          // did I break something?
+        } else if (
+          oldElement instanceof HTMLOptionElement &&
+          newElement instanceof HTMLOptionElement
+        ) {
+          syncBooleanAttribute(oldElement, newElement, "selected", ctx);
+        } else if (
+          oldElement instanceof HTMLTextAreaElement &&
+          newElement instanceof HTMLTextAreaElement
+        ) {
+          let newValue = newElement.value;
+          let oldValue = oldElement.value;
+          if (ignoreAttribute("value", oldElement, "update", ctx)) {
+            return;
           }
+          if (newValue !== oldValue) {
+            oldElement.value = newValue;
+          }
+          if (
+            oldElement.firstChild &&
+            oldElement.firstChild.nodeValue !== newValue
+          ) {
+            oldElement.firstChild.nodeValue = newValue;
+          }
+        }
+      }
 
-          //=============================================================================
-          // Scans forward from the insertionPoint in the old parent looking for a potential id match
-          // for the newChild.  We stop if we find a potential id match for the new child OR
-          // if the number of potential id matches we are discarding is greater than the
-          // potential id matches for the new child
-          //=============================================================================
-          function findIdSetMatch(newContent, oldParent, newChild, insertionPoint, ctx) {
-
-              // max id matches we are willing to discard in our search
-              let newChildPotentialIdCount = getIdIntersectionCount(ctx, newChild, oldParent);
-
-              let potentialMatch = null;
-
-              // only search forward if there is a possibility of an id match
-              if (newChildPotentialIdCount > 0) {
-                  let potentialMatch = insertionPoint;
-                  // if there is a possibility of an id match, scan forward
-                  // keep track of the potential id match count we are discarding (the
-                  // newChildPotentialIdCount must be greater than this to make it likely
-                  // worth it)
-                  let otherMatchCount = 0;
-                  while (potentialMatch != null) {
-
-                      // If we have an id match, return the current potential match
-                      if (isIdSetMatch(newChild, potentialMatch, ctx)) {
-                          return potentialMatch;
-                      }
-
-                      // computer the other potential matches of this new content
-                      otherMatchCount += getIdIntersectionCount(ctx, potentialMatch, newContent);
-                      if (otherMatchCount > newChildPotentialIdCount) {
-                          // if we have more potential id matches in _other_ content, we
-                          // do not have a good candidate for an id match, so return null
-                          return null;
-                      }
-
-                      // advanced to the next old content child
-                      potentialMatch = potentialMatch.nextSibling;
-                  }
-              }
-              return potentialMatch;
+      /**
+       * @param {Element} oldElement element to write the value to
+       * @param {Element} newElement element to read the value from
+       * @param {string} attributeName the attribute name
+       * @param {MorphContext} ctx the merge context
+       */
+      function syncBooleanAttribute(oldElement, newElement, attributeName, ctx) {
+        // @ts-ignore this function is only used on boolean attrs that are reflected as dom properties
+        const newLiveValue = newElement[attributeName],
+          // @ts-ignore ditto
+          oldLiveValue = oldElement[attributeName];
+        if (newLiveValue !== oldLiveValue) {
+          const ignoreUpdate = ignoreAttribute(
+            attributeName,
+            oldElement,
+            "update",
+            ctx,
+          );
+          if (!ignoreUpdate) {
+            // update attribute's associated DOM property
+            // @ts-ignore this function is only used on boolean attrs that are reflected as dom properties
+            oldElement[attributeName] = newElement[attributeName];
+          }
+          if (newLiveValue) {
+            if (!ignoreUpdate) {
+              // https://developer.mozilla.org/en-US/docs/Glossary/Boolean/HTML
+              // this is the correct way to set a boolean attribute to "true"
+              oldElement.setAttribute(attributeName, "");
+            }
+          } else {
+            if (!ignoreAttribute(attributeName, oldElement, "remove", ctx)) {
+              oldElement.removeAttribute(attributeName);
+            }
           }
+        }
+      }
 
-          //=============================================================================
-          // Scans forward from the insertionPoint in the old parent looking for a potential soft match
-          // for the newChild.  We stop if we find a potential soft match for the new child OR
-          // if we find a potential id match in the old parents children OR if we find two
-          // potential soft matches for the next two pieces of new content
-          //=============================================================================
-          function findSoftMatch(newContent, oldParent, newChild, insertionPoint, ctx) {
-
-              let potentialSoftMatch = insertionPoint;
-              let nextSibling = newChild.nextSibling;
-              let siblingSoftMatchCount = 0;
-
-              while (potentialSoftMatch != null) {
-
-                  if (getIdIntersectionCount(ctx, potentialSoftMatch, newContent) > 0) {
-                      // the current potential soft match has a potential id set match with the remaining new
-                      // content so bail out of looking
-                      return null;
-                  }
-
-                  // if we have a soft match with the current node, return it
-                  if (isSoftMatch(newChild, potentialSoftMatch)) {
-                      return potentialSoftMatch;
-                  }
-
-                  if (isSoftMatch(nextSibling, potentialSoftMatch)) {
-                      // the next new node has a soft match with this node, so
-                      // increment the count of future soft matches
-                      siblingSoftMatchCount++;
-                      nextSibling = nextSibling.nextSibling;
-
-                      // If there are two future soft matches, bail to allow the siblings to soft match
-                      // so that we don't consume future soft matches for the sake of the current node
-                      if (siblingSoftMatchCount >= 2) {
-                          return null;
-                      }
-                  }
-
-                  // advanced to the next old content child
-                  potentialSoftMatch = potentialSoftMatch.nextSibling;
-              }
+      /**
+       * @param {string} attr the attribute to be mutated
+       * @param {Element} element the element that is going to be updated
+       * @param {"update" | "remove"} updateType
+       * @param {MorphContext} ctx the merge context
+       * @returns {boolean} true if the attribute should be ignored, false otherwise
+       */
+      function ignoreAttribute(attr, element, updateType, ctx) {
+        if (
+          attr === "value" &&
+          ctx.ignoreActiveValue &&
+          element === document.activeElement
+        ) {
+          return true;
+        }
+        return (
+          ctx.callbacks.beforeAttributeUpdated(attr, element, updateType) ===
+          false
+        );
+      }
 
-              return potentialSoftMatch;
-          }
+      /**
+       * @param {Node} possibleActiveElement
+       * @param {MorphContext} ctx
+       * @returns {boolean}
+       */
+      function ignoreValueOfActiveElement(possibleActiveElement, ctx) {
+        return (
+          !!ctx.ignoreActiveValue &&
+          possibleActiveElement === document.activeElement &&
+          possibleActiveElement !== document.body
+        );
+      }
 
-          function parseContent(newContent) {
-              let parser = new DOMParser();
-
-              // remove svgs to avoid false-positive matches on head, etc.
-              let contentWithSvgsRemoved = newContent.replace(/<svg(\s[^>]*>|>)([\s\S]*?)<\/svg>/gim, '');
-
-              // if the newContent contains a html, head or body tag, we can simply parse it w/o wrapping
-              if (contentWithSvgsRemoved.match(/<\/html>/) || contentWithSvgsRemoved.match(/<\/head>/) || contentWithSvgsRemoved.match(/<\/body>/)) {
-                  let content = parser.parseFromString(newContent, "text/html");
-                  // if it is a full HTML document, return the document itself as the parent container
-                  if (contentWithSvgsRemoved.match(/<\/html>/)) {
-                      content.generatedByIdiomorph = true;
-                      return content;
-                  } else {
-                      // otherwise return the html element as the parent container
-                      let htmlElement = content.firstChild;
-                      if (htmlElement) {
-                          htmlElement.generatedByIdiomorph = true;
-                          return htmlElement;
-                      } else {
-                          return null;
-                      }
-                  }
-              } else {
-                  // if it is partial HTML, wrap it in a template tag to provide a parent element and also to help
-                  // deal with touchy tags like tr, tbody, etc.
-                  let responseDoc = parser.parseFromString("<body><template>" + newContent + "</template></body>", "text/html");
-                  let content = responseDoc.body.querySelector('template').content;
-                  content.generatedByIdiomorph = true;
-                  return content
-              }
-          }
+      return morphNode;
+    })();
 
-          function normalizeContent(newContent) {
-              if (newContent == null) {
-                  // noinspection UnnecessaryLocalVariableJS
-                  const dummyParent = document.createElement('div');
-                  return dummyParent;
-              } else if (newContent.generatedByIdiomorph) {
-                  // the template tag created by idiomorph parsing can serve as a dummy parent
-                  return newContent;
-              } else if (newContent instanceof Node) {
-                  // a single node is added as a child to a dummy parent
-                  const dummyParent = document.createElement('div');
-                  dummyParent.append(newContent);
-                  return dummyParent;
-              } else {
-                  // all nodes in the array or HTMLElement collection are consolidated under
-                  // a single dummy parent element
-                  const dummyParent = document.createElement('div');
-                  for (const elt of [...newContent]) {
-                      dummyParent.append(elt);
-                  }
-                  return dummyParent;
-              }
-          }
+    //=============================================================================
+    // Head Management Functions
+    //=============================================================================
+    /**
+     * @param {MorphContext} ctx
+     * @param {Element} oldNode
+     * @param {Element} newNode
+     * @param {function} callback
+     * @returns {Node[] | Promise<Node[]>}
+     */
+    function withHeadBlocking(ctx, oldNode, newNode, callback) {
+      if (ctx.head.block) {
+        const oldHead = oldNode.querySelector("head");
+        const newHead = newNode.querySelector("head");
+        if (oldHead && newHead) {
+          const promises = handleHeadElement(oldHead, newHead, ctx);
+          // when head promises resolve, proceed ignoring the head tag
+          return Promise.all(promises).then(() => {
+            const newCtx = Object.assign(ctx, {
+              head: {
+                block: false,
+                ignore: true,
+              },
+            });
+            return callback(newCtx);
+          });
+        }
+      }
+      // just proceed if we not head blocking
+      return callback(ctx);
+    }
 
-          function insertSiblings(previousSibling, morphedNode, nextSibling) {
-              let stack = [];
-              let added = [];
-              while (previousSibling != null) {
-                  stack.push(previousSibling);
-                  previousSibling = previousSibling.previousSibling;
-              }
-              while (stack.length > 0) {
-                  let node = stack.pop();
-                  added.push(node); // push added preceding siblings on in order and insert
-                  morphedNode.parentElement.insertBefore(node, morphedNode);
-              }
-              added.push(morphedNode);
-              while (nextSibling != null) {
-                  stack.push(nextSibling);
-                  added.push(nextSibling); // here we are going in order, so push on as we scan, rather than add
-                  nextSibling = nextSibling.nextSibling;
-              }
-              while (stack.length > 0) {
-                  morphedNode.parentElement.insertBefore(stack.pop(), morphedNode.nextSibling);
-              }
-              return added;
+    /**
+     *  The HEAD tag can be handled specially, either w/ a 'merge' or 'append' style
+     *
+     * @param {Element} oldHead
+     * @param {Element} newHead
+     * @param {MorphContext} ctx
+     * @returns {Promise<void>[]}
+     */
+    function handleHeadElement(oldHead, newHead, ctx) {
+      let added = [];
+      let removed = [];
+      let preserved = [];
+      let nodesToAppend = [];
+
+      // put all new head elements into a Map, by their outerHTML
+      let srcToNewHeadNodes = new Map();
+      for (const newHeadChild of newHead.children) {
+        srcToNewHeadNodes.set(newHeadChild.outerHTML, newHeadChild);
+      }
+
+      // for each elt in the current head
+      for (const currentHeadElt of oldHead.children) {
+        // If the current head element is in the map
+        let inNewContent = srcToNewHeadNodes.has(currentHeadElt.outerHTML);
+        let isReAppended = ctx.head.shouldReAppend(currentHeadElt);
+        let isPreserved = ctx.head.shouldPreserve(currentHeadElt);
+        if (inNewContent || isPreserved) {
+          if (isReAppended) {
+            // remove the current version and let the new version replace it and re-execute
+            removed.push(currentHeadElt);
+          } else {
+            // this element already exists and should not be re-appended, so remove it from
+            // the new content map, preserving it in the DOM
+            srcToNewHeadNodes.delete(currentHeadElt.outerHTML);
+            preserved.push(currentHeadElt);
           }
-
-          function findBestNodeMatch(newContent, oldNode, ctx) {
-              let currentElement;
-              currentElement = newContent.firstChild;
-              let bestElement = currentElement;
-              let score = 0;
-              while (currentElement) {
-                  let newScore = scoreElement(currentElement, oldNode, ctx);
-                  if (newScore > score) {
-                      bestElement = currentElement;
-                      score = newScore;
-                  }
-                  currentElement = currentElement.nextSibling;
-              }
-              return bestElement;
+        } else {
+          if (ctx.head.style === "append") {
+            // we are appending and this existing element is not new content
+            // so if and only if it is marked for re-append do we do anything
+            if (isReAppended) {
+              removed.push(currentHeadElt);
+              nodesToAppend.push(currentHeadElt);
+            }
+          } else {
+            // if this is a merge, we remove this content since it is not in the new head
+            if (ctx.head.shouldRemove(currentHeadElt) !== false) {
+              removed.push(currentHeadElt);
+            }
           }
+        }
+      }
 
-          function scoreElement(node1, node2, ctx) {
-              if (isSoftMatch(node1, node2)) {
-                  return .5 + getIdIntersectionCount(ctx, node1, node2);
-              }
-              return 0;
+      // Push the remaining new head elements in the Map into the
+      // nodes to append to the head tag
+      nodesToAppend.push(...srcToNewHeadNodes.values());
+
+      let promises = [];
+      for (const newNode of nodesToAppend) {
+        // TODO: This could theoretically be null, based on type
+        let newElt = /** @type {ChildNode} */ (
+          document.createRange().createContextualFragment(newNode.outerHTML)
+            .firstChild
+        );
+        if (ctx.callbacks.beforeNodeAdded(newElt) !== false) {
+          if (
+            ("href" in newElt && newElt.href) ||
+            ("src" in newElt && newElt.src)
+          ) {
+            /** @type {(result?: any) => void} */ let resolve;
+            let promise = new Promise(function (_resolve) {
+              resolve = _resolve;
+            });
+            newElt.addEventListener("load", function () {
+              resolve();
+            });
+            promises.push(promise);
           }
+          oldHead.appendChild(newElt);
+          ctx.callbacks.afterNodeAdded(newElt);
+          added.push(newElt);
+        }
+      }
 
-          function removeNode(tempNode, ctx) {
-              removeIdsFromConsideration(ctx, tempNode);
-              if (ctx.callbacks.beforeNodeRemoved(tempNode) === false) return;
+      // remove all removed elements, after we have appended the new elements to avoid
+      // additional network requests for things like style sheets
+      for (const removedElement of removed) {
+        if (ctx.callbacks.beforeNodeRemoved(removedElement) !== false) {
+          oldHead.removeChild(removedElement);
+          ctx.callbacks.afterNodeRemoved(removedElement);
+        }
+      }
 
-              tempNode.remove();
-              ctx.callbacks.afterNodeRemoved(tempNode);
-          }
+      ctx.head.afterHeadMorphed(oldHead, {
+        added: added,
+        kept: preserved,
+        removed: removed,
+      });
+      return promises;
+    }
+
+    //=============================================================================
+    // Create Morph Context Functions
+    //=============================================================================
+    const createMorphContext = (function () {
+      /**
+       *
+       * @param {Element} oldNode
+       * @param {Element} newContent
+       * @param {Config} config
+       * @returns {MorphContext}
+       */
+      function createMorphContext(oldNode, newContent, config) {
+        const { persistentIds, idMap } = createIdMaps(oldNode, newContent);
+
+        const mergedConfig = mergeDefaults(config);
+        const morphStyle = mergedConfig.morphStyle || "outerHTML";
+        if (!["innerHTML", "outerHTML"].includes(morphStyle)) {
+          throw `Do not understand how to morph style ${morphStyle}`;
+        }
 
-          //=============================================================================
-          // ID Set Functions
-          //=============================================================================
+        return {
+          target: oldNode,
+          newContent: newContent,
+          config: mergedConfig,
+          morphStyle: morphStyle,
+          ignoreActive: mergedConfig.ignoreActive,
+          ignoreActiveValue: mergedConfig.ignoreActiveValue,
+          restoreFocus: mergedConfig.restoreFocus,
+          idMap: idMap,
+          persistentIds: persistentIds,
+          pantry: createPantry(),
+          callbacks: mergedConfig.callbacks,
+          head: mergedConfig.head,
+        };
+      }
 
-          function isIdInConsideration(ctx, id) {
-              return !ctx.deadIds.has(id);
-          }
+      /**
+       * Deep merges the config object and the Idiomorph.defaults object to
+       * produce a final configuration object
+       * @param {Config} config
+       * @returns {ConfigInternal}
+       */
+      function mergeDefaults(config) {
+        let finalConfig = Object.assign({}, defaults);
 
-          function idIsWithinNode(ctx, id, targetNode) {
-              let idSet = ctx.idMap.get(targetNode) || EMPTY_SET;
-              return idSet.has(id);
-          }
+        // copy top level stuff into final config
+        Object.assign(finalConfig, config);
 
-          function removeIdsFromConsideration(ctx, node) {
-              let idSet = ctx.idMap.get(node) || EMPTY_SET;
-              for (const id of idSet) {
-                  ctx.deadIds.add(id);
+        // copy callbacks into final config (do this to deep merge the callbacks)
+        finalConfig.callbacks = Object.assign(
+          {},
+          defaults.callbacks,
+          config.callbacks,
+        );
+
+        // copy head config into final config  (do this to deep merge the head)
+        finalConfig.head = Object.assign({}, defaults.head, config.head);
+
+        return finalConfig;
+      }
+
+      /**
+       * @returns {HTMLDivElement}
+       */
+      function createPantry() {
+        const pantry = document.createElement("div");
+        pantry.hidden = true;
+        document.body.insertAdjacentElement("afterend", pantry);
+        return pantry;
+      }
+
+      /**
+       * Returns all elements with an ID contained within the root element and its descendants
+       *
+       * @param {Element} root
+       * @returns {Element[]}
+       */
+      function findIdElements(root) {
+        let elements = Array.from(root.querySelectorAll("[id]"));
+        if (root.id) {
+          elements.push(root);
+        }
+        return elements;
+      }
+
+      /**
+       * A bottom-up algorithm that populates a map of Element -> IdSet.
+       * The idSet for a given element is the set of all IDs contained within its subtree.
+       * As an optimzation, we filter these IDs through the given list of persistent IDs,
+       * because we don't need to bother considering IDed elements that won't be in the new content.
+       *
+       * @param {Map<Node, Set<string>>} idMap
+       * @param {Set<string>} persistentIds
+       * @param {Element} root
+       * @param {Element[]} elements
+       */
+      function populateIdMapWithTree(idMap, persistentIds, root, elements) {
+        for (const elt of elements) {
+          if (persistentIds.has(elt.id)) {
+            /** @type {Element|null} */
+            let current = elt;
+            // walk up the parent hierarchy of that element, adding the id
+            // of element to the parent's id set
+            while (current) {
+              let idSet = idMap.get(current);
+              // if the id set doesn't exist, create it and insert it in the map
+              if (idSet == null) {
+                idSet = new Set();
+                idMap.set(current, idSet);
               }
+              idSet.add(elt.id);
+
+              if (current === root) break;
+              current = current.parentElement;
+            }
           }
+        }
+      }
 
-          function getIdIntersectionCount(ctx, node1, node2) {
-              let sourceSet = ctx.idMap.get(node1) || EMPTY_SET;
-              let matchCount = 0;
-              for (const id of sourceSet) {
-                  // a potential match is an id in the source and potentialIdsSet, but
-                  // that has not already been merged into the DOM
-                  if (isIdInConsideration(ctx, id) && idIsWithinNode(ctx, id, node2)) {
-                      ++matchCount;
-                  }
-              }
-              return matchCount;
+      /**
+       * This function computes a map of nodes to all ids contained within that node (inclusive of the
+       * node).  This map can be used to ask if two nodes have intersecting sets of ids, which allows
+       * for a looser definition of "matching" than tradition id matching, and allows child nodes
+       * to contribute to a parent nodes matching.
+       *
+       * @param {Element} oldContent  the old content that will be morphed
+       * @param {Element} newContent  the new content to morph to
+       * @returns {IdSets}
+       */
+      function createIdMaps(oldContent, newContent) {
+        const oldIdElements = findIdElements(oldContent);
+        const newIdElements = findIdElements(newContent);
+
+        const persistentIds = createPersistentIds(oldIdElements, newIdElements);
+
+        /** @type {Map<Node, Set<string>>} */
+        let idMap = new Map();
+        populateIdMapWithTree(idMap, persistentIds, oldContent, oldIdElements);
+
+        /** @ts-ignore - if newContent is a duck-typed parent, pass its single child node as the root to halt upwards iteration */
+        const newRoot = newContent.__idiomorphRoot || newContent;
+        populateIdMapWithTree(idMap, persistentIds, newRoot, newIdElements);
+
+        return { persistentIds, idMap };
+      }
+
+      /**
+       * This function computes the set of ids that persist between the two contents excluding duplicates
+       *
+       * @param {Element[]} oldIdElements
+       * @param {Element[]} newIdElements
+       * @returns {Set<string>}
+       */
+      function createPersistentIds(oldIdElements, newIdElements) {
+        let duplicateIds = new Set();
+
+        /** @type {Map<string, string>} */
+        let oldIdTagNameMap = new Map();
+        for (const { id, tagName } of oldIdElements) {
+          if (oldIdTagNameMap.has(id)) {
+            duplicateIds.add(id);
+          } else {
+            oldIdTagNameMap.set(id, tagName);
           }
+        }
 
-          /**
-           * A bottom up algorithm that finds all elements with ids inside of the node
-           * argument and populates id sets for those nodes and all their parents, generating
-           * a set of ids contained within all nodes for the entire hierarchy in the DOM
-           *
-           * @param node {Element}
-           * @param {Map<Node, Set<String>>} idMap
-           */
-          function populateIdMapForNode(node, idMap) {
-              let nodeParent = node.parentElement;
-              // find all elements with an id property
-              let idElements = node.querySelectorAll('[id]');
-              for (const elt of idElements) {
-                  let current = elt;
-                  // walk up the parent hierarchy of that element, adding the id
-                  // of element to the parent's id set
-                  while (current !== nodeParent && current != null) {
-                      let idSet = idMap.get(current);
-                      // if the id set doesn't exist, create it and insert it in the  map
-                      if (idSet == null) {
-                          idSet = new Set();
-                          idMap.set(current, idSet);
-                      }
-                      idSet.add(elt.id);
-                      current = current.parentElement;
-                  }
-              }
+        let persistentIds = new Set();
+        for (const { id, tagName } of newIdElements) {
+          if (persistentIds.has(id)) {
+            duplicateIds.add(id);
+          } else if (oldIdTagNameMap.get(id) === tagName) {
+            persistentIds.add(id);
           }
+          // skip if tag types mismatch because its not possible to morph one tag into another
+        }
 
-          /**
-           * This function computes a map of nodes to all ids contained within that node (inclusive of the
-           * node).  This map can be used to ask if two nodes have intersecting sets of ids, which allows
-           * for a looser definition of "matching" than tradition id matching, and allows child nodes
-           * to contribute to a parent nodes matching.
-           *
-           * @param {Element} oldContent  the old content that will be morphed
-           * @param {Element} newContent  the new content to morph to
-           * @returns {Map<Node, Set<String>>} a map of nodes to id sets for the
-           */
-          function createIdMap(oldContent, newContent) {
-              let idMap = new Map();
-              populateIdMapForNode(oldContent, idMap);
-              populateIdMapForNode(newContent, idMap);
-              return idMap;
+        for (const id of duplicateIds) {
+          persistentIds.delete(id);
+        }
+        return persistentIds;
+      }
+
+      return createMorphContext;
+    })();
+
+    //=============================================================================
+    // HTML Normalization Functions
+    //=============================================================================
+    const { normalizeElement, normalizeParent } = (function () {
+      /** @type {WeakSet<Node>} */
+      const generatedByIdiomorph = new WeakSet();
+
+      /**
+       *
+       * @param {Element | Document} content
+       * @returns {Element}
+       */
+      function normalizeElement(content) {
+        if (content instanceof Document) {
+          return content.documentElement;
+        } else {
+          return content;
+        }
+      }
+
+      /**
+       *
+       * @param {null | string | Node | HTMLCollection | Node[] | Document & {generatedByIdiomorph:boolean}} newContent
+       * @returns {Element}
+       */
+      function normalizeParent(newContent) {
+        if (newContent == null) {
+          return document.createElement("div"); // dummy parent element
+        } else if (typeof newContent === "string") {
+          return normalizeParent(parseContent(newContent));
+        } else if (
+          generatedByIdiomorph.has(/** @type {Element} */ (newContent))
+        ) {
+          // the template tag created by idiomorph parsing can serve as a dummy parent
+          return /** @type {Element} */ (newContent);
+        } else if (newContent instanceof Node) {
+          if (newContent.parentNode) {
+            // we can't use the parent directly because newContent may have siblings
+            // that we don't want in the morph, and reparenting might be expensive (TODO is it?),
+            // so we create a duck-typed parent node instead.
+            return createDuckTypedParent(newContent);
+          } else {
+            // a single node is added as a child to a dummy parent
+            const dummyParent = document.createElement("div");
+            dummyParent.append(newContent);
+            return dummyParent;
+          }
+        } else {
+          // all nodes in the array or HTMLElement collection are consolidated under
+          // a single dummy parent element
+          const dummyParent = document.createElement("div");
+          for (const elt of [...newContent]) {
+            dummyParent.append(elt);
           }
+          return dummyParent;
+        }
+      }
 
-          //=============================================================================
-          // This is what ends up becoming the Idiomorph global object
-          //=============================================================================
-          return {
-              morph,
-              defaults
+      /**
+       * Creates a fake duck-typed parent element to wrap a single node, without actually reparenting it.
+       * "If it walks like a duck, and quacks like a duck, then it must be a duck!" -- James Whitcomb Riley (1849–1916)
+       *
+       * @param {Node} newContent
+       * @returns {Element}
+       */
+      function createDuckTypedParent(newContent) {
+        return /** @type {Element} */ (
+          /** @type {unknown} */ ({
+            childNodes: [newContent],
+            /** @ts-ignore - cover your eyes for a minute, tsc */
+            querySelectorAll: (s) => {
+              /** @ts-ignore */
+              const elements = newContent.querySelectorAll(s);
+              /** @ts-ignore */
+              return newContent.matches(s) ? [newContent, ...elements] : elements;
+            },
+            /** @ts-ignore */
+            insertBefore: (n, r) => newContent.parentNode.insertBefore(n, r),
+            /** @ts-ignore */
+            moveBefore: (n, r) => newContent.parentNode.moveBefore(n, r),
+            // for later use with populateIdMapWithTree to halt upwards iteration
+            get __idiomorphRoot() {
+              return newContent;
+            },
+          })
+        );
+      }
+
+      /**
+       *
+       * @param {string} newContent
+       * @returns {Node | null | DocumentFragment}
+       */
+      function parseContent(newContent) {
+        let parser = new DOMParser();
+
+        // remove svgs to avoid false-positive matches on head, etc.
+        let contentWithSvgsRemoved = newContent.replace(
+          /<svg(\s[^>]*>|>)([\s\S]*?)<\/svg>/gim,
+          "",
+        );
+
+        // if the newContent contains a html, head or body tag, we can simply parse it w/o wrapping
+        if (
+          contentWithSvgsRemoved.match(/<\/html>/) ||
+          contentWithSvgsRemoved.match(/<\/head>/) ||
+          contentWithSvgsRemoved.match(/<\/body>/)
+        ) {
+          let content = parser.parseFromString(newContent, "text/html");
+          // if it is a full HTML document, return the document itself as the parent container
+          if (contentWithSvgsRemoved.match(/<\/html>/)) {
+            generatedByIdiomorph.add(content);
+            return content;
+          } else {
+            // otherwise return the html element as the parent container
+            let htmlElement = content.firstChild;
+            if (htmlElement) {
+              generatedByIdiomorph.add(htmlElement);
+            }
+            return htmlElement;
           }
-      })();
+        } else {
+          // if it is partial HTML, wrap it in a template tag to provide a parent element and also to help
+          // deal with touchy tags like tr, tbody, etc.
+          let responseDoc = parser.parseFromString(
+            "<body><template>" + newContent + "</template></body>",
+            "text/html",
+          );
+          let content = /** @type {HTMLTemplateElement} */ (
+            responseDoc.body.querySelector("template")
+          ).content;
+          generatedByIdiomorph.add(content);
+          return content;
+        }
+      }
+
+      return { normalizeElement, normalizeParent };
+    })();
+
+    //=============================================================================
+    // This is what ends up becoming the Idiomorph global object
+    //=============================================================================
+    return {
+      morph,
+      defaults,
+    };
+  })();
 
   function morphElements(currentElement, newElement, { callbacks, ...options } = {}) {
     Idiomorph.morph(currentElement, newElement, {
@@ -2873,7 +3346,7 @@ Copyright © 2024 37signals LLC
   }
 
   function morphChildren(currentElement, newElement) {
-    morphElements(currentElement, newElement.children, {
+    morphElements(currentElement, newElement.childNodes, {
       morphStyle: "innerHTML"
     });
   }
@@ -3666,16 +4139,6 @@ Copyright © 2024 37signals LLC
 
     // Private
 
-    getHistoryMethodForAction(action) {
-      switch (action) {
-        case "replace":
-          return history.replaceState
-        case "advance":
-        case "restore":
-          return history.pushState
-      }
-    }
-
     hasPreloadedResponse() {
       return typeof this.response == "object"
     }
@@ -3795,6 +4258,12 @@ Copyright © 2024 37signals LLC
 
     visitRendered(_visit) {}
 
+    // Link prefetching
+
+    linkPrefetchingIsEnabledForLocation(location) {
+      return true
+    }
+
     // Form Submission Delegate
 
     formSubmissionStarted(_formSubmission) {
@@ -4379,6 +4848,17 @@ Copyright © 2024 37signals LLC
       }
     }
 
+    // Link prefetching
+
+    linkPrefetchingIsEnabledForLocation(location) {
+      // Not all adapters implement linkPrefetchingIsEnabledForLocation
+      if (typeof this.adapter.linkPrefetchingIsEnabledForLocation === "function") {
+        return this.adapter.linkPrefetchingIsEnabledForLocation(location)
+      }
+
+      return true
+    }
+
     // Visit delegate
 
     visitStarted(visit) {
@@ -5285,7 +5765,8 @@ Copyright © 2024 37signals LLC
 
     refresh(url, requestId) {
       const isRecentRequest = requestId && this.recentRequests.has(requestId);
-      if (!isRecentRequest && !this.navigator.currentVisit) {
+      const isCurrentUrl = url === document.baseURI;
+      if (!isRecentRequest && !this.navigator.currentVisit && isCurrentUrl) {
         this.visit(url, { action: "replace", shouldCacheSnapshot: false });
       }
     }
@@ -5409,7 +5890,8 @@ Copyright © 2024 37signals LLC
     canPrefetchRequestToLocation(link, location) {
       return (
         this.elementIsNavigatable(link) &&
-          locationIsVisitable(location, this.snapshot.rootLocation)
+        locationIsVisitable(location, this.snapshot.rootLocation) &&
+        this.navigator.linkPrefetchingIsEnabledForLocation(location)
       )
     }
 
@@ -6513,10 +6995,10 @@ Copyright © 2024 37signals LLC
      * Gets the list of duplicate children (i.e. those with the same ID)
      */
     get duplicateChildren() {
-      const existingChildren = this.targetElements.flatMap((e) => [...e.children]).filter((c) => !!c.id);
-      const newChildrenIds = [...(this.templateContent?.children || [])].filter((c) => !!c.id).map((c) => c.id);
+      const existingChildren = this.targetElements.flatMap((e) => [...e.children]).filter((c) => !!c.getAttribute("id"));
+      const newChildrenIds = [...(this.templateContent?.children || [])].filter((c) => !!c.getAttribute("id")).map((c) => c.getAttribute("id"));
 
-      return existingChildren.filter((c) => newChildrenIds.includes(c.id))
+      return existingChildren.filter((c) => newChildrenIds.includes(c.getAttribute("id")))
     }
 
     /**