Merge pull request #221 from opf/bump/primer-upstream

Bump/primer upstream 0.36.3
opf · Jan 13, 2025 · d1147a4 · d1147a4
2 parents 2239a08 + 36013e7
commit d1147a4
Show file tree

Hide file tree

Showing 74 changed files with 33 additions and 21 deletions.
diff --git a/.changeset/cyan-moons-run.md b/.changeset/cyan-moons-run.md
@@ -0,0 +1,5 @@
+---
+'@openproject/primer-view-components': patch
+---
+
+Fix `NoMethodError` when checking if `ActionList::Divider`s are active
diff --git a/.changeset/slow-impalas-relate.md b/.changeset/slow-impalas-relate.md
@@ -0,0 +1,5 @@
+---
+'@openproject/primer-view-components': patch
+---
+
+Add top spacing to Dialog::Body to avoid it being glued to the divider
diff --git a/.github/workflows/accessibility-alt-text-bot.yml b/.github/workflows/accessibility-alt-text-bot.yml
@@ -5,9 +5,11 @@ on:
   pull_request:
     types: [opened, edited]
   issue_comment:
-    types: [created, edited]
+    types: [created, edited, deleted]
   discussion:
     types: [created, edited]
+  discussion_comment:
+    types: [created, edited, deleted]
 
 permissions:
   issues: write
@@ -21,4 +23,4 @@ jobs:
     if: ${{ github.event.issue || github.event.pull_request || github.event.discussion }}
     steps:
       - name: Get action 'github/accessibility-alt-text-bot'
