Merge branch 'main' into kh-set-min-width-for-button

primer · Apr 30, 2024 · c546607 · c546607
2 parents 8cd0454 + 811fac4
commit c546607
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 167 deletions.
diff --git a/.changeset/wild-knives-notice.md b/.changeset/wild-knives-notice.md
diff --git a/app/components/primer/alpha/overlay.html.erb b/app/components/primer/alpha/overlay.html.erb
@@ -6,20 +6,7 @@
     <% if content.present? %>
       <%= content %>
     <% else %>
-      <% if bodies.size > 1 %>
-        <%= render(Primer::Alpha::TabPanels.new(label: "label", wrapper_arguments: { classes: "Overlay-tabPanels" })) do |component| %>
-          <% bodies.each do |body| %>
-            <% component.with_tab(**body.tab_arguments) do |tab| %>
-              <% tab.with_panel(classes: "Overlay-tabPanel") do %>
-                <%= body %>
-              <% end %>
-              <% tab.with_text { body.tab_label } %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% else %>
-        <%= bodies.first %>
-      <% end %>
+      <%= body %>
       <%= footer %>
     <% end %>
   <% end %>

diff --git a/app/components/primer/alpha/overlay.pcss b/app/components/primer/alpha/overlay.pcss
@@ -24,19 +24,3 @@ anchored-position.not-anchored::backdrop, dialog::backdrop {
     outline: solid 1px transparent;
   }
 }
-
-.Overlay-tabPanels {
-  display: flex;
-  flex-direction: column;
-  overflow-y: hidden;
-
-  &::part(tablist-wrapper) {
-    margin: var(--base-size-8) 0;
-    padding: 0 var(--base-size-8);
-  }
-}
-
-.Overlay-tabPanel {
-  overflow: hidden;
-  display: flex;
-}
diff --git a/app/components/primer/alpha/overlay.rb b/app/components/primer/alpha/overlay.rb
@@ -106,11 +106,10 @@ class Overlay < Primer::Component
       }
 
       # Required body content.
-      # when multiple bodies are passed, they will be rendered in a TabPanels component.
       #
       # @param padding [Symbol] The padding. <%= one_of(Primer::Alpha::Overlay::PADDING_OPTIONS) %>
       # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-      renders_many :bodies, lambda { |padding: @padding, **system_arguments|
