@burger-editor/local 4.0.0-alpha.55 → 4.0.0-alpha.57

package/dist/client.js

@@ -1296,7 +1296,7 @@ var style$b = "/* No Styling */\n";
 var template$b = "<a href=\"\" data-kind=\"primary\" data-before-icon=\"none\" data-after-icon=\"none\" data-bge=\"link:href, target:target, kind:data-kind, before-icon:data-before-icon, after-icon:data-after-icon\">\n\t<div>\n\t\t<span data-bge=\"text\">ボタン</span>\n\t\t<span data-bge=\"subtext\">サブテキスト</span>\n\t</div>\n</a>\n";
 
 var button = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "button",
   template: template$b,
   style: style$b,
@@ -1352,7 +1352,7 @@ var style$a = "/* No Styling */\n";
 var template$a = "<details data-bge=\"open:open\">\n\t<summary data-bge=\"summary\">折りたたみコンテンツ</summary>\n\t<div data-bge=\"content\"><p>内容を入力してください</p></div>\n</details>\n";
 
 var details = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "details",
   template: template$a,
   style: style$a,
@@ -1366,7 +1366,7 @@ var style$9 = "[data-bgi='download-file'] {\n\t[data-bge*='size'] {\n\t\t&::befo
 var template$9 = "<a href=\"./files/bgeditor/bg-sample.pdf\" target=\"_blank\" data-bge=\"path:href, download:download\">\n\t<div>\n\t\t<span data-bge=\"name\">サンプルダウンロードファイル</span>\n\t\t<span data-bge=\"formated-size, size:data-size\" data-size=\"138158\">134.92kB</span>\n\t</div>\n</a>\n";
 
 var downloadFile = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "download-file",
   template: template$9,
   style: style$9,
@@ -1405,7 +1405,7 @@ var style$8 = "[data-bgi='google-maps'] {\n\tdiv {\n\t\tinline-size: 100%;\n\t\t
 var template$8 = "<div data-lat=\"35.681382\" data-lng=\"139.766084\" data-zoom=\"16\" data-bge=\"lat:data-lat, lng:data-lng, zoom:data-zoom\">\n\t<img data-bge=\"img:src\" src=\"https://maps.google.com/maps/api/staticmap?center=35.681382,139.766084&amp;zoom=16&amp;size=640x400&amp;markers=color:red|color:red|35.681382,139.766084&amp;scale=2&amp;key=%googleMapsApiKey%\" width=\"8\" height=\"5\" alt=\"Google Maps\" />\n</div>\n<a href=\"https://maps.apple.com/?q=35.681382,139.766084\" data-bge=\"url:href\" target=\"_blank\"><span>アプリで開く</span></a>\n";
 
 var googleMaps = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "google-maps",
   template: template$8,
   style: style$8,
@@ -1540,7 +1540,7 @@ var style$7 = "[data-bgi='hr'] {\n\t--inline-size: 100%;\n\t--border-color: #000
 var template$7 = "<div data-bgi-hr-kind=\"primary\" data-bge=\"kind:data-bgi-hr-kind\">\n\t<hr />\n</div>\n";
 
 var hr = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "hr",
   template: template$7,
   style: style$7,
