studio-engine 0.74.11 → 0.74.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb7849240e659870dc37f51a2ba9c11c9307cab6059102805fcd5b4ef2bfdb53
-  data.tar.gz: fdbb67edfb1d7fc445402f2449ebbca016f10f6a9927775b229f2a5ba8ce59d8
+  metadata.gz: c4fe6cb6d0167ad680d5d6e9dc577a623c87e83d839847be79950877b922d576
+  data.tar.gz: 07d63386f006d3bfba60556910097f0f0797e52f28f6bcde41e38c37e4af9326
 SHA512:
-  metadata.gz: f7523343af9ecf3d2762c223b82ff777a850a84c29ddb52eaa6c09ae8e90d7588ba4011cbee361bf0f08c043ddf0081abdab36fafc4ae39caa2b4d59eb4309a0
-  data.tar.gz: 003cd9c09eaba85c4006d92434a1e4606462e170db49e29764b80d32593fbd75f10cd9a547654df8edd293c06a5c91872808bab14c3a6c385ff7cf78bae88047
+  metadata.gz: a46c78e389a2776d874522186127a1a16ae5bca04429ee3879a3bd0b1a8ce4e669d382803d94a2f3becb127c8735cd40255f62ef848cdfec3a76e912997d347d
+  data.tar.gz: caab23ce4c8cd6788ad50bc28391302b9b388015dd33e19a80855ba708f335f38653a449af6afd3b4afe43dd92a7cd87233ed51874f831c7cf175d6109ebe76e

data/CHANGELOG.md

@@ -4,6 +4,32 @@ The format is [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). This pro
 
 ## Unreleased
 
+## 0.74.12 — 2026-09-16
+
+### Fixed
+
+- **A modal partial rendered from a layout no longer re-emits the whole page
+  body.** In a Rails partial `block_given?` is always true, and a `yield` with
+  no caller block returns the layout's content: the entire rendered page once
+  the layout is rendering. Four partials tested their block that way.
+  turf-monster hit it live: its layout-rendered username modal reaches
+  `blocks/_card_header` with a nil subtitle, so every signed-in page for a user
+  allowed to rename carried a second copy of its own body inside a
+  `<template>`. Measured on turf-monster's `/`, `/contests` and `/account`
+  against 0.74.11: two copies of the page body before, one after.
+  - New `Studio::PartialBlock.content(view, yielded)` returns a caller's block
+    content, or nil when there is none. It treats a blank yield, or a yield
+    equal to `content_for(:layout)`, as no block.
+  - `blocks/_card_header` (the subtitle slot), `blocks/_success_card` (both
+    slot positions), `_host` and `_scoped_host` (the registration seam) now
+    ask it instead of `block_given?`.
+  - The block contract is unchanged. A caller passing a non-blank block
+    renders as before, so no consumer edits a call site. A no-block render
+    outside a layout now omits the empty subtitle paragraph or slot wrapper it
+    used to leave.
+  - Guarded by `test/views/partial_block_layout_yield_test.rb`, which renders
+    each partial through a real layout and counts the page body.
+
 ## 0.74.11 — 2026-09-13
 
 ## 0.74.10 — 2026-09-13

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

@@ -838,8 +838,13 @@
          :class="$store.modals.cardClasses()">
       <%# Consumer-provided content registrations. Each block typically
           contains a <template x-if="$store.modals.current().id === 'X'">