-        uses: github/accessibility-alt-text-bot@v1.5.0
+        uses: github/accessibility-alt-text-bot@v1.6.0
diff --git a/...ht/screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark.png b/...ht/screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark.png
diff --git a/...ots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark_colorblind.png b/...ots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark_colorblind.png
diff --git a/...enshots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark_dimmed.png b/...enshots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark_dimmed.png
diff --git a/.../snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark_high_contrast.png b/.../snapshots.test.ts-snapshots/primer/alpha/dialog/default/dark_high_contrast.png
diff --git a/...t/screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/light.png b/...t/screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/default/light.png
diff --git a/...ts/snapshots.test.ts-snapshots/primer/alpha/dialog/default/light_colorblind.png b/...ts/snapshots.test.ts-snapshots/primer/alpha/dialog/default/light_colorblind.png
diff --git a/...snapshots.test.ts-snapshots/primer/alpha/dialog/default/light_high_contrast.png b/...snapshots.test.ts-snapshots/primer/alpha/dialog/default/light_high_contrast.png
diff --git a/.../snapshots.test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark.png b/.../snapshots.test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark.png
diff --git a/...test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark_colorblind.png b/...test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark_colorblind.png
diff --git a/...ots.test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark_dimmed.png b/...ots.test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark_dimmed.png
diff --git a/...t.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark_high_contrast.png b/...t.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/dark_high_contrast.png
diff --git a/...snapshots.test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/light.png b/...snapshots.test.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/light.png
diff --git a/...est.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/light_colorblind.png b/...est.ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/light_colorblind.png
diff --git a/....ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/light_high_contrast.png b/....ts-snapshots/primer/alpha/dialog/dialog_inside_overlay/light_high_contrast.png
diff --git a/...eenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark.png b/...eenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark.png
diff --git a/...apshots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark_colorblind.png b/...apshots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark_colorblind.png
diff --git a/...s/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark_dimmed.png b/...s/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark_dimmed.png
diff --git a/...hots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark_high_contrast.png b/...hots.test.ts-snapshots/primer/alpha/dialog/initally_open/dark_high_contrast.png
diff --git a/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/default.png b/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/default.png
diff --git a/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/focused.png b/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/focused.png
diff --git a/...enshots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/light.png b/...enshots/snapshots.test.ts-snapshots/primer/alpha/dialog/initally_open/light.png
diff --git a/...pshots.test.ts-snapshots/primer/alpha/dialog/initally_open/light_colorblind.png b/...pshots.test.ts-snapshots/primer/alpha/dialog/initally_open/light_colorblind.png
diff --git a/...ots.test.ts-snapshots/primer/alpha/dialog/initally_open/light_high_contrast.png b/...ots.test.ts-snapshots/primer/alpha/dialog/initally_open/light_high_contrast.png
diff --git a/.../screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark.png b/.../screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark.png
diff --git a/...s/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark_colorblind.png b/...s/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark_colorblind.png
diff --git a/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark_dimmed.png b/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark_dimmed.png
diff --git a/...napshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark_high_contrast.png b/...napshots.test.ts-snapshots/primer/alpha/dialog/left_side/dark_high_contrast.png
diff --git a/...screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/light.png b/...screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/light.png
diff --git a/.../snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/light_colorblind.png b/.../snapshots.test.ts-snapshots/primer/alpha/dialog/left_side/light_colorblind.png
diff --git a/...apshots.test.ts-snapshots/primer/alpha/dialog/left_side/light_high_contrast.png b/...apshots.test.ts-snapshots/primer/alpha/dialog/left_side/light_high_contrast.png
diff --git a/...screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark.png b/...screenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark.png
diff --git a/.../snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark_colorblind.png b/.../snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark_colorblind.png
diff --git a/...hots/snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark_dimmed.png b/...hots/snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark_dimmed.png
diff --git a/...apshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark_high_contrast.png b/...apshots.test.ts-snapshots/primer/alpha/dialog/right_side/dark_high_contrast.png
diff --git a/...creenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/light.png b/...creenshots/snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/light.png
diff --git a/...snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/light_colorblind.png b/...snapshots.test.ts-snapshots/primer/alpha/dialog/right_side/light_colorblind.png
diff --git a/...pshots.test.ts-snapshots/primer/alpha/dialog/right_side/light_high_contrast.png b/...pshots.test.ts-snapshots/primer/alpha/dialog/right_side/light_high_contrast.png
diff --git a/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark.png b/...shots/snapshots.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark.png
diff --git a/...hots.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark_colorblind.png b/...hots.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark_colorblind.png
diff --git a/...napshots.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark_dimmed.png b/...napshots.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark_dimmed.png
diff --git a/...s.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark_high_contrast.png b/...s.test.ts-snapshots/primer/alpha/dialog/scroll_container/dark_high_contrast.png
diff --git a/...hots/snapshots.test.ts-snapshots/primer/alpha/dialog/scroll_container/light.png b/...hots/snapshots.test.ts-snapshots/primer/alpha/dialog/scroll_container/light.png
diff --git a/...ots.test.ts-snapshots/primer/alpha/dialog/scroll_container/light_colorblind.png b/...ots.test.ts-snapshots/primer/alpha/dialog/scroll_container/light_colorblind.png
diff --git a/....test.ts-snapshots/primer/alpha/dialog/scroll_container/light_high_contrast.png b/....test.ts-snapshots/primer/alpha/dialog/scroll_container/light_high_contrast.png
diff --git a/...ots/snapshots.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark.png b/...ots/snapshots.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark.png
diff --git a/...ts.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark_colorblind.png b/...ts.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark_colorblind.png
diff --git a/...pshots.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark_dimmed.png b/...pshots.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark_dimmed.png
diff --git a/...test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark_high_contrast.png b/...test.ts-snapshots/primer/alpha/dialog/with_auto_complete/dark_high_contrast.png
diff --git a/...ts/snapshots.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/light.png b/...ts/snapshots.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/light.png
diff --git a/...s.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/light_colorblind.png b/...s.test.ts-snapshots/primer/alpha/dialog/with_auto_complete/light_colorblind.png
diff --git a/...est.ts-snapshots/primer/alpha/dialog/with_auto_complete/light_high_contrast.png b/...est.ts-snapshots/primer/alpha/dialog/with_auto_complete/light_high_contrast.png
diff --git a/...st.ts-snapshots/primer/open_project/danger_confirmation_dialog/default/dark.png b/...st.ts-snapshots/primer/open_project/danger_confirmation_dialog/default/dark.png
diff --git a/...hots/primer/open_project/danger_confirmation_dialog/default/dark_colorblind.png b/...hots/primer/open_project/danger_confirmation_dialog/default/dark_colorblind.png
diff --git a/...napshots/primer/open_project/danger_confirmation_dialog/default/dark_dimmed.png b/...napshots/primer/open_project/danger_confirmation_dialog/default/dark_dimmed.png
diff --git a/...s/primer/open_project/danger_confirmation_dialog/default/dark_high_contrast.png b/...s/primer/open_project/danger_confirmation_dialog/default/dark_high_contrast.png
diff --git a/...t.ts-snapshots/primer/open_project/danger_confirmation_dialog/default/light.png b/...t.ts-snapshots/primer/open_project/danger_confirmation_dialog/default/light.png
diff --git a/...ots/primer/open_project/danger_confirmation_dialog/default/light_colorblind.png b/...ots/primer/open_project/danger_confirmation_dialog/default/light_colorblind.png
diff --git a/.../primer/open_project/danger_confirmation_dialog/default/light_high_contrast.png b/.../primer/open_project/danger_confirmation_dialog/default/light_high_contrast.png
diff --git a/...napshots.test.ts-snapshots/primer/open_project/feedback_dialog/default/dark.png b/...napshots.test.ts-snapshots/primer/open_project/feedback_dialog/default/dark.png
diff --git a/...st.ts-snapshots/primer/open_project/feedback_dialog/default/dark_colorblind.png b/...st.ts-snapshots/primer/open_project/feedback_dialog/default/dark_colorblind.png
diff --git a/...s.test.ts-snapshots/primer/open_project/feedback_dialog/default/dark_dimmed.png b/...s.test.ts-snapshots/primer/open_project/feedback_dialog/default/dark_dimmed.png
diff --git a/...ts-snapshots/primer/open_project/feedback_dialog/default/dark_high_contrast.png b/...ts-snapshots/primer/open_project/feedback_dialog/default/dark_high_contrast.png
diff --git a/...apshots.test.ts-snapshots/primer/open_project/feedback_dialog/default/light.png b/...apshots.test.ts-snapshots/primer/open_project/feedback_dialog/default/light.png
diff --git a/...t.ts-snapshots/primer/open_project/feedback_dialog/default/light_colorblind.png b/...t.ts-snapshots/primer/open_project/feedback_dialog/default/light_colorblind.png
diff --git a/...s-snapshots/primer/open_project/feedback_dialog/default/light_high_contrast.png b/...s-snapshots/primer/open_project/feedback_dialog/default/light_high_contrast.png
diff --git a/app/components/primer/alpha/action_list/divider.rb b/app/components/primer/alpha/action_list/divider.rb
@@ -29,6 +29,10 @@ def initialize(scheme: DEFAULT_SCHEME, **system_arguments)
         def call
           render(Primer::BaseComponent.new(**@system_arguments)) { content }
         end
