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 flex children sections are showing on wrong elements (#1078)
Ivan Starkov74f87ccada36
diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.tsindex 161099a624..134bfa7c58 100644--- a/apps/builder/app/builder/features/style-panel/shared/style-info.ts+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.ts@@ -282,3 +282,69 @@ export const useStyleInfo = () => {return styleInfoData;};++export const useInstanceStyleData = (+ instanceId: Instance["id"] | undefined+) => {+ const instancesIndex = useStore(instancesIndexStore);+ const { stylesByInstanceId } = useStore(stylesIndexStore);+ const [breakpoints] = useBreakpoints();+ const selectedBreakpoint = useStore(selectedBreakpointStore);+ const selectedBreakpointId = selectedBreakpoint?.id;++ const cascadedBreakpointIds = useMemo(+ () => getCascadedBreakpointIds(breakpoints, selectedBreakpointId),+ [breakpoints, selectedBreakpointId]+ );++ const selfAndCascadeInfo = useMemo(() => {+ if (instanceId === undefined || selectedBreakpointId === undefined) {+ return {};+ }+ return getCascadedInfo(stylesByInstanceId, instanceId, [+ ...cascadedBreakpointIds,+ selectedBreakpointId,+ ]);+ }, [+ stylesByInstanceId,+ instanceId,+ cascadedBreakpointIds,+ selectedBreakpointId,+ ]);++ const inheritedInfo = useMemo(() => {+ if (selectedBreakpointId === undefined || instanceId === undefined) {+ return {};+ }+ return getInheritedInfo(+ instancesIndex,+ stylesByInstanceId,+ instanceId,+ cascadedBreakpointIds,+ selectedBreakpointId+ );+ }, [+ instancesIndex,+ stylesByInstanceId,+ cascadedBreakpointIds,+ selectedBreakpointId,+ instanceId,+ ]);++ const styleData = useMemo(() => {+ const styleData: Style = {};+ for (const property of styleProperties) {+ // temporary solution until we start computing all styles from data+ const inherited = inheritedInfo[property];+ const cascaded = selfAndCascadeInfo[property];+ const value = cascaded?.value ?? inherited?.value;++ if (value) {+ styleData[property] = value;+ }+ }+ return styleData;+ }, [selfAndCascadeInfo, inheritedInfo]);++ return styleData;+};diff --git a/apps/builder/app/builder/features/style-panel/style-sections.tsx b/apps/builder/app/builder/features/style-panel/style-sections.tsxindex 488a2bf03d..37139551e5 100644--- a/apps/builder/app/builder/features/style-panel/style-sections.tsx+++ b/apps/builder/app/builder/features/style-panel/style-sections.tsx@@ -2,7 +2,7 @@ import { Grid } from "@webstudio-is/design-system";import { toValue } from "@webstudio-is/css-engine";import { styleConfigByName } from "./shared/configs";import type { Category } from "@webstudio-is/react-sdk";-import type { StyleProperty } from "@webstudio-is/css-data";+import type { Style, StyleProperty } from "@webstudio-is/css-data";import type {SetProperty,DeleteProperty,@@ -106,13 +106,13 @@ export const renderCategory = ({);};-export const shouldRenderCategory = ({- currentStyle,- category,-}: RenderCategoryProps) => {+export const shouldRenderCategory = (+ { currentStyle, category }: RenderCategoryProps,+ parentStyle: Style+) => {switch (category) {case "flexChild":- return toValue(currentStyle.display?.value).includes("flex");+ return toValue(parentStyle.display).includes("flex");case "gridChild":return toValue(currentStyle.display?.value).includes("grid");}diff --git a/apps/builder/app/builder/features/style-panel/style-settings.tsx b/apps/builder/app/builder/features/style-panel/style-settings.tsxindex 08aa28eb0b..20f2f6a25d 100644--- a/apps/builder/app/builder/features/style-panel/style-settings.tsx+++ b/apps/builder/app/builder/features/style-panel/style-settings.tsx@@ -14,6 +14,12 @@ import { dependencies } from "./shared/dependencies";import type { SetProperty, CreateBatchUpdate } from "./shared/use-style-data";import type { StyleInfo } from "./shared/style-info";import type { RenderPropertyProps } from "./style-sections";+import { useStore } from "@nanostores/react";+import {+ instancesIndexStore,+ selectedInstanceIdStore,+} from "~/shared/nano-states";+import { useInstanceStyleData } from "./shared/style-info";// Finds a property/value by using any available form: property, label, valueconst filterProperties = (@@ -92,6 +98,19 @@ export type StyleSettingsProps = {search: string;};+const useParentStyle = () => {+ const selectedInstanceId = useStore(selectedInstanceIdStore);+ const instanceIndex = useStore(instancesIndexStore);++ const parentInstance =+ selectedInstanceId === undefined+ ? undefined+ : instanceIndex.parentInstancesById.get(selectedInstanceId);++ const parentInstanceStyleData = useInstanceStyleData(parentInstance?.id);+ return parentInstanceStyleData;+};+export const StyleSettings = ({setProperty,deleteProperty,@@ -102,6 +121,9 @@ export const StyleSettings = ({const isSearchMode = search.length !== 0;const all = [];let category: Category;++ const parentStyle = useParentStyle();+for (category in categories) {// @todo seems like properties are the exact strings and styleConfig.property is not?const categoryProperties = filterProperties(@@ -156,7 +178,8 @@ export const StyleSettings = ({styleConfigsByCategory,moreStyleConfigsByCategory,};- if (shouldRenderCategory(categoryProps)) {++ if (shouldRenderCategory(categoryProps, parentStyle)) {all.push(<CollapsibleSectionisOpen={isSearchMode ? true : undefined}