Merge branch 'main' into add-button-wrap-param

primer · Apr 8, 2024 · 8b5f0cf · 8b5f0cf
2 parents 59f205f + 747cb95
commit 8b5f0cf
Show file tree

Hide file tree

Showing 16 changed files with 245 additions and 151 deletions.
diff --git a/.changeset/eight-worms-bake.md b/.changeset/eight-worms-bake.md
diff --git a/.changeset/swift-fans-march.md b/.changeset/swift-fans-march.md
@@ -0,0 +1,6 @@
+---
+"@primer/view-components": patch
+---
+
+Allow `:link` Button scheme text label to wrap
+
diff --git a/...apshots.test.ts-snapshots/primer/beta/button/link_scheme_label_wrap/default.png b/...apshots.test.ts-snapshots/primer/beta/button/link_scheme_label_wrap/default.png
diff --git a/...apshots.test.ts-snapshots/primer/beta/button/link_scheme_label_wrap/focused.png b/...apshots.test.ts-snapshots/primer/beta/button/link_scheme_label_wrap/focused.png
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gemspec
 rails_version = (ENV["RAILS_VERSION"] || "7.1.1").to_s
 
 gem "rack-cors"
-gem "rake", "~> 13.1"
+gem "rake", "~> 13.2"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -77,7 +77,7 @@ GEM
     cuprite (0.15)
       capybara (~> 3.0)
       ferrum (~> 0.14.0)
-    debug (1.9.1)
+    debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
     docile (1.4.0)
@@ -106,7 +106,7 @@ GEM
     irb (1.12.0)
       rdoc
       reline (>= 0.4.2)
-    json (2.7.1)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.3)
@@ -186,19 +186,19 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     regexp_parser (2.9.0)
-    reline (0.4.3)
+    reline (0.5.0)
       io-console (~> 0.5)
     rexml (3.2.6)
     rouge (4.2.0)
-    rubocop (1.62.1)
+    rubocop (1.63.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -311,7 +311,7 @@ DEPENDENCIES
   puma (~> 6.4.2)
   rack-cors
   railties (= 7.1.1)
-  rake (~> 13.1)
+  rake (~> 13.2)
   rubocop
   rubocop-github (~> 0.20.0)
   rubocop-performance

diff --git a/app/components/primer/alpha/action_list/item.rb b/app/components/primer/alpha/action_list/item.rb
@@ -303,7 +303,7 @@ def before_render
           )
 
           if @truncate_label == :show_tooltip && !tooltip?
-            with_tooltip(text: @label, direction: :e)
+            with_tooltip(text: @label, direction: :ne)
           end
 
           return unless leading_visual

diff --git a/app/components/primer/beta/button.pcss b/app/components/primer/beta/button.pcss
@@ -330,6 +330,7 @@ summary.Button {
   border: none;
   height: unset;
   padding: 0;
+  min-width: fit-content;
 
   &:hover:not(:disabled, .Button--inactive) {
     text-decoration: underline;
@@ -347,6 +348,10 @@ summary.Button {
     border-color: transparent;
     fill: var(--control-fgColor-disabled);
   }
+
+  & .Button-label {
+      white-space: unset;
+  }
 }
 
 /* danger */

diff --git a/demo/Gemfile b/demo/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 rails_version = (ENV["RAILS_VERSION"] || "7.1.1").to_s
 
-gem "rake", "~> 13.1"
+gem "rake", "~> 13.2"
 gem "rack-cors"
 gem "sprockets"
 gem "sprockets-rails"

diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock
@@ -280,7 +280,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -368,7 +368,7 @@ DEPENDENCIES
   puma (~> 6.4.2)
   rack-cors
   railties (= 7.1.1)
-  rake (~> 13.1)
+  rake (~> 13.2)
   spring (~> 4.1)
   spring-watcher-listen (~> 2.1)
   sprockets