Merge branch 'main' into patch-1

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Add the following users as reviewers on new pull requests
 
-* @benoitgrelard @jjenzz @andy-hook
+* @StephenHaney @vladmoroz @lucasmotta @hadihallak @chaance

.github/CONTRIBUTING.md

@@ -55,40 +55,40 @@ cd primitives
 git remote add upstream https://github.com/radix-ui/primitives.git
 ```
 
-1. Synchronize your local `main` branch with the upstream remote:
+3. Synchronize your local `main` branch with the upstream remote:
 
 ```sh
 git checkout main
 git pull upstream main
 ```
 
-1. Make sure your Node version matches the [.nvmrc](../.nvmrc).
+4. Make sure your Node version matches the [.nvmrc](../.nvmrc).
 
 ```
 node -v
 ```
 
-1. Install dependencies with [yarn](https://yarnpkg.com):
+5. Install dependencies with [yarn](https://yarnpkg.com):
 
 ```sh
 yarn install
 ```
 
-1. Create a new branch related to your PR:
+6. Create a new branch related to your PR:
 
 ```sh
 git checkout -b my-bug-fix
 ```
 
-6. Make changes, then commit and push to your forked repository:
+7. Make changes, then commit and push to your forked repository:
 
 ```sh
 git push -u origin HEAD
 ```
 
-7. Go to [the repository](https://github.com/radix-ui/primitives) and [make a Pull Request](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
+8. Go to [the repository](https://github.com/radix-ui/primitives) and [make a Pull Request](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
 
-8. We will review your Pull Request and either merge it, request changes to it, or close it with an explanation.
+9. We will review your Pull Request and either merge it, request changes to it, or close it with an explanation.
 
 ## Working locally
 

.nvmrc

@@ -1 +1 @@
-16.17.0
+18

.storybook/main.ts

@@ -0,0 +1,64 @@
+import type { StorybookConfig } from '@storybook/react-webpack5';
+import path from 'path';
+
+const config: StorybookConfig = {
+  stories: ['../packages/core/**/*.stories.tsx', '../packages/react/**/*.stories.tsx'],
+  addons: [
+    getAbsolutePath('@storybook/addon-essentials'),
+    getAbsolutePath('@storybook/addon-storysource'),
+  ],
+  framework: {
+    name: getAbsolutePath('@storybook/react-webpack5'),
+    options: {
+      builder: {
+        useSWC: true,
+      },
+      // enable React strict mode
+      strictMode: true,
+    },
+  },
+  swc: () => ({
+    jsc: {
+      transform: {
+        react: {
+          // Do not require importing React into scope to use JSX
+          runtime: 'automatic',
+        },
+      },
+    },
+  }),
+
+  // we need to add aliases to webpack so it knows how to follow
+  // to the source of the packages rather than the built version (dist)
+  webpackFinal: async (config) => ({
+    ...config,
+    resolve: {
+      ...config.resolve,
+      alias: {
+        ...config.resolve.alias,
+        ...convertTsConfigPathsToWebpackAliases(),
+      },
+    },
+  }),
+};
+
+export default config;
+
+/**
+ * This function is used to resolve the absolute path of a package.
+ * It is needed in projects that use Yarn PnP or are set up within a monorepo.
+ */
+function getAbsolutePath(value: string): any {
+  return path.dirname(require.resolve(path.join(value, 'package.json')));
+}
+
+function convertTsConfigPathsToWebpackAliases() {
+  const rootDir = path.resolve(__dirname, '../');
+  const tsconfig = require('../tsconfig.json');
+  const tsconfigPaths: Array<string | string[]> = Object.entries(tsconfig.compilerOptions.paths);
+
+  return tsconfigPaths.reduce((aliases, [realPath, mappedPath]) => {
+    aliases[realPath] = path.join(rootDir, mappedPath[0]);
+    return aliases;
+  }, {});
+}

.storybook/manager.ts

@@ -0,0 +1,7 @@
+import { addons } from '@storybook/manager-api';
+import { themes } from '@storybook/theming';
+
+addons.setConfig({
+  enableShortcuts: false,
+  theme: themes.light,
+});

.storybook/preview.ts

@@ -0,0 +1,19 @@
+import type { Preview } from '@storybook/react';
+
+const preview: Preview = {
+  parameters: {
+    // This should work after upgrading to Storybook 7.6 but doesn't.
+    // I am leaving it commented out here so we can fix it one day.
+    //
+    // options: {
+    //   storySort: {
+    //     order: ['Components', 'Utilities'],
+    //   },
+    // },
+
+    // disables Chromatic on a global level
+    chromatic: { disable: true },
+  },
+};
+
+export default preview;

.yarn/versions/19bdd400.yml

@@ -0,0 +1,5 @@
+releases:
+  "@radix-ui/react-avatar": patch
+
+declined:
+  - primitives

.yarn/versions/8a3bd6ee.yml

@@ -0,0 +1,22 @@
+releases:
+  "@radix-ui/react-accordion": patch
+  "@radix-ui/react-alert-dialog": patch
+  "@radix-ui/react-checkbox": patch
+  "@radix-ui/react-collapsible": patch
+  "@radix-ui/react-context-menu": patch
+  "@radix-ui/react-dialog": patch
+  "@radix-ui/react-dropdown-menu": patch
+  "@radix-ui/react-hover-card": patch
+  "@radix-ui/react-menu": patch
+  "@radix-ui/react-menubar": patch
+  "@radix-ui/react-navigation-menu": patch
+  "@radix-ui/react-popover": patch
+  "@radix-ui/react-presence": patch
+  "@radix-ui/react-radio-group": patch
+  "@radix-ui/react-scroll-area": patch
+  "@radix-ui/react-tabs": patch
+  "@radix-ui/react-toast": patch
+  "@radix-ui/react-tooltip": patch
+
+declined:
+  - primitives

.yarn/versions/96c502e7.yml

@@ -0,0 +1,2 @@
+declined:
+  - primitives

.yarn/versions/a0df87d9.yml

@@ -0,0 +1,5 @@
+releases:
+  "@radix-ui/react-checkbox": patch
+
+declined:
+  - primitives

.yarn/versions/a54ad5a9.yml

@@ -0,0 +1,6 @@
+releases:
+  "@radix-ui/react-scroll-area": minor
+
+declined:
+  - primitives
+  - ssr-testing

.yarn/versions/cc138cf5.yml

@@ -0,0 +1,5 @@
+releases:
+  "@radix-ui/react-select": patch
+
+declined:
+  - primitives

.yarn/versions/cccc0adb.yml

@@ -0,0 +1,5 @@
+releases:
+  "@radix-ui/react-select": patch
+
+declined:
+  - primitives

.yarn/versions/f24f9512.yml

@@ -0,0 +1,2 @@
+releases:
+  "@radix-ui/react-select": patch

.yarnrc.yml

@@ -7,14 +7,10 @@ changesetIgnorePatterns:
   - '**/*.test.{ts,tsx}'
   - '**/*.stories.{ts,tsx}'
 
-nodeLinker: node-modules
+compressionLevel: mixed
+
+enableGlobalCache: false
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: '@yarnpkg/plugin-workspace-tools'
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: '@yarnpkg/plugin-typescript'
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: '@yarnpkg/plugin-version'
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.0.1.cjs
+yarnPath: .yarn/releases/yarn-4.1.0.cjs

build.mjs

@@ -0,0 +1,48 @@
+import { globSync } from 'glob';
+import * as esbuild from 'esbuild';
+import * as tsup from 'tsup';
+
+async function build(path) {
+  const file = `${path}/src/index.ts`;
+  const dist = `${path}/dist`;
+
+  const esbuildConfig = {
+    entryPoints: [file],
+    external: ['@radix-ui/*'],
+    packages: 'external',
+    bundle: true,
+    sourcemap: true,
+    format: 'cjs',
+    target: 'es2022',
+    outdir: dist,
+  };
+
+  await esbuild.build(esbuildConfig);
+  console.log(`Built ${path}/dist/index.js`);
+
+  await esbuild.build({
+    ...esbuildConfig,
+    format: 'esm',
+    outExtension: { '.js': '.mjs' },
+  });
+  console.log(`Built ${path}/dist/index.mjs`);
+
+  // tsup is used to emit d.ts files only (esbuild can't do that).
+  //
+  // Notes:
+  // 1. Emitting d.ts files is super slow for whatever reason.
+  // 2. It could have fully replaced esbuild (as it uses that internally),
+  //    but at the moment its esbuild version is somewhat outdated.
+  //    It’s also harder to configure and esbuild docs are more thorough.
+  await tsup.build({
+    entry: [file],
+    format: ['cjs', 'esm'],
+    dts: { only: true },
+    outDir: dist,
+    silent: true,
+    external: [/@radix-ui\/.+/],
+  });
+  console.log(`Built ${path}/dist/index.d.ts`);
+}
+
+globSync('packages/*/*').forEach(build);

cypress/integration/Form.spec.ts

@@ -8,6 +8,7 @@ describe('Form', () => {
   });
 
   function checkControlMessageAssociation() {
+    cy.get('@control').should('have.attr', 'aria-describedby');
     cy.get('@control')
       .invoke('attr', 'aria-describedby')
       .then((ariaDescribedby) =>