Merge remote-tracking branch 'upstream/main'

implydata · Jun 6, 2023 · e012a92 · e012a92
2 parents e0af35a + eca6bab
commit e012a92
Show file tree

Hide file tree

Showing 162 changed files with 2,769 additions and 590 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -62,6 +62,12 @@ git checkout main
 git pull upstream main
 ```
 
+1. Make sure your Node version matches the [.nvmrc](../.nvmrc).
+
+```
+node -v
+```
+
 1. Install dependencies with [yarn](https://yarnpkg.com):
 
 ```sh

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.6.0
+16.17.0
diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -1,4 +1,9 @@
 export const parameters = {
+  options: {
+    storySort: {
+      order: ['Components', 'Utilities'],
+    },
+  },
   // disables Chromatic on a global level
   chromatic: { disable: true },
 };
diff --git a/.yarn/versions/310b65b7.yml b/.yarn/versions/310b65b7.yml
@@ -0,0 +1,13 @@
+releases:
+  "@implydata/radix-react-alert-dialog": patch
+  "@implydata/radix-react-context-menu": patch
+  "@implydata/radix-react-dialog": patch
+  "@implydata/radix-react-dropdown-menu": patch
+  "@implydata/radix-react-focus-scope": patch
+  "@implydata/radix-react-menu": patch
+  "@implydata/radix-react-menubar": patch
+  "@implydata/radix-react-popover": patch
+  "@implydata/radix-react-select": patch
+
+declined:
+  - primitives
diff --git a/.yarn/versions/61ceaf74.yml b/.yarn/versions/61ceaf74.yml
diff --git a/.yarn/versions/c47b2fc0.yml → .yarn/versions/6d1dbdd9.yml b/.yarn/versions/c47b2fc0.yml → .yarn/versions/6d1dbdd9.yml
diff --git a/.yarn/versions/852d0fe8.yml b/.yarn/versions/852d0fe8.yml
@@ -0,0 +1,17 @@
+releases:
+  "@implydata/radix-react-alert-dialog": patch
+  "@implydata/radix-react-context-menu": patch
+  "@implydata/radix-react-dialog": patch
+  "@implydata/radix-react-dismissable-layer": patch
+  "@implydata/radix-react-dropdown-menu": patch
+  "@implydata/radix-react-hover-card": patch
+  "@implydata/radix-react-menu": patch
+  "@implydata/radix-react-menubar": patch
+  "@implydata/radix-react-navigation-menu": patch
+  "@implydata/radix-react-popover": patch
+  "@implydata/radix-react-select": patch
+  "@implydata/radix-react-toast": patch
+  "@implydata/radix-react-tooltip": patch
+
+declined:
+  - primitives
diff --git a/.yarn/versions/8e903555.yml b/.yarn/versions/8e903555.yml
@@ -0,0 +1,5 @@
+releases:
+  "@implydata/radix-react-scroll-area": patch
+
+declined:
+  - primitives
diff --git a/.yarn/versions/96d1204b.yml b/.yarn/versions/96d1204b.yml
@@ -0,0 +1,5 @@
+releases:
+  "@implydata/radix-react-select": major
+
+declined:
+  - primitives
diff --git a/.yarn/versions/b84e01b4.yml b/.yarn/versions/b84e01b4.yml
@@ -0,0 +1,13 @@
+releases:
+  "@implydata/radix-react-context-menu": patch
+  "@implydata/radix-react-dropdown-menu": patch
+  "@implydata/radix-react-hover-card": patch
+  "@implydata/radix-react-menu": patch
+  "@implydata/radix-react-menubar": patch
+  "@implydata/radix-react-popover": patch
+  "@implydata/radix-react-popper": patch
+  "@implydata/radix-react-select": patch
+  "@implydata/radix-react-tooltip": patch
+
+declined:
+  - primitives
diff --git a/.yarn/versions/ca844fc6.yml b/.yarn/versions/ca844fc6.yml
@@ -0,0 +1,16 @@
+releases:
+  "@implydata/radix-react-alert-dialog": patch
+  "@implydata/radix-react-context-menu": patch
+  "@implydata/radix-react-dialog": patch
+  "@implydata/radix-react-dropdown-menu": patch
+  "@implydata/radix-react-hover-card": patch
+  "@implydata/radix-react-menu": patch
+  "@implydata/radix-react-menubar": patch
+  "@implydata/radix-react-popover": patch
+  "@implydata/radix-react-portal": patch
+  "@implydata/radix-react-select": patch
+  "@implydata/radix-react-toast": patch
+  "@implydata/radix-react-tooltip": patch
+
+declined:
+  - primitives
diff --git a/cypress/integration/Dialog.spec.ts b/cypress/integration/Dialog.spec.ts
@@ -111,6 +111,16 @@ describe('Dialog', () => {
       // finally, ensure that pointer-events have been reset and interactions restored
       shouldAllowOutsideInteraction('realTouch');
     });
