Merge branch 'main' into fix-popover-open-selector-for-anchored-position

primer · May 12, 2023 · 89640eb · 89640eb
2 parents 247c163 + a1ca6fd
commit 89640eb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/.changeset/forty-tomatoes-rule.md b/.changeset/forty-tomatoes-rule.md
@@ -0,0 +1,5 @@
+---
+'@primer/view-components': patch
+---
+
+Fix embedded example in SelectInput docs
diff --git a/.changeset/funny-tomatoes-sparkle.md b/.changeset/funny-tomatoes-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@primer/view-components': patch
+---
+
+Make ActionList leading visual icons the same color as the item text.
diff --git a/app/components/primer/alpha/action_list/item.rb b/app/components/primer/alpha/action_list/item.rb
@@ -42,9 +42,7 @@ class Item < Primer::Component
         #
         # To render custom content, call the `with_leading_visual_content` method and pass a block that returns a string.
         renders_one :leading_visual, types: {
-          icon: lambda { |**system_arguments|
-            Primer::Beta::Octicon.new(classes: "ActionListItem-visual ActionListItem-visual--leading", **system_arguments)
-          },
+          icon: Primer::Beta::Octicon,
           avatar: ->(**kwargs) { Primer::Beta::Avatar.new(**{ **kwargs, size: 16 }) },
           svg: lambda { |**system_arguments|
             Primer::BaseComponent.new(tag: :svg, width: "16", height: "16", **system_arguments)

diff --git a/lib/primer/yard/lookbook_pages_backend.rb b/lib/primer/yard/lookbook_pages_backend.rb
@@ -10,7 +10,7 @@ class LookbookPage
       PREVIEW_MAP = {
         Primer::Alpha::TextField => [:single_text_field_form, :multi_text_field_form],
         Primer::Alpha::TextArea => [],
-        Primer::Alpha::Select => [:select_list_form],
+        Primer::Alpha::Select => [:select_form],
         Primer::Alpha::MultiInput => [:multi_input_form],
         Primer::Alpha::RadioButton => [:radio_button_with_nested_form],
         Primer::Alpha::RadioButtonGroup => [:radio_button_group_form],
@@ -49,6 +49,12 @@ def generate
 
         preview_methods = PREVIEW_MAP[component]
         preview_erbs = preview_methods.map do |preview_method|
+          # rubocop:disable Style/IfUnlessModifier
+          if Primer::Forms::FormsPreview.instance_methods.exclude?(preview_method)
+            raise "Preview '#{preview_method}' does not exist in Primer::Forms::FormsPreview"
+          end
+          # rubocop:enable Style/IfUnlessModifier
+
           "<%= embed Primer::Forms::FormsPreview, #{preview_method.inspect} %>"
         end
         # rubocop:enable Lint/UselessAssignment