Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: radix-ui/primitives
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 157415ed1f34c53b5afbf53a047895ed6a7f957f
Choose a base ref
...
head repository: radix-ui/primitives
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3c5e05fab070dfa68212230e85baf0879269c57d
Choose a head ref
  • 12 commits
  • 94 files changed
  • 5 contributors

Commits on Oct 1, 2024

  1. New release

    chaance committed Oct 1, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    79c6a88 View commit details

Commits on Oct 3, 2024

  1. feat: Tooltip - Performance - avoid calling clearTimeout on unmount i…

    …f timeout id is 0 (#3163)
    
    Co-authored-by: Carlos Nicacio <cnicacio-contractor@zappos.com>
    carloseustaquio and Carlos Nicacio authored Oct 3, 2024
    Copy the full SHA
    db6267a View commit details
  2. Publish release candidate

    chaance authored and github-actions[bot] committed Oct 3, 2024
    Copy the full SHA
    74b182b View commit details

Commits on Nov 12, 2024

  1. Revert "[ScrollArea] Viewport fixes (#2945)" (#3225)

    chaance authored Nov 12, 2024
    Copy the full SHA
    d70e369 View commit details
  2. Publish release candidate

    chaance authored and github-actions[bot] committed Nov 12, 2024
    Copy the full SHA
    83330a4 View commit details
  3. New release

    chaance committed Nov 12, 2024
    Copy the full SHA
    4584a37 View commit details

Commits on Dec 12, 2024

  1. Fix composeRefs in React 19 (#3283)

    dmitri-gb authored Dec 12, 2024
    Copy the full SHA
    6d803c0 View commit details
  2. Publish release candidate

    chaance authored and github-actions[bot] committed Dec 12, 2024
    Copy the full SHA
    02543ca View commit details

Commits on Dec 13, 2024

  1. Avoid error in logs on React <19 when using composeRefs (#3285)

    dmitri-gb authored Dec 13, 2024
    Copy the full SHA
    4e6e632 View commit details
  2. Publish release candidate

    chaance authored and github-actions[bot] committed Dec 13, 2024
    Copy the full SHA
    8b66f06 View commit details
  3. minor refactor + add comments

    chaance committed Dec 13, 2024
    Copy the full SHA
    9fca902 View commit details
  4. Publish release candidate

    chaance authored and github-actions[bot] committed Dec 13, 2024
    Copy the full SHA
    3c5e05f View commit details
Showing with 2,242 additions and 6,634 deletions.
  1. +3 −0 .prettierignore
  2. +5 −3 .storybook/main.ts
  3. +0 −5 .yarn/versions/19bdd400.yml
  4. +0 −9 .yarn/versions/2adbb5fd.yml
  5. +0 −9 .yarn/versions/3e57a8d0.yml
  6. +0 −16 .yarn/versions/41451f5a.yml
  7. +3 −0 .yarn/versions/6b9a7d73.yml
  8. +0 −22 .yarn/versions/8a3bd6ee.yml
  9. +0 −17 .yarn/versions/8cb19c89.yml
  10. +0 −2 .yarn/versions/96c502e7.yml
  11. +0 −3 .yarn/versions/9bca397e.yml
  12. +0 −5 .yarn/versions/9cbffb59.yml
  13. +0 −5 .yarn/versions/a0df87d9.yml
  14. +49 −0 .yarn/versions/a4655765.yml
  15. +0 −6 .yarn/versions/a54ad5a9.yml
  16. +0 −33 .yarn/versions/c80771b8.yml
  17. +0 −5 .yarn/versions/cc138cf5.yml
  18. +0 −5 .yarn/versions/cccc0adb.yml
  19. +0 −2 .yarn/versions/f24f9512.yml
  20. +19 −14 package.json
  21. +3 −2 packages/core/primitive/package.json
  22. +1 −1 packages/core/primitive/src/primitive.tsx
  23. +3 −2 packages/react/accessible-icon/package.json
  24. +1 −1 packages/react/accessible-icon/src/AccessibleIcon.tsx
  25. +2 −2 packages/react/accordion/package.json
  26. +2 −2 packages/react/alert-dialog/package.json
  27. +1 −1 packages/react/alert-dialog/src/AlertDialog.tsx
  28. +3 −2 packages/react/announce/package.json
  29. +3 −2 packages/react/arrow/package.json
  30. +3 −2 packages/react/aspect-ratio/package.json
  31. +2 −2 packages/react/avatar/package.json
  32. +2 −2 packages/react/checkbox/package.json
  33. +2 −2 packages/react/collapsible/package.json
  34. +1 −1 packages/react/collapsible/src/Collapsible.tsx
  35. +3 −2 packages/react/collection/package.json
  36. +5 −2 packages/react/collection/src/Collection.tsx
  37. +3 −2 packages/react/compose-refs/package.json
  38. +31 −5 packages/react/compose-refs/src/composeRefs.tsx
  39. +2 −2 packages/react/context-menu/package.json
  40. +2 −3 packages/react/context/package.json
  41. +2 −2 packages/react/dialog/package.json
  42. +3 −3 packages/react/dialog/src/Dialog.tsx
  43. +2 −2 packages/react/dismissable-layer/package.json
  44. +2 −2 packages/react/dropdown-menu/package.json
  45. +1 −1 packages/react/dropdown-menu/src/DropdownMenu.stories.tsx
  46. +1 −1 packages/react/dropdown-menu/src/DropdownMenu.tsx
  47. +2 −3 packages/react/focus-guards/package.json
  48. +3 −2 packages/react/focus-scope/package.json
  49. +1 −1 packages/react/focus-scope/src/FocusScope.stories.tsx
  50. +3 −2 packages/react/form/package.json
  51. +2 −2 packages/react/hover-card/package.json
  52. +1 −1 packages/react/hover-card/src/HoverCard.stories.tsx
  53. +3 −2 packages/react/label/package.json
  54. +2 −2 packages/react/menu/package.json
  55. +2 −2 packages/react/menubar/package.json
  56. +1 −1 packages/react/menubar/src/Menubar.tsx
  57. +2 −2 packages/react/navigation-menu/package.json
  58. +5 −5 packages/react/navigation-menu/src/NavigationMenu.tsx
  59. +2 −2 packages/react/popover/package.json
  60. +1 −1 packages/react/popover/src/Popover.stories.tsx
  61. +1 −1 packages/react/popover/src/Popover.tsx
  62. +3 −2 packages/react/popper/package.json
  63. +2 −2 packages/react/portal/package.json
  64. +2 −2 packages/react/presence/package.json
  65. +2 −2 packages/react/presence/src/Presence.tsx
  66. +3 −2 packages/react/primitive/package.json
  67. +3 −2 packages/react/progress/package.json
  68. +2 −2 packages/react/radio-group/package.json
  69. +3 −2 packages/react/roving-focus/package.json
  70. +2 −2 packages/react/scroll-area/package.json
  71. +0 −88 packages/react/scroll-area/src/ScrollArea.stories.tsx
  72. +14 −57 packages/react/scroll-area/src/ScrollArea.tsx
  73. +2 −2 packages/react/select/package.json
  74. +3 −2 packages/react/separator/package.json
  75. +2 −2 packages/react/slider/package.json
  76. +1 −1 packages/react/slider/src/Slider.stories.tsx
  77. +2 −2 packages/react/slider/src/Slider.tsx
  78. +3 −2 packages/react/slot/package.json
  79. +8 −6 packages/react/slot/src/Slot.tsx
  80. +2 −2 packages/react/switch/package.json
  81. +24 −0 packages/react/switch/src/Switch.test.tsx
  82. +2 −2 packages/react/tabs/package.json
  83. +2 −2 packages/react/toast/package.json
  84. +3 −2 packages/react/toggle-group/package.json
  85. +3 −2 packages/react/toggle/package.json
  86. +3 −2 packages/react/toolbar/package.json
  87. +2 −2 packages/react/tooltip/package.json
  88. +1 −1 packages/react/tooltip/src/Tooltip.stories.tsx
  89. +10 −1 packages/react/tooltip/src/Tooltip.tsx
  90. +3 −2 packages/react/visually-hidden/package.json
  91. +18 −48 ssr-testing/app/scroll-area/page.tsx
  92. +1 −1 ssr-testing/next-env.d.ts
  93. +6 −6 ssr-testing/package.json
  94. +1,909 −6,140 yarn.lock
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.next
node_modules
.yarn
dist
storybook-static
8 changes: 5 additions & 3 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -3,20 +3,22 @@ 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'),
getAbsolutePath('@storybook/addon-webpack5-compiler-swc'),
],

framework: {
name: getAbsolutePath('@storybook/react-webpack5'),
options: {
builder: {
useSWC: true,
},
builder: {},
// enable React strict mode
strictMode: true,
},
},

swc: () => ({
jsc: {
transform: {
5 changes: 0 additions & 5 deletions .yarn/versions/19bdd400.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/versions/2adbb5fd.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/versions/3e57a8d0.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .yarn/versions/41451f5a.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .yarn/versions/6b9a7d73.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
declined:
- primitives
- "@radix-ui/react-compose-refs"
22 changes: 0 additions & 22 deletions .yarn/versions/8a3bd6ee.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .yarn/versions/8cb19c89.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .yarn/versions/96c502e7.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .yarn/versions/9bca397e.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .yarn/versions/9cbffb59.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .yarn/versions/a0df87d9.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .yarn/versions/a4655765.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
releases:
"@radix-ui/primitive": patch
"@radix-ui/react-accessible-icon": patch
"@radix-ui/react-accordion": patch
"@radix-ui/react-alert-dialog": patch
"@radix-ui/react-announce": patch
"@radix-ui/react-arrow": patch
"@radix-ui/react-aspect-ratio": patch
"@radix-ui/react-avatar": patch
"@radix-ui/react-checkbox": patch
"@radix-ui/react-collapsible": patch
"@radix-ui/react-collection": patch
"@radix-ui/react-compose-refs": patch
"@radix-ui/react-context-menu": patch
"@radix-ui/react-dialog": patch
"@radix-ui/react-dismissable-layer": patch
"@radix-ui/react-dropdown-menu": patch
"@radix-ui/react-focus-scope": patch
"@radix-ui/react-form": patch
"@radix-ui/react-hover-card": patch
"@radix-ui/react-label": 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-popper": patch
"@radix-ui/react-portal": patch
"@radix-ui/react-presence": patch
"@radix-ui/react-primitive": patch
"@radix-ui/react-progress": patch
"@radix-ui/react-radio-group": patch
"@radix-ui/react-roving-focus": patch
"@radix-ui/react-scroll-area": patch
"@radix-ui/react-select": patch
"@radix-ui/react-separator": patch
"@radix-ui/react-slider": patch
"@radix-ui/react-slot": patch
"@radix-ui/react-switch": patch
"@radix-ui/react-tabs": patch
"@radix-ui/react-toast": patch
"@radix-ui/react-toggle": patch
"@radix-ui/react-toggle-group": patch
"@radix-ui/react-toolbar": patch
"@radix-ui/react-tooltip": patch
"@radix-ui/react-visually-hidden": patch

declined:
- primitives
- ssr-testing
6 changes: 0 additions & 6 deletions .yarn/versions/a54ad5a9.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .yarn/versions/c80771b8.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .yarn/versions/cc138cf5.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .yarn/versions/cccc0adb.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .yarn/versions/f24f9512.yml

This file was deleted.

33 changes: 19 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -28,30 +28,34 @@
"bump:check": "yarn version check"
},
"dependencies": {
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@stitches/core": "^1.2.8",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-storysource": "^7.6.17",
"@storybook/react": "^7.6.17",
"@storybook/react-webpack5": "^7.6.17",
"@storybook/test": "^7.6.17",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-storysource": "^8.4.7",
"@storybook/addon-webpack5-compiler-swc": "^1.0.5",
"@storybook/manager-api": "^8.4.7",
"@storybook/react": "^8.4.7",
"@storybook/react-webpack5": "^8.4.7",
"@storybook/test": "^8.4.7",
"@storybook/theming": "^8.4.7",
"@testing-library/cypress": "^7.0.6",
"@testing-library/dom": "^10.1.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.1.0",
"@types/eslint": "^7.28.0",
"@types/fs-extra": "^11",
"@types/jest": "^27.4.1",
"@types/jest": "^29.5.14",
"@types/jest-axe": "^3.5.3",
"@types/react": "^18.0.5",
"@types/react-dom": "^18.0.0",
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.2",
"@types/react-test-renderer": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^5.19.0",
"@typescript-eslint/parser": "^5.19.0",
"babel-eslint": "^10.1.0",
"cypress": "^8.0.0",
"cypress-real-events": "^1.5.0",
"esbuild": "0.21.4",
@@ -67,19 +71,20 @@
"fs-extra": "^11.1.1",
"glob": "^10.2.2",
"husky": "^4.3.6",
"jest": "^27.5.1",
"jest": "^29.7.0",
"jest-axe": "^6.0.0",
"jest-environment-jsdom": "^29.7.0",
"jest-watch-typeahead": "^1.0.0",
"lint-staged": "^10.5.3",
"prettier": "^2.0.5",
"pretty-quick": "^2.0.1",
"react-test-renderer": "^18.0.0",
"replace-in-files": "^3.0.0",
"start-server-and-test": "2.0.3",
"storybook": "^7.6.17",
"ts-jest": "^27.1.4",
"storybook": "^8.4.7",
"ts-jest": "^29.2.5",
"tsup": "8.0.2",
"typescript": "^4.6.3"
"typescript": "^5.7.2"
},
"resolutions": {
"chokidar": "3.4.3"
5 changes: 3 additions & 2 deletions packages/core/primitive/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/primitive",
"version": "1.1.0",
"version": "1.1.1-rc.3",
"license": "MIT",
"exports": {
".": {
@@ -34,5 +34,6 @@
},
"bugs": {
"url": "https://github.com/radix-ui/primitives/issues"
}
},
"stableVersion": "1.1.0"
}
2 changes: 1 addition & 1 deletion packages/core/primitive/src/primitive.tsx
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ function composeEventHandlers<E>(
return function handleEvent(event: E) {
originalEventHandler?.(event);

if (checkForDefaultPrevented === false || !((event as unknown) as Event).defaultPrevented) {
if (checkForDefaultPrevented === false || !(event as unknown as Event).defaultPrevented) {
return ourEventHandler?.(event);
}
};
5 changes: 3 additions & 2 deletions packages/react/accessible-icon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/react-accessible-icon",
"version": "1.1.0",
"version": "1.1.1-rc.3",
"license": "MIT",
"exports": {
".": {
@@ -51,5 +51,6 @@
},
"bugs": {
"url": "https://github.com/radix-ui/primitives/issues"
}
},
"stableVersion": "1.1.0"
}
2 changes: 1 addition & 1 deletion packages/react/accessible-icon/src/AccessibleIcon.tsx
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ const AccessibleIcon: React.FC<AccessibleIconProps> = ({ children, label }) => {
const child = React.Children.only(children);
return (
<>
{React.cloneElement(child as React.ReactElement, {
{React.cloneElement(child as React.ReactElement<React.SVGAttributes<SVGElement>>, {
// accessibility
'aria-hidden': 'true',
focusable: 'false', // See: https://allyjs.io/tutorials/focusing-in-svg.html#making-svg-elements-focusable
4 changes: 2 additions & 2 deletions packages/react/accordion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/react-accordion",
"version": "1.2.1-rc.14",
"version": "1.2.2-rc.3",
"license": "MIT",
"exports": {
".": {
@@ -60,5 +60,5 @@
"bugs": {
"url": "https://github.com/radix-ui/primitives/issues"
},
"stableVersion": "1.2.0"
"stableVersion": "1.2.1"
}
4 changes: 2 additions & 2 deletions packages/react/alert-dialog/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@radix-ui/react-alert-dialog",
"version": "1.1.2-rc.14",
"version": "1.1.3-rc.3",
"license": "MIT",
"exports": {
".": {
@@ -57,5 +57,5 @@
"bugs": {
"url": "https://github.com/radix-ui/primitives/issues"
},
"stableVersion": "1.1.1"
"stableVersion": "1.1.2"
}
Loading