+
+    it('keeps focus trapped even if focused element is removed', () => {
+      cy.findByText('open').click();
+      cy.findByText('close').should('be.focused');
+      cy.realPress('Tab');
+      cy.findByText('destroy me').should('be.focused');
+      cy.realPress('Space');
+      cy.realPress('Tab');
+      cy.findByText('close').should('be.focused');
+    });
   });
 
   describe('given a non-modal dialog', () => {

diff --git a/cypress/integration/Select.spec.ts b/cypress/integration/Select.spec.ts
@@ -15,4 +15,19 @@ describe('Select', () => {
       cy.findByText(/t-shirt size/).should('include.text', 'size S');
     });
   });
+
+  describe('given a select with no value', () => {
+    it('should display the placeholder', () => {
+      cy.findByText('…').should('exist');
+    });
+
+    it('can be reset to the placeholder', () => {
+      cy.findByLabelText(/choose a model/).click();
+      cy.findByRole('option', { name: /model x/i }).click();
+      cy.findByText(/model y/i).should('not.exist');
+      cy.findByText(/model x/i).should('exist');
+      cy.findByText('unset').click();
+      cy.findByText('…').should('exist');
+    });
+  });
 });
diff --git a/package.json b/package.json
@@ -55,6 +55,7 @@
     "@testing-library/user-event": "^14.1.0",
     "@types/babel__template": "^7.4.1",
     "@types/eslint": "^7.28.0",
+    "@types/fs-extra": "^11",
     "@types/jest": "^27.4.1",
     "@types/jest-axe": "^3.5.3",
     "@types/react": "^18.0.5",
@@ -74,6 +75,8 @@
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.2.0",
+    "fs-extra": "^11.1.1",
+    "glob": "^10.2.2",
     "husky": "^4.3.6",
     "jest": "^27.5.1",
     "jest-axe": "^6.0.0",
@@ -180,5 +183,8 @@
   },
   "lint-staged": {
     "*.{js,ts,tsx}": "eslint --quiet --fix --cache"
+  },
+  "volta": {
+    "node": "18.16.0"
   }
 }
diff --git a/packages/core/number/README.md b/packages/core/number/README.md
@@ -3,9 +3,9 @@
 ## Installation
 
 ```sh
-$ yarn add @radix-ui/number
+$ yarn add @implydata/radix-number
 # or
-$ npm install @radix-ui/number
+$ npm install @implydata/radix-number
 ```
 
 ## Usage

