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.

fix: set proper default value in radix with content block (#4937)

Bogdan Chadkinbdf446309801
diff --git a/apps/builder/app/builder/features/ai/ai-fetch-result.ts b/apps/builder/app/builder/features/ai/ai-fetch-result.ts
index 1ca306f8d8..a8c311c0ef 100644
--- a/apps/builder/app/builder/features/ai/ai-fetch-result.ts
+++ b/apps/builder/app/builder/features/ai/ai-fetch-result.ts
@@ -9,7 +9,6 @@ import { createRegularStyleSheet } from "@webstudio-is/css-engine";
import {
generateJsxElement,
generateJsxChildren,
- getIndexesWithinAncestors,
idAttribute,
componentAttribute,
} from "@webstudio-is/react-sdk";
@@ -18,6 +17,7 @@ import {
Instance,
createScope,
findTreeInstanceIds,
+ getIndexesWithinAncestors,
} from "@webstudio-is/sdk";
import { computed } from "nanostores";
import {
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
index 5d1fb76362..dbd72b80ef 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -26,6 +26,7 @@ import {
descendantComponent,
blockComponent,
blockTemplateComponent,
+ getIndexesWithinAncestors,
} from "@webstudio-is/sdk";
import {
idAttribute,
@@ -33,7 +34,6 @@ import {
showAttribute,
selectorIdAttribute,
indexAttribute,
- getIndexesWithinAncestors,
type AnyComponent,
textContentAttribute,
} from "@webstudio-is/react-sdk";
diff --git a/apps/builder/app/shared/nano-states/components.ts b/apps/builder/app/shared/nano-states/components.ts
index 4e7b157123..602268b8ec 100644
--- a/apps/builder/app/shared/nano-states/components.ts
+++ b/apps/builder/app/shared/nano-states/components.ts
@@ -7,13 +7,13 @@ import {
type Hook,
type HookContext,
namespaceMeta,
- getIndexesWithinAncestors,
type InstanceData,
} from "@webstudio-is/react-sdk";
-import type {
- Instance,
- WsComponentMeta,
- WsComponentPropsMeta,
+import {
+ getIndexesWithinAncestors,
+ type Instance,
+ type WsComponentMeta,
+ type WsComponentPropsMeta,
} from "@webstudio-is/sdk";
import type { InstanceSelector } from "../tree-utils";
import { $memoryProps, $props } from "./misc";
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
index 4ae6520d8b..f8ee7dc3c3 100644
--- a/packages/cli/src/prebuild.ts
+++ b/packages/cli/src/prebuild.ts
@@ -17,7 +17,6 @@ import { log, spinner } from "@clack/prompts";
import merge from "deepmerge";
import {
generateWebstudioComponent,
- getIndexesWithinAncestors,
type Params,
normalizeProps,
generateRemixRoute,
@@ -606,11 +605,7 @@ export const prebuild = async (options: {
props,
dataSources,
classesMap: classes,
- indexesWithinAncestors: getIndexesWithinAncestors(
- projectMetas,
- instances,
- [rootInstanceId]
- ),
+ metas: projectMetas,
});
const projectMeta = siteData.build.pages.meta;
diff --git a/packages/react-sdk/src/component-generator.test.tsx b/packages/react-sdk/src/component-generator.test.tsx
index 7ae246d740..21ed5a1e8c 100644
--- a/packages/react-sdk/src/component-generator.test.tsx
+++ b/packages/react-sdk/src/component-generator.test.tsx
@@ -5,6 +5,7 @@ import {
createScope,
ROOT_INSTANCE_ID,
SYSTEM_VARIABLE_ID,
+ WsComponentMeta,
} from "@webstudio-is/sdk";
import {
$,
@@ -291,25 +292,6 @@ test("generate jsx element with condition based on show prop", () => {
);
});
-test("generate jsx element with index prop", () => {
- expect(
- generateJsxChildren({
- scope: createScope(),
- usedDataSources: new Map(),
- indexesWithinAncestors: new Map([["box", 5]]),
- children: [{ type: "id", value: "box" }],
- ...renderData(<$.Box ws:id="box"></$.Box>),
- })
- ).toEqual(
- validateJSX(
- clear(`
- <Box
- data-ws-index="5" />
- `)
- )
- );
-});
-
test("generate jsx children with text", () => {
expect(
generateJsxChildren({
@@ -483,7 +465,7 @@ test("generate component with variables and actions", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map([["input", 0]]),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<$.Input
@@ -522,7 +504,7 @@ test("merge classes if no className", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(<$.Body ws:id="body"></$.Body>),
})
).toEqual(
@@ -545,7 +527,7 @@ test("add classes and merge classes", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(<$.Body ws:id="body" className='cls2 "cls3"'></$.Body>),
})
).toEqual(
@@ -568,7 +550,7 @@ test("add classes", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(<$.Body ws:id="body" className='cls2 "cls3"'></$.Body>),
})
).toEqual(
@@ -592,7 +574,7 @@ test("add bind classes and merge classes", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body
ws:id="body"
@@ -623,7 +605,7 @@ test("avoid generating collection parameter variable as state", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<ws.collection
@@ -684,7 +666,7 @@ test("generate both page system and global system variables when present", () =>
value: SYSTEM_VARIABLE_ID,
},
],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...data,
})
).toEqual(
@@ -716,7 +698,7 @@ test("generate resources loading", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body
ws:id="body"
@@ -777,7 +759,7 @@ test("avoid generating unused variables", () => {
value: "unusedParameterId",
},
],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...data,
})
).toMatchInlineSnapshot(`
@@ -798,7 +780,7 @@ test("avoid generating descendant component", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<ws.descendant></ws.descendant>
@@ -824,7 +806,7 @@ test("generate conditional collection", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<ws.collection
@@ -863,7 +845,7 @@ test("generate conditional body", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body" data-ws-show={expression`${condition}`}></$.Body>
),
@@ -897,7 +879,7 @@ test("generate resource prop", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<$.Form ws:id="form1" action={myResource}></$.Form>
@@ -926,7 +908,7 @@ test("skip unsafe properties", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body
ws:id="body"
@@ -958,7 +940,7 @@ test("variable names can be js identifiers", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<$.Input
@@ -998,7 +980,7 @@ test("renders nothing if only templates are present in block", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<ws.block ws:id="block">
@@ -1031,7 +1013,7 @@ test("renders only block children", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<ws.block ws:id="block">
@@ -1066,7 +1048,7 @@ test("generate unset variables as undefined", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...renderData(
<$.Body ws:id="body">
<$.Box>{expression`a + b`}</$.Box>
@@ -1105,7 +1087,7 @@ test("generate global variables", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...data,
})
).toEqual(
@@ -1141,7 +1123,7 @@ test("ignore unused global variables", () => {
name: "Page",
rootInstanceId: "body",
parameters: [],
- indexesWithinAncestors: new Map(),
+ metas: new Map(),
...data,
})
).toEqual(
@@ -1156,3 +1138,115 @@ test("ignore unused global variables", () => {
)
);
});
+
+test("generate prop with index within ancestor", () => {
+ expect(
+ generateWebstudioComponent({
+ classesMap: new Map(),
+ scope: createScope(),
+ name: "Page",
+ rootInstanceId: "body",
+ parameters: [],
+ metas: new Map<string, WsComponentMeta>([
+ [
+ "TabsTrigger",
+ { type: "container", icon: "", indexWithinAncestor: "Tabs" },
+ ],
+ [
+ "TabsContent",
+ { type: "container", icon: "", indexWithinAncestor: "Tabs" },
+ ],
+ ]),
+ ...renderData(
+ <$.Body ws:id="body">
+ <$.Tabs>
+ <$.TabsList>
+ <$.TabsTrigger></$.TabsTrigger>
+ <$.Box>
+ <$.TabsTrigger></$.TabsTrigger>
+ </$.Box>
+ </$.TabsList>
+ <$.Box>
+ <$.TabsContent></$.TabsContent>
+ </$.Box>
+ <$.TabsContent></$.TabsContent>
+ </$.Tabs>
+ </$.Body>
+ ),
+ })
+ ).toEqual(
+ validateJSX(
+ clear(`
+ const Page = () => {
+ return <Body>
+ <Tabs>
+ <TabsList>
+ <TabsTrigger
+ data-ws-index="0" />
+ <Box>
+ <TabsTrigger
+ data-ws-index="1" />
+ </Box>
+ </TabsList>
+ <Box>
+ <TabsContent
+ data-ws-index="0" />
+ </Box>
+ <TabsContent
+ data-ws-index="1" />
+ </Tabs>
+ </Body>
+ }
+ `)
+ )
+ );
+});
+
+test("ignore ws:block-template when generate index attribute", () => {
+ const BlockTemplate = ws["block-template"];
+ expect(
+ generateWebstudioComponent({
+ classesMap: new Map(),
+ scope: createScope(),
+ name: "Page",
+ rootInstanceId: "bodyId",
+ parameters: [],
+ metas: new Map<string, WsComponentMeta>([
+ [
+ "TabsTrigger",
+ { type: "container", icon: "", indexWithinAncestor: "Tabs" },
+ ],
+ ]),
+ ...renderData(
+ <$.Body ws:id="bodyId">
+ <$.Tabs>
+ <BlockTemplate>
+ <$.TabsTrigger></$.TabsTrigger>
+ </BlockTemplate>
+ <$.Box>
+ <$.TabsTrigger></$.TabsTrigger>
+ </$.Box>
+ <$.TabsTrigger></$.TabsTrigger>
+ </$.Tabs>
+ </$.Body>
+ ),
+ })
+ ).toEqual(
+ validateJSX(
+ clear(`
+ const Page = () => {
+ return <Body>
+ <Tabs>
+ <Box>
+ <TabsTrigger
+ data-ws-index="0" />
+ </Box>
+ <TabsTrigger
+ data-ws-index="1" />
+ </Tabs>
+ </Body>
+ }
+ `)
+ )
+ );
+});
diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.ts
index 18ec71c5aa..02003573b1 100644
--- a/packages/react-sdk/src/component-generator.ts
+++ b/packages/react-sdk/src/component-generator.ts
@@ -6,6 +6,8 @@ import type {
DataSources,
Prop,
DataSource,
+ WsComponentMeta,
+ IndexesWithinAncestors,
} from "@webstudio-is/sdk";
import {
parseComponentName,
@@ -16,9 +18,9 @@ import {
blockTemplateComponent,
collectionComponent,
descendantComponent,
+ getIndexesWithinAncestors,
} from "@webstudio-is/sdk";
import { indexAttribute, isAttributeNameSafe, showAttribute } from "./props";
-import type { IndexesWithinAncestors } from "./instance-utils";
/**
* (arg1) => {
@@ -391,7 +393,7 @@ export const generateWebstudioComponent = ({
instances,
props,
dataSources,
- indexesWithinAncestors,
+ metas,
classesMap,
}: {
scope: Scope;
@@ -401,13 +403,16 @@ export const generateWebstudioComponent = ({
instances: Instances;
props: Props;
dataSources: DataSources;
- indexesWithinAncestors: IndexesWithinAncestors;
classesMap: Map<string, Array<string>>;
+ metas: Map<Instance["component"], WsComponentMeta>;
}) => {
const instance = instances.get(rootInstanceId);
if (instance === undefined) {
return "";
}
+ const indexesWithinAncestors = getIndexesWithinAncestors(metas, instances, [
+ rootInstanceId,
+ ]);
const usedDataSources: DataSources = new Map();
const generatedJsx = generateJsxElement({
diff --git a/packages/react-sdk/src/hook.ts b/packages/react-sdk/src/hook.ts
index 6c60580558..d17cf7d670 100644
--- a/packages/react-sdk/src/hook.ts
+++ b/packages/react-sdk/src/hook.ts
@@ -1,5 +1,4 @@
-import type { Instance, Prop } from "@webstudio-is/sdk";
-import type { IndexesWithinAncestors } from "./instance-utils";
+import type { IndexesWithinAncestors, Instance, Prop } from "@webstudio-is/sdk";
export type InstanceData = {
id: Instance["id"];
diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.ts
index 9df6629d4f..f63d24970f 100644
--- a/packages/react-sdk/src/index.ts
+++ b/packages/react-sdk/src/index.ts
@@ -3,7 +3,6 @@ export * from "./components/components-utils";
export * from "./embed-template";
export * from "./props";
export type * from "./context";
-export { getIndexesWithinAncestors } from "./instance-utils";
export type * from "./hook";
export {
generateWebstudioComponent,
diff --git a/packages/react-sdk/src/instance-utils.test.tsx b/packages/react-sdk/src/instance-utils.test.tsx
deleted file mode 100644
index 79b3a618c8..0000000000
--- a/packages/react-sdk/src/instance-utils.test.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { test, expect } from "vitest";
-import type { Instance, Instances, WsComponentMeta } from "@webstudio-is/sdk";
-import { getIndexesWithinAncestors } from "./instance-utils";
-
-const getIdValuePair = <T extends { id: string }>(item: T) =>
- [item.id, item] as const;
-
-const toMap = <T extends { id: string }>(list: T[]) =>
- new Map(list.map(getIdValuePair));
-
-const createInstance = (
- id: Instance["id"],
- component: string,
- children: Instance["children"]
-): Instance => {
- return { type: "instance", id, component, children };
-};
-
-const createMeta = (meta?: Partial<WsComponentMeta>) => {
- return { type: "container", label: "", icon: "", ...meta } as const;
-};
-
-test("get indexes within ancestors", () => {
- // body0
- // tabs1
- // tabs1list
- // tabs1box
- // tabs1trigger1
- // tabs1trigger2
- // tabs1content1
- // tabs2
- // tabs2list
- // tabs2trigger1
- // tabs2content1
- // tabs1content2
- const instances: Instances = toMap([
- createInstance("body0", "Body", [{ type: "id", value: "tabs1" }]),
- // tabs1
- createInstance("tabs1", "Tabs", [
- { type: "id", value: "tabs1list" },
- { type: "id", value: "tabs1content1" },
- { type: "id", value: "tabs1content2" },
- ]),
- createInstance("tabs1list", "TabsList", [
- { type: "id", value: "tabs1box" },
- ]),
- createInstance("tabs1box", "Box", [
- { type: "id", value: "tabs1trigger1" },
- { type: "id", value: "tabs1trigger2" },
- ]),
- createInstance("tabs1trigger1", "TabsTrigger", []),
- createInstance("tabs1trigger2", "TabsTrigger", []),
- createInstance("tabs1content1", "TabsContent", [
- { type: "id", value: "tabs2" },
- ]),
- createInstance("tabs1content2", "TabsContent", []),
- // tabs2
- createInstance("tabs2", "Tabs", [
- { type: "id", value: "tabs2list" },
- { type: "id", value: "tabs2content1" },
- ]),
- createInstance("tabs2list", "TabsList", [
- { type: "id", value: "tabs2trigger1" },
- ]),
- createInstance("tabs2trigger1", "TabsTrigger", []),
- createInstance("tabs2content1", "TabsContent", []),
- ] satisfies Instance[]);
- const metas = new Map<Instance["component"], WsComponentMeta>([
- ["Body", createMeta()],
- ["Box", createMeta()],
- ["Tabs", createMeta()],
- ["TabsList", createMeta({ indexWithinAncestor: "Tabs" })],
- ["TabsTrigger", createMeta({ indexWithinAncestor: "TabsList" })],
- ["TabsContent", createMeta({ indexWithinAncestor: "Tabs" })],
- ]);
- expect(getIndexesWithinAncestors(metas, instances, ["body0"])).toEqual(
- new Map([
- ["tabs1list", 0],
- ["tabs1trigger1", 0],
- ["tabs1trigger2", 1],
- ["tabs1content1", 0],
- ["tabs1content2", 1],
- ["tabs2list", 0],
- ["tabs2trigger1", 0],
- ["tabs2content1", 0],
- ])
- );
-});
diff --git a/packages/react-sdk/src/instance-utils.ts b/packages/react-sdk/src/instance-utils.ts
deleted file mode 100644
index 1ca7e16e7d..0000000000
--- a/packages/react-sdk/src/instance-utils.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { Instance, Instances, WsComponentMeta } from "@webstudio-is/sdk";
-
-export type IndexesWithinAncestors = Map<Instance["id"], number>;
-
-export const getIndexesWithinAncestors = (
- metas: Map<Instance["component"], WsComponentMeta>,
- instances: Instances,
- rootIds: Instance["id"][]
-) => {
- const ancestors = new Set<Instance["component"]>();
- for (const meta of metas.values()) {
- if (meta.indexWithinAncestor !== undefined) {
- ancestors.add(meta.indexWithinAncestor);
- }
- }
-
- const indexes: IndexesWithinAncestors = new Map();
-
- const traverseInstances = (
- instances: Instances,
- instanceId: Instance["id"],
- latestIndexes = new Map<
- Instance["component"],
- Map<Instance["component"], number>
- >()
- ) => {
- const instance = instances.get(instanceId);
- if (instance === undefined) {
- return;
- }
- const meta = metas.get(instance.component);
- if (meta === undefined) {
- return;
- }
-
- if (ancestors.has(instance.component)) {
- latestIndexes = new Map(latestIndexes);
- latestIndexes.set(instance.component, new Map());
- }
-
- if (meta.indexWithinAncestor !== undefined) {
- const ancestorIndexes = latestIndexes.get(meta.indexWithinAncestor);
- if (ancestorIndexes !== undefined) {
- let index = ancestorIndexes.get(instance.component) ?? -1;
- index += 1;
- ancestorIndexes.set(instance.component, index);
- indexes.set(instance.id, index);
- }
- }
-
- for (const child of instance.children) {
- if (child.type === "id") {
- traverseInstances(instances, child.value, latestIndexes);
- }
- }
- };
-
- const latestIndexes = new Map();
- for (const instanceId of rootIds) {
- traverseInstances(instances, instanceId, latestIndexes);
- }
-
- return indexes;
-};
diff --git a/packages/sdk-cli/src/bin.ts b/packages/sdk-cli/src/bin.ts
index a7eb366312..78470ea10c 100755
--- a/packages/sdk-cli/src/bin.ts
+++ b/packages/sdk-cli/src/bin.ts
@@ -1,2 +1,2 @@
-#!/usr/bin/env tsx --conditions=webstudio
+#!/usr/bin/env tsx --conditions=webstudio --experimental-import-meta-resolve
import "./cli";
diff --git a/packages/sdk-cli/src/generate-stories.ts b/packages/sdk-cli/src/generate-stories.ts
index 8594a5c7a2..6bdf5ee03a 100644
--- a/packages/sdk-cli/src/generate-stories.ts
+++ b/packages/sdk-cli/src/generate-stories.ts
@@ -15,7 +15,6 @@ import {
} from "@webstudio-is/sdk";
import {
generateWebstudioComponent,
- getIndexesWithinAncestors,
namespaceMeta,
} from "@webstudio-is/react-sdk";
import { renderTemplate, type TemplateMeta } from "@webstudio-is/template";
@@ -201,9 +200,7 @@ export const generateStories = async () => {
instances,
props,
dataSources: new Map(data.dataSources.map((prop) => [prop.id, prop])),
- indexesWithinAncestors: getIndexesWithinAncestors(usedMetas, instances, [
- rootInstanceId,
- ]),
+ metas: usedMetas,
});
content += getStoriesExports(name, cssText);
diff --git a/packages/sdk/src/instances-utils.test.tsx b/packages/sdk/src/instances-utils.test.tsx
index c93d961775..e84d6f7776 100644
--- a/packages/sdk/src/instances-utils.test.tsx
+++ b/packages/sdk/src/instances-utils.test.tsx
@@ -1,10 +1,17 @@
import { expect, test } from "vitest";
-import { $, renderData } from "@webstudio-is/template";
+import { $, renderData, ws } from "@webstudio-is/template";
import {
findTreeInstanceIds,
findTreeInstanceIdsExcludingSlotDescendants,
+ getIndexesWithinAncestors,
parseComponentName,
} from "./instances-utils";
+import type { WsComponentMeta } from "./schema/component-meta";
+import type { Instance } from "./schema/instances";
+
+const createMeta = (meta?: Partial<WsComponentMeta>) => {
+ return { type: "container", label: "", icon: "", ...meta } as const;
+};
test("find all tree instances", () => {
const { instances } = renderData(
@@ -49,3 +56,71 @@ test("extract short name and namespace from component name", () => {
expect(parseComponentName("Box")).toEqual([undefined, "Box"]);
expect(parseComponentName("radix:Box")).toEqual(["radix", "Box"]);
});
+
+test("get indexes within ancestors", () => {
+ const { instances } = renderData(
+ <$.Body ws:id="body0">
+ <$.Tabs ws:id="tabs1">
+ <$.TabsList ws:id="tabs1list">
+ <$.Box>
+ <$.TabsTrigger ws:id="tabs1trigger1"></$.TabsTrigger>
+ <$.TabsTrigger ws:id="tabs1trigger2"></$.TabsTrigger>
+ </$.Box>
+ </$.TabsList>
+ <$.TabsContent ws:id="tabs1content1"></$.TabsContent>
+ <$.TabsContent ws:id="tabs1content2">
+ <$.Tabs ws:id="tabs2">
+ <$.TabsList ws:id="tabs2list">
+ <$.TabsTrigger ws:id="tabs2trigger1"></$.TabsTrigger>
+ </$.TabsList>
+ <$.TabsContent ws:id="tabs2content1"></$.TabsContent>
+ </$.Tabs>
+ </$.TabsContent>
+ </$.Tabs>
+ </$.Body>
+ );
+ const metas = new Map<Instance["component"], WsComponentMeta>([
+ ["TabsList", createMeta({ indexWithinAncestor: "Tabs" })],
+ ["TabsTrigger", createMeta({ indexWithinAncestor: "TabsList" })],
+ ["TabsContent", createMeta({ indexWithinAncestor: "Tabs" })],
+ ]);
+ expect(getIndexesWithinAncestors(metas, instances, ["body0"])).toEqual(
+ new Map([
+ ["tabs1list", 0],
+ ["tabs1trigger1", 0],
+ ["tabs1trigger2", 1],
+ ["tabs1content1", 0],
+ ["tabs1content2", 1],
+ // reset nested ones
+ ["tabs2list", 0],
+ ["tabs2trigger1", 0],
+ ["tabs2content1", 0],
+ ])
+ );
+});
+
+test("ignore ws:block-template when compute indexes within ancestors", () => {
+ const BlockTemplate = ws["block-template"];
+ const { instances } = renderData(
+ <$.Body ws:id="body0">
+ <$.Tabs>
+ <BlockTemplate>
+ <$.TabsTrigger ws:id="trigger1"></$.TabsTrigger>
+ </BlockTemplate>
+ <$.TabsTrigger ws:id="trigger2"></$.TabsTrigger>
+ <$.TabsTrigger ws:id="trigger3"></$.TabsTrigger>
+ </$.Tabs>
+ </$.Body>
+ );
+ const metas = new Map<Instance["component"], WsComponentMeta>([
+ ["TabsTrigger", createMeta({ indexWithinAncestor: "Tabs" })],
+ ]);
+ expect(getIndexesWithinAncestors(metas, instances, ["body0"])).toEqual(
+ new Map([
+ ["trigger2", 0],
+ ["trigger3", 1],
+ // reset the one inside of block template
+ ["trigger1", 0],
+ ])
+ );
+});
diff --git a/packages/sdk/src/instances-utils.ts b/packages/sdk/src/instances-utils.ts
index 35ed3085f7..4c9969d96c 100644
--- a/packages/sdk/src/instances-utils.ts
+++ b/packages/sdk/src/instances-utils.ts
@@ -1,4 +1,6 @@
+import type { WsComponentMeta } from "./schema/component-meta";
import type { Instance, Instances } from "./schema/instances";
+import { blockTemplateComponent } from "./core-metas";
export const ROOT_INSTANCE_ID = ":root";
@@ -58,3 +60,70 @@ export const parseComponentName = (componentName: string) => {
}
return [namespace, name] as const;
};
+
+export type IndexesWithinAncestors = Map<Instance["id"], number>;
+
+export const getIndexesWithinAncestors = (
+ metas: Map<Instance["component"], WsComponentMeta>,
+ instances: Instances,
+ rootIds: Instance["id"][]
+) => {
+ const ancestors = new Set<Instance["component"]>();
+ for (const meta of metas.values()) {
+ if (meta.indexWithinAncestor !== undefined) {
+ ancestors.add(meta.indexWithinAncestor);
+ }
+ }
+
+ const indexes: IndexesWithinAncestors = new Map();
+
+ const traverseInstances = (
+ instances: Instances,
+ instanceId: Instance["id"],
+ latestIndexes = new Map<
+ Instance["component"],
+ Map<Instance["component"], number>
+ >()
+ ) => {
+ const instance = instances.get(instanceId);
+ if (instance === undefined) {
+ return;
+ }
+ const meta = metas.get(instance.component);
+
+ // reset for both nested ancestors and block template
+ if (ancestors.has(instance.component)) {
+ latestIndexes = new Map(latestIndexes);
+ latestIndexes.set(instance.component, new Map());
+ }
+ if (instance.component === blockTemplateComponent) {
+ latestIndexes = new Map(latestIndexes);
+ for (const key of latestIndexes.keys()) {
+ latestIndexes.set(key, new Map());
+ }
+ }
+
+ if (meta?.indexWithinAncestor !== undefined) {
+ const ancestorIndexes = latestIndexes.get(meta.indexWithinAncestor);
+ if (ancestorIndexes) {
+ let index = ancestorIndexes.get(instance.component) ?? -1;
+ index += 1;
+ ancestorIndexes.set(instance.component, index);
+ indexes.set(instance.id, index);
+ }
+ }
+
+ for (const child of instance.children) {
+ if (child.type === "id") {
+ traverseInstances(instances, child.value, latestIndexes);
+ }
+ }
+ };
+
+ const latestIndexes = new Map();
+ for (const instanceId of rootIds) {
+ traverseInstances(instances, instanceId, latestIndexes);
+ }
+
+ return indexes;
+};