-          render "modals/X" </template>. %>
-      <%= yield if block_given? %>
+          render "modals/X" </template>.
+          NOT `yield if block_given?`. In a partial block_given? is always true,
+          and a caller-less yield returns the layout's content, so a host
+          rendered from a layout with no block (an app whose modals all live in
+          _host_extras) put the whole page body inside the card. See
+          Studio::PartialBlock. %>
+      <%= Studio::PartialBlock.content(self, yield) %>
 
       <%# APP-WIDE modal registrations — the second seam. The block above is
           per-CALLSITE: an app rendering this host from two layouts (a live one

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

@@ -364,8 +364,11 @@
        @keydown.escape.window="$store.<%= scoped_store %>.current() && $store.<%= scoped_store %>.current().props.dismissible !== false && $store.<%= scoped_store %>.close()"
        @click.self="$store.<%= scoped_store %>.current() && $store.<%= scoped_store %>.current().props.dismissible !== false && $store.<%= scoped_store %>.close()">
     <div class="<%= card_class %> max-h-[85dvh] overflow-y-auto" :class="$store.<%= scoped_store %>.cardClasses()">
-      <%# Consumer-provided registrations — one <template x-if> per modal id. %>
-      <%= yield if block_given? %>
+      <%# Consumer-provided registrations — one <template x-if> per modal id.
+          Not `yield if block_given?`: a partial's block_given? is always true,
+          and a caller-less yield returns the layout's whole page body. See
+          Studio::PartialBlock. %>
+      <%= Studio::PartialBlock.content(self, yield) %>
     </div>
   </div>
 </template>

data/app/views/studio/modals/blocks/_card_header.html.erb

@@ -21,10 +21,16 @@
                     for processing / loading states.
     size:           :md (default) OR :lg (celebration end-state, text-3xl title).
 
-  Block: if given, the block's content replaces the subtitle area. Explicit
-  subtitle locals are checked BEFORE block_given? — a partial's block_given? can
-  read TRUE off the layout yield even with no block passed (see the engine's
-  Rails-partial block_given? note), so lead with the locals.
+  Block: if given, the block's content replaces the subtitle area. The subtitle
+  locals outrank it.
+
+  NEVER TEST THE BLOCK WITH block_given?. In a Rails partial it is always true,
+  and a yield with no caller block returns the LAYOUT's content. This branch
+  used to read `elsif block_given?`, so a header rendered from the layout with
+  no subtitle yielded the whole page body into the modal: every signed-in
+  turf-monster page for a user allowed to rename carried two copies of itself
+  (modal-header-yields-whole-page, 2026-09-16). Studio::PartialBlock
+  (lib/studio/partial_block.rb) tells a real block from that fallback.
 %>
 <%
   icon_color = local_assigns[:icon_color] || 'primary'
@@ -77,7 +83,7 @@
     <p class="<%= sub_cls %>" x-text="<%= subtitle_key %>"></p>
   <% elsif local_assigns[:subtitle] %>
     <p class="<%= sub_cls %>"><%= subtitle %></p>
-  <% elsif block_given? %>
-    <p class="<%= sub_cls %>"><%= yield %></p>
+  <% elsif (caller_block = Studio::PartialBlock.content(self, yield)) %>
+    <p class="<%= sub_cls %>"><%= caller_block %></p>
   <% end %>
 </div>

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

@@ -73,6 +73,11 @@
   large_title   = !!local_assigns[:large_title]
   use_drain     = has_redirect && !!local_assigns[:cta_drain]
   slot_position = local_assigns.fetch(:slot_position, :below_cta).to_sym
+  # The caller's block, captured ONCE, or nil when there is none. Never
+  # block_given?: in a partial it is always true, and a caller-less yield
+  # returns the layout's content, so a card rendered from a layout with no
+  # block re-emitted the whole page body under its CTA. See Studio::PartialBlock.
+  caller_block  = Studio::PartialBlock.content(self, yield)
 
   data_attr = "{
     _remaining: #{redirect_secs},
@@ -231,8 +236,8 @@
       card has always run its kickoff timer and seeds bar above the button for
       that reason, and this is what lets the engine's card do the same instead of
       the app forking one to keep the order. %>
-  <% if block_given? && slot_position == :above_cta %>
-    <div class="mb-4"><%= yield %></div>
+  <% if caller_block && slot_position == :above_cta %>
+    <div class="mb-4"><%= caller_block %></div>
   <% end %>
 
   <%# Primary CTA — three flavors:
@@ -288,9 +293,9 @@
   <% end %>
 
   <%# ...or below it, which stays the DEFAULT: every existing caller renders here
-      and none of them asked to move. A partial can only yield once, so exactly
-      one of these two branches runs. %>
-  <% if block_given? && slot_position != :above_cta %>
-    <div class="mt-3"><%= yield %></div>
+      and none of them asked to move. The block is captured once at the top, and
+      exactly one of these two branches renders it. %>
+  <% if caller_block && slot_position != :above_cta %>
+    <div class="mt-3"><%= caller_block %></div>
   <% end %>
 </div>

data/lib/studio/partial_block.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Studio
+  # The content of the block a CALLER passed to a partial, or nil when it passed
+  # none. The engine's slot-taking partials ask this, never `block_given?`.
+  #
+  # WHY block_given? IS THE WRONG QUESTION IN A PARTIAL. ActionView compiles a
+  # template into a method and ALWAYS invokes that method with a block:
+  # PartialRenderer passes `{ |*name| view._layout_for(*name, &block) }` whether
+  # or not the render that reached the partial carried one. So `block_given?` is
+  # true in every partial. A `yield` with no caller block then falls through to
+  # `_layout_for`'s other branch, the LAYOUT's content. While the page's own
+  # template renders, that is empty. Once the layout renders, it is THE WHOLE
+  # PAGE BODY.
+  #
+  # MEASURED 2026-09-16 (modal-header-yields-whole-page). turf-monster renders
+  # the modal host from its layout. The username modal's plain "Saved" card
+  # reached blocks/_card_header with a nil subtitle, and the header's
+  # `elsif block_given?` yielded the entire page a second time inside a
+  # <template>: two copies of the page body on /, /contests and /account for
+  # every signed-in user allowed to rename. Nothing painted, nothing raised, and
+  # every request returned 200.
+  #
+  # HOW THIS ANSWERS IT. Rails gives a template no way to ask whether its caller
+  # passed a block, so the partial yields and hands the result in:
+  #
+  #   caller_block = Studio::PartialBlock.content(self, yield)
+  #
+  # A caller-less yield can only return the layout's content or nothing, so a
+  # yield equal to `content_for(:layout)` is that fallback, not a block. A blank
+  # yield also reads as no block: an empty slot wrapper is never what a caller
+  # meant.
+  #
+  # THIS FIXES THE PREDICATE; THE BLOCK CONTRACT IS UNCHANGED. A caller that
+  # passes a non-blank block renders exactly as before, so no consumer edits a
+  # call site. A NEW slot should still prefer a named local that names a partial
+  # (solana-studio's wallet picker does), which needs no predicate at all.
+  module PartialBlock
+    module_function
+
+    # view    — the partial's view context (`self` inside the template).
+    # yielded — the partial's own `yield`, evaluated where the partial calls this.
+    def content(view, yielded)
+      return nil if yielded.blank?
+      return nil if yielded == view.content_for(:layout)
+
+      yielded
+    end
+  end
+end

data/lib/studio/version.rb

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.74.11"
+  VERSION = "0.74.12"
 end

data/lib/studio.rb

@@ -10,6 +10,7 @@ require "studio/theme_resolver"
 require "studio/ui_primitives"
 require "studio/js_literal"
 require "studio/js_identifier"
+require "studio/partial_block"
 require "studio/sidebar_sections"
 require "studio/profile_sections"
 require "studio/profile_image"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.74.11
+  version: 0.74.12
 platform: ruby
 authors:
 - Alex McRitchie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-14 00:00:00.000000000 Z
+date: 2026-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -570,6 +570,7 @@ files:
 - lib/studio/name_parts.rb
 - lib/studio/newsletter.rb
 - lib/studio/oauth_identity.rb
+- lib/studio/partial_block.rb
 - lib/studio/profile_image.rb
 - lib/studio/profile_sections.rb
 - lib/studio/redis.rb