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 border-color (#1300)
Ivan Starkov6f03fc06b227
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsxindex f0b1e0d016..37958e0038 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx@@ -130,10 +130,6 @@ const BackgroundsCollapsibleSection = (const { label, children } = props;const [isOpen, setIsOpen] = useOpenState(props);- if (props === undefined) {- // @todo will gone after refactor- throw new Error("Error");- }const layersStyleSource = getLayersStyleSource(props.currentStyle);const dots: ("local" | "remote")[] = [];diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsxindex 00ccf9538e..54eff80533 100644--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx@@ -11,9 +11,8 @@ import { PropertyName } from "../../shared/property-name";import { getStyleSource } from "../../shared/style-info";import type { RenderCategoryProps } from "../../style-sections";import { toValue } from "@webstudio-is/css-engine";-+import { deleteAllProperties, setAllProperties } from "./border-utils";import type { StyleProperty, UnitValue } from "@webstudio-is/css-data";-import type { DeleteProperty, SetProperty } from "../../shared/use-style-data";import { type ReactNode, useState } from "react";const borderPropertyStyleValueDefault: UnitValue = {@@ -96,21 +95,15 @@ export const BorderProperty = ({...borderProperties.map((property) => currentStyle[property]));- const deleteAllProperties: DeleteProperty = (_propertyName, options) => {- const batch = createBatchUpdate();- for (const property of borderProperties) {- batch.deleteProperty(property);- }- batch.publish(options);- };+ const deleteBorderProperties = deleteAllProperties(+ borderProperties,+ createBatchUpdate+ );- const setAllProperties: ReturnType<SetProperty> = (value, options) => {- const batch = createBatchUpdate();- for (const property of borderProperties) {- batch.setProperty(property)(value);- }- batch.publish(options);- };+ const setBorderProperties = setAllProperties(+ borderProperties,+ createBatchUpdate+ )(firstPropertyName);return (<Grid gap={1}>@@ -124,7 +117,7 @@ export const BorderProperty = ({style={currentStyle}property={borderProperties}label={label}- onReset={() => deleteAllProperties(firstPropertyName)}+ onReset={() => deleteBorderProperties(firstPropertyName)}/><Box@@ -139,8 +132,8 @@ export const BorderProperty = ({styleSource={borderWidthStyleSource}keywords={borderWidthKeywords}value={borderWidthStyleInfo}- setValue={setAllProperties}- deleteProperty={deleteAllProperties}+ setValue={setBorderProperties}+ deleteProperty={deleteBorderProperties}/></Box>diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-utils.ts b/apps/builder/app/builder/features/style-panel/sections/borders/border-utils.tsnew file mode 100644index 0000000000..45d60a2479--- /dev/null+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-utils.ts@@ -0,0 +1,32 @@+import type { StyleProperty } from "@webstudio-is/css-data";+import type {+ CreateBatchUpdate,+ DeleteProperty,+ SetProperty,+} from "../../shared/use-style-data";++export const deleteAllProperties: (+ styleProperties: readonly StyleProperty[],+ createBatchUpdate: CreateBatchUpdate+) => DeleteProperty =+ (styleProperties, createBatchUpdate) => (_propertyName, options) => {+ const batch = createBatchUpdate();+ for (const property of styleProperties) {+ batch.deleteProperty(property);+ }+ batch.publish(options);+ };++export const setAllProperties: (+ styleProperties: readonly StyleProperty[],+ createBatchUpdate: CreateBatchUpdate+) => SetProperty =+ (styleProperties, createBatchUpdate) =>+ (_propertyName) =>+ (value, options) => {+ const batch = createBatchUpdate();+ for (const property of styleProperties) {+ batch.setProperty(property)(value);+ }+ batch.publish(options);+ };diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsxindex 03b47f8750..3f5c579fc0 100644--- a/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/borders/borders.tsx@@ -6,20 +6,41 @@ import { PropertyName } from "../../shared/property-name";import type { RenderCategoryProps } from "../../style-sections";import { BorderRadius } from "./border-radius";import { BorderStyle } from "./border-style";+import { deleteAllProperties, setAllProperties } from "./border-utils";import { BorderWidth } from "./border-width";const { items: borderColorItems } = styleConfigByName["borderTopColor"];-export const BordersSection = ({- currentStyle,- setProperty,- deleteProperty,- createBatchUpdate,- label,- isOpen,-}: RenderCategoryProps) => {+const borderColorProperties = [+ "borderTopColor",+ "borderRightColor",+ "borderBottomColor",+ "borderLeftColor",+] as const;++export const BordersSection = (props: RenderCategoryProps) => {+ const { currentStyle, setProperty, deleteProperty, createBatchUpdate } =+ props;++ /**+ * We do not use shorthand properties such as borderWidth or borderRadius in our code.+ * However, in the UI, we can display a single field, and in that case, we can use any property+ * from the shorthand property set and pass it instead.+ **/+ const borderColorProperty = borderColorProperties[0];++ const deleteAllBorderColorProperties = deleteAllProperties(+ borderColorProperties,+ createBatchUpdate+ );++ const setAllBorderColorProperties = setAllProperties(+ borderColorProperties,+ createBatchUpdate+ );+return (- <CollapsibleSection label={label} isOpen={isOpen}>+ <CollapsibleSection label={props.label} isOpen={props.isOpen}><Flex direction="column" gap={2}><Gridcss={{@@ -32,9 +53,9 @@ export const BordersSection = ({><PropertyNamestyle={currentStyle}- property={"borderTopColor"}+ property={borderColorProperty}label={"Color"}- onReset={() => deleteProperty("borderTopColor")}+ onReset={() => deleteAllBorderColorProperties(borderColorProperty)}/><Box@@ -43,11 +64,11 @@ export const BordersSection = ({}}><ColorControl- property={"borderTopColor"}+ property={borderColorProperty}items={borderColorItems}currentStyle={currentStyle}- setProperty={setProperty}- deleteProperty={deleteProperty}+ setProperty={setAllBorderColorProperties}+ deleteProperty={deleteAllBorderColorProperties}/></Box></Grid>