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: Improve autoplacement when inserting component via 1-click in components panel or via paste (#3422)

Oleg Isonen700c9b95ab79
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
index 36128c86a0..c11ef2319c 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
@@ -26,6 +26,7 @@ import { $registeredComponentMetas, $selectedPage } from "~/shared/nano-states";
import { getMetaMaps } from "./get-meta-maps";
import { getInstanceLabel } from "~/shared/instance-utils";
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
+import { insert } from "./insert";
export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
const metaByComponentName = useStore($registeredComponentMetas);
@@ -37,7 +38,7 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
() => getMetaMaps(metaByComponentName),
[metaByComponentName]
);
- const { dragCard, handleInsert, draggableContainerRef } = useDraggable({
+ const { dragCard, draggableContainerRef } = useDraggable({
publish,
metaByComponentName,
});
@@ -119,7 +120,7 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
);
if (component) {
onSetActiveTab("none");
- handleInsert(component);
+ insert(component);
}
}}
>
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/insert.ts b/apps/builder/app/builder/features/sidebar-left/panels/components/insert.ts
new file mode 100644
index 0000000000..26cb778a3e
--- /dev/null
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/insert.ts
@@ -0,0 +1,71 @@
+import { type WsComponentMeta } from "@webstudio-is/react-sdk";
+import { toast } from "@webstudio-is/design-system";
+import {
+ $instances,
+ $registeredComponentMetas,
+ $selectedInstanceSelector,
+ $selectedPage,
+} from "~/shared/nano-states";
+import {
+ computeInstancesConstraints,
+ findClosestDroppableTarget,
+ getComponentTemplateData,
+ insertTemplateData,
+} from "~/shared/instance-utils";
+
+const formatInsertionError = (component: string, meta: WsComponentMeta) => {
+ const or = new Intl.ListFormat("en", {
+ type: "disjunction",
+ });
+ const and = new Intl.ListFormat("en", {
+ type: "conjunction",
+ });
+ const messages: string[] = [];
+ if (meta.requiredAncestors) {
+ const listString = or.format(meta.requiredAncestors);
+ messages.push(`can be added only inside of ${listString}`);
+ }
+ if (meta.invalidAncestors) {
+ const listString = and.format(meta.invalidAncestors);
+ messages.push(`cannot be added inside of ${listString}`);
+ }
+ return `${component} ${and.format(messages)}`;
+};
+
+// Insert a component depending on currently selected instance.
+// Used for 1-click insert from the components panel.
+export const insert = (component: string) => {
+ const selectedPage = $selectedPage.get();
+ if (selectedPage === undefined) {
+ return;
+ }
+ const templateData = getComponentTemplateData(component);
+ if (templateData === undefined) {
+ return;
+ }
+ const newInstances = new Map(
+ templateData.instances.map((instance) => [instance.id, instance])
+ );
+ const rootInstanceIds = templateData.children
+ .filter((child) => child.type === "id")
+ .map((child) => child.value);
+ const instanceSelector = $selectedInstanceSelector.get() ?? [
+ selectedPage.rootInstanceId,
+ ];
+ const metas = $registeredComponentMetas.get();
+ const dropTarget = findClosestDroppableTarget(
+ metas,
+ $instances.get(),
+ // fallback to root as drop target
+ instanceSelector,
+ computeInstancesConstraints(metas, newInstances, rootInstanceIds)
+ );
+ if (dropTarget === undefined) {
+ const meta = metas.get(component);
+ if (meta) {
+ toast.error(formatInsertionError(component, meta));
+ }
+ return;
+ }
+ insertTemplateData(templateData, dropTarget);
+};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
index 09501e5abe..b630bb3d9b 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
@@ -8,24 +8,12 @@ import {
Flex,
useDrag,
ComponentCard,
- toast,
useDisableCanvasPointerEvents,
} from "@webstudio-is/design-system";
-import {
- $instances,
- $registeredComponentMetas,
- $selectedInstanceSelector,
- $selectedPage,
-} from "~/shared/nano-states";
+import { $registeredComponentMetas } from "~/shared/nano-states";
import { useSubscribe, type Publish } from "~/shared/pubsub";
import { $canvasRect, $scale } from "~/builder/shared/nano-states";
-import {
- computeInstancesConstraints,
- findClosestDroppableTarget,
- getComponentTemplateData,
- getInstanceLabel,
- insertTemplateData,
-} from "~/shared/instance-utils";
+import { getInstanceLabel } from "~/shared/instance-utils";
import { MetaIcon } from "~/builder/shared/meta-icon";
const DragLayer = ({
@@ -97,25 +85,6 @@ export const elementToComponentName = (
return false;
};
-const formatInsertionError = (component: string, meta: WsComponentMeta) => {
- const or = new Intl.ListFormat("en", {
- type: "disjunction",
- });
- const and = new Intl.ListFormat("en", {
- type: "conjunction",
- });
- const messages: string[] = [];
- if (meta.requiredAncestors) {
- const listString = or.format(meta.requiredAncestors);
- messages.push(`can be added only inside of ${listString}`);
- }
- if (meta.invalidAncestors) {
- const listString = and.format(meta.invalidAncestors);
- messages.push(`cannot be added inside of ${listString}`);
- }
- return `${component} ${and.format(messages)}`;
-};
-
export const useDraggable = ({
publish,
metaByComponentName,
@@ -174,45 +143,8 @@ export const useDraggable = ({
<DragLayer component={dragComponent} point={point} />
) : undefined;
- const handleInsert = (component: string) => {
- const selectedPage = $selectedPage.get();
- if (selectedPage === undefined) {
- return;
- }
- const templateData = getComponentTemplateData(component);
- if (templateData === undefined) {
- return;
- }
- const newInstances = new Map(
- templateData.instances.map((instance) => [instance.id, instance])
- );
- const rootInstanceIds = templateData.children
- .filter((child) => child.type === "id")
- .map((child) => child.value);
- const instanceSelector = $selectedInstanceSelector.get() ?? [
- selectedPage.rootInstanceId,
- ];
- const metas = $registeredComponentMetas.get();
- const dropTarget = findClosestDroppableTarget(
- metas,
- $instances.get(),
- // fallback to root as drop target
- instanceSelector,
- computeInstancesConstraints(metas, newInstances, rootInstanceIds)
- );
- if (dropTarget === undefined) {
- const meta = metas.get(component);
- if (meta) {
- toast.error(formatInsertionError(component, meta));
- }
- return;
- }
- insertTemplateData(templateData, dropTarget);
- };
-
return {
dragCard,
draggableContainerRef: dragHandlers.rootRef,
- handleInsert,
};
};
diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsx
index 8416994804..9083922f2f 100644
--- a/apps/builder/app/builder/shared/navigator-tree.tsx
+++ b/apps/builder/app/builder/shared/navigator-tree.tsx
@@ -67,22 +67,12 @@ export const NavigatorTree = () => {
if (insertConstraints === undefined) {
return -1;
}
- const componentSelector: string[] = [];
- for (const instanceId of instanceSelector) {
- const component = instances.get(instanceId)?.component;
- // collection produce fake instances
- // and fragment does not have constraints
- if (component === undefined) {
- componentSelector.push("Fragment");
- continue;
- }
- componentSelector.push(component);
- }
- return findClosestDroppableComponentIndex(
+ return findClosestDroppableComponentIndex({
metas,
- componentSelector,
- insertConstraints
- );
+ constraints: insertConstraints,
+ instances,
+ instanceSelector,
+ });
},
[instances, metas, insertConstraints]
);
diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.ts
index 6822eb328a..a142908d44 100644
--- a/apps/builder/app/canvas/shared/use-drag-drop.ts
+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts
@@ -93,23 +93,12 @@ const findClosestDroppableInstanceSelector = (
return;
}
- const componentSelector: string[] = [];
- for (const instanceId of instanceSelector) {
- const component = instances.get(instanceId)?.component;
- // collection produce fake instances
- // and fragment does not have constraints
- if (component === undefined) {
- componentSelector.push("Fragment");
- continue;
- }
- componentSelector.push(component);
- }
-
- const droppableIndex = findClosestDroppableComponentIndex(
- $registeredComponentMetas.get(),
- componentSelector,
- insertConstraints
- );
+ const droppableIndex = findClosestDroppableComponentIndex({
+ metas: $registeredComponentMetas.get(),
+ constraints: insertConstraints,
+ instances: $instances.get(),
+ instanceSelector,
+ });
if (droppableIndex === -1) {
return;
}
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
index fdaa9178ad..35944708e2 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
@@ -596,44 +596,6 @@ test("insert into portal fragment when portal is a target", () => {
);
});
-test("wrap siblings with span when instance is rich text container", () => {
- $instances.set(
- toMap([
- createInstance("body", "Body", [
- { type: "id", value: "text" },
- { type: "id", value: "box" },
- ]),
- createInstance("text", "Text", [{ type: "text", value: "My Text" }]),
- createInstance("box", "Box", []),
- ])
- );
- $selectedInstanceSelector.set(["box", "body"]);
- const clipboardData = onCopy() ?? "";
- $selectedInstanceSelector.set(["text", "body"]);
-
- const prevInstances = $instances.get();
- onPaste(clipboardData);
- const [boxId, spanId] = getMapDifference(
- prevInstances,
- $instances.get()
- ).keys();
- expect($instances.get()).toEqual(
- toMap([
- createInstance("body", "Body", [
- { type: "id", value: "text" },
- { type: "id", value: "box" },
- ]),
- createInstance("text", "Text", [
- { type: "id", value: spanId },
- { type: "id", value: boxId },
- ]),
- createInstance("box", "Box", []),
- createInstance(boxId, "Box", []),
- createInstance(spanId, "Text", [{ type: "text", value: "My Text" }]),
- ])
- );
-});
-
test("inline data source not available in portal when copy paste inside the portal", () => {
const instances = toMap([
createInstance("body", "Body", [
diff --git a/apps/builder/app/shared/instance-utils.test.ts b/apps/builder/app/shared/instance-utils.test.ts
index 815371a03e..954900978a 100644
--- a/apps/builder/app/shared/instance-utils.test.ts
+++ b/apps/builder/app/shared/instance-utils.test.ts
@@ -291,80 +291,119 @@ describe("compute instances constraints", () => {
describe("find closest droppable component index", () => {
test("finds container", () => {
expect(
- findClosestDroppableComponentIndex(
- createFakeComponentMetas({}),
- ["Box", "Body"],
- emptyInsertConstraints
- )
+ findClosestDroppableComponentIndex({
+ metas: createFakeComponentMetas({}),
+ constraints: emptyInsertConstraints,
+ instances: new Map<Instance["id"], Instance>([
+ createInstancePair("body", "Body", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", []),
+ ]),
+ instanceSelector: ["box", "body"],
+ })
).toEqual(0);
});
test("skips non containers", () => {
expect(
- findClosestDroppableComponentIndex(
- createFakeComponentMetas({}),
- ["Bold", "Italic", "Text", "Box", "Body"],
- emptyInsertConstraints
- )
+ findClosestDroppableComponentIndex({
+ metas: createFakeComponentMetas({}),
+ constraints: emptyInsertConstraints,
+ instances: new Map<Instance["id"], Instance>([
+ createInstancePair("body", "Body", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", [{ type: "id", value: "text" }]),
+ createInstancePair("text", "Text", [{ type: "id", value: "italic" }]),
+ createInstancePair("italic", "Italic", [
+ { type: "id", value: "bold" },
+ ]),
+ createInstancePair("bold", "Bold", []),
+ ]),
+ instanceSelector: ["bold", "italic", "text", "box", "body"],
+ })
).toEqual(2);
});
test("considers invalid ancestors", () => {
expect(
- findClosestDroppableComponentIndex(
- createFakeComponentMetas({}),
- ["Box", "Item", "Body"],
- {
+ findClosestDroppableComponentIndex({
+ metas: createFakeComponentMetas({}),
+ constraints: {
requiredAncestors: new Set(),
invalidAncestors: new Set(["Item"]),
- }
- )
+ },
+ instances: new Map<Instance["id"], Instance>([
+ createInstancePair("body", "Body", [{ type: "id", value: "item" }]),
+ createInstancePair("item", "Item", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", []),
+ ]),
+ instanceSelector: ["box", "item", "body"],
+ })
).toEqual(2);
});
test("requires some ancestor", () => {
expect(
- findClosestDroppableComponentIndex(
- createFakeComponentMetas({}),
- ["Box", "Body"],
- {
+ findClosestDroppableComponentIndex({
+ metas: createFakeComponentMetas({}),
+ constraints: {
requiredAncestors: new Set(["Form"]),
invalidAncestors: new Set(),
- }
- )
+ },
+ instances: new Map<Instance["id"], Instance>([
+ createInstancePair("body", "Body", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", []),
+ ]),
+ instanceSelector: ["box", "body"],
+ })
).toEqual(-1);
expect(
- findClosestDroppableComponentIndex(
- createFakeComponentMetas({}),
- ["Box", "Form", "Body"],
- {
+ findClosestDroppableComponentIndex({
+ metas: createFakeComponentMetas({}),
+ constraints: {
requiredAncestors: new Set(["Form"]),
invalidAncestors: new Set(),
- }
- )
+ },
+ instances: new Map<Instance["id"], Instance>([
+ createInstancePair("body", "Body", [{ type: "id", value: "form" }]),
+ createInstancePair("form", "Form", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", []),
+ ]),
+ instanceSelector: ["box", "form", "body"],
+ })
).toEqual(0);
});
test("considers both required and invalid ancestors", () => {
expect(
- findClosestDroppableComponentIndex(
- createFakeComponentMetas({}),
- ["Div", "Box", "Form", "Body"],
- {
+ findClosestDroppableComponentIndex({
+ metas: createFakeComponentMetas({}),
+ constraints: {
requiredAncestors: new Set(["Form"]),
invalidAncestors: new Set(["Box"]),
- }
- )
+ },
+ instances: new Map<Instance["id"], Instance>([
+ createInstancePair("body", "Body", [{ type: "id", value: "form" }]),
+ createInstancePair("form", "Form", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", [{ type: "id", value: "div" }]),
+ createInstancePair("div", "Div", []),
+ ]),
+ instanceSelector: ["div", "box", "form", "body"],
+ })
).toEqual(2);
expect(
- findClosestDroppableComponentIndex(
- createFakeComponentMetas({}),
- ["Div", "Form", "Box", "Body"],
- {
+ findClosestDroppableComponentIndex({
+ metas: createFakeComponentMetas({}),
+ constraints: {
requiredAncestors: new Set(["Form"]),
invalidAncestors: new Set(["Box"]),
- }
- )
+ },
+ instances: new Map<Instance["id"], Instance>([
+ createInstancePair("body", "Body", [{ type: "id", value: "form" }]),
+ createInstancePair("form", "Form", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", [{ type: "id", value: "div" }]),
+ createInstancePair("div", "Div", []),
+ ]),
+ instanceSelector: ["div", "form", "box", "body"],
+ })
).toEqual(-1);
});
});
@@ -437,6 +476,58 @@ describe("find closest droppable target", () => {
position: 1,
});
});
+
+ test("finds closest container that doesn't have a direct text child", () => {
+ const instances = new Map([
+ createInstancePair("body", "Body", [
+ { type: "id", value: "box1" },
+ { type: "id", value: "paragraph" },
+ { type: "id", value: "box2" },
+ ]),
+ createInstancePair("paragraph", "Paragraph", [
+ { type: "text", value: "some text" },
+ ]),
+ createInstancePair("box1", "Box1", []),
+ createInstancePair("box2", "Box2", []),
+ ]);
+ expect(
+ findClosestDroppableTarget(
+ defaultMetasMap,
+ instances,
+ ["paragraph", "body"],
+ emptyInsertConstraints
+ )
+ ).toEqual({
+ parentSelector: ["body"],
+ position: 2,
+ });
+ });
+
+ test("finds closest container that doesn't have an expression as a child", () => {
+ const instances = new Map([
+ createInstancePair("body", "Body", [
+ { type: "id", value: "box1" },
+ { type: "id", value: "paragraph" },
+ { type: "id", value: "box2" },
+ ]),
+ createInstancePair("paragraph", "Paragraph", [
+ { type: "expression", value: '"bla"' },
+ ]),
+ createInstancePair("box1", "Box1", []),
+ createInstancePair("box2", "Box2", []),
+ ]);
+ expect(
+ findClosestDroppableTarget(
+ defaultMetasMap,
+ instances,
+ ["paragraph", "body"],
+ emptyInsertConstraints
+ )
+ ).toEqual({
+ parentSelector: ["body"],
+ position: 2,
+ });
+ });
});
describe("insert instance children", () => {
@@ -654,6 +745,61 @@ test("insert template data with instances", () => {
);
});
+test("insert template inside text-only instance should wrap the text into Text instance", () => {
+ $instances.set(
+ toMap([
+ createInstance("body", "Body", [
+ {
+ type: "id",
+ value: "heading",
+ },
+ ]),
+ createInstance("heading", "Heading", [
+ { type: "text", value: "Heading text" },
+ ]),
+ ])
+ );
+ insertTemplateData(
+ {
+ children: [{ type: "id", value: "box" }],
+ instances: [createInstance("box", "Box", [])],
+ props: [],
+ dataSources: [],
+ styleSourceSelections: [],
+ styleSources: [],
+ styles: [],
+ assets: [],
+ resources: [],
+ breakpoints: [],
+ },
+ { parentSelector: ["heading", "body"], position: "end" }
+ );
+
+ expect($instances.get()).toEqual(
+ toMap<Instance>([
+ createInstance("body", "Body", [
+ {
+ type: "id",
+ value: "heading",
+ },
+ ]),
+ createInstance("heading", "Heading", [
+ {
+ type: "id",
+ value: expect.not.stringMatching("text") as unknown as string,
+ },
+ { type: "id", value: "box" },
+ ]),
+ createInstance(
+ expect.not.stringMatching("text") as unknown as string,
+ "Text",
+ [{ type: "text", value: "Heading text" }]
+ ),
+ createInstance("box", "Box", []),
+ ])
+ );
+});
+
test("insert template data with only new style sources", () => {
$instances.set(new Map([createInstancePair("body", "Body", [])]));
$styleSourceSelections.set(new Map());
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index 13d30fcf86..4ab6c783ef 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -295,12 +295,30 @@ export const computeInstancesConstraints = (
};
};
-export const findClosestDroppableComponentIndex = (
- metas: Map<string, WsComponentMeta>,
- componentSelector: string[],
- constraints: InsertConstraints
-) => {
+export const findClosestDroppableComponentIndex = ({
+ metas,
+ constraints,
+ instances,
+ instanceSelector,
+ allowInsertIntoTextContainer = true,
+}: {
+ metas: Map<string, WsComponentMeta>;
+ constraints: InsertConstraints;
+ instances: Instances;
+ instanceSelector: InstanceSelector;
+ allowInsertIntoTextContainer?: boolean;
+}) => {
const { requiredAncestors, invalidAncestors } = constraints;
+ const componentSelector: string[] = [];
+ for (const instanceId of instanceSelector) {
+ const instance = instances.get(instanceId);
+ if (instance === undefined) {
+ componentSelector.push("Fragment");
+ continue;
+ }
+ // Collection produce fake instances and fragment does not have constraints.
+ componentSelector.push(instance.component);
+ }
let containerIndex = -1;
let requiredFound = false;
@@ -311,6 +329,18 @@ export const findClosestDroppableComponentIndex = (
requiredFound = false;
continue;
}
+ if (allowInsertIntoTextContainer === false) {
+ const instance = instances.get(instanceSelector[index]);
+ if (instance !== undefined) {
+ const hasTextChild = instance.children.some(
+ (child) => child.type === "text" || child.type === "expression"
+ );
+ if (hasTextChild) {
+ containerIndex = -1;
+ continue;
+ }
+ }
+ }
if (requiredAncestors.has(ancestorComponent) === true) {
requiredFound = true;
}
@@ -332,26 +362,17 @@ export const findClosestDroppableTarget = (
instanceSelector: InstanceSelector,
insertConstraints: InsertConstraints
): undefined | DroppableTarget => {
- const componentSelector: string[] = [];
- for (const instanceId of instanceSelector) {
- const component = instances.get(instanceId)?.component;
- // collection produce fake instances
- // and fragment does not have constraints
- if (component === undefined) {
- componentSelector.push("Fragment");
- continue;
- }
- componentSelector.push(component);
- }
-
- const droppableIndex = findClosestDroppableComponentIndex(
+ const droppableIndex = findClosestDroppableComponentIndex({
metas,
- componentSelector,
- insertConstraints
- );
+ constraints: insertConstraints,
+ instances,
+ instanceSelector,
+ allowInsertIntoTextContainer: false,
+ });
if (droppableIndex === -1) {
return;
}
+
if (droppableIndex === 0) {
return {
parentSelector: instanceSelector,
diff --git a/packages/sdk-components-react/src/list-item.ws.ts b/packages/sdk-components-react/src/list-item.ws.ts
index f1cdc3c9cb..797e511bfc 100644
--- a/packages/sdk-components-react/src/list-item.ws.ts
+++ b/packages/sdk-components-react/src/list-item.ws.ts
@@ -26,7 +26,7 @@ export const meta: WsComponentMeta = {
template: [
{
type: "instance",
- component: "List Item",
+ component: "ListItem",
children: [
{
type: "text",
diff --git a/packages/sdk-components-react/src/list.ws.ts b/packages/sdk-components-react/src/list.ws.ts
index 7a356fdb58..7fa1859f9d 100644
--- a/packages/sdk-components-react/src/list.ws.ts
+++ b/packages/sdk-components-react/src/list.ws.ts
@@ -59,17 +59,35 @@ export const meta: WsComponentMeta = {
{
type: "instance",
component: "ListItem",
- children: [],
+ children: [
+ {
+ type: "text",
+ value: "List Item text you can edit",
+ placeholder: true,
+ },
+ ],
},
{
type: "instance",
component: "ListItem",
- children: [],
+ children: [
+ {
+ type: "text",
+ value: "List Item text you can edit",
+ placeholder: true,
+ },
+ ],
},
{
type: "instance",
component: "ListItem",
- children: [],
+ children: [
+ {
+ type: "text",
+ value: "List Item text you can edit",
+ placeholder: true,
+ },
+ ],
},
],
},