@burger-editor/client 4.0.0-alpha.16 → 4.0.0-alpha.17

package/dist/client.js

@@ -2938,6 +2938,7 @@ const CSS_LAYER = {
     ui: 'bge-ui',
 };
 const BLOCK_OPTION_CSS_CUSTOM_PROPERTY_PREFIX = '--bge-options-';
+const BLOCK_OPTION_SCOPE_SELECTOR = `[data-bge-container]`;
 
 /**
  *
@@ -3417,7 +3418,7 @@ function getStyleRules(rules, scope) {
     const styleRules = [];
     for (const rule of rules) {
         if (rule instanceof CSSStyleRule) {
-            styleRules.push(rule);
+            styleRules.push(...getStyleRules(rule.cssRules, scope), rule);
             continue;
         }
         if (rule instanceof CSSGroupingRule) {
@@ -3437,10 +3438,11 @@ function searchCustomProperty(scope, found) {
         try {
             const styleRules = getStyleRules(styleSheet.cssRules, scope);
             for (const cssRule of styleRules) {
-                if (cssRule.selectorText === ':root') {
+                const selector = cssRule.selectorText.trim().replace(/^&/, '').trim();
+                if (selector === BLOCK_OPTION_SCOPE_SELECTOR) {
                     for (const cssProperty of cssRule.style) {
                         if (!cssProperty.startsWith('--')) {
-                            return;
+                            continue;
                         }
                         const value = cssRule.style.getPropertyValue(cssProperty);
                         found(cssProperty, value);
@@ -21909,12 +21911,17 @@ function run2(config) {
   });
   const handlers = [];
   state.doc.nodesBetween(from, to, (node, pos) => {
-    if (!node.isTextblock || node.type.spec.code) {
+    var _a, _b, _c, _d, _e;
+    if (((_b = (_a = node.type) == null ? void 0 : _a.spec) == null ? void 0 : _b.code) || !(node.isText || node.isTextblock || node.isInline)) {
       return;
     }
+    const contentSize = (_e = (_d = (_c = node.content) == null ? void 0 : _c.size) != null ? _d : node.nodeSize) != null ? _e : 0;
     const resolvedFrom = Math.max(from, pos);
-    const resolvedTo = Math.min(to, pos + node.content.size);
-    const textToMatch = node.textBetween(resolvedFrom - pos, resolvedTo - pos, void 0, "\uFFFC");
+    const resolvedTo = Math.min(to, pos + contentSize);
+    if (resolvedFrom >= resolvedTo) {
+      return;
+    }
+    const textToMatch = node.isText ? node.text || "" : node.textBetween(resolvedFrom - pos, resolvedTo - pos, void 0, "\uFFFC");
     const matches = pasteRuleMatcherHandler(textToMatch, rule.find, pasteEvent);
     matches.forEach((match) => {
       if (match.index === void 0) {
@@ -22131,8 +22138,6 @@ var ExtensionManager = class {
   get plugins() {
     const { editor } = this;
     const extensions = sortExtensions([...this.extensions].reverse());
-    const inputRules = [];
-    const pasteRules = [];
     const allPlugins = extensions.map((extension) => {
       const context = {
         name: extension.name,
@@ -22163,11 +22168,23 @@ var ExtensionManager = class {
       plugins.push(keyMapPlugin);
       const addInputRules = getExtensionField(extension, "addInputRules", context);
       if (isExtensionRulesEnabled(extension, editor.options.enableInputRules) && addInputRules) {
-        inputRules.push(...addInputRules());
+        const rules = addInputRules();
+        if (rules && rules.length) {
+          const inputResult = inputRulesPlugin({
+            editor,
+            rules
+          });
+          const inputPlugins = Array.isArray(inputResult) ? inputResult : [inputResult];
+          plugins.push(...inputPlugins);
+        }
       }
       const addPasteRules = getExtensionField(extension, "addPasteRules", context);
       if (isExtensionRulesEnabled(extension, editor.options.enablePasteRules) && addPasteRules) {
-        pasteRules.push(...addPasteRules());
+        const rules = addPasteRules();
+        if (rules && rules.length) {
+          const pasteRules = pasteRulesPlugin({ editor, rules });
+          plugins.push(...pasteRules);
+        }
       }
       const addProseMirrorPlugins = getExtensionField(
         extension,
@@ -22180,17 +22197,7 @@ var ExtensionManager = class {
       }
       return plugins;
     }).flat();
-    return [
-      inputRulesPlugin({
-        editor,
-        rules: inputRules
-      }),
-      ...pasteRulesPlugin({
-        editor,
-        rules: pasteRules
-      }),
-      ...allPlugins
-    ];
+    return allPlugins;
   }
   /**
    * Get all attributes from the extensions.
@@ -35812,29 +35819,40 @@ function create_effect(type, fn, sync, push = true) {
 		schedule_effect(effect);
 	}
 
-	// if an effect has no dependencies, no DOM and no teardown function,
-	// don't bother adding it to the effect tree
-	var inert =
-		sync &&
-		effect.deps === null &&
-		effect.first === null &&
-		effect.nodes_start === null &&
-		effect.teardown === null &&
-		(effect.f & EFFECT_PRESERVED) === 0;
-
-	if (!inert && push) {
-		if (parent !== null) {
-			push_effect(effect, parent);
-		}
+	if (push) {
+		/** @type {Effect | null} */
+		var e = effect;
 
-		// if we're in a derived, add the effect there too
+		// if an effect has already ran and doesn't need to be kept in the tree
+		// (because it won't re-run, has no DOM, and has no teardown etc)
+		// then we skip it and go to its child (if any)
 		if (
-			active_reaction !== null &&
-			(active_reaction.f & DERIVED) !== 0 &&
-			(type & ROOT_EFFECT) === 0
+			sync &&
+			e.deps === null &&
+			e.teardown === null &&
+			e.nodes_start === null &&
+			e.first === e.last && // either `null`, or a singular child
+			(e.f & EFFECT_PRESERVED) === 0
 		) {
-			var derived = /** @type {Derived} */ (active_reaction);
-			(derived.effects ??= []).push(effect);
+			e = e.first;
+		}
+
+		if (e !== null) {
+			e.parent = parent;
+
+			if (parent !== null) {
+				push_effect(e, parent);
+			}
+
+			// if we're in a derived, add the effect there too
+			if (
+				active_reaction !== null &&
+				(active_reaction.f & DERIVED) !== 0 &&
+				(type & ROOT_EFFECT) === 0
+			) {
+				var derived = /** @type {Derived} */ (active_reaction);
+				(derived.effects ??= []).push(e);
+			}
 		}
 	}
 
@@ -35897,7 +35915,7 @@ function user_pre_effect(fn) {
  */
 function component_root(fn) {
 	Batch.ensure();
-	const effect = create_effect(ROOT_EFFECT, fn, true);
+	const effect = create_effect(ROOT_EFFECT | EFFECT_PRESERVED, fn, true);
 
 	return (options = {}) => {
 		return new Promise((fulfil) => {
@@ -36013,7 +36031,7 @@ function block(fn, flags = 0) {
  * @param {boolean} [push]
  */
 function branch(fn, push = true) {
-	return create_effect(BRANCH_EFFECT, fn, true, push);
+	return create_effect(BRANCH_EFFECT | EFFECT_PRESERVED, fn, true, push);
 }
 
 /**
@@ -42774,7 +42792,7 @@ function parseConfig(config) {
   }
 }
 
-const version = "4.0.0-alpha.15";
+const version = "4.0.0-alpha.16";
 function attachDraftSwitcher(engine) {
   if (engine.hasDraft()) {
     const container = document.createElement("div");