+      renders_one :body, lambda { |padding: @padding, **system_arguments|
         Primer::Alpha::Overlay::Body.new(
           padding: padding,
           **system_arguments
@@ -186,16 +185,7 @@ def before_render
             @system_arguments[:aria][:label] = @title
           end
         end
-        if bodies?
-          if bodies.size > 1
-            # confirm all bodies have tab_label
-            bodies.each do |body|
-              raise ArgumentError, "Multiple with_body slots require `tab_label` to be passed." unless body.tab_label.present?
-            end
-          end
-        else
-          with_body
-        end
+        with_body unless body?
       end
 
       private

diff --git a/app/components/primer/alpha/overlay/body.rb b/app/components/primer/alpha/overlay/body.rb
@@ -6,21 +6,15 @@ class Overlay
       # A `Overlay::Body` is a compositional component, used to render the
       # Body of an overlay. See <%= link_to_component(Primer::Alpha::Overlay) %>.
       class Body < Primer::Component
-
-        attr_reader :tab_arguments, :tab_label
-
-        # @param tab_arguments [Hash] Arguments passed to TabPanels component
         # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-        def initialize(padding: DEFAULT_PADDING, tab_label: nil, tab_arguments: {}, **system_arguments)
+        def initialize(padding: DEFAULT_PADDING, **system_arguments)
           @system_arguments = deny_tag_argument(**system_arguments)
           @system_arguments[:tag] = :div
           @system_arguments[:classes] = class_names(
             "Overlay-body",
             PADDING_MAPPINGS[fetch_or_fallback(PADDING_OPTIONS, padding, DEFAULT_PADDING)],
             system_arguments[:classes]
           )
-          @tab_arguments = tab_arguments
-          @tab_label = tab_label
         end
 
         def call

diff --git a/app/components/primer/alpha/tab_panels.rb b/app/components/primer/alpha/tab_panels.rb
@@ -19,7 +19,7 @@ class TabPanels < Primer::Component
       # @param id [String] Unique ID of tab.
       # @param selected [Boolean] Whether the tab is selected.
       # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-      renders_many :tabs, lambda { |id: self.class.generate_id, selected: false, **system_arguments|
+      renders_many :tabs, lambda { |id:, selected: false, **system_arguments|
         system_arguments[:id] = id
         system_arguments[:classes] = tab_nav_tab_classes(system_arguments[:classes])
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/previews/primer/alpha/overlay_preview.rb b/previews/primer/alpha/overlay_preview.rb
@@ -195,10 +195,6 @@ def overlay_with_header_subtitle
         end
       end
 
-      def overlay_with_three_bodies
-        render_with_template(locals: {})
-      end
-
       def in_a_sticky_container
         render_with_template(locals: {})
       end

diff --git a/previews/primer/alpha/overlay_preview/overlay_with_three_bodies.html.erb b/previews/primer/alpha/overlay_preview/overlay_with_three_bodies.html.erb
diff --git a/static/arguments.json b/static/arguments.json
@@ -1866,12 +1866,6 @@
     "source": "https://github.com/primer/view_components/tree/main/app/components/primer/alpha/overlay/body.rb",
     "lookbook": "https://primer.style/view-components/lookbook/inspect/primer/alpha/overlay/body/default/",
     "parameters": [
-      {
-        "name": "tab_arguments",
-        "type": "Hash",
-        "default": "`{}`",
-        "description": "Arguments passed to TabPanels component"
-      },
       {
         "name": "system_arguments",
         "type": "Hash",

diff --git a/static/classes.json b/static/classes.json
@@ -408,12 +408,6 @@
   "Overlay-headerFilter": [
     "Primer::Alpha::Dialog"
   ],
-  "Overlay-tabPanel": [
-    "Primer::Alpha::Overlay"
-  ],
-  "Overlay-tabPanels": [
-    "Primer::Alpha::Overlay"
-  ],
   "Popover": [
     "Primer::Beta::Popover"
   ],

diff --git a/static/info_arch.json b/static/info_arch.json
@@ -6000,8 +6000,8 @@
         ]
       },
       {
-        "name": "bodies",
-        "description": "Required body content.\nwhen multiple bodies are passed, they will be rendered in a TabPanels component.",
+        "name": "body",
+        "description": "Required body content.",
         "parameters": [
           {
             "name": "padding",
@@ -6157,19 +6157,6 @@
           ]
         }
       },
-      {
-        "preview_path": "primer/alpha/overlay/overlay_with_three_bodies",
-        "name": "overlay_with_three_bodies",
-        "snapshot": "false",
-        "skip_rules": {
-          "wont_fix": [
-            "region"
-          ],
-          "will_fix": [
-            "color-contrast"
-          ]
-        }
-      },
       {
         "preview_path": "primer/alpha/overlay/in_a_sticky_container",
         "name": "in_a_sticky_container",
@@ -6338,12 +6325,6 @@
         "source": "https://github.com/primer/view_components/tree/main/app/components/primer/alpha/overlay/body.rb",
         "lookbook": "https://primer.style/view-components/lookbook/inspect/primer/alpha/overlay/body/default/",
         "parameters": [
-          {
-            "name": "tab_arguments",
-            "type": "Hash",
-            "default": "`{}`",
-            "description": "Arguments passed to TabPanels component"
-          },
           {
             "name": "system_arguments",
             "type": "Hash",
@@ -6355,20 +6336,7 @@
 
         ],
         "methods": [
-          {
-            "name": "tab_arguments",
-            "description": "Returns the value of attribute tab_arguments.",
-            "parameters": [
 
-            ]
-          },
-          {
-            "name": "tab_label",
-            "description": "Returns the value of attribute tab_label.",
-            "parameters": [
-
-            ]
-          }
         ],
         "previews": [
 

diff --git a/static/previews.json b/static/previews.json
@@ -4979,19 +4979,6 @@
           ]
         }
       },
-      {
-        "preview_path": "primer/alpha/overlay/overlay_with_three_bodies",
-        "name": "overlay_with_three_bodies",
-        "snapshot": "false",
-        "skip_rules": {
-          "wont_fix": [
-            "region"
-          ],
-          "will_fix": [
-            "color-contrast"
-          ]
-        }
-      },
       {
         "preview_path": "primer/alpha/overlay/in_a_sticky_container",
         "name": "in_a_sticky_container",

diff --git a/test/components/primer/alpha/overlay_test.rb b/test/components/primer/alpha/overlay_test.rb
@@ -132,29 +132,4 @@ def test_renders_header_subtitle
 
     assert_selector(".Overlay-header .Overlay-description")
   end
-
-  def test_renders_multiple_bodies_as_tabpanels
-    render_inline(Primer::Alpha::Overlay.new(title: "Title", role: :dialog)) do |component|
-      component.with_header
-      component.with_body(tab_label: "Tab 1") { "Hello" }
-      component.with_body(tab_label: "Tab 2") { "Hello" }
-    end
-
-    assert_selector("tab-container.Overlay-tabPanels") do
-      assert_selector(".tabnav-tab", count: 2)
-      assert_selector(".Overlay-tabPanel", count: 2, visible: :all)
-    end
-  end
-
-  def test_raises_argument_error_when_tab_label_is_missing
-    error = assert_raises(ArgumentError) do
-      render_inline(Primer::Alpha::Overlay.new(title: "Title", role: :dialog)) do |component|
-        component.with_header
-        component.with_body { "Hello" }
-        component.with_body { "Hello" }
-      end
-    end
-
-    assert_includes(error.message, "Multiple with_body slots require `tab_label` to be passed.")
-  end
 end