RubyGems - studio-engine - Versions diffs - 0.62.4 → 0.62.5 - Mend

studio-engine 0.62.4 → 0.62.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/app/views/studio/modals/_host.html.erb +45 -2
data/app/views/studio/modals/_scoped_host.html.erb +35 -6
data/app/views/studio/modals/blocks/_success_card.html.erb +9 -1
data/lib/studio/version.rb +1 -1
metadata +1 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8407df81b6cb7059899c1f78c85cc36f0187e37ea0c5e0a2b47b7f611dbd1471
-  data.tar.gz: d28c8cf45183f8ae08f66e3b57950cfada513c6738a2dd3fce1a6c8bb81568e1
+  metadata.gz: 629e819d3b8b6a9c92140a69829e75a3d6d6c3c8e9ff4faeede098ffe7394a1e
+  data.tar.gz: 562d9d5caffa68f7c282cc91cb91369fe132a8e90c63257b97f43bf4d328669b
 SHA512:
-  metadata.gz: 6e547a7ee0083346abd7977616fe43921991889c911639d5b72ff29196eb639dd7f880f2692688dd46e16aa3ab5e4e07223366646ad15a24c4c940111c0f6a93
-  data.tar.gz: c84c519a783dfc04cc63d95eef3f71f0f6f4d34c8e758d8adbd89ce292ed5b3553e21a5e1e4308c44237b82d4520dbec4e2dc029b1302c97cc7294735213486c
+  metadata.gz: 3bc2df617a2f90f9c46efde0d73f7f39f7b2f063147971303d004b080c80af4710cb4cce605cbb7a608e87c37bcdd58dceaa4a2d0088c791b9024625c3da1fb3
+  data.tar.gz: 5a69fabcce40e7e93c5b8d0a3b88431a74d4047e100854393be1fb5ead4b4bacb0229b7182953e148655fe64a1faa60eacbb6aca426531fb20e34bff30116686

data/app/views/studio/modals/_host.html.erb CHANGED Viewed

@@ -301,7 +301,7 @@
           _backdropEl = null;
           // Only restore if the element is still in the document — a Turbo visit can
           // replace the page under an open modal, and focusing a detached node
-          // silently moves focus to <body>, which is worse than leaving it alone.
+          // silently moves focus to the document body, which is worse than leaving it alone.
           if (target && target.focus && document.contains(target)) target.focus();
         },
@@ -349,13 +349,25 @@
           var entry = this.current();
           if (!entry) return 'Dialog';
           var p = entry.props || {};
-          return p.ariaLabel || p.title || String(entry.id).replace(/[-_]/g, ' ');
+          // TRIMMED, not merely truthy. `title: '   '` is a truthy string, so it used to
+          // pass straight through — and the accessible-name computation then trims it to
+          // empty and announces a bare "dialog", the exact outcome this fallback chain
+          // exists to prevent. An empty string already fell through (it is falsy); a
+          // whitespace-only one did not, which is the more likely typo of the two.
+          var named = function(v) {
+            return (typeof v === 'string' && v.trim() !== '') ? v : null;
+          };
+          return named(p.ariaLabel) || named(p.title) || String(entry.id).replace(/[-_]/g, ' ');
         },
         open: function(id, props, opts) {
           props = props || {};
           opts  = opts  || {};
           var self = this;
+          // Set by any branch that re-mounts the INNER content template without
+          // re-mounting the OUTER one — see the push branch below. The replace
+          // branch returns early and calls refocus() from its own phase 2.
+          var remounted = false;
           if (opts.replace && this.stack.length > 0) {
             var current = this.current();
@@ -404,10 +416,25 @@
             }
             // Already mid-close — just hot-swap so we don't double up timers.
             this.stack[this.stack.length - 1] = { id: id, props: props };
+            remounted = true;
           } else {
+            // A push onto a NON-EMPTY stack is the third re-mount seam, and the one
+            // the trap missed longest. current() stays truthy, so the OUTER template
+            // never re-mounts and x-init never re-runs captureFocus — while the INNER
+            // content template DOES re-mount and unmounts whatever was focused.
+            // Focus lands on the document body, which is not a descendant of the backdrop, so the
+            // @keydown.tab handler bound there stops firing and native tabbing resumes.
+            // MEASURED on /lab/birthday_gate: open a card, Tab once, push a second
+            // card, then Shift+Tab three times and you walk onto three BACKGROUND-PAGE
+            // buttons behind a still-open dialog.
+            //
+            // Only the FIRST push is safe: current() goes falsy -> truthy, the outer
+            // template mounts, and x-init captures for us.
+            remounted = this.stack.length > 0;
             this.stack.push({ id: id, props: props });
           }
           this._sync();
+          if (remounted) this.refocus();
         },
         // Sugar — `swap('foo', props)` ≡ `open('foo', props, { replace: true })`.
         // Pass opts through so callers can request a back-direction slide
@@ -491,7 +518,14 @@
             // (open → swap → close) unmounts one dialog and mounts the next, and
             // restoring to the background page in between would yank focus out of
             // a flow the user is still inside.
+            //
+            // BUT NOT RESTORING IS NOT THE SAME AS DOING NOTHING. Closing down to an
+            // underlying modal re-mounts the inner template, so focus falls to the document body
+            // with the dialog still open — the trap is off while the user is still
+            // inside it. releaseFocus() was correctly gated on an empty stack; the
+            // missing half was the else. MEASURED on both hosts.
             if (self.stack.length === 0) self.releaseFocus();
