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
feat: inline variables outside current component/slot (#2778)
Bogdan Chadkina76c29fc05d7
diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex 25378a6616..2b4144590d 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -187,6 +187,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({slice,availableDataSources: findAvailableDataSources($dataSources.get(),+ $instances.get(),parentInstanceSelector),beforeTransactionEnd: (rootInstanceId, draft) => {diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts b/apps/builder/app/shared/copy-paste/plugin-instance.test.tsindex fbfa57b213..fbf3e75cb7 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts@@ -27,7 +27,7 @@ import {$registeredComponentMetas,$selectedPageId,} from "../nano-states";-import { onCopy, onPaste } from "./plugin-instance";+import { onCopy, onCut, onPaste } from "./plugin-instance";import { createDefaultPages } from "@webstudio-is/project-build";const expectString = expect.any(String) as unknown as string;@@ -629,3 +629,66 @@ test("wrap siblings with span when instance is rich text container", () => {]));});++test("inline data source not available in portal when copy paste inside the portal", () => {+ const instances = toMap([+ createInstance("body", "Body", [+ { type: "id", value: "box" },+ { type: "id", value: "portal" },+ ]),+ createInstance("box", "Box", []),+ createInstance("portal", portalComponent, [+ { type: "id", value: "fragment" },+ ]),+ createInstance("fragment", "Fragment", []),+ ]);+ $instances.set(instances);+ const dataSources = toMap<DataSource>([+ {+ id: "variableId",+ scopeInstanceId: "body",+ name: "variableName",+ type: "variable",+ value: { type: "string", value: "value" },+ },+ ]);+ $dataSources.set(dataSources);+ const props = toMap<Prop>([+ {+ id: "propId",+ instanceId: "box",+ name: "data-value",+ type: "expression",+ value: "$ws$dataSource$variableId",+ },+ ]);+ $props.set(props);+ $selectedInstanceSelector.set(["box", "body"]);+ const clipboardData = onCut() ?? "";+ $selectedInstanceSelector.set(["fragment", "portal", "body"]);+ onPaste(clipboardData);+ expect($instances.get()).toEqual(+ toMap([+ createInstance("body", "Body", [{ type: "id", value: "portal" }]),+ createInstance("portal", portalComponent, [+ { type: "id", value: "fragment" },+ ]),+ createInstance("fragment", "Fragment", [+ { type: "id", value: expectString },+ ]),+ createInstance(expectString, "Box", []),+ ])+ );+ expect($dataSources.get()).toEqual(dataSources);+ expect($props.get()).toEqual(+ toMap<Prop>([+ {+ id: expectString,+ instanceId: expectString,+ name: "data-value",+ type: "expression",+ value: `"value"`,+ },+ ])+ );+});diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.tsindex 0bd5ec4d47..9afdabd38c 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts@@ -206,6 +206,7 @@ export const onPaste = (clipboardData: string): boolean => {slice: data,availableDataSources: findAvailableDataSources($dataSources.get(),+ $instances.get(),instanceSelector),beforeTransactionEnd: (rootInstanceId, draft) => {diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex f7ad38ddfd..a5d3f0f413 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -722,9 +722,18 @@ export const getInstancesSlice = (rootInstanceId: string) => {export const findAvailableDataSources = (dataSources: DataSources,+ instances: Instances,instanceSelector: InstanceSelector) => {- const instanceIds = new Set(instanceSelector);+ // inline data sources not scoped to current portal+ const instanceIds = new Set();+ for (const instanceId of instanceSelector) {+ const instance = instances.get(instanceId);+ if (instance?.component === portalComponent) {+ break;+ }+ instanceIds.add(instanceId);+ }const availableDataSources = new Set<DataSource["id"]>();for (const { id, scopeInstanceId } of dataSources.values()) {if (scopeInstanceId && instanceIds.has(scopeInstanceId)) {