Merge branch 'main' into refactor-dialog-to-use-dialog-internally

.changeset/popular-timers-shop.md

@@ -0,0 +1,5 @@
+---
+'@primer/view-components': minor
+---
+
+Remove touch target gaps between ActionBar items

.changeset/soft-singers-travel.md

@@ -0,0 +1,5 @@
+---
+'@primer/view-components': minor
+---
+
+Add missing 64px Avatar size

.github/dependabot.yml

@@ -10,21 +10,21 @@ updates:
       - "skip changeset"
       - "actions"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
 
   # NPM
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     labels:
       - "dependencies"
       - "skip changeset"
       - "npm"
   - package-ecosystem: "npm"
     directory: "/demo"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     labels:
       - "dependencies"
       - "skip changeset"
@@ -34,15 +34,15 @@ updates:
   - package-ecosystem: "bundler"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     labels:
       - "dependencies"
       - "skip changeset"
       - "bundler"
   - package-ecosystem: "bundler"
     directory: "/demo"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     labels:
       - "dependencies"
       - "skip changeset"

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Get specific changed files
       id: changed-files
-      uses: tj-actions/changed-files@v40.0.2
+      uses: tj-actions/changed-files@v40.1.1
       with:
         files: |
           docs/**/*.md
@@ -39,7 +39,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Get specific changed files
       id: changed-files
-      uses: tj-actions/changed-files@v40.0.2
+      uses: tj-actions/changed-files@v40.1.1
       with:
         files: |
           app/**/*.rb
@@ -62,7 +62,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Get changed files
       id: changed-files
-      uses: tj-actions/changed-files@v40.0.2
+      uses: tj-actions/changed-files@v40.1.1
       with:
         files: |
           app/components/**/*.erb
@@ -82,7 +82,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Get changed files
       id: changed-files
-      uses: tj-actions/changed-files@v40.0.2
+      uses: tj-actions/changed-files@v40.1.1
       with:
         files: |
           app/components/**/*.ts
@@ -103,7 +103,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Get changed files
       id: changed-files
-      uses: tj-actions/changed-files@v40.0.2
+      uses: tj-actions/changed-files@v40.1.1
       with:
         files: |
           app/components/**/*.pcss

.github/workflows/release-checklist.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Get or Create Comment
         if: success() && steps.findPr.outputs.number
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           PR_NUMBER: ${{ steps.findPr.outputs.pr }}
         with:

.github/workflows/triage.yml

@@ -48,7 +48,7 @@ jobs:
     name: semver label
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         id: version-result
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -60,7 +60,7 @@ jobs:
             if (match && match[0]) {
               return match[0][1]
             }
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         env:
           RELEASE: ${{ steps.version-result.outputs.result }}
         with:

app/components/primer/alpha/action_bar.pcss

@@ -2,7 +2,7 @@
 .ActionBar {
   position: relative;
   display: flex !important;
-  min-width: calc(var(--control-medium-size) * 3); 
+  min-width: calc(var(--control-medium-size) * 3);
   align-items: center;
   flex-grow: 1;
   flex-shrink: 1;
@@ -51,19 +51,3 @@
 .ActionBar--large .ActionBar-divider {
   margin: 0 var(--controlStack-large-gap-condensed);
 }
-
-/* Increase spacing so touch targets don't overlap */
-
-@media (pointer: coarse) {
-  .ActionBar .ActionBar-item-container {
-    gap: calc(var(--control-minTarget-coarse) - var(--control-medium-size)); /* 12px */
-  }
-
-  .ActionBar--small .ActionBar-item-container {
-    gap: calc(var(--control-minTarget-coarse) - var(--control-small-size));  /* 16px */
-  }
-
-  .ActionBar--large .ActionBar-item-container {
-    gap: calc(var(--control-minTarget-coarse) - var(--control-large-size));  /* 4px */
-  }
-}

app/components/primer/beta/avatar.rb

@@ -25,7 +25,7 @@ class Avatar < Primer::Component
       DEFAULT_SHAPE = :circle
       SHAPE_OPTIONS = [DEFAULT_SHAPE, :square].freeze
 
-      SIZE_OPTIONS = [16, DEFAULT_SIZE, SMALL_THRESHOLD, 32, 40, 48, 80].freeze
+      SIZE_OPTIONS = [16, DEFAULT_SIZE, SMALL_THRESHOLD, 32, 40, 48, 64, 80].freeze
 
       # @param src [String] The source url of the avatar image.
       # @param alt [String] Passed through to alt on img tag.

demo/package.json

@@ -5,8 +5,8 @@
   "dependencies": {
     "@primer/css": "^21.0.9",
     "@primer/primitives": "^7.15.0",
-    "@rails/actioncable": "^7.1.1",
-    "@rails/ujs": "^7.1.1",
+    "@rails/actioncable": "^7.1.2",
+    "@rails/ujs": "^7.1.2",
     "turbolinks": "^5.2.0",
     "webpack-dev-server": "^4.15.1"
   }