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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Dialog within collection issues (#3597)
Ivan Starkova4d3f33bada6
diff --git a/apps/builder/app/shared/nano-states/components.ts b/apps/builder/app/shared/nano-states/components.tsindex f47a852740..dd52ba2236 100644--- a/apps/builder/app/shared/nano-states/components.ts+++ b/apps/builder/app/shared/nano-states/components.ts@@ -13,10 +13,11 @@ import {import type { Instance } from "@webstudio-is/sdk";import { decodeDataSourceVariable } from "@webstudio-is/sdk";import type { InstanceSelector } from "../tree-utils";-import { $dataSources, $props } from "./nano-states";+import { $dataSources, $memoryProps, $props } from "./nano-states";import { $instances, $selectedInstanceSelector } from "./instances";import { $selectedPage } from "./pages";import { $dataSourceVariables } from "./variables";+import { nanoid } from "nanoid";const createHookContext = (): HookContext => {const metas = $registeredComponentMetas.get();@@ -47,6 +48,57 @@ const createHookContext = (): HookContext => {}},+ setMemoryProp: (instanceSelector, propName, value) => {+ if (instanceSelector.length === 0) {+ console.error("instanceSelector is empty");+ return;+ }++ const props = $memoryProps.get();++ const newProps = props.get(JSON.stringify(instanceSelector)) ?? new Map();++ const propBase = {+ id: nanoid(),+ instanceId: instanceSelector[0]!,+ name: propName,+ };++ if (value !== undefined) {+ switch (typeof value) {+ case "string":+ newProps.set(propName, {+ ...propBase,+ type: "string",+ value,+ });+ break;+ case "number":+ newProps.set(propName, {+ ...propBase,+ type: "number",+ value,+ });+ break;+ case "boolean":+ newProps.set(propName, {+ ...propBase,+ type: "boolean",+ value,+ });+ break;+ default:+ throw new Error(`Unsupported type ${typeof value}`);+ }+ } else {+ newProps.delete(propName);+ }++ props.set(JSON.stringify(instanceSelector), newProps);++ $memoryProps.set(new Map(props));+ },+setPropVariable: (instanceId, propName, value) => {const dataSourceVariables = new Map($dataSourceVariables.get());const dataSources = new Map($dataSources.get());@@ -91,6 +143,7 @@ export const subscribeComponentHooks = () => {const instance = instances.get(id);return instance ? [instance] : [];}),+ instanceSelector: lastSelectedInstanceSelector,});}}@@ -102,6 +155,7 @@ export const subscribeComponentHooks = () => {const instance = instances.get(id);return instance ? [instance] : [];}),+ instanceSelector,});}}diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 9af6b7f402..115bfd29ae 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -60,6 +60,9 @@ export const $dataSources = atom<DataSources>(new Map());export const $resources = atom(new Map<Resource["id"], Resource>());export const $props = atom<Props>(new Map());++export const $memoryProps = atom<Map<string, Props>>(new Map());+export const $propsIndex = computed($props, (props) => {const propsByInstanceId = new Map<Instance["id"], Prop[]>();for (const prop of props.values()) {diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.tsindex 183fae9244..f07c96c2d0 100644--- a/apps/builder/app/shared/nano-states/props.ts+++ b/apps/builder/app/shared/nano-states/props.ts@@ -28,6 +28,8 @@ import {$assets,$resources,$uploadingFilesDataStore,+ $memoryProps,+ $isPreviewMode,} from "./nano-states";import { $selectedPage, $pages } from "./pages";import type { InstanceSelector } from "../tree-utils";@@ -244,6 +246,8 @@ export const $propValuesByInstanceSelector = computed($pages,$assets,$uploadingFilesDataStore,+ $memoryProps,+ $isPreviewMode,],(instances,@@ -253,7 +257,9 @@ export const $propValuesByInstanceSelector = computed(params,pages,assets,- uploadingFilesDataStore+ uploadingFilesDataStore,+ memoryProps,+ isPreviewMode) => {const variableValues = new Map<string, unknown>(unscopedVariableValues);@@ -345,6 +351,7 @@ export const $propValuesByInstanceSelector = computed(JSON.stringify(instanceSelector),propValues);+if (instance.component === collectionComponent) {const data = propValues.get("data");const itemVariableId = parameters.get("item");@@ -377,7 +384,22 @@ export const $propValuesByInstanceSelector = computed(}}};+traverseInstances([page.rootInstanceId]);++ if (false === isPreviewMode) {+ for (const [memoryKey, memoryValue] of memoryProps) {+ const propsBySelector =+ propValuesByInstanceSelector.get(memoryKey) ?? new Map();++ for (const [memoryProp, memoryPropValue] of memoryValue) {+ propsBySelector.set(memoryProp, memoryPropValue.value);+ }++ propValuesByInstanceSelector.set(memoryKey, propsBySelector);+ }+ }+return propValuesByInstanceSelector;});diff --git a/apps/builder/app/shared/shim.ts b/apps/builder/app/shared/shim.tsindex e42fe0f538..13a50b176e 100644--- a/apps/builder/app/shared/shim.ts+++ b/apps/builder/app/shared/shim.ts@@ -25,7 +25,7 @@ export const setUnion = <Item>(current: Set<Item>, other: Set<Item>) => {};export const mapGroupBy = <Item, Key>(- array: Item[] | IterableIterator<Item>,+ array: Item[] | Iterable<Item>,getKey: (item: Item) => Key) => {const groups = new Map<Key, Item[]>();diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tsindex 1a7070d244..e4b2383563 100644--- a/apps/builder/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -40,6 +40,7 @@ import {$marketplaceProduct,$canvasIframeState,$uploadingFilesDataStore,+ $memoryProps,} from "~/shared/nano-states";import { $ephemeralStyles } from "~/canvas/stores";@@ -122,6 +123,7 @@ export const registerContainers = () => {clientStores.set("selectedInstanceStates", $selectedInstanceStates);clientStores.set("canvasIframeState", $canvasIframeState);clientStores.set("uploadingFilesDataStore", $uploadingFilesDataStore);+ clientStores.set("memoryProps", $memoryProps);for (const [name, store] of $synchronizedBreakpoints) {clientStores.set(name, store);diff --git a/packages/react-sdk/src/hook.ts b/packages/react-sdk/src/hook.tsindex 3c2a61a47b..f94a430114 100644--- a/packages/react-sdk/src/hook.ts+++ b/packages/react-sdk/src/hook.ts@@ -15,6 +15,11 @@ export type HookContext = {propName: Prop["name"],value: unknown) => void;+ setMemoryProp: (+ instanceId: readonly Instance["id"][],+ propName: Prop["name"],+ value: unknown+ ) => void;};export type InstancePath = Instance[];@@ -24,6 +29,7 @@ type NavigatorEvent = {* List of instances from selected to the root*/instancePath: InstancePath;+ instanceSelector: readonly Instance["id"][];};export type Hook = {@@ -50,3 +56,16 @@ export const getClosestInstance = (}}};++export const getInstanceSelectorById = (+ instanceSelector: readonly Instance["id"][],+ instanceId: Instance["id"]+) => {+ const index = instanceSelector.findIndex(+ (selector) => selector === instanceId+ );+ if (index === -1) {+ return [];+ }+ return instanceSelector.slice(index);+};diff --git a/packages/sdk-components-react-radix/src/accordion.tsx b/packages/sdk-components-react-radix/src/accordion.tsxindex ec9f949308..4213ae5474 100644--- a/packages/sdk-components-react-radix/src/accordion.tsx+++ b/packages/sdk-components-react-radix/src/accordion.tsx@@ -15,6 +15,7 @@ import {import {getClosestInstance,getIndexWithinAncestorFromComponentProps,+ getInstanceSelectorById,type Hook,} from "@webstudio-is/react-sdk";@@ -79,8 +80,13 @@ export const hooksAccordion: Hook = {const itemValue =context.getPropValue(item.id, "value") ??context.indexesWithinAncestors.get(item.id)?.toString();+if (itemValue) {- context.setPropVariable(accordion.id, "value", itemValue);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ accordion.id+ );+ context.setMemoryProp(instanceSelector, "value", itemValue);}}}diff --git a/packages/sdk-components-react-radix/src/accordion.ws.ts b/packages/sdk-components-react-radix/src/accordion.ws.tsindex 233b30497a..928c73d8a9 100644--- a/packages/sdk-components-react-radix/src/accordion.ws.ts+++ b/packages/sdk-components-react-radix/src/accordion.ws.ts@@ -131,23 +131,9 @@ export const metaAccordion: WsComponentMeta = {{type: "instance",component: "Accordion",- variables: {- accordionValue: { initialValue: "0" },- },props: [{ type: "boolean", name: "collapsible", value: true },- { type: "expression", name: "value", code: "accordionValue" },- {- name: "onValueChange",- type: "action",- value: [- {- type: "execute",- args: ["value"],- code: `accordionValue = value`,- },- ],- },+ { type: "string", name: "defaultValue", value: "0" },],children: [{diff --git a/packages/sdk-components-react-radix/src/collapsible.tsx b/packages/sdk-components-react-radix/src/collapsible.tsxindex 41b71bbf38..7f123af05c 100644--- a/packages/sdk-components-react-radix/src/collapsible.tsx+++ b/packages/sdk-components-react-radix/src/collapsible.tsx@@ -7,7 +7,11 @@ import {type RefAttributes,} from "react";import { Root, Trigger, Content } from "@radix-ui/react-collapsible";-import { type Hook, getClosestInstance } from "@webstudio-is/react-sdk";+import {+ type Hook,+ getClosestInstance,+ getInstanceSelectorById,+} from "@webstudio-is/react-sdk";export const Collapsible: ForwardRefExoticComponent<Omit<ComponentProps<typeof Root>, "defaultOpen" | "asChild"> &@@ -54,7 +58,11 @@ export const hooksCollapsible: Hook = {`${namespace}:Collapsible`);if (collapsible) {- context.setPropVariable(collapsible.id, "open", true);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ collapsible.id+ );+ context.setMemoryProp(instanceSelector, "open", true);}}}diff --git a/packages/sdk-components-react-radix/src/collapsible.ws.ts b/packages/sdk-components-react-radix/src/collapsible.ws.tsindex 6fc3f8510e..388ea7316d 100644--- a/packages/sdk-components-react-radix/src/collapsible.ws.ts+++ b/packages/sdk-components-react-radix/src/collapsible.ws.ts@@ -32,23 +32,7 @@ export const metaCollapsible: WsComponentMeta = {{type: "instance",component: "Collapsible",- variables: {- collapsibleOpen: { initialValue: false },- },- props: [- {- type: "expression",- name: "open",- code: "collapsibleOpen",- },- {- name: "onOpenChange",- type: "action",- value: [- { type: "execute", args: ["open"], code: `collapsibleOpen = open` },- ],- },- ],+ props: [],children: [{type: "instance",diff --git a/packages/sdk-components-react-radix/src/dialog.tsx b/packages/sdk-components-react-radix/src/dialog.tsxindex ff7ffe45d8..2a2cc0760b 100644--- a/packages/sdk-components-react-radix/src/dialog.tsx+++ b/packages/sdk-components-react-radix/src/dialog.tsx@@ -12,6 +12,7 @@ import * as DialogPrimitive from "@radix-ui/react-dialog";import {ReactSdkContext,getClosestInstance,+ getInstanceSelectorById,type Hook,} from "@webstudio-is/react-sdk";@@ -201,7 +202,11 @@ export const hooksDialog: Hook = {`${namespace}:Dialog`);if (dialog) {- context.setPropVariable(dialog.id, "open", false);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ dialog.id+ );+ context.setMemoryProp(instanceSelector, "open", undefined);}}}@@ -214,8 +219,14 @@ export const hooksDialog: Hook = {instance,`${namespace}:Dialog`);+if (dialog) {- context.setPropVariable(dialog.id, "open", true);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ dialog.id+ );++ context.setMemoryProp(instanceSelector, "open", true);}}}diff --git a/packages/sdk-components-react-radix/src/dialog.ws.ts b/packages/sdk-components-react-radix/src/dialog.ws.tsindex 6e257cb647..6b3016fc1c 100644--- a/packages/sdk-components-react-radix/src/dialog.ws.ts+++ b/packages/sdk-components-react-radix/src/dialog.ws.ts@@ -109,23 +109,6 @@ export const metaDialog: WsComponentMeta = {{type: "instance",component: "Dialog",- variables: {- dialogOpen: { initialValue: false },- },- props: [- {- type: "expression",- name: "open",- code: "dialogOpen",- },- {- name: "onOpenChange",- type: "action",- value: [- { type: "execute", args: ["open"], code: `dialogOpen = open` },- ],- },- ],children: [{type: "instance",@@ -295,7 +278,7 @@ export const metaDialog: WsComponentMeta = {export const propsMetaDialog: WsComponentPropsMeta = {props: propsDialog,- initialProps: ["open"],+ initialProps: [],};export const propsMetaDialogTrigger: WsComponentPropsMeta = {diff --git a/packages/sdk-components-react-radix/src/navigation-menu.tsx b/packages/sdk-components-react-radix/src/navigation-menu.tsxindex 97322aac91..329e43efc9 100644--- a/packages/sdk-components-react-radix/src/navigation-menu.tsx+++ b/packages/sdk-components-react-radix/src/navigation-menu.tsx@@ -2,6 +2,7 @@ import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu";import {getClosestInstance,getIndexWithinAncestorFromComponentProps,+ getInstanceSelectorById,ReactSdkContext,type Hook,} from "@webstudio-is/react-sdk";@@ -92,7 +93,12 @@ export const hooksNavigationMenu: Hook = {);if (menu) {- context.setPropVariable(menu.id, "value", "");+ const menuSelector = getInstanceSelectorById(+ event.instanceSelector,+ menu.id+ );++ context.setMemoryProp(menuSelector, "value", undefined);}}}@@ -121,7 +127,12 @@ export const hooksNavigationMenu: Hook = {context.indexesWithinAncestors.get(menuItem.id)?.toString();if (contentValue) {- context.setPropVariable(menu.id, "value", contentValue);+ const menuSelector = getInstanceSelectorById(+ event.instanceSelector,+ menu.id+ );++ context.setMemoryProp(menuSelector, "value", contentValue);}}}diff --git a/packages/sdk-components-react-radix/src/navigation-menu.ws.ts b/packages/sdk-components-react-radix/src/navigation-menu.ws.tsindex f23eefacf7..2f887542cf 100644--- a/packages/sdk-components-react-radix/src/navigation-menu.ws.ts+++ b/packages/sdk-components-react-radix/src/navigation-menu.ws.ts@@ -318,23 +318,7 @@ export const metaNavigationMenu: WsComponentMeta = {{type: "instance",component: "NavigationMenu",- variables: {- menuValue: { initialValue: "" },- },- props: [- { type: "expression", name: "value", code: "menuValue" },- {- name: "onValueChange",- type: "action",- value: [- {- type: "execute",- args: ["value"],- code: `menuValue = value`,- },- ],- },- ],+ props: [],// relative// Omiting this: z-10 flex max-w-max flex-1 items-center justify-centerstyles: [tc.relative(), tc.maxW("max")].flat(),diff --git a/packages/sdk-components-react-radix/src/popover.tsx b/packages/sdk-components-react-radix/src/popover.tsxindex 7e5c47888a..d05b99fdd7 100644--- a/packages/sdk-components-react-radix/src/popover.tsx+++ b/packages/sdk-components-react-radix/src/popover.tsx@@ -5,7 +5,11 @@ import {Children,} from "react";import * as PopoverPrimitive from "@radix-ui/react-popover";-import { getClosestInstance, type Hook } from "@webstudio-is/react-sdk";+import {+ getClosestInstance,+ getInstanceSelectorById,+ type Hook,+} from "@webstudio-is/react-sdk";// wrap in forwardRef because Root is functional component without refexport const Popover = forwardRef<@@ -71,7 +75,11 @@ export const hooksPopover: Hook = {`${namespace}:Popover`);if (popover) {- context.setPropVariable(popover.id, "open", false);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ popover.id+ );+ context.setMemoryProp(instanceSelector, "open", undefined);}}}@@ -85,7 +93,11 @@ export const hooksPopover: Hook = {`${namespace}:Popover`);if (popover) {- context.setPropVariable(popover.id, "open", true);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ popover.id+ );+ context.setMemoryProp(instanceSelector, "open", true);}}}diff --git a/packages/sdk-components-react-radix/src/popover.ws.ts b/packages/sdk-components-react-radix/src/popover.ws.tsindex 1ae5f21422..c0050c5eec 100644--- a/packages/sdk-components-react-radix/src/popover.ws.ts+++ b/packages/sdk-components-react-radix/src/popover.ws.ts@@ -53,23 +53,7 @@ export const metaPopover: WsComponentMeta = {{type: "instance",component: "Popover",- variables: {- popoverOpen: { initialValue: false },- },- props: [- {- type: "expression",- name: "open",- code: "popoverOpen",- },- {- name: "onOpenChange",- type: "action",- value: [- { type: "execute", args: ["open"], code: `popoverOpen = open` },- ],- },- ],+ props: [],children: [{type: "instance",diff --git a/packages/sdk-components-react-radix/src/select.tsx b/packages/sdk-components-react-radix/src/select.tsxindex f93751d865..2afe9ab83b 100644--- a/packages/sdk-components-react-radix/src/select.tsx+++ b/packages/sdk-components-react-radix/src/select.tsx@@ -4,6 +4,7 @@ import {type ComponentPropsWithoutRef,forwardRef,type RefAttributes,+ useContext,} from "react";import {Root,@@ -16,7 +17,12 @@ import {Portal,Viewport,} from "@radix-ui/react-select";-import { type Hook, getClosestInstance } from "@webstudio-is/react-sdk";+import {+ type Hook,+ getClosestInstance,+ getInstanceSelectorById,+ ReactSdkContext,+} from "@webstudio-is/react-sdk";// wrap in forwardRef because Root is functional component without refexport const Select = forwardRef<@@ -26,9 +32,21 @@ export const Select = forwardRef<return <Root {...props} />;});-export const SelectTrigger: ForwardRefExoticComponent<- ComponentProps<typeof Trigger> & RefAttributes<HTMLButtonElement>-> = Trigger;+export const SelectTrigger = forwardRef<+ HTMLButtonElement,+ ComponentPropsWithoutRef<typeof Trigger>+>((props, ref) => {+ const { renderer } = useContext(ReactSdkContext);++ const onPointerDown =+ renderer === "canvas"+ ? (event: React.PointerEvent) => {+ event.preventDefault();+ }+ : undefined;++ return <Trigger onPointerDown={onPointerDown} ref={ref} {...props} />;+});export const SelectValue = forwardRef<HTMLDivElement,@@ -83,7 +101,11 @@ export const hooksSelect: Hook = {`${namespace}:Select`);if (select) {- context.setPropVariable(select.id, "open", false);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ select.id+ );+ context.setMemoryProp(instanceSelector, "open", undefined);}}}@@ -97,7 +119,11 @@ export const hooksSelect: Hook = {`${namespace}:Select`);if (select) {- context.setPropVariable(select.id, "open", true);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ select.id+ );+ context.setMemoryProp(instanceSelector, "open", true);}}}diff --git a/packages/sdk-components-react-radix/src/select.ws.ts b/packages/sdk-components-react-radix/src/select.ws.tsindex f2d958d790..a4898e01a6 100644--- a/packages/sdk-components-react-radix/src/select.ws.ts+++ b/packages/sdk-components-react-radix/src/select.ws.ts@@ -116,7 +116,6 @@ export const metaSelect: WsComponentMeta = {component: "Select",variables: {selectValue: { initialValue: "" },- selectOpen: { initialValue: false },},props: [{@@ -131,18 +130,6 @@ export const metaSelect: WsComponentMeta = {{ type: "execute", args: ["value"], code: `selectValue = value` },],},- {- name: "open",- type: "expression",- code: "selectOpen",- },- {- name: "onOpenChange",- type: "action",- value: [- { type: "execute", args: ["open"], code: `selectOpen = open` },- ],- },],children: [{diff --git a/packages/sdk-components-react-radix/src/sheet.tsx b/packages/sdk-components-react-radix/src/sheet.tsxindex fab31e9d53..a9bebf1668 100644--- a/packages/sdk-components-react-radix/src/sheet.tsx+++ b/packages/sdk-components-react-radix/src/sheet.tsx@@ -3,7 +3,11 @@ import {type ElementRef,type ComponentPropsWithoutRef,} from "react";-import { getClosestInstance, type Hook } from "@webstudio-is/react-sdk";+import {+ getClosestInstance,+ getInstanceSelectorById,+ type Hook,+} from "@webstudio-is/react-sdk";import * as Dialog from "./dialog";export const Sheet = Dialog.Dialog;@@ -55,8 +59,13 @@ export const hooksSheet: Hook = {instance,`${namespace}:Sheet`);+if (sheet) {- context.setPropVariable(sheet.id, "open", false);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ sheet.id+ );+ context.setMemoryProp(instanceSelector, "open", undefined);}}}@@ -70,7 +79,11 @@ export const hooksSheet: Hook = {`${namespace}:Sheet`);if (sheet) {- context.setPropVariable(sheet.id, "open", true);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ sheet.id+ );+ context.setMemoryProp(instanceSelector, "open", true);}}}diff --git a/packages/sdk-components-react-radix/src/sheet.ws.ts b/packages/sdk-components-react-radix/src/sheet.ws.tsindex 74926cd6aa..445cb91483 100644--- a/packages/sdk-components-react-radix/src/sheet.ws.ts+++ b/packages/sdk-components-react-radix/src/sheet.ws.ts@@ -24,23 +24,7 @@ export const meta: WsComponentMeta = {type: "instance",component: "Dialog",label: "Sheet",- variables: {- sheetOpen: { initialValue: false },- },- props: [- {- type: "expression",- name: "open",- code: "sheetOpen",- },- {- name: "onOpenChange",- type: "action",- value: [- { type: "execute", args: ["open"], code: `sheetOpen = open` },- ],- },- ],+ props: [],children: [{type: "instance",diff --git a/packages/sdk-components-react-radix/src/tabs.tsx b/packages/sdk-components-react-radix/src/tabs.tsxindex 2a3ef1c6f2..3e8ada7cb8 100644--- a/packages/sdk-components-react-radix/src/tabs.tsx+++ b/packages/sdk-components-react-radix/src/tabs.tsx@@ -9,6 +9,7 @@ import { Root, List, Trigger, Content } from "@radix-ui/react-tabs";import {getClosestInstance,getIndexWithinAncestorFromComponentProps,+ getInstanceSelectorById,type Hook,} from "@webstudio-is/react-sdk";@@ -55,7 +56,11 @@ export const hooksTabs: Hook = {context.getPropValue(instance.id, "value") ??context.indexesWithinAncestors.get(instance.id)?.toString();if (tabs && contentValue) {- context.setPropVariable(tabs.id, "value", contentValue);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ tabs.id+ );+ context.setMemoryProp(instanceSelector, "value", contentValue);}}}diff --git a/packages/sdk-components-react-radix/src/tabs.ws.ts b/packages/sdk-components-react-radix/src/tabs.ws.tsindex 587ba20817..4ab05483aa 100644--- a/packages/sdk-components-react-radix/src/tabs.ws.ts+++ b/packages/sdk-components-react-radix/src/tabs.ws.ts@@ -79,19 +79,7 @@ export const metaTabs: WsComponentMeta = {{type: "instance",component: "Tabs",- variables: {- tabsValue: { initialValue: "0" },- },- props: [- { type: "expression", name: "value", code: "tabsValue" },- {- name: "onValueChange",- type: "action",- value: [- { type: "execute", args: ["value"], code: `tabsValue = value` },- ],- },- ],+ props: [{ type: "string", name: "defaultValue", value: "0" }],children: [{type: "instance",diff --git a/packages/sdk-components-react-radix/src/tooltip.tsx b/packages/sdk-components-react-radix/src/tooltip.tsxindex aad736a1db..d8d93c24fb 100644--- a/packages/sdk-components-react-radix/src/tooltip.tsx+++ b/packages/sdk-components-react-radix/src/tooltip.tsx@@ -1,5 +1,9 @@import * as TooltipPrimitive from "@radix-ui/react-tooltip";-import { getClosestInstance, type Hook } from "@webstudio-is/react-sdk";+import {+ getClosestInstance,+ getInstanceSelectorById,+ type Hook,+} from "@webstudio-is/react-sdk";import {forwardRef,@@ -70,7 +74,11 @@ export const hooksTooltip: Hook = {`${namespace}:Tooltip`);if (tooltip) {- context.setPropVariable(tooltip.id, "open", false);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ tooltip.id+ );+ context.setMemoryProp(instanceSelector, "open", undefined);}}}@@ -84,7 +92,11 @@ export const hooksTooltip: Hook = {`${namespace}:Tooltip`);if (tooltip) {- context.setPropVariable(tooltip.id, "open", true);+ const instanceSelector = getInstanceSelectorById(+ event.instanceSelector,+ tooltip.id+ );+ context.setMemoryProp(instanceSelector, "open", true);}}}diff --git a/packages/sdk-components-react-radix/src/tooltip.ws.ts b/packages/sdk-components-react-radix/src/tooltip.ws.tsindex e1e6754c3d..b463c28ff0 100644--- a/packages/sdk-components-react-radix/src/tooltip.ws.ts+++ b/packages/sdk-components-react-radix/src/tooltip.ws.ts@@ -54,23 +54,7 @@ export const metaTooltip: WsComponentMeta = {{type: "instance",component: "Tooltip",- variables: {- tooltipOpen: { initialValue: false },- },- props: [- {- type: "expression",- name: "open",- code: "tooltipOpen",- },- {- name: "onOpenChange",- type: "action",- value: [- { type: "execute", args: ["open"], code: `tooltipOpen = open` },- ],- },- ],+ props: [],children: [{type: "instance",