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
refactor: hyphenate space and position sections (#4973)
Bogdan Chadkin68cce117e61e
diff --git a/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsx b/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsxindex 1d0f569c47..e7f5c6e124 100644--- a/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsx@@ -1,15 +1,22 @@-import { Grid, theme } from "@webstudio-is/design-system";import { useRef, useState } from "react";-import { movementMapInset, useKeyboardNavigation } from "../shared/keyboard";+import { Grid, theme } from "@webstudio-is/design-system";+import type { CssProperty, StyleValue } from "@webstudio-is/css-engine";+import { useKeyboardNavigation } from "../shared/keyboard";import { createBatchUpdate, deleteProperty } from "../../shared/use-style-data";-import { getInsetModifiersGroup, useScrub } from "../shared/scrub";+import { useScrub } from "../shared/scrub";import { ValueText } from "../shared/value-text";-import type { StyleValue } from "@webstudio-is/css-engine";-import { InputPopover } from "../shared/input-popover";-import { InsetLayout, type InsetProperty } from "./inset-layout";-import { InsetTooltip } from "./inset-tooltip";import { useComputedStyleDecl, useComputedStyles } from "../../shared/model";import { useModifierKeys, type Modifiers } from "../../shared/modifier-keys";+import { InputPopover } from "../shared/input-popover";+import { InsetLayout, type InsetProperty } from "./inset-layout";+import { getInsetModifiersGroup, InsetTooltip } from "./inset-tooltip";++const movementMapInset = {+ top: ["bottom", "right", "bottom", "left"],+ right: ["top", "left", "bottom", "left"],+ bottom: ["top", "right", "top", "left"],+ left: ["top", "right", "bottom", "right"],+} as const;const Cell = ({scrubStatus,@@ -23,7 +30,7 @@ const Cell = ({onPopoverClose: () => void;scrubStatus: ReturnType<typeof useScrub>;property: InsetProperty;- getActiveProperties: (modifiers?: Modifiers) => readonly InsetProperty[];+ getActiveProperties: (modifiers?: Modifiers) => CssProperty[];onHover: (target: HoverTarget | undefined) => void;}) => {const styleDecl = useComputedStyleDecl(property);@@ -93,7 +100,7 @@ export const InsetControl = () => {const [openProperty, setOpenProperty] = useState<InsetProperty>();const [activePopoverProperties, setActivePopoverProperties] = useState<- undefined | readonly InsetProperty[]+ undefined | CssProperty[]>();const modifiers = useModifierKeys();const handleOpenProperty = (property: undefined | InsetProperty) => {@@ -111,11 +118,14 @@ export const InsetControl = () => {});// by deafult highlight hovered or scrubbed properties- // if keyboard navigation is active, highlight its active property// if popover is open, highlight its property and hovered propertiesconst activeProperties = [...(activePopoverProperties ?? scrubStatus.properties),];+ // if keyboard navigation is active, highlight its active property+ if (keyboardNavigation.isActive) {+ activeProperties.push(keyboardNavigation.activeProperty);+ }const getActiveProperties = (modifiers?: Modifiers) => {return modifiers && openProperty? getInsetModifiersGroup(openProperty, modifiers)diff --git a/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsx b/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsxindex 731804f27b..f9f75ce845 100644--- a/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsx@@ -1,5 +1,6 @@-import { Grid, Box, theme, styled } from "@webstudio-is/design-system";import type { MouseEvent } from "react";+import { Grid, Box, theme, styled } from "@webstudio-is/design-system";+import type { CssProperty } from "@webstudio-is/css-engine";import type { Modifiers } from "../../shared/modifier-keys";const RECT_HEIGHT = 6;@@ -42,7 +43,7 @@ type InsetLayoutProps = {onHover: (args: { element: HTMLElement; property: InsetProperty } | undefined) => void;- getActiveProperties: (modifiers?: Modifiers) => readonly InsetProperty[];+ getActiveProperties: (modifiers?: Modifiers) => CssProperty[];};/*** Grid schema for graphical layoutdiff --git a/apps/builder/app/builder/features/style-panel/sections/position/inset-tooltip.tsx b/apps/builder/app/builder/features/style-panel/sections/position/inset-tooltip.tsxindex 14eac47db6..611b7c354a 100644--- a/apps/builder/app/builder/features/style-panel/sections/position/inset-tooltip.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/position/inset-tooltip.tsx@@ -1,12 +1,36 @@import { useState, type ReactElement } from "react";import { Tooltip } from "@webstudio-is/design-system";+import type { CssProperty } from "@webstudio-is/css-engine";import { useModifierKeys } from "../../shared/modifier-keys";-import { getInsetModifiersGroup } from "../shared/scrub";import { createBatchUpdate } from "../../shared/use-style-data";import type { InsetProperty } from "./inset-layout";import { PropertyInfo } from "../../property-label";import { useComputedStyles } from "../../shared/model";+const opposingInsetGroups = [+ ["top", "bottom"],+ ["left", "right"],+] satisfies CssProperty[][];++const circleInsetGroups = [+ ["top", "right", "bottom", "left"],+] satisfies CssProperty[][];++export const getInsetModifiersGroup = (+ property: CssProperty,+ modifiers: { shiftKey: boolean; altKey: boolean }+) => {+ let groups: CssProperty[][] = [];++ if (modifiers.shiftKey) {+ groups = circleInsetGroups;+ } else if (modifiers.altKey) {+ groups = opposingInsetGroups;+ }++ return groups.find((group) => group.includes(property)) ?? [property];+};+const sides = {top: "top",right: "left",@@ -15,7 +39,7 @@ const sides = {} as const;const propertyContents: {- properties: InsetProperty[];+ properties: CssProperty[];label: string;description: string;}[] = [@@ -41,9 +65,9 @@ const propertyContents: {},];-const isSameUnorderedArrays = (- arrA: readonly string[],- arrB: readonly string[]+const isSameUnorderedArrays = <Item,>(+ arrA: readonly Item[],+ arrB: readonly Item[]) => {if (arrA.length !== arrB.length) {return false;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 61a1765e37..8def0ca4b4 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@@ -1,4 +1,4 @@-import { toValue, type StyleProperty } from "@webstudio-is/css-engine";+import { toValue, type CssProperty } from "@webstudio-is/css-engine";import { Grid, theme } from "@webstudio-is/design-system";import { propertyDescriptions } from "@webstudio-is/css-data";import { StyleSection } from "../../shared/style-section";@@ -13,12 +13,12 @@ import { InsetControl } from "./inset-control";export const properties = ["position",- "zIndex",+ "z-index","top","right","bottom","left",-] satisfies Array<StyleProperty>;+] satisfies CssProperty[];export const Section = () => {const position = useComputedStyleDecl("position");@@ -56,9 +56,9 @@ export const Section = () => {<PropertyLabellabel="Z Index"description={propertyDescriptions.zIndex}- properties={["zIndex"]}+ properties={["z-index"]}/>- <TextControl property="zIndex" />+ <TextControl property="z-index" /></>)}</Grid>@@ -69,9 +69,9 @@ export const Section = () => {<PropertyLabellabel="Z Index"description={propertyDescriptions.zIndex}- properties={["zIndex"]}+ properties={["z-index"]}/>- <TextControl property="zIndex" />+ <TextControl property="z-index" /></Grid></Grid>)}diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsxindex 4a50c7023b..f2a4d7b590 100644--- a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx@@ -8,7 +8,7 @@ import {Flex,theme,} from "@webstudio-is/design-system";-import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";+import type { CssProperty, StyleValue } from "@webstudio-is/css-engine";import { propertyDescriptions } from "@webstudio-is/css-data";import {CssValueInput,@@ -34,8 +34,8 @@ const Input = ({onClosePopover,}: {styleSource: StyleValueSourceColor;- property: StyleProperty;- getActiveProperties: (modifiers?: Modifiers) => readonly StyleProperty[];+ property: CssProperty;+ getActiveProperties: (modifiers?: Modifiers) => CssProperty[];value: StyleValue;onClosePopover: () => void;}) => {@@ -147,8 +147,8 @@ export const InputPopover = ({onClose,}: {styleSource: StyleValueSourceColor;- property: StyleProperty;- getActiveProperties: (modifiers?: Modifiers) => readonly StyleProperty[];+ property: CssProperty;+ getActiveProperties: (modifiers?: Modifiers) => CssProperty[];value: StyleValue;isOpen: boolean;onClose: () => void;diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/keyboard.ts b/apps/builder/app/builder/features/style-panel/sections/shared/keyboard.tsindex 95dc247c3f..bab31fd2d9 100644--- a/apps/builder/app/builder/features/style-panel/sections/shared/keyboard.ts+++ b/apps/builder/app/builder/features/style-panel/sections/shared/keyboard.ts@@ -9,24 +9,6 @@ const movementKeys = ["ArrowLeft",] as const;-export const movementMapSpace = {- marginTop: ["marginBottom", "marginRight", "paddingTop", "marginLeft"],- marginRight: ["marginTop", "marginLeft", "marginBottom", "paddingRight"],- marginBottom: ["paddingBottom", "marginRight", "marginTop", "marginLeft"],- marginLeft: ["marginTop", "paddingLeft", "marginBottom", "marginRight"],- paddingTop: ["marginTop", "paddingRight", "paddingBottom", "paddingLeft"],- paddingRight: ["paddingTop", "marginRight", "paddingBottom", "paddingBottom"],- paddingBottom: ["paddingTop", "paddingRight", "marginBottom", "paddingLeft"],- paddingLeft: ["paddingTop", "paddingTop", "paddingBottom", "marginLeft"],-} as const;--export const movementMapInset = {- top: ["bottom", "right", "bottom", "left"],- right: ["top", "left", "bottom", "left"],- bottom: ["top", "right", "top", "left"],- left: ["top", "right", "bottom", "right"],-} as const;-/*** useFocusWithin does't work with popovers, implement it using debounce*/diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsxindex 10df7d45bd..0ffb7797b0 100644--- a/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/shared/scrub.tsx@@ -1,18 +1,16 @@+import { useState, useEffect, useRef } from "react";import type {- StyleProperty,+ CssProperty,StyleValue,UnitValue,} from "@webstudio-is/css-engine";+import { toValue } from "@webstudio-is/css-engine";import { numericScrubControl } from "@webstudio-is/design-system";-import { useState, useEffect, useRef } from "react";+import { camelCaseProperty, isValidDeclaration } from "@webstudio-is/css-data";import { useModifierKeys } from "../../shared/modifier-keys";import type { StyleUpdateOptions } from "../../shared/use-style-data";-import type { SpaceStyleProperty } from "../space/types";-import { isValidDeclaration } from "@webstudio-is/css-data";import { parseIntermediateOrInvalidValue } from "../../shared/css-value-input/parse-intermediate-or-invalid-value";-import { toValue } from "@webstudio-is/css-engine";import type { CssValueInputValue } from "../../shared/css-value-input/css-value-input";-import type { InsetProperty } from "../position/inset-layout";type ScrubStatus<P extends string> = {isActive: boolean;@@ -34,7 +32,7 @@ type HoverTarget<P> = {element: HTMLElement | SVGElement;};-export const useScrub = <P extends StyleProperty>(props: {+export const useScrub = <P extends CssProperty>(props: {value?: StyleValue;target: HoverTarget<P> | undefined;getModifiersGroup: (@@ -87,7 +85,7 @@ export const useScrub = <P extends StyleProperty>(props: {} as const;if (isValidDeclaration(property, toValue(value)) === false) {- value = parseIntermediateOrInvalidValue(property, {+ value = parseIntermediateOrInvalidValue(camelCaseProperty(property), {type: "intermediate",value: `${value.value}`,unit: value.unit,@@ -154,52 +152,3 @@ export const useScrub = <P extends StyleProperty>(props: {values,};};--const opposingSpaceGroups = [- ["paddingTop", "paddingBottom"],- ["paddingRight", "paddingLeft"],- ["marginTop", "marginBottom"],- ["marginRight", "marginLeft"],-] as const;--const circleSpaceGroups = [- ["paddingTop", "paddingRight", "paddingBottom", "paddingLeft"],- ["marginTop", "marginRight", "marginBottom", "marginLeft"],-] as const;--export const getSpaceModifiersGroup = (- property: SpaceStyleProperty,- modifiers: { shiftKey: boolean; altKey: boolean }-) => {- let groups: ReadonlyArray<ReadonlyArray<SpaceStyleProperty>> = [];-- if (modifiers.shiftKey) {- groups = circleSpaceGroups;- } else if (modifiers.altKey) {- groups = opposingSpaceGroups;- }-- return groups.find((group) => group.includes(property)) ?? [property];-};--const opposingInsetGroups = [- ["top", "bottom"],- ["left", "right"],-] as const;--const circleInsetGroups = [["top", "right", "bottom", "left"]] as const;--export const getInsetModifiersGroup = (- property: InsetProperty,- modifiers: { shiftKey: boolean; altKey: boolean }-) => {- let groups: ReadonlyArray<ReadonlyArray<InsetProperty>> = [];-- if (modifiers.shiftKey) {- groups = circleInsetGroups;- } else if (modifiers.altKey) {- groups = opposingInsetGroups;- }-- return groups.find((group) => group.includes(property)) ?? [property];-};diff --git a/apps/builder/app/builder/features/style-panel/sections/space/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/space/layout.tsxindex bf40b0840a..542b2257a6 100644--- a/apps/builder/app/builder/features/style-panel/sections/space/layout.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/space/layout.tsx@@ -1,9 +1,12 @@-import { styled } from "@webstudio-is/design-system";import { forwardRef, useId } from "react";import type { ComponentProps, Ref } from "react";-import type { HoverTarget, SpaceStyleProperty } from "./types";-import { spaceProperties } from "./properties";-import { theme } from "@webstudio-is/design-system";+import { styled, theme } from "@webstudio-is/design-system";+import type { CssProperty } from "@webstudio-is/css-engine";+import {+ spaceProperties,+ type HoverTarget,+ type SpaceStyleProperty,+} from "./properties";const VALUE_WIDTH = 36;const VALUE_HEIGHT = 24;@@ -173,14 +176,14 @@ const Cell = styled("div", {padding: theme.spacing[2],variants: {property: {- marginTop: { gridColumn: "2 / 5", gridRow: "1" },- marginRight: { gridColumn: "5", gridRow: "1 / 8" },- marginBottom: { gridColumn: "2 / 5", gridRow: "7" },- marginLeft: { gridColumn: "1", gridRow: "1 / 8" },- paddingTop: { gridColumn: "3 / 4", gridRow: "3" },- paddingRight: { gridColumn: "4", gridRow: "3 / 6" },- paddingBottom: { gridColumn: "3 / 4", gridRow: "5" },- paddingLeft: { gridColumn: "2", gridRow: "3 / 6" },+ "margin-top": { gridColumn: "2 / 5", gridRow: "1" },+ "margin-right": { gridColumn: "5", gridRow: "1 / 8" },+ "margin-bottom": { gridColumn: "2 / 5", gridRow: "7" },+ "margin-left": { gridColumn: "1", gridRow: "1 / 8" },+ "padding-top": { gridColumn: "3 / 4", gridRow: "3" },+ "padding-right": { gridColumn: "4", gridRow: "3 / 6" },+ "padding-bottom": { gridColumn: "3 / 4", gridRow: "5" },+ "padding-left": { gridColumn: "2", gridRow: "3 / 6" },},},});@@ -201,17 +204,17 @@ const Label = styled("div", {const getSide = (property: SpaceStyleProperty) => {switch (property) {- case "marginTop":- case "paddingTop":+ case "margin-top":+ case "padding-top":return "top";- case "marginRight":- case "paddingRight":+ case "margin-right":+ case "padding-right":return "right";- case "marginBottom":- case "paddingBottom":+ case "margin-bottom":+ case "padding-bottom":return "bottom";- case "marginLeft":- case "paddingLeft":+ case "margin-left":+ case "padding-left":return "left";}};@@ -249,7 +252,7 @@ type LayoutProps = {onMouseLeave?: ComponentProps<"div">["onMouseLeave"];onMouseMove?: ComponentProps<"div">["onMouseMove"];onHover: (hoverTarget: HoverTarget | undefined) => void;- activeProperties?: ReadonlyArray<SpaceStyleProperty>;+ activeProperties?: CssProperty[];renderCell: (args: { property: SpaceStyleProperty }) => React.ReactNode;};@@ -302,20 +305,20 @@ export const SpaceLayout = forwardRef(xmlns="http://www.w3.org/2000/svg"><g clipPath={`url(#${outerClipId})`}>- {renderValueArea("marginTop")}- {renderValueArea("marginRight")}- {renderValueArea("marginBottom")}- {renderValueArea("marginLeft")}+ {renderValueArea("margin-top")}+ {renderValueArea("margin-right")}+ {renderValueArea("margin-bottom")}+ {renderValueArea("margin-left")}</g><OuterRect /><InnerOuterRect /><g clipPath={`url(#${innerClipId})`}>- {renderValueArea("paddingTop")}- {renderValueArea("paddingRight")}- {renderValueArea("paddingBottom")}- {renderValueArea("paddingLeft")}+ {renderValueArea("padding-top")}+ {renderValueArea("padding-right")}+ {renderValueArea("padding-bottom")}+ {renderValueArea("padding-left")}</g><InnerRect />diff --git a/apps/builder/app/builder/features/style-panel/sections/space/properties.ts b/apps/builder/app/builder/features/style-panel/sections/space/properties.tsindex dde9091a81..c90bae829d 100644--- a/apps/builder/app/builder/features/style-panel/sections/space/properties.ts+++ b/apps/builder/app/builder/features/style-panel/sections/space/properties.ts@@ -1,12 +1,19 @@-import type { StyleProperty } from "@webstudio-is/css-engine";+import type { CssProperty } from "@webstudio-is/css-engine";export const spaceProperties = [- "marginTop",- "marginRight",- "marginBottom",- "marginLeft",- "paddingTop",- "paddingRight",- "paddingBottom",- "paddingLeft",-] satisfies Array<StyleProperty>;+ "margin-top",+ "margin-right",+ "margin-bottom",+ "margin-left",+ "padding-top",+ "padding-right",+ "padding-bottom",+ "padding-left",+] satisfies CssProperty[];++export type SpaceStyleProperty = (typeof spaceProperties)[number];++export type HoverTarget = {+ property: SpaceStyleProperty;+ element: SVGElement | HTMLElement;+};diff --git a/apps/builder/app/builder/features/style-panel/sections/space/space.tsx b/apps/builder/app/builder/features/style-panel/sections/space/space.tsxindex 6585e7d6e4..3e2b7889f1 100644--- a/apps/builder/app/builder/features/style-panel/sections/space/space.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/space/space.tsx@@ -1,17 +1,94 @@import { useState, useRef } from "react";+import { theme } from "@webstudio-is/design-system";+import { hyphenateProperty, type CssProperty } from "@webstudio-is/css-engine";import { SpaceLayout } from "./layout";import { ValueText } from "../shared/value-text";-import { getSpaceModifiersGroup, useScrub } from "../shared/scrub";-import { spaceProperties } from "./properties";-import type { SpaceStyleProperty, HoverTarget } from "./types";+import { useScrub } from "../shared/scrub";+import {+ spaceProperties,+ type HoverTarget,+ type SpaceStyleProperty,+} from "./properties";import { InputPopover } from "../shared/input-popover";import { SpaceTooltip } from "./tooltip";import { StyleSection } from "../../shared/style-section";-import { movementMapSpace, useKeyboardNavigation } from "../shared/keyboard";+import { useKeyboardNavigation } from "../shared/keyboard";import { useComputedStyleDecl, useComputedStyles } from "../../shared/model";import { createBatchUpdate } from "../../shared/use-style-data";import { useModifierKeys, type Modifiers } from "../../shared/modifier-keys";-import { theme } from "@webstudio-is/design-system";++const movementMapSpace = {+ "margin-top": ["margin-bottom", "margin-right", "padding-top", "margin-left"],+ "margin-right": [+ "margin-top",+ "margin-left",+ "margin-bottom",+ "padding-right",+ ],+ "margin-bottom": [+ "padding-bottom",+ "margin-right",+ "margin-top",+ "margin-left",+ ],+ "margin-left": [+ "margin-top",+ "padding-left",+ "margin-bottom",+ "margin-right",+ ],+ "padding-top": [+ "margin-top",+ "padding-right",+ "padding-bottom",+ "padding-left",+ ],+ "padding-right": [+ "padding-top",+ "margin-right",+ "padding-bottom",+ "padding-bottom",+ ],+ "padding-bottom": [+ "padding-top",+ "padding-right",+ "margin-bottom",+ "padding-left",+ ],+ "padding-left": [+ "padding-top",+ "padding-top",+ "padding-bottom",+ "margin-left",+ ],+} as const satisfies Record<SpaceStyleProperty, SpaceStyleProperty[]>;++const opposingSpaceGroups = [+ ["padding-top", "padding-bottom"],+ ["padding-right", "padding-left"],+ ["margin-top", "margin-bottom"],+ ["margin-right", "margin-left"],+] satisfies CssProperty[][];++const circleSpaceGroups = [+ ["padding-top", "padding-right", "padding-bottom", "padding-left"],+ ["margin-top", "margin-right", "margin-bottom", "margin-left"],+] satisfies CssProperty[][];++const getSpaceModifiersGroup = (+ property: CssProperty,+ modifiers: { shiftKey: boolean; altKey: boolean }+) => {+ let groups: CssProperty[][] = [];++ if (modifiers.shiftKey) {+ groups = circleSpaceGroups;+ } else if (modifiers.altKey) {+ groups = opposingSpaceGroups;+ }++ return groups.find((group) => group.includes(property)) ?? [property];+};const Cell = ({isPopoverOpen,@@ -25,7 +102,7 @@ const Cell = ({onPopoverClose: () => void;onHover: (target: HoverTarget | undefined) => void;property: SpaceStyleProperty;- getActiveProperties: (modifiers?: Modifiers) => readonly SpaceStyleProperty[];+ getActiveProperties: (modifiers?: Modifiers) => CssProperty[];scrubStatus: ReturnType<typeof useScrub>;}) => {const styleDecl = useComputedStyleDecl(property);@@ -76,7 +153,8 @@ export const Section = () => {const scrubStatus = useScrub({value: styles.find(- (styleDecl) => styleDecl.property === hoverTarget?.property+ (styleDecl) =>+ hyphenateProperty(styleDecl.property) === hoverTarget?.property)?.usedValue,target: hoverTarget,getModifiersGroup: getSpaceModifiersGroup,@@ -92,9 +170,9 @@ export const Section = () => {},});- const [openProperty, setOpenProperty] = useState<SpaceStyleProperty>();+ const [openProperty, setOpenProperty] = useState<CssProperty>();const [activePopoverProperties, setActivePopoverProperties] = useState<- undefined | readonly SpaceStyleProperty[]+ undefined | CssProperty[]>();const modifiers = useModifierKeys();const handleOpenProperty = (property: undefined | SpaceStyleProperty) => {@@ -112,11 +190,14 @@ export const Section = () => {});// by deafult highlight hovered or scrubbed properties- // if keyboard navigation is active, highlight its active property// if popover is open, highlight its property and hovered properties- const activeProperties: readonly SpaceStyleProperty[] = [+ const activeProperties: CssProperty[] = [...(activePopoverProperties ?? scrubStatus.properties),];+ // if keyboard navigation is active, highlight its active property+ if (keyboardNavigation.isActive) {+ activeProperties.push(keyboardNavigation.activeProperty);+ }const getActiveProperties = (modifiers?: Modifiers) => {return modifiers && openProperty@@ -136,7 +217,7 @@ export const Section = () => {onClick={(event) => {const property = hoverTarget?.property;const styleValueSource = styles.find(- (styleDecl) => styleDecl.property === property+ (styleDecl) => hyphenateProperty(styleDecl.property) === property)?.source.name;if (diff --git a/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsx b/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsxindex fb79394ae5..e855c47bee 100644--- a/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsx@@ -3,17 +3,17 @@ import { deleteProperty } from "../../shared/use-style-data";import { Tooltip } from "@webstudio-is/design-system";import { PropertyInfo } from "../../property-label";import { useComputedStyles } from "../../shared/model";-import type { SpaceStyleProperty } from "./types";+import type { SpaceStyleProperty } from "./properties";const sides = {- paddingTop: "top",- paddingRight: "top",- paddingBottom: "bottom",- paddingLeft: "left",- marginTop: "top",- marginRight: "left",- marginBottom: "bottom",- marginLeft: "right",+ "padding-top": "top",+ "padding-right": "top",+ "padding-bottom": "bottom",+ "padding-left": "left",+ "margin-top": "top",+ "margin-right": "left",+ "margin-bottom": "bottom",+ "margin-left": "right",} as const;const propertyContents: {@@ -23,40 +23,45 @@ const propertyContents: {}[] = [// Padding{- properties: ["paddingTop", "paddingBottom"],+ properties: ["padding-top", "padding-bottom"],label: "Vertical Padding",description:"Defines the space between the content of an element and its top and bottom border. Can affect layout height.",},{- properties: ["paddingLeft", "paddingRight"],+ properties: ["padding-left", "padding-right"],label: "Horizontal Padding",description:"Defines the space between the content of an element and its left and right border. Can affect layout width.",},{- properties: ["paddingTop", "paddingBottom", "paddingLeft", "paddingRight"],+ properties: [+ "padding-top",+ "padding-bottom",+ "padding-left",+ "padding-right",+ ],label: "Padding",description:"Defines the space between the content of an element and its border. Can affect layout size.",},// Margin{- properties: ["marginTop", "marginBottom"],+ properties: ["margin-top", "margin-bottom"],label: "Vertical Margin",description: "Sets the margin at the top and bottom of an element.",},{- properties: ["marginLeft", "marginRight"],+ properties: ["margin-left", "margin-right"],label: "Horizontal Margin",description: "Sets the margin at the left and right of an element.",},{- properties: ["marginTop", "marginBottom", "marginLeft", "marginRight"],+ properties: ["margin-top", "margin-bottom", "margin-left", "margin-right"],label: "Margin",description: "Sets the margin of an element.",},diff --git a/apps/builder/app/builder/features/style-panel/sections/space/types.ts b/apps/builder/app/builder/features/style-panel/sections/space/types.tsdeleted file mode 100644index f7c451f818..0000000000--- a/apps/builder/app/builder/features/style-panel/sections/space/types.ts+++ /dev/null@@ -1,8 +0,0 @@-import type { spaceProperties } from "./properties";--export type SpaceStyleProperty = (typeof spaceProperties)[number];--export type HoverTarget = {- property: SpaceStyleProperty;- element: SVGElement | HTMLElement;-};