@@ -1630,7 +1630,7 @@ function createWidthState() {
 
 const ORIGIN = "__org";
 var image = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "image",
   template: template$6,
   style: style$6,
@@ -1828,7 +1828,7 @@ var style$5 = "[data-bgi='import'] {\n\tbge-import {\n\t\t&::before {\n\t\t\tfon
 var template$5 = "<bge-import data-bge=\":src\" src=\"\"></bge-import>\n";
 
 var importItem = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "import",
   template: template$5,
   style: style$5,
@@ -1842,7 +1842,7 @@ var style$4 = "/* No Styling */\n";
 var template$4 = "<div data-bge=\":scrollable\" data-bge-scrollable=\"false\">\n\t<table>\n\t\t<caption data-bge=\"caption\">\n\t\t\tキャプションを入力してください\n\t\t</caption>\n\t\t<tbody data-bge-list>\n\t\t\t<tr>\n\t\t\t\t<th data-bge=\"th\">表組の見出し</th>\n\t\t\t\t<td data-bge=\"td\">表組の内容を入力してください</td>\n\t\t\t</tr>\n\t\t</tbody>\n\t</table>\n</div>\n";
 
 var table = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "table",
   template: template$4,
   style: style$4,
@@ -1870,7 +1870,7 @@ var style$3 = "/* No Styling */\n";
 var template$3 = "<h2 data-bge=\"title-h2\">見出しを入力してください</h2>\n";
 
 var titleH2 = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "title-h2",
   template: template$3,
   style: style$3,
@@ -1884,7 +1884,7 @@ var style$2 = "/* No Styling */\n";
 var template$2 = "<h3 data-bge=\"title-h3\">見出しを入力してください</h3>\n";
 
 var titleH3 = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "title-h3",
   template: template$2,
   style: style$2,
@@ -1898,7 +1898,7 @@ var style$1 = "/* No Styling */\n";
 var template$1 = "<div data-bge=\"wysiwyg\"><p>本文を入力してください</p></div>\n";
 
 var wysiwyg = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "wysiwyg",
   template: template$1,
   style: style$1,
@@ -1913,7 +1913,7 @@ var template = "<div data-id=\"3KtWfp0UopM\" data-title=\"YouTube動画\" data-w
 
 const FALLBACK_TITLE = "YouTube\u52D5\u753B";
 var youtube = createItem$1({
-  version: "4.0.0-alpha.54",
+  version: "4.0.0-alpha.56",
   name: "youtube",
   template,
   style: style$c,
@@ -4220,6 +4220,10 @@ function set$1(el, prefix, name, datum, xssSanitize = true) {
     el.removeAttribute(name);
     return;
   }
+  if (el.localName.includes("-")) {
+    el.setAttribute(name, `${datum}`);
+    return;
+  }
   if (!name.startsWith("data-") && !propInElement(el, name)) {
     const dataAttr = `data-${prefix}-${kebabCase(name)}`;
     if (el.hasAttribute(dataAttr)) {
@@ -11960,6 +11964,27 @@ class Transform {
     return this.steps.length > 0;
   }
   /**
+  Return a single range, in post-transform document positions,
+  that covers all content changed by this transform. Returns null
+  if no replacements are made. Note that this will ignore changes
+  that add/remove marks without replacing the underlying content.
+  */
+  changedRange() {
+    let from2 = 1e9, to = -1e9;
+    for (let i = 0; i < this.mapping.maps.length; i++) {
+      let map2 = this.mapping.maps[i];
+      if (i) {
+        from2 = map2.map(from2, 1);
+        to = map2.map(to, -1);
+      }
+      map2.forEach((_f, _t, fromB, toB) => {
+        from2 = Math.min(from2, fromB);
+        to = Math.max(to, toB);
+      });
+    }
+    return from2 == 1e9 ? null : { from: from2, to };
+  }
+  /**
   @internal
   */
   addStep(step, doc2) {
@@ -19576,8 +19601,12 @@ var focus = (position = null, options = {}) => ({ editor, view, tr: tr2, dispatc
       }
     });
   };
-  if (view.hasFocus() && position === null || position === false) {
-    return true;
+  try {
+    if (view.hasFocus() && position === null || position === false) {
+      return true;
+    }
+  } catch {
+    return false;
   }
   if (dispatch && position === null && !isTextSelection(editor.state.selection)) {
     delayedFocus();
@@ -22864,19 +22893,20 @@ var NodePos = class _NodePos {
     this.node.content.forEach((node, offset) => {
       const isBlock = node.isBlock && !node.isTextblock;
       const isNonTextAtom = node.isAtom && !node.isText;
+      const isInline2 = node.isInline;
       const targetPos = this.pos + offset + (isNonTextAtom ? 0 : 1);
       if (targetPos < 0 || targetPos > this.resolvedPos.doc.nodeSize - 2) {
         return;
       }
       const $pos = this.resolvedPos.doc.resolve(targetPos);
-      if (!isBlock && $pos.depth <= this.depth) {
+      if (!isBlock && !isInline2 && $pos.depth <= this.depth) {
         return;
       }
-      const childNodePos = new _NodePos($pos, this.editor, isBlock, isBlock ? node : null);
+      const childNodePos = new _NodePos($pos, this.editor, isBlock, isBlock || isInline2 ? node : null);
       if (isBlock) {
         childNodePos.actualDepth = this.depth + 1;
       }
-      children.push(new _NodePos($pos, this.editor, isBlock, isBlock ? node : null));
+      children.push(childNodePos);
     });
     return children;
   }
@@ -23839,7 +23869,8 @@ var ResizableNodeView = class {
     return this.container;
   }
   get contentDOM() {
-    return this.contentElement;
+    var _a2;
+    return (_a2 = this.contentElement) != null ? _a2 : null;
   }
   handleEditorUpdate() {
     const isEditable = this.editor.isEditable;
@@ -27370,11 +27401,13 @@ var ListItem = Node3.create({
       node,
       h2,
       (context) => {
+        var _a2, _b;
         if (context.parentType === "bulletList") {
           return "- ";
         }
         if (context.parentType === "orderedList") {
-          return `${context.index + 1}. `;
+          const start = ((_b = (_a2 = context.meta) == null ? void 0 : _a2.parentAttrs) == null ? void 0 : _b.start) || 1;
+          return `${start + context.index}. `;
         }
         return "- ";
       },
@@ -28240,6 +28273,8 @@ Extension.create({
     return extensions;
   }
 });
+var EMPTY_PARAGRAPH_MARKDOWN = "&nbsp;";
+var NBSP_CHAR = " ";
 var Paragraph = Node3.create({
   name: "paragraph",
   priority: 1e3,
@@ -28261,18 +28296,21 @@ var Paragraph = Node3.create({
     if (tokens.length === 1 && tokens[0].type === "image") {
       return helpers.parseChildren([tokens[0]]);
     }
-    return helpers.createNode(
-      "paragraph",
-      void 0,
-      // no attributes for paragraph
-      helpers.parseInline(tokens)
-    );
+    const content = helpers.parseInline(tokens);
+    if (content.length === 1 && content[0].type === "text" && (content[0].text === EMPTY_PARAGRAPH_MARKDOWN || content[0].text === NBSP_CHAR)) {
+      return helpers.createNode("paragraph", void 0, []);
+    }
+    return helpers.createNode("paragraph", void 0, content);
   },
   renderMarkdown: (node, h2) => {
-    if (!node || !Array.isArray(node.content)) {
+    if (!node) {
       return "";
     }
-    return h2.renderChildren(node.content);
+    const content = Array.isArray(node.content) ? node.content : [];
+    if (content.length === 0) {
+      return EMPTY_PARAGRAPH_MARKDOWN;
+    }
+    return h2.renderChildren(content);
   },
   addCommands() {
     return {
@@ -29496,12 +29534,17 @@ var Gapcursor = Extension.create({
     };
   }
 });
+var DEFAULT_DATA_ATTRIBUTE = "placeholder";
+function preparePlaceholderAttribute(attr) {
+  return attr.replace(/\s+/g, "-").replace(/[^a-zA-Z0-9-]/g, "").replace(/^[0-9-]+/, "").replace(/^-+/, "").toLowerCase();
+}
 Extension.create({
   name: "placeholder",
   addOptions() {
     return {
       emptyEditorClass: "is-editor-empty",
       emptyNodeClass: "is-empty",
+      dataAttribute: DEFAULT_DATA_ATTRIBUTE,
       placeholder: "Write something …",
       showOnlyWhenEditable: true,
       showOnlyCurrent: true,
@@ -29509,6 +29552,7 @@ Extension.create({
     };
   },
   addProseMirrorPlugins() {
+    const dataAttribute = this.options.dataAttribute ? `data-${preparePlaceholderAttribute(this.options.dataAttribute)}` : `data-${DEFAULT_DATA_ATTRIBUTE}`;
     return [
       new Plugin({
         key: new PluginKey("placeholder"),
@@ -29531,7 +29575,7 @@ Extension.create({
                 }
                 const decoration = Decoration.node(pos, pos + node.nodeSize, {
                   class: classes.join(" "),
-                  "data-placeholder": typeof this.options.placeholder === "function" ? this.options.placeholder({
+                  [dataAttribute]: typeof this.options.placeholder === "function" ? this.options.placeholder({
                     editor: this.editor,
                     node,
                     pos,
@@ -33235,7 +33279,8 @@ activateTextOnlyMode_fn = function() {
   if (!__privateGet$1(this, _textOnlyContainer)) {
     __privateSet$1(this, _textOnlyContainer, document.createElement("div"));
     __privateGet$1(this, _textOnlyContainer).dataset.textOnlyEditor = "";
-    this.shadowRoot.querySelector("[data-bge-mode]").append(__privateGet$1(this, _textOnlyContainer));
+    const modeContainer = this.shadowRoot.querySelector("[data-bge-mode]");
+    modeContainer.insertBefore(__privateGet$1(this, _textOnlyContainer), __privateGet$1(this, _structureChangeMessage));
   }
   const textOnlyStyle = document.createElement("style");
   textOnlyStyle.dataset.textOnlyStyle = "";
@@ -33535,6 +33580,16 @@ const _BgeWysiwygEditorElement = class _BgeWysiwygEditorElement2 extends HTMLEle
         updateButtonState(button, event2.detail.state, this);
       }
     });
+    __privateGet(this, _wysiwygElement).addEventListener("bge:structure-change", () => {
+      const currentState = getCurrentEditorState(__privateGet(this, _wysiwygElement));
+      for (const button of buttons) {
+        updateButtonState(button, currentState, this);
+      }
+    });
+    const initialState = getCurrentEditorState(__privateGet(this, _wysiwygElement));
+    for (const button of buttons) {
+      updateButtonState(button, initialState, this);
+    }
     if (_BgeWysiwygEditorElement2.experimentalTextOnlyMode) {
       const modeSelector = this.querySelector(
         "[data-bge-mode-selector]"
@@ -33543,23 +33598,23 @@ const _BgeWysiwygEditorElement = class _BgeWysiwygEditorElement2 extends HTMLEle
         throw new Error("Mode selector not found");
       }
       modeSelector.value = __privateGet(this, _wysiwygElement).mode;
-      const initialHasStructureChange = __privateGet(this, _wysiwygElement).hasStructureChange;
       const wysiwygOption = modeSelector.querySelector(
         'option[value="wysiwyg"]'
       );
-      if (wysiwygOption) {
-        wysiwygOption.disabled = initialHasStructureChange;
-      }
       const handleStructureChange = (event2) => {
         const hasStructureChange = event2.detail.hasStructureChange;
         if (wysiwygOption) {
           wysiwygOption.disabled = hasStructureChange;
         }
+        modeSelector.value = __privateGet(this, _wysiwygElement).mode;
       };
       __privateGet(this, _wysiwygElement).addEventListener(
         "bge:structure-change",
         handleStructureChange
       );
+      if (wysiwygOption) {
+        wysiwygOption.disabled = __privateGet(this, _wysiwygElement).hasStructureChange;
+      }
       modeSelector.addEventListener("change", () => {
         if (!__privateGet(this, _wysiwygElement)) {
           throw new ReferenceError("<bge-wysiwyg-editor> is not connected");
@@ -33583,10 +33638,6 @@ const _BgeWysiwygEditorElement = class _BgeWysiwygEditorElement2 extends HTMLEle
       if (!htmlModeButton) {
         throw new Error("HTML mode button not found");
       }
-      const initialHasStructureChange = __privateGet(this, _wysiwygElement).hasStructureChange;
-      const initialIsHtmlMode = __privateGet(this, _wysiwygElement).mode === "html";
-      htmlModeButton.disabled = initialIsHtmlMode && initialHasStructureChange;
-      htmlModeButton.ariaPressed = initialIsHtmlMode ? "true" : "false";
       htmlModeButton.addEventListener("click", () => {
         if (!__privateGet(this, _wysiwygElement)) {
           throw new ReferenceError("<bge-wysiwyg-editor> is not connected");
@@ -33608,9 +33659,12 @@ const _BgeWysiwygEditorElement = class _BgeWysiwygEditorElement2 extends HTMLEle
       });
       __privateGet(this, _wysiwygElement).addEventListener("bge:structure-change", (event2) => {
         const hasStructureChange = event2.detail.hasStructureChange;
-        const isHtmlMode = __privateGet(this, _wysiwygElement).mode === "html";
-        htmlModeButton.disabled = isHtmlMode && hasStructureChange;
+        const isHtmlMode2 = __privateGet(this, _wysiwygElement).mode === "html";
+        htmlModeButton.disabled = isHtmlMode2 && hasStructureChange;
       });
+      const isHtmlMode = __privateGet(this, _wysiwygElement).mode === "html";
+      htmlModeButton.ariaPressed = isHtmlMode ? "true" : "false";
+      htmlModeButton.disabled = isHtmlMode && __privateGet(this, _wysiwygElement).hasStructureChange;
     }
   }
   setStyle(css) {
@@ -33768,6 +33822,9 @@ function bindToggle(button, wysiwygElement) {
 }
 function updateButtonState(button, state2, editorElement) {
   const buttonType = button.dataset.bgeToolbarButton;
+  if (!buttonType) {
+    return;
+  }
   if (buttonType === "html-mode" || buttonType === "text-only-mode") {
     return;
   }
@@ -33813,6 +33870,7 @@ const ATTACHMENT_KEY = "@attach";
 const DEV = false;
 var is_array = Array.isArray;
 var index_of = Array.prototype.indexOf;
+var includes = Array.prototype.includes;
 var array_from = Array.from;
 var define_property = Object.defineProperty;
 var get_descriptor = Object.getOwnPropertyDescriptor;
@@ -34146,6 +34204,7 @@ class Batch {
    */
   skipped_effects = /* @__PURE__ */ new Set();
   is_fork = false;
+  #decrement_queued = false;
   is_deferred() {
     return this.is_fork || this.#blocking_pending > 0;
   }
@@ -34155,20 +34214,24 @@ class Batch {
    */
   process(root_effects) {
     queued_root_effects = [];
-    previous_batch = null;
     this.apply();
     var effects = [];
     var render_effects = [];
     for (const root2 of root_effects) {
       this.#traverse_effect_tree(root2, effects, render_effects);
     }
-    if (!this.is_fork) {
-      this.#resolve();
-    }
     if (this.is_deferred()) {
       this.#defer_effects(render_effects);
       this.#defer_effects(effects);
+      for (const e of this.skipped_effects) {
+        reset_branch(e);
+      }
     } else {
+      for (const fn of this.#commit_callbacks) fn();
+      this.#commit_callbacks.clear();
+      if (this.#pending === 0) {
+        this.#commit();
+      }
       previous_batch = this;
       current_batch = null;
       flush_queued_effects(render_effects);
@@ -34202,7 +34265,7 @@ class Batch {
         } else if ((flags2 & EFFECT) !== 0) {
           effects.push(effect2);
         } else if (is_dirty(effect2)) {
-          if ((flags2 & BLOCK_EFFECT) !== 0) this.#dirty_effects.add(effect2);
+          if ((flags2 & BLOCK_EFFECT) !== 0) this.#maybe_dirty_effects.add(effect2);
           update_effect(effect2);
         }
         var child2 = effect2.first;
@@ -34270,15 +34333,6 @@ class Batch {
     for (const fn of this.#discard_callbacks) fn(this);
     this.#discard_callbacks.clear();
   }
-  #resolve() {
-    if (this.#blocking_pending === 0) {
-      for (const fn of this.#commit_callbacks) fn();
-      this.#commit_callbacks.clear();
-    }
-    if (this.#pending === 0) {
-      this.#commit();
-    }
-  }
   #commit() {
     if (batches.size > 1) {
       this.previous.clear();
@@ -34344,7 +34398,16 @@ class Batch {
   decrement(blocking) {
     this.#pending -= 1;
     if (blocking) this.#blocking_pending -= 1;
-    this.revive();
+    if (this.#decrement_queued) return;
+    this.#decrement_queued = true;
+    queue_micro_task(() => {
+      this.#decrement_queued = false;
+      if (!this.is_deferred()) {
+        this.revive();
+      } else if (queued_root_effects.length > 0) {
+        this.flush();
+      }
+    });
   }
   revive() {
     for (const e of this.#dirty_effects) {
@@ -34374,7 +34437,7 @@ class Batch {
       const batch = current_batch = new Batch();
       batches.add(current_batch);
       if (!is_flushing_sync) {
-        Batch.enqueue(() => {
+        queue_micro_task(() => {
           if (current_batch !== batch) {
             return;
           }
@@ -34384,10 +34447,6 @@ class Batch {
     }
     return current_batch;
   }
-  /** @param {() => void} task */
-  static enqueue(task) {
-    queue_micro_task(task);
-  }
   apply() {
     return;
   }
@@ -34417,11 +34476,9 @@ function flushSync(fn) {
   }
 }
 function flush_effects() {
-  var was_updating_effect = is_updating_effect;
   is_flushing = true;
   try {
     var flush_count = 0;
-    set_is_updating_effect(true);
     while (queued_root_effects.length > 0) {
       var batch = Batch.ensure();
       if (flush_count++ > 1e3) {
@@ -34435,7 +34492,6 @@ function flush_effects() {
     }
   } finally {
     is_flushing = false;
-    set_is_updating_effect(was_updating_effect);
     last_scheduled_effect = null;
   }
 }
@@ -34517,7 +34573,7 @@ function depends_on(reaction, sources, checked) {
   if (depends !== void 0) return depends;
   if (reaction.deps !== null) {
     for (const dep of reaction.deps) {
-      if (sources.includes(dep)) {
+      if (includes.call(sources, dep)) {
         return true;
       }
       if ((dep.f & DERIVED) !== 0 && depends_on(
@@ -34553,6 +34609,17 @@ function schedule_effect(signal) {
   }
   queued_root_effects.push(effect2);
 }
+function reset_branch(effect2) {
+  if ((effect2.f & BRANCH_EFFECT) !== 0 && (effect2.f & CLEAN) !== 0) {
+    return;
+  }
+  set_signal_status(effect2, CLEAN);
+  var e = effect2.first;
+  while (e !== null) {
+    reset_branch(e);
+    e = e.next;
+  }
+}
 function createSubscriber(start) {
   let subscribers = 0;
   let version2 = source(0);
@@ -34609,6 +34676,7 @@ class Boundary {
   #pending_anchor = null;
   #local_pending_count = 0;
   #pending_count = 0;
+  #pending_count_update_queued = false;
   #is_creating_fallback = false;
   /** @type {Set<Effect>} */
   #dirty_effects = /* @__PURE__ */ new Set();
@@ -34669,11 +34737,9 @@ class Boundary {
   }
   #hydrate_pending_content() {
     const pending = this.#props.pending;
-    if (!pending) {
-      return;
-    }
+    if (!pending) return;
     this.#pending_effect = branch(() => pending(this.#anchor));
-    Batch.enqueue(() => {
+    queue_micro_task(() => {
       var anchor = this.#get_anchor();
       this.#main_effect = this.#run(() => {
         Batch.ensure();
@@ -34802,9 +34868,14 @@ class Boundary {
   update_pending_count(d2) {
     this.#update_pending_count(d2);
     this.#local_pending_count += d2;
-    if (this.#effect_pending) {
-      internal_set(this.#effect_pending, this.#local_pending_count);
-    }
+    if (!this.#effect_pending || this.#pending_count_update_queued) return;
+    this.#pending_count_update_queued = true;
+    queue_micro_task(() => {
+      this.#pending_count_update_queued = false;
+      if (this.#effect_pending) {
+        internal_set(this.#effect_pending, this.#local_pending_count);
+      }
+    });
   }
   get_effect_pending() {
     this.#effect_pending_subscriber();
@@ -34861,19 +34932,15 @@ class Boundary {
         this.is_pending = false;
       }
     };
-    var previous_reaction = active_reaction;
-    try {
-      set_active_reaction(null);
-      calling_on_error = true;
-      onerror?.(error, reset2);
-      calling_on_error = false;
-    } catch (error2) {
-      invoke_error_boundary(error2, this.#effect && this.#effect.parent);
-    } finally {
-      set_active_reaction(previous_reaction);
-    }
-    if (failed) {
-      queue_micro_task(() => {
+    queue_micro_task(() => {
+      try {
+        calling_on_error = true;
+        onerror?.(error, reset2);
+        calling_on_error = false;
+      } catch (error2) {
+        invoke_error_boundary(error2, this.#effect && this.#effect.parent);
+      }
+      if (failed) {
         this.#failed_effect = this.#run(() => {
           Batch.ensure();
           this.#is_creating_fallback = true;
@@ -34896,13 +34963,14 @@ class Boundary {
             this.#is_creating_fallback = false;
           }
         });
-      });
-    }
+      }
+    });
   }
 }
 function flatten(blockers, sync, async, fn) {
   const d2 = is_runes() ? derived : derived_safe_equal;
-  if (async.length === 0 && blockers.length === 0) {
+  var pending = blockers.filter((b2) => !b2.settled);
+  if (async.length === 0 && pending.length === 0) {
     fn(sync.map(d2));
     return;
   }
@@ -34912,32 +34980,29 @@ function flatten(blockers, sync, async, fn) {
     active_effect
   );
   var restore = capture();
-  function run3() {
-    Promise.all(async.map((expression) => /* @__PURE__ */ async_derived(expression))).then((result) => {
-      restore();
-      try {
-        fn([...sync.map(d2), ...result]);
-      } catch (error) {
-        if ((parent.f & DESTROYED) === 0) {
-          invoke_error_boundary(error, parent);
-        }
+  var blocker_promise = pending.length === 1 ? pending[0].promise : pending.length > 1 ? Promise.all(pending.map((b2) => b2.promise)) : null;
+  function finish(values) {
+    restore();
+    try {
+      fn(values);
+    } catch (error) {
+      if ((parent.f & DESTROYED) === 0) {
+        invoke_error_boundary(error, parent);
       }
-      batch?.deactivate();
-      unset_context();
-    }).catch((error) => {
-      invoke_error_boundary(error, parent);
-    });
+    }
+    batch?.deactivate();
+    unset_context();
   }
-  if (blockers.length > 0) {
-    Promise.all(blockers).then(() => {
-      restore();
-      try {
-        return run3();
-      } finally {
-        batch?.deactivate();
-        unset_context();
-      }
-    });
+  if (async.length === 0) {
+    blocker_promise.then(() => finish(sync.map(d2)));
+    return;
+  }
+  function run3() {
+    restore();
+    Promise.all(async.map((expression) => /* @__PURE__ */ async_derived(expression))).then((result) => finish([...sync.map(d2), ...result])).catch((error) => invoke_error_boundary(error, parent));
+  }
+  if (blocker_promise) {
+    blocker_promise.then(run3);
   } else {
     run3();
   }
@@ -35199,7 +35264,7 @@ function mutate(source2, value) {
 function set(source2, value, should_proxy = false) {
   if (active_reaction !== null && // since we are untracking the function inside `$inspect.with` we need to add this check
   // to ensure we error if state is set inside an inspect effect
-  (!untracking || (active_reaction.f & EAGER_EFFECT) !== 0) && is_runes() && (active_reaction.f & (DERIVED | BLOCK_EFFECT | ASYNC | EAGER_EFFECT)) !== 0 && !current_sources?.includes(source2)) {
+  (!untracking || (active_reaction.f & EAGER_EFFECT) !== 0) && is_runes() && (active_reaction.f & (DERIVED | BLOCK_EFFECT | ASYNC | EAGER_EFFECT)) !== 0 && (current_sources === null || !includes.call(current_sources, source2))) {
     state_unsafe_mutation();
   }
   let new_value = should_proxy ? proxy(value) : value;
@@ -35243,20 +35308,13 @@ function internal_set(source2, value) {
 }
 function flush_eager_effects() {
   eager_effects_deferred = false;
-  var prev_is_updating_effect = is_updating_effect;
-  set_is_updating_effect(true);
-  const inspects = Array.from(eager_effects);
-  try {
-    for (const effect2 of inspects) {
-      if ((effect2.f & CLEAN) !== 0) {
-        set_signal_status(effect2, MAYBE_DIRTY);
-      }
-      if (is_dirty(effect2)) {
-        update_effect(effect2);
-      }
+  for (const effect2 of eager_effects) {
+    if ((effect2.f & CLEAN) !== 0) {
+      set_signal_status(effect2, MAYBE_DIRTY);
+    }
+    if (is_dirty(effect2)) {
+      update_effect(effect2);
     }
-  } finally {
-    set_is_updating_effect(prev_is_updating_effect);
   }
   eager_effects.clear();
 }
@@ -36007,9 +36065,6 @@ function invalidate_inner_signals(fn) {
   }
 }
 let is_updating_effect = false;
-function set_is_updating_effect(value) {
-  is_updating_effect = value;
-}
 let is_destroying_effect = false;
 function set_is_destroying_effect(value) {
   is_destroying_effect = value;
@@ -36088,7 +36143,7 @@ function is_dirty(reaction) {
 function schedule_possible_effect_self_invalidation(signal, effect2, root2 = true) {
   var reactions = signal.reactions;
   if (reactions === null) return;
-  if (current_sources?.includes(signal)) {
+  if (current_sources !== null && includes.call(current_sources, signal)) {
     return;
   }
   for (var i = 0; i < reactions.length; i++) {
@@ -36146,9 +36201,12 @@ function update_reaction(reaction) {
     );
     var result = fn();
     var deps = reaction.deps;
+    var is_fork = current_batch?.is_fork;
     if (new_deps !== null) {
       var i;
-      remove_reactions(reaction, skipped_deps);
+      if (!is_fork) {
+        remove_reactions(reaction, skipped_deps);
+      }
       if (deps !== null && skipped_deps > 0) {
         deps.length = skipped_deps + new_deps.length;
         for (i = 0; i < new_deps.length; i++) {
@@ -36162,7 +36220,7 @@ function update_reaction(reaction) {
           (deps[i].reactions ??= []).push(reaction);
         }
       }
-    } else if (deps !== null && skipped_deps < deps.length) {
+    } else if (!is_fork && deps !== null && skipped_deps < deps.length) {
       remove_reactions(reaction, skipped_deps);
       deps.length = skipped_deps;
     }
@@ -36232,7 +36290,7 @@ function remove_reaction(signal, dependency) {
   if (reactions === null && (dependency.f & DERIVED) !== 0 && // Destroying a child effect while updating a parent effect can cause a dependency to appear
   // to be unused, when in fact it is used by the currently-updating parent. Checking `new_deps`
   // allows us to skip the expensive work of disconnecting and immediately reconnecting it
-  (new_deps === null || !new_deps.includes(dependency))) {
+  (new_deps === null || !includes.call(new_deps, dependency))) {
     var derived2 = (
       /** @type {Derived} */
       dependency
@@ -36290,7 +36348,7 @@ function get2(signal) {
   captured_signals?.add(signal);
   if (active_reaction !== null && !untracking) {
     var destroyed = active_effect !== null && (active_effect.f & DESTROYED) !== 0;
-    if (!destroyed && !current_sources?.includes(signal)) {
+    if (!destroyed && (current_sources === null || !includes.call(current_sources, signal))) {
       var deps = active_reaction.deps;
       if ((active_reaction.f & REACTION_IS_UPDATING) !== 0) {
         if (signal.rv < read_version) {
@@ -36308,7 +36366,7 @@ function get2(signal) {
         var reactions = signal.reactions;
         if (reactions === null) {
           signal.reactions = [active_reaction];
-        } else if (!reactions.includes(active_reaction)) {
+        } else if (!includes.call(reactions, active_reaction)) {
           reactions.push(active_reaction);
         }
       }
@@ -37146,11 +37204,17 @@ function each(node, flags2, get_collection, get_key, render_fn, fallback_fn = nu
   var state2 = { effect: effect2, items, outrogroups: null, fallback };
   first_run = false;
 }
+function skip_to_branch(effect2) {
+  while (effect2 !== null && (effect2.f & BRANCH_EFFECT) === 0) {
+    effect2 = effect2.next;
+  }
+  return effect2;
+}
 function reconcile(state2, array, anchor, flags2, get_key) {
   var is_animated = (flags2 & EACH_IS_ANIMATED) !== 0;
   var length = array.length;
   var items = state2.items;
-  var current = state2.effect.first;
+  var current = skip_to_branch(state2.effect.first);
   var seen;
   var prev = null;
   var to_animate;
@@ -37200,7 +37264,7 @@ function reconcile(state2, array, anchor, flags2, get_key) {
         prev = effect2;
         matched = [];
         stashed = [];
-        current = prev.next;
+        current = skip_to_branch(prev.next);
         continue;
       }
     }
@@ -37248,7 +37312,7 @@ function reconcile(state2, array, anchor, flags2, get_key) {
       while (current !== null && current !== effect2) {
         (seen ??= /* @__PURE__ */ new Set()).add(current);
         stashed.push(current);
-        current = current.next;
+        current = skip_to_branch(current.next);
       }
       if (current === null) {
         continue;
@@ -37258,7 +37322,7 @@ function reconcile(state2, array, anchor, flags2, get_key) {
       matched.push(effect2);
     }
     prev = effect2;
-    current = effect2.next;
+    current = skip_to_branch(effect2.next);
   }
   if (state2.outrogroups !== null) {
     for (const group of state2.outrogroups) {
@@ -37284,7 +37348,7 @@ function reconcile(state2, array, anchor, flags2, get_key) {
       if ((current.f & INERT) === 0 && current !== state2.fallback) {
         to_destroy.push(current);
       }
-      current = current.next;
+      current = skip_to_branch(current.next);
     }
     var destroy_length = to_destroy.length;
     if (destroy_length > 0) {