+            else self.refocus();
           }, modalAnim('exit', entry.props && entry.props.exitAnim).ms);
         },
         closeAll: function() {
@@ -517,6 +551,15 @@
             return modal.props && modal.props.dismissible === false;
           });
           this._sync();
+          // Same re-mount, same release: a surviving non-dismissible card is still on
+          // screen, and the cards dropped from under it took focus with them. MEASURED:
+          // activeElement the document body behind a still-open non-dismissible dialog.
+          //
+          // Nothing is done when the stack empties. That is deliberate and different
+          // from close(): this runs on the Turbo/bfcache teardown path, where the page
+          // is going away and closeAll() already declines to restore into a document
+          // about to be replaced.
+          if (this.stack.length > 0) this.refocus();
         },
         // isOpen(id) — is a card with this id ON THE STACK, in any
         // lifecycle state? A card mid-close still counts: close() flips

data/app/views/studio/modals/_scoped_host.html.erb CHANGED Viewed

@@ -162,7 +162,15 @@
           var entry = this.current();
           if (!entry) return 'Dialog';
           var p = entry.props || {};
-          return p.ariaLabel || p.title || String(entry.id).replace(/[-_]/g, ' ');
+          // TRIMMED, not merely truthy. `title: '   '` is a truthy string, so it used to
+          // pass straight through — and the accessible-name computation then trims it to
+          // empty and announces a bare "dialog", the exact outcome this fallback chain
+          // exists to prevent. An empty string already fell through (it is falsy); a
+          // whitespace-only one did not, which is the more likely typo of the two.
+          var named = function(v) {
+            return (typeof v === 'string' && v.trim() !== '') ? v : null;
+          };
+          return named(p.ariaLabel) || named(p.title) || String(entry.id).replace(/[-_]/g, ' ');
         },
         // open(id, props, opts) — opts.replace swaps the top entry in place
@@ -172,17 +180,26 @@
           opts  = opts  || {};
           var entry = { id: id, props: props };
-          var replaced = false;
+          // Did this call re-mount the INNER content template without re-mounting the
+          // OUTER one? That is the whole question the focus trap turns on.
+          var remounted = false;
           if (opts.replace && this.stack.length > 0) {
             this.stack.splice(this.stack.length - 1, 1, entry);
-            replaced = true;
+            remounted = true;
           } else {
+            // THE COMMENT THIS REPLACES SAID "only on a REPLACE", on the premise that a
+            // fresh push takes current() falsy -> truthy so the outer template mounts and
+            // x-init captures for us. That is TRUE only when the stack was EMPTY, and
+            // silently false for a stacked push: current() was already truthy, so the
+            // outer template does not re-mount, x-init never re-runs, and the inner
+            // template unmounts whatever was focused. Focus lands on the document body — not a
+            // descendant of the backdrop — so the @keydown.tab handler bound there stops
+            // firing and native tabbing walks straight onto the page behind.
+            remounted = this.stack.length > 0;
             this.stack.push(entry);
           }
           this._sync();
-          // Only on a REPLACE. A fresh push takes current() falsy -> truthy, so the
-          // outer template mounts and x-init calls captureFocus for us.
-          if (replaced) this.refocus();
+          if (remounted) this.refocus();
         },
         swap: function(id, props, opts) {
@@ -205,7 +222,13 @@
             // Only when the LAST modal leaves — a stacked flow unmounts one dialog
             // and mounts the next, and restoring in between yanks focus out of a
             // flow the user is still inside.
+            //
+            // NOT RESTORING IS NOT THE SAME AS DOING NOTHING. Closing down TO an
+            // underlying modal re-mounts the inner template, so focus falls to the document body
+            // with that dialog still open — the trap is off while the user is still
+            // inside it. The gate was right; the else was missing.
             if (self.stack.length === 0) self.releaseFocus();
+            else self.refocus();
           }, CLOSE_ANIM_MS);
         },
@@ -224,6 +247,12 @@
             return entry.props && entry.props.dismissible === false;
           });
           this._sync();
+          // Same re-mount, same release: a surviving non-dismissible card is still on
+          // screen and the cards dropped from under it took focus with them. Nothing is
+          // done when the stack empties — deliberately unlike close(): this is the
+          // Turbo/bfcache teardown path, where closeAll() already declines to restore
+          // into a document about to be replaced.
+          if (this.stack.length > 0) this.refocus();
         },
         // isOpen(id) — on the stack in ANY lifecycle state, including a card

data/app/views/studio/modals/blocks/_success_card.html.erb CHANGED Viewed

@@ -78,6 +78,7 @@
     _remaining: #{redirect_secs},
     _total: #{redirect_secs},
     _redirectTimer: null,
+    _confettiTimer: null,
     startCountdown(url) {
       if (!url) return;
       var self = this;
@@ -92,9 +93,16 @@
       }, 1000);
     },
     fireConfetti() {
-      setTimeout(function() {
+      var self = this;
+      if (self._confettiTimer) clearTimeout(self._confettiTimer);
+      self._confettiTimer = setTimeout(function() {
+        self._confettiTimer = null;
         try { if (window.fireSuccessConfetti) window.fireSuccessConfetti(); } catch (_) {}
       }, 100);
+    },
+    destroy() {
+      if (this._redirectTimer) { clearInterval(this._redirectTimer); this._redirectTimer = null; }
+      if (this._confettiTimer) { clearTimeout(this._confettiTimer); this._confettiTimer = null; }
     }
   }".gsub(/\s+/, ' ').html_safe

data/lib/studio/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.62.4"
+  VERSION = "0.62.5"
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.62.4
+  version: 0.62.5
 platform: ruby
 authors:
 - Alex McRitchie