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
experimental: migrate typography section to style object model (#4091)
Bogdan Chadkin5d206b2e9308
diff --git a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsxindex 133c30e1f3..3bddc8a7de 100644--- a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx@@ -5,7 +5,6 @@ import {NestedInputButton,} from "@webstudio-is/design-system";import { FontsManager } from "~/builder/shared/fonts-manager";-import type { ControlProps } from "../types";import { FloatingPanel } from "~/builder/shared/floating-panel";import { forwardRef, useMemo, useState, type ComponentProps } from "react";import { toValue } from "@webstudio-is/css-engine";@@ -15,6 +14,8 @@ import { toItems } from "~/builder/shared/fonts-manager";import { UploadIcon } from "@webstudio-is/icons";import { styleConfigByName } from "../../shared/configs";import { parseCssValue } from "@webstudio-is/css-data";+import { useComputedStyleDecl } from "../../shared/model";+import { setProperty } from "../../shared/use-style-data";type Item = { value: string; label?: string };@@ -40,13 +41,10 @@ const matchOrSuggestToCreate = (return matched;};-export const FontFamilyControl = ({- property,- currentStyle,- setProperty,-}: ControlProps) => {- const value = currentStyle[property]?.value;- const setValue = setProperty(property);+export const FontFamilyControl = () => {+ const fontFamily = useComputedStyleDecl("fontFamily");+ const value = fontFamily.cascadedValue;+ const setValue = setProperty("fontFamily");const [intermediateValue, setIntermediateValue] = useState<string | undefined>();diff --git a/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsxindex 30298c42a2..03690beec6 100644--- a/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx@@ -3,8 +3,9 @@ import { type FontWeight, fontWeights } from "@webstudio-is/fonts";import { toValue } from "@webstudio-is/css-engine";import { useMemo } from "react";import { useAssets } from "~/builder/shared/assets";-import type { ControlProps } from "../types";import { isSupportedFontWeight } from "./is-supported-font-weight";+import { useComputedStyles } from "../../shared/model";+import { setProperty } from "../../shared/use-style-data";type FontWeightItem = {label: string;@@ -73,19 +74,15 @@ const useLabels = (return { labels, selectedLabel };};-export const FontWeightControl = ({- property,- currentStyle,- setProperty,- isAdvanced,-}: ControlProps) => {- const fontWeight = currentStyle[property]?.value;-+export const FontWeightControl = () => {// We need the font family to determine which font weights are available- const fontFamily = currentStyle.fontFamily?.value;+ const [fontWeight, fontFamily] = useComputedStyles([+ "fontWeight",+ "fontFamily",+ ]);const availableFontWeights = useAvailableFontWeights(- toValue(fontFamily, (styleValue) => {+ toValue(fontFamily.cascadedValue, (styleValue) => {// override default fallback with rendering only first font familyif (styleValue.type === "fontFamily") {return {@@ -97,10 +94,10 @@ export const FontWeightControl = ({);const { labels, selectedLabel } = useLabels(availableFontWeights,- toValue(fontWeight)+ toValue(fontWeight.cascadedValue));- const setValue = setProperty(property);+ const setValue = setProperty("fontWeight");const setFontWeight = (label: string, options?: { isEphemeral: boolean }) => {const selected = availableFontWeights.find(@@ -113,7 +110,6 @@ export const FontWeightControl = ({return (<Select- disabled={isAdvanced}// show empty field instead of radix placeholder// like css value input doesplaceholder=""@@ -125,7 +121,7 @@ export const FontWeightControl = ({// Remove preview when mouse leaves the item.if (label === undefined) {if (fontWeight !== undefined) {- setValue(fontWeight, { isEphemeral: true });+ setValue(fontWeight.cascadedValue, { isEphemeral: true });}return;}@@ -135,7 +131,7 @@ export const FontWeightControl = ({onOpenChange={(isOpen) => {// Remove ephemeral changes when closing the menu.if (isOpen === false && fontWeight !== undefined) {- setValue(fontWeight, { isEphemeral: true });+ setValue(fontWeight.cascadedValue, { isEphemeral: true });}}}/>diff --git a/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx b/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsxindex 025f37a56b..657e5e4ff7 100644--- a/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx@@ -108,10 +108,7 @@ export const ToggleGroupControl = ({}) => {const styles = useComputedStyles(properties);const styleValueSource = getPriorityStyleValueSource(styles);- const selectedValue = toValue(- styles.find((styleDecl) => styleDecl.source.name !== "default")- ?.cascadedValue- );+ const selectedValue = toValue(styles[0].cascadedValue);const values = styles.map((styleDecl) => toValue(styleDecl.cascadedValue));const isAdvanced =// show value as advanced when value is not represent with buttonsdiff --git a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsxindex 4f3dc8b3c1..d526709819 100644--- a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx@@ -5,17 +5,10 @@ import {EnhancedTooltip,theme,IconButton,+ Box,} from "@webstudio-is/design-system";import { propertyDescriptions } from "@webstudio-is/css-data";import type { StyleProperty } from "@webstudio-is/css-engine";-import type { SectionProps } from "../shared/section";-import {- ColorControl,- FontFamilyControl,- FontWeightControl,- SelectControl,- TextControl,-} from "../../controls";import {CrossSmallIcon,EllipsesIcon,@@ -35,10 +28,30 @@ import {TextUppercaseIcon,} from "@webstudio-is/icons";import { ToggleGroupControl } from "../../controls/toggle-group/toggle-group-control";+import {+ ColorControl,+ FontFamilyControl,+ FontWeightControl,+ SelectControl,+ TextControl,+} from "../../controls";import { FloatingPanel } from "~/builder/shared/floating-panel";-import { getStyleSourceColor, type StyleInfo } from "../../shared/style-info";import { StyleSection } from "../../shared/style-section";-import { PropertyLabel } from "../../property-label";+import {+ getPriorityStyleValueSource,+ PropertyLabel,+} from "../../property-label";+import { useComputedStyles } from "../../shared/model";+import { createBatchUpdate } from "../../shared/use-style-data";++const advancedProperties: StyleProperty[] = [+ "whiteSpaceCollapse",+ "textWrapMode",+ "textWrapStyle",+ "direction",+ "hyphens",+ "textOverflow",+];export const properties = ["fontFamily",@@ -51,29 +64,22 @@ export const properties = ["textDecorationLine","letterSpacing","textTransform",- "direction",- "whiteSpaceCollapse",- "textWrapMode",- "textWrapStyle",- "textOverflow",- "hyphens",+ ...advancedProperties,] satisfies Array<StyleProperty>;-export const Section = (props: SectionProps) => {+export const Section = () => {return (<StyleSection label="Typography" properties={properties}><Flex gap="2" direction="column">- <TypographySectionFont {...props} />+ <TypographySectionFont /><TypographySectionSizing />- <TypographySectionAdvanced {...props} />+ <TypographySectionAdvanced /></Flex></StyleSection>);};-export const TypographySectionFont = (props: SectionProps) => {- const { currentStyle, setProperty, deleteProperty } = props;-+const TypographySectionFont = () => {return (<Grid css={{ gridTemplateColumns: "4fr 6fr" }} gap={2}><PropertyLabel@@ -81,23 +87,13 @@ export const TypographySectionFont = (props: SectionProps) => {description={propertyDescriptions.fontFamily}properties={["fontFamily"]}/>- <FontFamilyControl- property="fontFamily"- currentStyle={currentStyle}- setProperty={setProperty}- deleteProperty={deleteProperty}- />+ <FontFamilyControl /><PropertyLabellabel="Weight"description={propertyDescriptions.fontWeight}properties={["fontWeight"]}/>- <FontWeightControl- property="fontWeight"- currentStyle={currentStyle}- setProperty={setProperty}- deleteProperty={deleteProperty}- />+ <FontWeightControl /><PropertyLabellabel="Color"description={propertyDescriptions.color}@@ -139,7 +135,7 @@ const TypographySectionSizing = () => {);};-export const TypographySectionAdvanced = (props: SectionProps) => {+const TypographySectionAdvanced = () => {return (<Grid gap="2" columns="2" align="end"><ToggleGroupControl@@ -236,7 +232,7 @@ export const TypographySectionAdvanced = (props: SectionProps) => {},]}/>- <TypographySectionAdvancedPopover {...props} />+ <TypographySectionAdvancedPopover /></Grid></Grid>);@@ -245,17 +241,12 @@ export const TypographySectionAdvanced = (props: SectionProps) => {const AdvancedOptionsButton = forwardRef<HTMLButtonElement,ComponentProps<typeof IconButton> & {- currentStyle: StyleInfo;- properties: StyleProperty[];- onReset: () => void;/** https://www.radix-ui.com/docs/primitives/components/collapsible#trigger */"data-state"?: "open" | "closed";}->(({ currentStyle, properties, onReset, onClick, ...rest }, ref) => {- const styleSourceColor = getStyleSourceColor({- properties,- currentStyle,- });+>(({ onClick, ...rest }, ref) => {+ const styles = useComputedStyles(advancedProperties);+ const styleValueSourceColor = getPriorityStyleValueSource(styles);return (<Flex><EnhancedTooltip content="More typography options">@@ -263,12 +254,16 @@ const AdvancedOptionsButton = forwardRef<{...rest}onClick={(event) => {if (event.altKey) {- onReset();+ const batch = createBatchUpdate();+ for (const property of advancedProperties) {+ batch.deleteProperty(property);+ }+ batch.publish();return;}onClick?.(event);}}- variant={styleSourceColor}+ variant={styleValueSourceColor}ref={ref}><EllipsesIcon />@@ -279,17 +274,7 @@ const AdvancedOptionsButton = forwardRef<});AdvancedOptionsButton.displayName = "AdvancedOptionsButton";-const advancedProperties: StyleProperty[] = [- "whiteSpaceCollapse",- "textWrapMode",- "textWrapStyle",- "direction",- "hyphens",- "textOverflow",-];--export const TypographySectionAdvancedPopover = (props: SectionProps) => {- const { createBatchUpdate, currentStyle } = props;+const TypographySectionAdvancedPopover = () => {return (<FloatingPaneltitle="Advanced Typography"@@ -301,116 +286,102 @@ export const TypographySectionAdvancedPopover = (props: SectionProps) => {width: theme.spacing[30],}}>- <Grid css={{ gridTemplateColumns: "4fr 6fr" }} gap={2}>+ <Grid css={{ gridTemplateColumns: "5fr 5fr" }} gap={2}><PropertyLabellabel="White Space"description={propertyDescriptions.whiteSpaceCollapse}properties={["whiteSpaceCollapse"]}/><SelectControl property="whiteSpaceCollapse" />- </Grid>- <Grid css={{ gridTemplateColumns: "4fr 6fr" }} gap={2}><PropertyLabellabel="Wrap Mode"description={propertyDescriptions.textWrapMode}properties={["textWrapMode"]}/><SelectControl property="textWrapMode" />- </Grid>- <Grid css={{ gridTemplateColumns: "4fr 6fr" }} gap={2}><PropertyLabellabel="Wrap Style"description={propertyDescriptions.textWrapStyle}properties={["textWrapStyle"]}/><SelectControl property="textWrapStyle" />- </Grid>- <Grid css={{ gridTemplateColumns: "4fr auto" }}><PropertyLabellabel="Direction"description={propertyDescriptions.direction}properties={["direction"]}/>- <ToggleGroupControl- properties={["direction"]}- items={[- {- child: <TextDirectionLTRIcon />,- description:- "Sets the text direction to left-to-right, which is the default for most languages.",- value: "ltr",- },- {- child: <TextDirectionRTLIcon />,- description:- "Sets the text direction to right-to-left, typically used for languages such as Arabic or Hebrew.",- value: "rtl",- },- ]}- />- </Grid>- <Grid css={{ gridTemplateColumns: "4fr auto" }}>+ <Box css={{ justifySelf: "end" }}>+ <ToggleGroupControl+ properties={["direction"]}+ items={[+ {+ child: <TextDirectionLTRIcon />,+ description:+ "Sets the text direction to left-to-right, which is the default for most languages.",+ value: "ltr",+ },+ {+ child: <TextDirectionRTLIcon />,+ description:+ "Sets the text direction to right-to-left, typically used for languages such as Arabic or Hebrew.",+ value: "rtl",+ },+ ]}+ />+ </Box><PropertyLabellabel="Hyphens"description={propertyDescriptions.hyphens}properties={["hyphens"]}/>- <ToggleGroupControl- properties={["hyphens"]}- items={[- {- child: <CrossSmallIcon />,- description:- "Disables hyphenation of words. Words will not be hyphenated even if they exceed the width of their container.",- value: "manual",- },- {- child: <TextHyphenIcon />,- description:- "Enables automatic hyphenation of words. The browser will hyphenate long words at appropriate points to fit within the width of their container.",- value: "auto",- },- ]}- />- </Grid>- <Grid css={{ gridTemplateColumns: "4fr auto" }}>+ <Box css={{ justifySelf: "end" }}>+ <ToggleGroupControl+ properties={["hyphens"]}+ items={[+ {+ child: <CrossSmallIcon />,+ description:+ "Disables hyphenation of words. Words will not be hyphenated even if they exceed the width of their container.",+ value: "manual",+ },+ {+ child: <TextHyphenIcon />,+ description:+ "Enables automatic hyphenation of words. The browser will hyphenate long words at appropriate points to fit within the width of their container.",+ value: "auto",+ },+ ]}+ />+ </Box><PropertyLabellabel="Text Overflow"description={propertyDescriptions.textOverflow}properties={["textOverflow"]}/>- <ToggleGroupControl- properties={["textOverflow"]}- items={[- {- child: <CrossSmallIcon />,- description:- "The overflowing text is clipped and hidden without any indication.",- value: "clip",- },- {- child: <TextTruncateIcon />,- description:- "The overflowing text is truncated with an ellipsis (...) to indicate that there is more content. To make the text-overflow: ellipsis property work, you need to set the following CSS properties: white-space: nowrap; overflow: hidden;",- value: "ellipsis",- },- ]}- />+ <Box css={{ justifySelf: "end" }}>+ <ToggleGroupControl+ properties={["textOverflow"]}+ items={[+ {+ child: <CrossSmallIcon />,+ description:+ "The overflowing text is clipped and hidden without any indication.",+ value: "clip",+ },+ {+ child: <TextTruncateIcon />,+ description:+ "The overflowing text is truncated with an ellipsis (...) to indicate that there is more content. To make the text-overflow: ellipsis property work, you need to set the following CSS properties: white-space: nowrap; overflow: hidden;",+ value: "ellipsis",+ },+ ]}+ />+ </Box></Grid></Grid>}>- <AdvancedOptionsButton- currentStyle={currentStyle}- properties={advancedProperties}- onReset={() => {- const batch = createBatchUpdate();- Object.values(advancedProperties).forEach((property) => {- batch.deleteProperty(property);- });- batch.publish();- }}- />+ <AdvancedOptionsButton /></FloatingPanel>);};