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 parent style calculation for unstylable parent components (#2167)
Ivan Starkov52b01efa3baa
diff --git a/apps/builder/app/builder/features/style-panel/parent-style.ts b/apps/builder/app/builder/features/style-panel/parent-style.tsnew file mode 100644index 0000000000..8661ca40c0--- /dev/null+++ b/apps/builder/app/builder/features/style-panel/parent-style.ts@@ -0,0 +1,31 @@+import { useStore } from "@nanostores/react";+import { useStyleInfoByInstanceId } from "./shared/style-info";+import {+ instancesStore,+ registeredComponentMetasStore,+ selectedInstanceSelectorStore,+} from "~/shared/nano-states";++/**+ * Gets styleable parent style+ **/+export const useParentStyle = () => {+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);+ const instances = useStore(instancesStore);+ const registeredComponentMetas = useStore(registeredComponentMetasStore);++ let parentInstanceSelector: string[] | undefined = undefined;+ for (let i = 1; i < (selectedInstanceSelector?.length ?? 0); ++i) {+ parentInstanceSelector = selectedInstanceSelector!.slice(i);+ const component = instances.get(parentInstanceSelector[0])?.component;+ const meta = component+ ? registeredComponentMetas.get(component)+ : undefined;+ if (meta?.stylable !== false) {+ break;+ }+ }++ const parentStyleInfo = useStyleInfoByInstanceId(parentInstanceSelector);+ return parentStyleInfo;+};diff --git a/apps/builder/app/builder/features/style-panel/sections/position/position.tsx b/apps/builder/app/builder/features/style-panel/sections/position/position.tsxindex 449da3a998..6560798b54 100644--- a/apps/builder/app/builder/features/style-panel/sections/position/position.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/position/position.tsx@@ -6,24 +6,10 @@ import { SelectControl, TextControl } from "../../controls";import { PropertyName } from "../../shared/property-name";import { styleConfigByName } from "../../shared/configs";import { PositionControl } from "./position-control";-import { useStyleInfoByInstanceId } from "../../shared/style-info";-import { selectedInstanceSelectorStore } from "~/shared/nano-states";-import { useStore } from "@nanostores/react";+import { useParentStyle } from "../../parent-style";const properties: StyleProperty[] = ["position"];-const useParentStyle = () => {- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- const parentInstanceSelector =- // root does not have parent- selectedInstanceSelector?.length === 1- ? undefined- : selectedInstanceSelector?.slice(1);- const parentStyleInfo = useStyleInfoByInstanceId(parentInstanceSelector);-- return parentStyleInfo;-};-const positionControlVisibleProperties = ["relative","absolute",diff --git a/apps/builder/app/builder/features/style-panel/style-settings.tsx b/apps/builder/app/builder/features/style-panel/style-settings.tsxindex 8e3a24811e..0280c44513 100644--- a/apps/builder/app/builder/features/style-panel/style-settings.tsx+++ b/apps/builder/app/builder/features/style-panel/style-settings.tsx@@ -13,8 +13,8 @@ import {selectedInstanceIntanceToTagStore,selectedInstanceSelectorStore,} from "~/shared/nano-states";-import { useStyleInfoByInstanceId } from "./shared/style-info";import { computed } from "nanostores";+import { useParentStyle } from "./parent-style";export type StyleSettingsProps = {currentStyle: StyleInfo;@@ -23,18 +23,6 @@ export type StyleSettingsProps = {createBatchUpdate: CreateBatchUpdate;};-const useParentStyle = () => {- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- const parentInstanceSelector =- // root does not have parent- selectedInstanceSelector?.length === 1- ? undefined- : selectedInstanceSelector?.slice(1);- const parentStyleInfo = useStyleInfoByInstanceId(parentInstanceSelector);-- return parentStyleInfo;-};-const selectedInstanceTagStore = computed([selectedInstanceSelectorStore, selectedInstanceIntanceToTagStore],(instanceSelector, instanceToTag) => {diff --git a/packages/sdk-components-react-radix/src/button.ws.ts b/packages/sdk-components-react-radix/src/button.ws.tsindex 3a9ac940b8..4246d7aad5 100644--- a/packages/sdk-components-react-radix/src/button.ws.ts+++ b/packages/sdk-components-react-radix/src/button.ws.ts@@ -169,5 +169,5 @@ export const meta: WsComponentMeta = {export const propsMeta: WsComponentPropsMeta = {props,- initialProps: ["id", "type", "variant", "size", "aria-label"],+ initialProps: ["id", "type", "aria-label"],};diff --git a/packages/sdk-components-react-radix/src/dialog.ws.tsx b/packages/sdk-components-react-radix/src/dialog.ws.tsxindex bfade1ed1c..15d7abc93d 100644--- a/packages/sdk-components-react-radix/src/dialog.ws.tsx+++ b/packages/sdk-components-react-radix/src/dialog.ws.tsx@@ -272,7 +272,7 @@ export const metaDialog: WsComponentMeta = {export const propsMetaDialog: WsComponentPropsMeta = {props: propsDialog,- initialProps: ["open", "modal"],+ initialProps: ["open"],};export const propsMetaDialogTrigger: WsComponentPropsMeta = {diff --git a/packages/sdk-components-react-radix/src/popover.ws.tsx b/packages/sdk-components-react-radix/src/popover.ws.tsxindex 8fba3d190a..2b871c07ff 100644--- a/packages/sdk-components-react-radix/src/popover.ws.tsx+++ b/packages/sdk-components-react-radix/src/popover.ws.tsx@@ -111,7 +111,7 @@ export const metaPopover: WsComponentMeta = {export const propsMetaPopover: WsComponentPropsMeta = {props: propsPopover,- initialProps: ["open", "modal"],+ initialProps: ["open"],};export const propsMetaPopoverTrigger: WsComponentPropsMeta = {diff --git a/packages/sdk-components-react-radix/src/sheet.ws.tsx b/packages/sdk-components-react-radix/src/sheet.ws.tsxindex 2f1c3da0a7..95f25fa515 100644--- a/packages/sdk-components-react-radix/src/sheet.ws.tsx+++ b/packages/sdk-components-react-radix/src/sheet.ws.tsx@@ -306,7 +306,7 @@ export const metaSheet: WsComponentMeta = {export const propsMetaSheet: WsComponentPropsMeta = {props: propsSheet,- initialProps: ["open", "modal"],+ initialProps: ["open"],};export const propsMetaSheetTrigger: WsComponentPropsMeta = {