+
+        def active?
+          false
+        end
       end
     end
   end

diff --git a/app/components/primer/alpha/dialog.pcss b/app/components/primer/alpha/dialog.pcss
@@ -231,10 +231,6 @@ dialog.Overlay:not([open]) {
     padding-bottom: var(--stack-padding-condensed);
     /* stylelint-disable-next-line primer/box-shadow */
     box-shadow: inset 0 calc(var(--borderWidth-thin) * -1) var(--borderColor-default);
-
-    & + .Overlay-body {
-      padding-top: var(--stack-padding-normal);
-    }
   }
 
   &.Overlay-header--large {
@@ -296,7 +292,6 @@ dialog.Overlay:not([open]) {
 /* generic body content slot */
 .Overlay-body {
   padding: var(--stack-padding-normal);
-  padding-top: 0;
   overflow-y: auto;
   scrollbar-width: thin;
   font-size: var(--text-body-size-medium);

diff --git a/demo/package-lock.json b/demo/package-lock.json
diff --git a/demo/package.json b/demo/package.json
@@ -6,7 +6,7 @@
     "@primer/css": "^21.5.1",
     "@primer/primitives": "^10.0.0",
     "@rails/actioncable": "^7.2.100",
-    "@rails/ujs": "^7.1.500",
+    "@rails/ujs": "^7.1.501",
     "turbolinks": "^5.2.0"
   },
   "devDependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/components/alpha/action_list_test.rb b/test/components/alpha/action_list_test.rb
@@ -226,6 +226,7 @@ def test_raises_when_two_items_selected_under_single_select
         error = assert_raises ArgumentError do
           render_inline(Primer::Alpha::ActionList.new(aria: { label: "List" }, select_variant: :single)) do |component|
             component.with_item(label: "Item 1", active: true)
+            component.with_divider
             component.with_item(label: "Item 2", active: true)
           end
         end
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,10 @@ def initialize(scheme: DEFAULT_SCHEME, **system_arguments) @@
             def call
               render(Primer::BaseComponent.new(**@system_arguments)) { content }
             end
+            def active?
+              false
+            end
           end
         end
       end
@@ Expand Down @@