Skip to content

refactor: bump radix #5129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 1, 2025
Merged

refactor: bump radix #5129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d60df8f
refactor: bump radix
TrySound Apr 16, 2025
401b8b2
Bump again
TrySound May 1, 2025
68bf40d
Fix controllable types
TrySound May 1, 2025
7b0566a
fix sdk radix
TrySound May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/builder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"@lezer/highlight": "^1.2.1",
"@nanostores/react": "^0.8.0",
"@nkzw/use-relative-time": "^1.1.0",
"@radix-ui/react-select": "^2.1.5",
"@radix-ui/react-tooltip": "^1.1.8",
"@radix-ui/react-select": "^2.2.2",
"@radix-ui/react-tooltip": "^1.2.4",
"@react-aria/interactions": "^3.23.0",
"@react-aria/utils": "^3.27.0",
"@remix-run/node": "^2.16.4",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@fontsource-variable/inter": "^5.0.20",
"@fontsource-variable/manrope": "^5.0.20",
"@fontsource/roboto-mono": "^5.0.18",
"@radix-ui/react-tooltip": "^1.1.8",
"@radix-ui/react-tooltip": "^1.2.4",
"@storybook/addon-actions": "^8.6.4",
"@storybook/addon-backgrounds": "^8.6.4",
"@storybook/addon-controls": "^8.6.4",
Expand Down
48 changes: 24 additions & 24 deletions packages/design-system/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,37 @@
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
"@floating-ui/dom": "^1.6.13",
"@radix-ui/colors": "^3.0.0",
"@radix-ui/react-accessible-icon": "^1.1.2",
"@radix-ui/react-avatar": "^1.1.3",
"@radix-ui/react-checkbox": "^1.1.4",
"@radix-ui/react-collapsible": "^1.1.3",
"@radix-ui/react-context-menu": "^2.2.6",
"@radix-ui/react-dialog": "^1.1.6",
"@radix-ui/react-dropdown-menu": "^2.1.6",
"@radix-ui/react-label": "^2.1.2",
"@radix-ui/react-popover": "^1.1.6",
"@radix-ui/react-progress": "^1.1.2",
"@radix-ui/react-radio-group": "^1.2.3",
"@radix-ui/react-accessible-icon": "^1.1.4",
"@radix-ui/react-avatar": "^1.1.7",
"@radix-ui/react-checkbox": "^1.2.3",
"@radix-ui/react-collapsible": "^1.1.8",
"@radix-ui/react-context-menu": "^2.2.12",
"@radix-ui/react-dialog": "^1.1.11",
"@radix-ui/react-dropdown-menu": "^2.1.12",
"@radix-ui/react-label": "^2.1.4",
"@radix-ui/react-popover": "^1.1.11",
"@radix-ui/react-progress": "^1.1.4",
"@radix-ui/react-radio-group": "^1.3.4",
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-select": "^2.1.5",
"@radix-ui/react-separator": "^1.1.2",
"@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-switch": "^1.1.3",
"@radix-ui/react-tabs": "^1.1.3",
"@radix-ui/react-toast": "^1.2.6",
"@radix-ui/react-toggle": "^1.1.2",
"@radix-ui/react-toggle-group": "^1.1.2",
"@radix-ui/react-toolbar": "^1.1.2",
"@radix-ui/react-tooltip": "^1.1.8",
"@radix-ui/react-use-controllable-state": "^1.1.0",
"@radix-ui/react-visually-hidden": "^1.1.2",
"@radix-ui/react-select": "^2.2.2",
"@radix-ui/react-separator": "^1.1.4",
"@radix-ui/react-slot": "^1.2.0",
"@radix-ui/react-switch": "^1.2.2",
"@radix-ui/react-tabs": "^1.1.9",
"@radix-ui/react-toast": "^1.2.11",
"@radix-ui/react-toggle": "^1.1.6",
"@radix-ui/react-toggle-group": "^1.1.7",
"@radix-ui/react-toolbar": "^1.1.7",
"@radix-ui/react-tooltip": "^1.2.4",
"@radix-ui/react-use-controllable-state": "^1.2.2",
"@radix-ui/react-visually-hidden": "^1.2.0",
"@react-aria/focus": "^3.19.1",
"@react-aria/interactions": "^3.23.0",
"@react-aria/utils": "^3.27.0",
"@stitches/react": "1.3.1-1",
"@webstudio-is/icons": "workspace:*",
"change-case": "^5.4.4",
"cmdk": "^1.0.4",
"cmdk": "^1.1.1",
"downshift": "^6.1.7",
"match-sorter": "^8.0.0",
"react-hot-toast": "^2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/ai-command-bar/autogrow-text-area.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const AutogrowTextArea = forwardRef(
// use
const [textValue, setTextValue] = useControllableState({
prop: value,
defaultProp: defaultValue,
defaultProp: defaultValue ?? "",
onChange,
});

Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/components/text-area.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export const TextArea = forwardRef(
) => {
const [textValue, setTextValue] = useControllableState({
prop: value,
defaultProp: defaultValue,
defaultProp: defaultValue ?? "",
onChange,
});

Expand Down
4 changes: 2 additions & 2 deletions packages/design-system/src/components/tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ export const Tooltip = forwardRef(
) => {
const triggerRef = useRef<HTMLButtonElement>(null);
// We need to intercept tooltip open
const [open = false, setOpen] = useControllableState({
const [open, setOpen] = useControllableState({
prop: openProp,
defaultProp: defaultOpen,
defaultProp: defaultOpen ?? false,
onChange: (open) => {
onOpenChange?.(open);
},
Expand Down
26 changes: 13 additions & 13 deletions packages/sdk-components-react-radix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
"dependencies": {
"@radix-ui/react-accordion": "^1.2.3",
"@radix-ui/react-checkbox": "^1.1.4",
"@radix-ui/react-collapsible": "^1.1.3",
"@radix-ui/react-dialog": "^1.1.6",
"@radix-ui/react-label": "^2.1.2",
"@radix-ui/react-navigation-menu": "^1.2.5",
"@radix-ui/react-popover": "^1.1.6",
"@radix-ui/react-radio-group": "^1.2.3",
"@radix-ui/react-select": "^2.1.5",
"@radix-ui/react-switch": "^1.1.3",
"@radix-ui/react-tabs": "^1.1.3",
"@radix-ui/react-tooltip": "^1.1.8",
"@radix-ui/react-use-controllable-state": "^1.1.0",
"@radix-ui/react-accordion": "^1.2.8",
"@radix-ui/react-checkbox": "^1.2.3",
"@radix-ui/react-collapsible": "^1.1.8",
"@radix-ui/react-dialog": "^1.1.11",
"@radix-ui/react-label": "^2.1.4",
"@radix-ui/react-navigation-menu": "^1.2.10",
"@radix-ui/react-popover": "^1.1.11",
"@radix-ui/react-radio-group": "^1.3.4",
"@radix-ui/react-select": "^2.2.2",
"@radix-ui/react-switch": "^1.2.2",
"@radix-ui/react-tabs": "^1.1.9",
"@radix-ui/react-tooltip": "^1.2.4",
"@radix-ui/react-use-controllable-state": "^1.2.2",
"@webstudio-is/css-engine": "workspace:*",
"@webstudio-is/icons": "workspace:*",
"@webstudio-is/react-sdk": "workspace:*",
Expand Down
11 changes: 6 additions & 5 deletions packages/sdk-components-react-radix/src/select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
forwardRef,
type RefAttributes,
useContext,
type ComponentPropsWithRef,
} from "react";
import {
Root,
Expand All @@ -23,11 +24,11 @@ import {
ReactSdkContext,
} from "@webstudio-is/react-sdk/runtime";

export const Select = forwardRef<HTMLDivElement, ComponentProps<typeof Root>>(
({ value, defaultValue, ...props }, _ref) => {
return <Root {...props} defaultValue={value ?? defaultValue} />;
}
);
export const Select: ForwardRefExoticComponent<
ComponentPropsWithRef<typeof Root>
> = forwardRef(({ value, defaultValue, ...props }, _ref) => {
return <Root {...props} defaultValue={value ?? defaultValue} />;
});

export const SelectTrigger = forwardRef<
HTMLButtonElement,
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-components-react-radix/src/tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const Tabs = forwardRef<
>(({ defaultValue, ...props }, ref) => {
const [value, onValueChange] = useControllableState({
prop: props.value,
defaultProp: defaultValue,
defaultProp: defaultValue ?? "",
onChange: props.onValueChange,
});

Expand Down
Loading