@schukai/monster 4.143.7 → 4.143.8

package/package.json

@@ -1 +1 @@
-{"author":"Volker Schukai","dependencies":{"@floating-ui/dom":"^1.7.6"},"description":"Monster is a simple library for creating fast, robust and lightweight websites.","homepage":"https://monsterjs.org/","keywords":["framework","web","dom","css","sass","mobile-first","app","front-end","templates","schukai","core","shopcloud","alvine","monster","buildmap","stack","observer","observable","uuid","node","nodelist","css-in-js","logger","log","theme"],"license":"AGPL 3.0","main":"source/monster.mjs","module":"source/monster.mjs","name":"@schukai/monster","repository":{"type":"git","url":"https://gitlab.schukai.com/oss/libraries/javascript/monster.git"},"type":"module","version":"4.143.7"}
+{"author":"Volker Schukai","dependencies":{"@floating-ui/dom":"^1.7.6"},"description":"Monster is a simple library for creating fast, robust and lightweight websites.","homepage":"https://monsterjs.org/","keywords":["framework","web","dom","css","sass","mobile-first","app","front-end","templates","schukai","core","shopcloud","alvine","monster","buildmap","stack","observer","observable","uuid","node","nodelist","css-in-js","logger","log","theme"],"license":"AGPL 3.0","main":"source/monster.mjs","module":"source/monster.mjs","name":"@schukai/monster","repository":{"type":"git","url":"https://gitlab.schukai.com/oss/libraries/javascript/monster.git"},"type":"module","version":"4.143.8"}

package/source/components/form/control-bar.mjs

@@ -1393,16 +1393,29 @@ function getVisualBorderElement(element, side) {
 		"textarea",
 		"monster-input-group",
 		"monster-select",
+		"monster-button",
+		"monster-state-button",
+		"monster-message-state-button",
+		"monster-action-button",
+		"monster-api-button",
+		"monster-confirm-button",
+		"monster-popper-button",
 		"[data-monster-role=control]",
 	].join(",");
 	if (element.shadowRoot instanceof ShadowRoot) {
-		return (
-			element.shadowRoot.querySelector("button,input,select,textarea") ||
-			element.shadowRoot.querySelector(
-				"monster-input-group,monster-select,[data-monster-role=control]",
-			) ||
-			element
+		const primaryControl = element.shadowRoot.querySelector(
+			"[data-monster-role=button],button,input,select,textarea",
 		);
+		if (primaryControl instanceof HTMLElement && primaryControl !== element) {
+			return getVisualBorderElement.call(this, primaryControl, side);
+		}
+
+		const control = element.shadowRoot.querySelector(selector);
+		if (control instanceof HTMLElement && control !== element) {
+			return getVisualBorderElement.call(this, control, side);
+		}
+
+		return element;
 	}
 
 	const candidates = Array.from(element.querySelectorAll(selector)).filter(
@@ -1413,10 +1426,14 @@ function getVisualBorderElement(element, side) {
 	}
 
 	if (side === "right" || side === "bottom") {
-		return candidates[candidates.length - 1];
+		return getVisualBorderElement.call(
+			this,
+			candidates[candidates.length - 1],
+			side,
+		);
 	}
 
-	return candidates[0];
+	return getVisualBorderElement.call(this, candidates[0], side);
 }
 
 /**

package/test/cases/components/form/control-bar.mjs

@@ -32,6 +32,8 @@ describe("ControlBar", function () {
           import("../../../../source/components/form/control-bar-spacer.mjs"),
           import("../../../../source/components/form/button.mjs"),
           import("../../../../source/components/form/popper-button.mjs"),
+          import("../../../../source/components/form/message-state-button.mjs"),
+          import("../../../../source/components/form/confirm-button.mjs"),
         ])
           .then((m) => {
             ControlBar = m[0].ControlBar;
@@ -506,6 +508,105 @@ describe("ControlBar", function () {
     }
   });
 
+  it("should join borders between message state and confirm buttons", async function () {
+    const originalRequestAnimationFrame = window.requestAnimationFrame;
+    const originalGlobalRequestAnimationFrame = globalThis.requestAnimationFrame;
+
+    const scheduledCallbacks = [];
+    const flushFrames = async () => {
+      while (scheduledCallbacks.length > 0) {
+        scheduledCallbacks.shift()();
+        await new Promise((resolve) => setTimeout(resolve, 0));
+      }
+    };
+
+    try {
+      window.requestAnimationFrame = (callback) => {
+        scheduledCallbacks.push(callback);
+        return scheduledCallbacks.length;
+      };
+      globalThis.requestAnimationFrame = window.requestAnimationFrame;
+
+      const mocks = document.getElementById("mocks");
+      mocks.innerHTML = `
+        <div id="workflow-border-bar-wrapper">
+          <monster-control-bar
+            id="workflow-border-bar"
+            data-nucleus-role="workflow-lifecycle-integrity-actions"
+          >
+            <monster-message-state-button
+              id="workflow-border-copy"
+              data-nucleus-role="workflow-lifecycle-integrity-copy"
+            >Diagnose kopieren</monster-message-state-button>
+            <monster-confirm-button
+              id="workflow-border-repair"
+              data-nucleus-role="workflow-lifecycle-integrity-repair"
+            >
+              <div>
+                <p>Workflow-Lifecycle für diese Variante jetzt reparieren?</p>
+              </div>
+              <div slot="confirm">Ja</div>
+              <div slot="cancel">Nein</div>
+              <div slot="button">Lifecycle reparieren</div>
+            </monster-confirm-button>
+          </monster-control-bar>
+        </div>
+      `;
+
+      const wrapper = document.getElementById("workflow-border-bar-wrapper");
+      const copy = document.getElementById("workflow-border-copy");
+      const repair = document.getElementById("workflow-border-repair");
+
+      wrapper.style.boxSizing = "border-box";
+      wrapper.style.width = "400px";
+      Object.defineProperty(wrapper, "clientWidth", {
+        configurable: true,
+        value: 400,
+      });
+
+      for (const control of [copy, repair]) {
+        Object.defineProperty(control, "offsetWidth", {
+          configurable: true,
+          value: 120,
+        });
+        Object.defineProperty(control, "offsetHeight", {
+          configurable: true,
+          value: 30,
+        });
+        control.getBoundingClientRect = () => ({
+          width: 120,
+          height: 30,
+          top: 0,
+          right: 120,
+          bottom: 30,
+          left: 0,
+          x: 0,
+          y: 0,
+          toJSON: () => {},
+        });
+      }
+
+      const copyInnerButton = copy.shadowRoot
+        ?.querySelector('[data-monster-role="button"]')
+        ?.shadowRoot?.querySelector("button");
+      const repairInnerButton = repair.shadowRoot?.querySelector(
+        '[data-monster-role="button"]',
+      );
+
+      copyInnerButton.style.borderRightWidth = "3px";
+      repairInnerButton.style.borderLeftWidth = "3px";
+
+      await flushFrames();
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      await new Promise((resolve) => setTimeout(resolve, 0));
+
+      expect(repair.style.marginLeft).to.equal("-3px");
+    } finally {
+      window.requestAnimationFrame = originalRequestAnimationFrame;
+      globalThis.requestAnimationFrame = originalGlobalRequestAnimationFrame;
+    }
+  });
+
   it("should size inline spacer lines from adjacent border widths", async function () {
     const originalRequestAnimationFrame = window.requestAnimationFrame;
     const originalGlobalRequestAnimationFrame = globalThis.requestAnimationFrame;