Skip to content

Commit 4648dd3

Browse files
committed
Sync upstream Primer through v0.53.2
Merges primer/view_components up to 18aa9c4, the batch released upstream as v0.53.2. Component change: reserves height as well as width in .ToggleSwitch-statusIcon so the switch no longer jumps when the loading spinner appears (primer#4152). Keeps the fork's workflow files unchanged: the upstream conflicts are GitHub Action version bumps (the fork pins by SHA through its own Dependabot) and the migration of gem publishing to RubyGems Trusted Publishing, which does not apply to the fork's release flow. Replays the rails-html-sanitizer 1.7.1 and loofah 2.25.2 bumps that merge=ours dropped from both Gemfile.locks. Remaining upstream lockfile bumps are left to the fork's weekly Dependabot. Regenerates static/classnames.* from a clean tree, which also picks up class names the fork's own sources already carried.
2 parents 14e8169 + 18aa9c4 commit 4648dd3

12 files changed

Lines changed: 210 additions & 84 deletions

File tree

.changeset/hungry-poems-shout.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@openproject/primer-view-components": patch
3+
---
4+
5+
Reserve height as well as width in `.ToggleSwitch-statusIcon` so the switch doesn't jump when the loading spinner is shown

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ group :development do
7171
gem "rubocop-performance"
7272
gem "rubocop-rails"
7373
gem "rubocop-rails-accessibility", "~> 1.0"
74-
gem "selenium-webdriver", "~> 4.41"
74+
gem "selenium-webdriver", "~> 4.44"
7575
gem "simplecov", "~> 0.22.0"
7676
gem "simplecov-console", "~> 0.9.5"
7777
gem "sprockets"
7878
gem "sprockets-rails"
7979
gem "thor"
8080
gem "timecop"
81-
gem "yard", "~> 0.9.44"
81+
gem "yard", "~> 0.9.45"
8282
end

Gemfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ GEM
134134
rb-fsevent (~> 0.10, >= 0.10.3)
135135
rb-inotify (~> 0.9, >= 0.9.10)
136136
logger (1.7.0)
137-
loofah (2.25.1)
137+
loofah (2.25.2)
138138
crass (~> 1.0.2)
139139
nokogiri (>= 1.12.0)
140140
lookbook (2.3.14)
@@ -207,8 +207,8 @@ GEM
207207
activesupport (>= 5.0.0)
208208
minitest
209209
nokogiri (>= 1.6)
210-
rails-html-sanitizer (1.7.0)
211-
loofah (~> 2.25)
210+
rails-html-sanitizer (1.7.1)
211+
loofah (~> 2.25, >= 2.25.2)
212212
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
213213
railties (8.0.2)
214214
actionpack (= 8.0.2)
@@ -265,9 +265,9 @@ GEM
265265
rubocop (>= 1.0.0)
266266
ruby-progressbar (1.13.0)
267267
ruby2_keywords (0.0.5)
268-
rubyzip (3.2.2)
268+
rubyzip (3.4.1)
269269
securerandom (0.4.1)
270-
selenium-webdriver (4.43.0)
270+
selenium-webdriver (4.47.0)
271271
base64 (~> 0.2)
272272
logger (~> 1.4)
273273
rexml (~> 3.2, >= 3.2.5)
@@ -331,7 +331,7 @@ GEM
331331
websocket-extensions (0.1.5)
332332
xpath (3.2.0)
333333
nokogiri (~> 1.8)
334-
yard (0.9.44)
334+
yard (0.9.45)
335335
zeitwerk (2.7.5)
336336

337337
PLATFORMS
@@ -374,7 +374,7 @@ DEPENDENCIES
374374
rubocop-performance
375375
rubocop-rails
376376
rubocop-rails-accessibility (~> 1.0)
377-
selenium-webdriver (~> 4.41)
377+
selenium-webdriver (~> 4.44)
378378
simplecov (~> 0.22.0)
379379
simplecov-console (~> 0.9.5)
380380
sourcemap (~> 0.1)
@@ -385,7 +385,7 @@ DEPENDENCIES
385385
view_component (= 4.12.0)
386386
vite_rails (~> 3.11)
387387
webmock
388-
yard (~> 0.9.44)
388+
yard (~> 0.9.45)
389389

390390
BUNDLED WITH
391391
2.5.5

app/components/primer/alpha/toggle_switch.pcss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,13 @@
184184

185185
.ToggleSwitch-statusIcon {
186186
display: flex;
187+
flex: none;
188+
align-items: center;
189+
justify-content: center;
187190
width: var(--base-size-16);
191+
height: var(--base-size-16);
192+
/* stylelint-disable-next-line primer/typography */
193+
line-height: 0;
188194
/* stylelint-disable-next-line primer/spacing */
189195
margin-top: 0.063rem;
190196
}

demo/Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ GEM
214214
ffi-compiler (~> 1.0)
215215
rake (~> 13.0)
216216
logger (1.7.0)
217-
loofah (2.25.1)
217+
loofah (2.25.2)
218218
crass (~> 1.0.2)
219219
nokogiri (>= 1.12.0)
220220
lookbook (2.3.14)
@@ -300,8 +300,8 @@ GEM
300300
activesupport (>= 5.0.0)
301301
minitest
302302
nokogiri (>= 1.6)
303-
rails-html-sanitizer (1.7.0)
304-
loofah (~> 2.25)
303+
rails-html-sanitizer (1.7.1)
304+
loofah (~> 2.25, >= 2.25.2)
305305
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
306306
railties (7.2.2.1)
307307
actionpack (= 7.2.2.1)

demo/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"version": "0.1.0",
55
"dependencies": {
6-
"@primer/css": "^22.2.0",
6+
"@primer/css": "^22.3.0",
77
"@primer/primitives": "^11.9.0",
88
"@rails/actioncable": "^8.1.300",
99
"@rails/ujs": "^7.1.600",

0 commit comments

Comments
 (0)