Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

feat: Experimental INP fix (#4560)

Ivan Starkovb867e67a9133
diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.json
index d60459e049..952525fb02 100644
--- a/packages/sdk-components-react-radix/package.json
+++ b/packages/sdk-components-react-radix/package.json
@@ -59,10 +59,12 @@
"@radix-ui/react-switch": "^1.1.1",
"@radix-ui/react-tabs": "^1.1.1",
"@radix-ui/react-tooltip": "^1.1.4",
+ "@radix-ui/react-use-controllable-state": "^1.1.0",
"@webstudio-is/css-engine": "workspace:*",
"@webstudio-is/icons": "workspace:*",
"@webstudio-is/react-sdk": "workspace:*",
- "@webstudio-is/sdk": "workspace:*"
+ "@webstudio-is/sdk": "workspace:*",
+ "await-interaction-response": "^0.0.2"
},
"devDependencies": {
"@types/node": "^22.9.3",
diff --git a/packages/sdk-components-react-radix/src/dialog.tsx b/packages/sdk-components-react-radix/src/dialog.tsx
index 2541bcc822..af249abd2b 100644
--- a/packages/sdk-components-react-radix/src/dialog.tsx
+++ b/packages/sdk-components-react-radix/src/dialog.tsx
@@ -7,6 +7,7 @@ import {
useEffect,
useRef,
useContext,
+ useCallback,
} from "react";
import * as DialogPrimitive from "@radix-ui/react-dialog";
import {
@@ -14,6 +15,8 @@ import {
getClosestInstance,
type Hook,
} from "@webstudio-is/react-sdk/runtime";
+import { useControllableState } from "@radix-ui/react-use-controllable-state";
+import interactionResponse from "await-interaction-response";
/**
* Naive heuristic to determine if a click event will cause navigate
@@ -49,9 +52,22 @@ export const Dialog = forwardRef<
HTMLDivElement,
Omit<ComponentPropsWithoutRef<typeof DialogPrimitive.Root>, "defaultOpen">
>((props, _ref) => {
- const { open, onOpenChange } = props;
const { renderer } = useContext(ReactSdkContext);
+ const [open, onOpenChange] = useControllableState({
+ prop: props.open,
+ defaultProp: false,
+ onChange: props.onOpenChange,
+ });
+
+ const onOpenChangeHandler = useCallback(
+ async (open: boolean) => {
+ await interactionResponse();
+ onOpenChange(open);
+ },
+ [onOpenChange]
+ );
+
/**
* Close the dialog when a navigable link within it is clicked.
*/
@@ -76,15 +92,21 @@ export const Dialog = forwardRef<
}
if (target.closest('[role="dialog"]')) {
- onOpenChange?.(false);
+ onOpenChangeHandler?.(false);
}
};
window.addEventListener("click", handleClick);
return () => window.removeEventListener("click", handleClick);
- }, [open, onOpenChange, renderer]);
+ }, [open, onOpenChangeHandler, renderer]);
- return <DialogPrimitive.Root {...props} />;
+ return (
+ <DialogPrimitive.Root
+ {...props}
+ onOpenChange={onOpenChangeHandler}
+ open={open}
+ />
+ );
});
/**
diff --git a/packages/sdk-components-react-radix/src/tabs.tsx b/packages/sdk-components-react-radix/src/tabs.tsx
index b0183d57b1..4e3f771f60 100644
--- a/packages/sdk-components-react-radix/src/tabs.tsx
+++ b/packages/sdk-components-react-radix/src/tabs.tsx
@@ -1,20 +1,43 @@
-import {
- type ComponentPropsWithoutRef,
- type ForwardRefExoticComponent,
- forwardRef,
- type ComponentProps,
- type RefAttributes,
-} from "react";
+import { type ComponentPropsWithoutRef, forwardRef, useCallback } from "react";
import { Root, List, Trigger, Content } from "@radix-ui/react-tabs";
import {
getClosestInstance,
getIndexWithinAncestorFromComponentProps,
type Hook,
} from "@webstudio-is/react-sdk/runtime";
+import { useControllableState } from "@radix-ui/react-use-controllable-state";
+import interactionResponse from "await-interaction-response";
+
+export const Tabs = forwardRef<
+ HTMLDivElement,
+ Omit<ComponentPropsWithoutRef<typeof Root>, "value" | "onValueChange"> & {
+ value?: string;
+ onValueChange?: (value: string) => void;
+ }
+>(({ defaultValue, ...props }, ref) => {
+ const [value, onValueChange] = useControllableState({
+ prop: props.value,
+ defaultProp: defaultValue,
+ onChange: props.onValueChange,
+ });
-export const Tabs: ForwardRefExoticComponent<
- Omit<ComponentProps<typeof Root>, "asChild"> & RefAttributes<HTMLDivElement>
-> = Root;
+ const handleValueChange = useCallback(
+ async (value: string) => {
+ await interactionResponse();
+ onValueChange(value);
+ },
+ [onValueChange]
+ );
+
+ return (
+ <Root
+ ref={ref}
+ {...props}
+ value={value}
+ onValueChange={handleValueChange}
+ />
+ );
+});
export const TabsList = List;
diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.json
index ceaec2aaa4..c1271c32c0 100644
--- a/packages/sdk-components-react/package.json
+++ b/packages/sdk-components-react/package.json
@@ -52,7 +52,8 @@
"@webstudio-is/react-sdk": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"colord": "^2.9.3",
- "micromark": "^4.0.0"
+ "micromark": "^4.0.0",
+ "await-interaction-response": "^0.0.2"
},
"devDependencies": {
"@testing-library/react": "^14.2.2",
diff --git a/packages/sdk-components-react/src/vimeo-play-button.tsx b/packages/sdk-components-react/src/vimeo-play-button.tsx
index e12e440b09..0567d6eb72 100644
--- a/packages/sdk-components-react/src/vimeo-play-button.tsx
+++ b/packages/sdk-components-react/src/vimeo-play-button.tsx
@@ -3,9 +3,11 @@ import {
type ElementRef,
type ComponentProps,
useContext,
+ useCallback,
} from "react";
import { VimeoContext } from "./vimeo";
import { Button, defaultTag } from "./button";
+import interactionResponse from "await-interaction-response";
export { defaultTag };
@@ -14,10 +16,17 @@ type Props = ComponentProps<typeof Button>;
export const VimeoPlayButton = forwardRef<ElementRef<typeof defaultTag>, Props>(
(props, ref) => {
const vimeoContext = useContext(VimeoContext);
+
+ const handleClick = useCallback(async () => {
+ await interactionResponse();
+ vimeoContext.onInitPlayer();
+ }, [vimeoContext]);
+
if (vimeoContext.status !== "initial") {
return;
}
- return <Button {...props} onClick={vimeoContext.onInitPlayer} ref={ref} />;
+
+ return <Button {...props} onClick={handleClick} ref={ref} />;
}
);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e0da5ad46..4a948f1011 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1835,6 +1835,9 @@ importers:
'@webstudio-is/sdk':
specifier: workspace:*
version: link:../sdk
+ await-interaction-response:
+ specifier: ^0.0.2
+ version: 0.0.2
colord:
specifier: ^2.9.3
version: 2.9.3
@@ -1905,6 +1908,9 @@ importers:
'@radix-ui/react-tooltip':
specifier: ^1.1.4
+ '@radix-ui/react-use-controllable-state':
+ specifier: ^1.1.0
+ version: 1.1.0(@types/[email protected])([email protected])
'@webstudio-is/css-engine':
specifier: workspace:*
version: link:../css-engine
@@ -1917,6 +1923,9 @@ importers:
'@webstudio-is/sdk':
specifier: workspace:*
version: link:../sdk
+ await-interaction-response:
+ specifier: ^0.0.2
+ version: 0.0.2
devDependencies:
'@types/node':
specifier: ^22.9.3
@@ -5126,6 +5135,9 @@ packages:
resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-gvURjcDvPxilee07zlraNIN6EXEXT1sxYI5Rsnwe8co9+syFAqDtJefYMxml6Z3Xg3Yp6zrrMCM1WqoxYUPH1A==}
+
resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
@@ -12015,6 +12027,8 @@ snapshots:
dependencies:
possible-typed-array-names: 1.0.0
+
dependencies:
follow-redirects: 1.15.2