Merge branch 'main' into test/update-tab-nav-test

Author: joshblack

.changeset/breezy-cars-hear.md

@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+UnderlineNav2: Prevent item width calculation when they are null

.changeset/cyan-bananas-live.md

@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+UnderlineNav2: Only run overflow layout function when nav item has a width

.changeset/fast-shoes-enjoy.md

@@ -18,9 +18,123 @@ export const parameters = {
     removeEmptyComments: true
   },
   options: {
-    storySort: {
-      order: ['Components', 'Behaviors', 'Hooks', 'Private components', 'Deprecated components', '*'],
-      method: 'alphabetical'
+    storySort: (a, b) => {
+      const defaultOrder = [
+        [
+          // Match on any story that leads with "Components"
+          'Components',
+          // This is the ordering of stories under "Components", by default
+          // we'll sort alphabetically
+          [
+            [
+              '*',
+              // Within a set of stories, set the order to the following
+              ['*', 'Playground', /Playground$/, 'Features', 'Examples']
+            ]
+          ]
+        ],
+        'Behaviors',
+        'Hooks',
+        'Private components',
+        'Deprecated components',
+        '*'
+      ]
+
+      /**
+       * Get the position of an item within a given order. This will return the
+       * index if the item is defined in the given array, or the wildcard index
+       * if it is not explicitlyd efined
+       */
+      function getPosition(order, item) {
+        const position = order.findIndex(value => {
+          if (Array.isArray(value)) {
+            if (typeof value[0] === 'string') {
+              return value[0] === item
+            }
+            return value[0].exec(item)
+          }
+
+          if (typeof value === 'string') {
+            return value === item
+          }
+
+          return value.exec(item)
+        })
+
+        if (position === -1) {
+          return order.indexOf('*')
+        }
+
+        return position
+      }
+
+      /**
+       * Compare two separate stories at the given level for the given order.
+       * The order will be relative at each level and is resolved based on the
+       * current order and values of the stories
+       */
+      function compare(a, b, level = 0, order = defaultOrder) {
+        const valueA = a[level]
+        const valueB = b[level]
+
+        // If the stories match at the same point in the hierarchy, we'll want
+        // to compare them using a relative ordering for the scheme
+        if (valueA === valueB) {
+          // Find the "nested order" for the hierarchy, if one exists. This
+          // will correspond with the ordering of the stories within this
+          // hierarchy
+          const nestedOrder = order.find(value => {
+            if (Array.isArray(value)) {
+              return value[0] === valueA
+            }
+            return value === valueA
+          })
+
+          if (nestedOrder && Array.isArray(nestedOrder)) {
+            return compare(a, b, level + 1, nestedOrder[1])
+          }
+
+          // If there is no nested order that we can find, look for wildcard
+          // patterns
+          const wildcard = order.find(value => {
+            if (Array.isArray(value)) {
+              return value[0] === '*'
+            }
+            return value === '*'
+          })
+
+          // If we have a wildcard pattern with sub-patterns to include for
+          // ordering, pass them along
+          if (wildcard && Array.isArray(wildcard)) {
+            return compare(a, b, level + 1, wildcard[1])
+          }
+
+          // Otherwise, everything is a wildcard pattern and should be sorted
+          // alphabetically at this level
+          return compare(a, b, level + 1, ['*'])
+        }
+
+        // If the stories do not currently match in the same hierarchy, get the
+        // position of each and compare them.
+        const positionA = getPosition(order, valueA)
+        const positionB = getPosition(order, valueB)
+
+        // If the positions are the same, sort them alphabetically
+        if (positionA === positionB) {
+          return valueA.localeCompare(valueB)
+        }
+
+        // Otherwise, compare by position in the given order
+        return positionA - positionB
+      }
+
+      function getHierarchy(story) {
+        const hierarchy = story.title.split('/')
+        hierarchy.push(story.name)
+        return hierarchy
+      }
+
+      return compare(getHierarchy(a), getHierarchy(b))
     }
   }
 }

.changeset/flat-cars-type.md

@@ -1,5 +1,23 @@
 # @primer/components
 
+## 35.14.1
+
+### Patch Changes
+
+- [#2510](https://github.com/primer/react/pull/2510) [`c326777e`](https://github.com/primer/react/commit/c326777ec0369968e49d9d9ceb21f7f5609f697b) Thanks [@langermank](https://github.com/langermank)! - Remove deprecated focus style primitives
+
+- [#2483](https://github.com/primer/react/pull/2483) [`23647cfc`](https://github.com/primer/react/commit/23647cfce6132bcf16aa2a31c33c20be029124e0) Thanks [@joshblack](https://github.com/joshblack)! - Add unobserve mock for ResizeObserver in test helpers
+
+- [#2504](https://github.com/primer/react/pull/2504) [`ea4a3c2a`](https://github.com/primer/react/commit/ea4a3c2a11d8d9cdc972405495902ac8e7b61e54) Thanks [@joshblack](https://github.com/joshblack)! - TreeView: Add support for Backspace to move focus to parent item
+
+- [#2511](https://github.com/primer/react/pull/2511) [`0a94420e`](https://github.com/primer/react/commit/0a94420e96a1989a0183f36ec7b90954c4ff4c7b) Thanks [@joshblack](https://github.com/joshblack)! - Remove selected from `<option>` and add defaultValue for `<select>` when placeholder is provided
+
+- [#2523](https://github.com/primer/react/pull/2523) [`50ed6441`](https://github.com/primer/react/commit/50ed644180733ab7baa8ee79dc019a9b6f61bf99) Thanks [@colebemis](https://github.com/colebemis)! - TreeView: Performance improvements
+
+- [#2521](https://github.com/primer/react/pull/2521) [`862f93c7`](https://github.com/primer/react/commit/862f93c7438b4c9be753e98a39af98c496d8629f) Thanks [@colebemis](https://github.com/colebemis)! - TreeView: Fix unexpected scrolling when focusing child items
+
+- [#2518](https://github.com/primer/react/pull/2518) [`60c36f58`](https://github.com/primer/react/commit/60c36f5872182047c8242718ae1fdeb5bf1669b8) Thanks [@colebemis](https://github.com/colebemis)! - TreeView: Remove loading indicator delay
+
 ## 35.14.0
 
 ### Minor Changes

.changeset/moody-islands-impress.md

@@ -3,7 +3,7 @@ componentId: action_list
 title: ActionList
 status: Beta
 source: https://github.com/primer/react/tree/main/src/ActionList
-storybook: '/react/storybook?path=/story/composite-components-actionlist'
+storybook: '/react/storybook?path=/story/components-actionlist'
 description: An ActionList is a list of items that can be activated or selected. ActionList is the base component for many menu-type components, including ActionMenu and SelectPanel.
 ---