diff --git a/packages/core/number/package.json b/packages/core/number/package.json
@@ -1,11 +1,23 @@
 {
   "name": "@implydata/radix-number",
-  "version": "1.1.0",
+  "version": "1.0.1",
   "license": "MIT",
-  "source": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.module.js",
-  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "source": "./src/index.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "README.md"

diff --git a/packages/core/primitive/README.md b/packages/core/primitive/README.md
@@ -3,9 +3,9 @@
 ## Installation
 
 ```sh
-$ yarn add @radix-ui/primitive
+$ yarn add @implydata/radix-primitive
 # or
-$ npm install @radix-ui/primitive
+$ npm install @implydata/radix-primitive
 ```
 
 ## Usage

diff --git a/packages/core/primitive/package.json b/packages/core/primitive/package.json
@@ -1,11 +1,23 @@
 {
   "name": "@implydata/radix-primitive",
-  "version": "1.1.0",
+  "version": "1.0.1",
   "license": "MIT",
-  "source": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.module.js",
-  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "source": "./src/index.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "README.md"

diff --git a/packages/core/rect/README.md b/packages/core/rect/README.md
@@ -3,9 +3,9 @@
 ## Installation
 
 ```sh
-$ yarn add @radix-ui/rect
+$ yarn add @implydata/radix-rect
 # or
-$ npm install @radix-ui/rect
+$ npm install @implydata/radix-rect
 ```
 
 ## Usage

diff --git a/packages/core/rect/package.json b/packages/core/rect/package.json
@@ -1,11 +1,23 @@
 {
   "name": "@implydata/radix-rect",
-  "version": "1.1.0",
+  "version": "1.0.1",
   "license": "MIT",
-  "source": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.module.js",
-  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "source": "./src/index.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "README.md"

diff --git a/packages/react/accessible-icon/README.md b/packages/react/accessible-icon/README.md
@@ -3,9 +3,9 @@
 ## Installation
 
 ```sh
-$ yarn add @radix-ui/react-accessible-icon
+$ yarn add @implydata/radix-react-accessible-icon
 # or
-$ npm install @radix-ui/react-accessible-icon
+$ npm install @implydata/radix-react-accessible-icon
 ```
 
 ## Usage

diff --git a/packages/react/accessible-icon/package.json b/packages/react/accessible-icon/package.json
@@ -1,11 +1,23 @@
 {
   "name": "@implydata/radix-react-accessible-icon",
-  "version": "1.1.0",
+  "version": "1.0.3",
   "license": "MIT",
-  "source": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.module.js",
-  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "source": "./src/index.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "README.md"
@@ -20,9 +32,19 @@
     "@implydata/radix-react-visually-hidden": "workspace:*"
   },
   "peerDependencies": {
+    "@types/react": "*",
+    "@types/react-dom": "*",
     "react": "^16.8 || ^17.0 || ^18.0",
     "react-dom": "^16.8 || ^17.0 || ^18.0"
   },
+  "peerDependenciesMeta": {
+    "@types/react": {
+      "optional": true
+    },
+    "@types/react-dom": {
+      "optional": true
+    }
+  },
   "homepage": "https://radix-ui.com/primitives",
   "repository": {
     "type": "git",

diff --git a/packages/react/accessible-icon/src/AccessibleIcon.stories.tsx b/packages/react/accessible-icon/src/AccessibleIcon.stories.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AccessibleIcon } from '@implydata/radix-react-accessible-icon';
 
-export default { title: 'Components/AccessibleIcon' };
+export default { title: 'Utilities/AccessibleIcon' };
 
 export const Styled = () => (
   <button type="button">

diff --git a/packages/react/accordion/README.md b/packages/react/accordion/README.md
@@ -3,9 +3,9 @@
 ## Installation
 
 ```sh
-$ yarn add @radix-ui/react-accordion
+$ yarn add @implydata/radix-react-accordion
 # or
-$ npm install @radix-ui/react-accordion
+$ npm install @implydata/radix-react-accordion
 ```
 
 ## Usage
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,12 @@ git checkout main @@
     git pull upstream main
     ```
+. Make sure your Node version matches the [.nvmrc](../.nvmrc).
+    ```
+    node -v
+    ```
 . Install dependencies with [yarn](https://yarnpkg.com):
     ```sh
@@ Expand Down @@