@zoreal/oauth2-react 0.2.22 → 0.2.24

package/dist/index.cjs

@@ -42,7 +42,7 @@ var import_react2 = require("react");
 
 // src/wire.ts
 var WIRE_VERSION = 1;
-var SDK_VERSION = "0.2.22";
+var SDK_VERSION = "0.2.24";
 var DEFAULT_ISSUER = "https://id.zoreal.com";
 var POLL_INTERVAL_MS = 2e3;
 var POLL_INTERVAL_ENROLLING_MS = 5e3;
@@ -1652,9 +1652,16 @@ var SVG_NS = "http://www.w3.org/2000/svg";
 var TAIL = 0.3;
 var STACK = Array.from({ length: 12 }, (_, i) => 12 - i);
 var HALO = [3, 2, 1];
-function radiusOf(control) {
-  const value = parseFloat(getComputedStyle(control).borderTopLeftRadius);
-  return Number.isFinite(value) ? value : 8;
+function cornerOf(radius, width, height) {
+  const raw = radius.trim();
+  const value = parseFloat(raw);
+  const offset = 2;
+  if (raw.endsWith("%") && Number.isFinite(value)) {
+    return [width * value / 100 + offset, height * value / 100 + offset];
+  }
+  const px = Number.isFinite(value) ? value : /infinity/i.test(raw) ? Infinity : 8;
+  const r = Math.min(px, width / 2, height / 2) + offset;
+  return [r, r];
 }
 function holdBusy(control) {
   if (typeof document === "undefined") return () => {
@@ -1675,12 +1682,11 @@ function holdBusy(control) {
   overlay.setAttribute("aria-hidden", "true");
   const svg = document.createElementNS(SVG_NS, "svg");
   svg.setAttribute("class", cx("ring-svg"));
-  const rx = radiusOf(control) + 2;
+  const rects = [];
   const layer = (name, len, alpha) => {
     const rect = document.createElementNS(SVG_NS, "rect");
     rect.setAttribute("class", cx(name));
-    rect.setAttribute("rx", String(rx));
-    rect.setAttribute("ry", String(rx));
+    rects.push(rect);
     rect.style.strokeDasharray = `calc(var(--zrl-l) * ${len}) calc(var(--zrl-l) * ${1 - len})`;
     rect.style.setProperty("--zrl-s", `calc(var(--zrl-l) * ${-(TAIL - len)})`);
     rect.style.opacity = alpha;
@@ -1703,6 +1709,11 @@ function holdBusy(control) {
     overlay.style.top = `${box.top}px`;
     overlay.style.width = `${box.width}px`;
     overlay.style.height = `${box.height}px`;
+    const [rx, ry] = cornerOf(getComputedStyle(control).borderTopLeftRadius, box.width, box.height);
+    for (const rect of rects) {
+      rect.setAttribute("rx", String(rx));
+      rect.setAttribute("ry", String(ry));
+    }
     const length = typeof measured?.getTotalLength === "function" ? measured.getTotalLength() : 0;
     if (length > 0) overlay.style.setProperty("--zrl-ring-len", `${length}px`);
   };
@@ -1786,6 +1797,30 @@ function markReturnDone(requestId) {
 function isReturnDone(requestId) {
   return storage()?.getItem(DONE + requestId) !== null && storage()?.getItem(DONE + requestId) !== void 0;
 }
+function visibleOrDone(requestId, signal) {
+  if (typeof document === "undefined" || document.visibilityState !== "hidden") {
+    return Promise.resolve(!isReturnDone(requestId));
+  }
+  return new Promise((resolve) => {
+    const finish = (value) => {
+      document.removeEventListener("visibilitychange", onVisible);
+      window.removeEventListener("storage", onStorage);
+      signal?.removeEventListener("abort", onAbort);
+      resolve(value);
+    };
+    const onVisible = () => {
+      if (document.visibilityState !== "hidden") finish(!isReturnDone(requestId));
+    };
+    const onStorage = () => {
+      if (isReturnDone(requestId)) finish(false);
+    };
+    const onAbort = () => finish(false);
+    document.addEventListener("visibilitychange", onVisible);
+    window.addEventListener("storage", onStorage);
+    signal?.addEventListener("abort", onAbort, { once: true });
+    if (isReturnDone(requestId)) finish(false);
+  });
+}
 function returnToUrl() {
   if (typeof window === "undefined") return void 0;
   const { href } = window.location;
@@ -2348,7 +2383,7 @@ function useZorealFlow(options) {
             controller.signal,
             { tolerateUnknownUntil: Date.now() + 15e3 }
           );
-          if (isReturnDone(requestId)) {
+          if (!await visibleOrDone(requestId, controller.signal)) {
             throw new DOMException("aborted", "AbortError");
           }
         } else {