Skip to content

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.

refactor: code editor improvements and editor for background-image (#3445)

Jaya Krishna Namburu667ec92d7507
diff --git a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx
index fcecee99a1..01a045a421 100644
--- a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx
@@ -1,9 +1,24 @@
import { useStore } from "@nanostores/react";
-import { Button } from "@webstudio-is/design-system";
+import { Button, InputField, Flex } from "@webstudio-is/design-system";
import { $assets } from "~/shared/nano-states";
import { FloatingPanel } from "~/builder/shared/floating-panel";
import { ImageManager } from "~/builder/shared/image-manager";
import type { ControlProps } from "../types";
+import { useEffect, useState } from "react";
+import type { InvalidValue } from "@webstudio-is/css-engine";
+
+const isValidURL = (value: string) => {
+ try {
+ return Boolean(new URL(value));
+ } catch {
+ return false;
+ }
+};
+
+type IntermediateValue = {
+ type: "intermediate";
+ value: string;
+};
export const ImageControl = ({
property,
@@ -11,36 +26,84 @@ export const ImageControl = ({
setProperty,
}: ControlProps) => {
const assets = useStore($assets);
+ const setValue = setProperty(property);
const styleValue = currentStyle[property]?.value;
+ const [remoteImageURL, setRemoteImageURL] = useState<
+ IntermediateValue | InvalidValue | undefined
+ >(undefined);
+
+ useEffect(() => {
+ if (styleValue?.type === "image" && styleValue.value.type === "url") {
+ setRemoteImageURL({ type: "intermediate", value: styleValue.value.url });
+ }
+ }, [styleValue]);
if (styleValue === undefined) {
- return null;
+ return;
}
- const setValue = setProperty(property);
-
const asset =
styleValue.type === "image" && styleValue.value.type === "asset"
? assets.get(styleValue.value.value)
: undefined;
+ const handleImageURLInput = (event: React.ChangeEvent<HTMLInputElement>) => {
+ const value = event.target.value;
+ if (isValidURL(value) === true) {
+ setRemoteImageURL({ type: "intermediate", value });
+ } else {
+ setRemoteImageURL({ type: "invalid", value });
+ }
+ };
+
+ const handleImageURLComplete = () => {
+ if (
+ remoteImageURL?.type === "intermediate" &&
+ isValidURL(remoteImageURL.value) === true
+ ) {
+ setValue({
+ type: "image",
+ value: { type: "url", url: remoteImageURL.value },
+ });
+ setRemoteImageURL(undefined);
+ }
+ };
+
return (
- <FloatingPanel
- title="Images"
- content={
- <ImageManager
- onChange={(asset) => {
- setValue({
- type: "image",
- value: { type: "asset", value: asset.id },
- });
- }}
- />
- }
- >
- <Button color="neutral" css={{ maxWidth: "100%", justifySelf: "right" }}>
- {asset?.name ?? "Choose image..."}
- </Button>
- </FloatingPanel>
+ <Flex direction="column" gap="2">
+ <InputField
+ type="text"
+ color={remoteImageURL?.type === "invalid" ? "error" : undefined}
+ placeholder="Enter image URL..."
+ value={remoteImageURL?.value ?? ""}
+ onChange={handleImageURLInput}
+ onKeyDown={(event) => {
+ if (event.key === "Enter") {
+ handleImageURLComplete();
+ }
+ }}
+ onBlur={handleImageURLComplete}
+ />
+ <FloatingPanel
+ title="Images"
+ content={
+ <ImageManager
+ onChange={(asset) => {
+ setValue({
+ type: "image",
+ value: { type: "asset", value: asset.id },
+ });
+ }}
+ />
+ }
+ >
+ <Button
+ color="neutral"
+ css={{ maxWidth: "100%", justifySelf: "right" }}
+ >
+ {asset?.name ?? "Choose image..."}
+ </Button>
+ </FloatingPanel>
+ </Flex>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx
index 314a3d7ec2..f98e6fbae3 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx
@@ -41,6 +41,7 @@ import {
import { toValue } from "@webstudio-is/css-engine";
import { BackgroundGradient } from "./background-gradient";
import { NonResetablePropertyName } from "../../shared/property-name";
+import { BackgroundImage } from "./background-image";
type BackgroundContentProps = {
currentStyle: StyleInfo;
@@ -157,11 +158,13 @@ export const BackgroundContent = (props: BackgroundContentProps) => {
>
{imageGradientToggle === "image" && (
<>
- <NonResetablePropertyName
- style={currentStyle}
- properties={["backgroundImage"]}
- label="Image"
- />
+ <Flex css={{ height: "100%" }} align="start">
+ <NonResetablePropertyName
+ style={currentStyle}
+ properties={["backgroundImage"]}
+ label="Image"
+ />
+ </Flex>
<FloatingPanelProvider container={elementRef}>
<ImageControl
@@ -174,35 +177,6 @@ export const BackgroundContent = (props: BackgroundContentProps) => {
</>
)}
- {imageGradientToggle === "gradient" && (
- <Flex css={{ gridColumn: "span 2" }} direction="column">
- <NonResetablePropertyName
- style={currentStyle}
- description={
- <>
- Paste a CSS gradient, for example:
- <br />
- <br />
- linear-gradient(...)
- <br />
- <br />
- If pasting from figma, remove the “background” property
- name.
- </>
- }
- properties={["backgroundImage"]}
- label="Code"
- />
-
- <BackgroundGradient
- setProperty={setProperty}
- deleteProperty={deleteProperty}
- currentStyle={currentStyle}
- setBackgroundColor={props.setBackgroundColor}
- />
- </Flex>
- )}
-
<NonResetablePropertyName
style={currentStyle}
properties={["backgroundClip"]}
@@ -348,6 +322,22 @@ export const BackgroundContent = (props: BackgroundContentProps) => {
/>
</Grid>
</BackgroundSection>
+ <Separator css={{ gridColumn: "span 2" }} />
+
+ {imageGradientToggle === "image" ? (
+ <BackgroundImage
+ setProperty={setProperty}
+ deleteProperty={deleteProperty}
+ currentStyle={currentStyle}
+ />
+ ) : (
+ <BackgroundGradient
+ setProperty={setProperty}
+ deleteProperty={deleteProperty}
+ currentStyle={currentStyle}
+ setBackgroundColor={props.setBackgroundColor}
+ />
+ )}
</>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx
index df56749b1c..0e212ee476 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-gradient.tsx
@@ -1,8 +1,14 @@
import type { InvalidValue, RgbValue } from "@webstudio-is/css-engine";
import { parseCssValue, parseBackground } from "@webstudio-is/css-data";
-import { TextArea, textVariants } from "@webstudio-is/design-system";
+import {
+ Flex,
+ TextArea,
+ textVariants,
+ theme,
+} from "@webstudio-is/design-system";
import { useEffect, useRef, useState } from "react";
import type { ControlProps } from "../../controls";
+import { NonResetablePropertyName } from "../../shared/property-name";
type IntermediateValue = {
type: "intermediate";
@@ -86,32 +92,59 @@ export const BackgroundGradient = (
}, []);
return (
- <TextArea
- ref={textAreaRef}
- css={{ ...textVariants.mono }}
- rows={2}
- autoGrow
- maxRows={4}
- name="description"
- value={textAreaValue ?? ""}
- color={intermediateValue?.type === "invalid" ? "error" : undefined}
- onChange={handleChange}
- onBlur={handleOnComplete}
- onKeyDown={(event) => {
- if (event.key === "Enter") {
- handleOnComplete();
- event.preventDefault();
+ <Flex
+ direction="column"
+ css={{
+ gridColumn: "span 2",
+ px: theme.spacing[9],
+ paddingTop: theme.spacing[5],
+ paddingBottom: theme.spacing[9],
+ gap: theme.spacing[3],
+ }}
+ >
+ <NonResetablePropertyName
+ style={props.currentStyle}
+ description={
+ <>
+ Paste a CSS gradient, for example:
+ <br />
+ <br />
+ linear-gradient(...)
+ <br />
+ <br />
+ If pasting from Figma, remove the "background" property name.
+ </>
}
+ properties={[property]}
+ label="Code"
+ />
+ <TextArea
+ ref={textAreaRef}
+ css={{ ...textVariants.mono }}
+ rows={2}
+ autoGrow
+ maxRows={4}
+ name="description"
+ value={textAreaValue ?? ""}
+ color={intermediateValue?.type === "invalid" ? "error" : undefined}
+ onChange={handleChange}
+ onBlur={handleOnComplete}
+ onKeyDown={(event) => {
+ if (event.key === "Enter") {
+ handleOnComplete();
+ event.preventDefault();
+ }
- if (event.key === "Escape") {
- if (intermediateValue === undefined) {
- return;
+ if (event.key === "Escape") {
+ if (intermediateValue === undefined) {
+ return;
+ }
+ props.deleteProperty(property, { isEphemeral: true });
+ setIntermediateValue(undefined);
+ event.preventDefault();
}
- props.deleteProperty(property, { isEphemeral: true });
- setIntermediateValue(undefined);
- event.preventDefault();
- }
- }}
- />
+ }}
+ />
+ </Flex>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx
new file mode 100644
index 0000000000..68cb860590
--- /dev/null
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx
@@ -0,0 +1,197 @@
+import { InvalidValue, type StyleProperty } from "@webstudio-is/css-engine";
+import {
+ TextArea,
+ textVariants,
+ Flex,
+ theme,
+ InputErrorsTooltip,
+} from "@webstudio-is/design-system";
+import { useRef, useState, useEffect } from "react";
+import type { ControlProps } from "../../controls";
+import { NonResetablePropertyName } from "../../shared/property-name";
+import { useStore } from "@nanostores/react";
+import { $assets } from "~/shared/nano-states";
+import { parseCssValue } from "@webstudio-is/css-data";
+import type { StyleUpdateOptions } from "../../shared/use-style-data";
+
+const property: StyleProperty = "backgroundImage";
+
+type IntermediateValue = {
+ type: "intermediate";
+ value: string;
+};
+
+const extractUrlFromValue = (cssValue: string) => {
+ const regex = /url\(["']?(.*?)["']?\)/;
+ const match = cssValue.match(regex);
+ return match ? match[1] : undefined;
+};
+
+const isAbsoluteURL = (value: string) => {
+ try {
+ return Boolean(new URL(value));
+ } catch {
+ return false;
+ }
+};
+
+export const BackgroundImage = (
+ props: Omit<ControlProps, "property" | "items">
+) => {
+ const textAreaRef = useRef<HTMLTextAreaElement>(null);
+ const assets = useStore($assets);
+ const styleValue = props.currentStyle[property]?.value;
+ const [errors, setErrors] = useState<string[]>([]);
+ const [intermediateValue, setIntermediateValue] = useState<
+ IntermediateValue | InvalidValue | undefined
+ >(undefined);
+
+ useEffect(() => {
+ if (styleValue === undefined) {
+ return;
+ }
+
+ if (styleValue.type === "keyword") {
+ setIntermediateValue({
+ type: "intermediate",
+ value: styleValue.value,
+ });
+ }
+
+ let backgroundUrl;
+ if (styleValue.type === "image") {
+ if (styleValue.value.type === "asset") {
+ const asset = assets.get(styleValue.value.value);
+ if (asset === undefined || asset.type !== "image") {
+ setErrors(["Asset not found"]);
+ setIntermediateValue({
+ type: "invalid",
+ value: styleValue.value.value,
+ });
+ return;
+ }
+ backgroundUrl = `url(${asset.name})`;
+ }
+
+ if (styleValue.value.type === "url") {
+ backgroundUrl = `url(${styleValue.value.url})`;
+ }
+
+ setIntermediateValue(
+ backgroundUrl !== undefined
+ ? { type: "intermediate", value: backgroundUrl }
+ : undefined
+ );
+ }
+ }, [styleValue, assets]);
+
+ const handleChange = (value: string, options: StyleUpdateOptions) => {
+ setIntermediateValue({
+ type: "intermediate",
+ value: value,
+ });
+
+ const newValue = parseCssValue(property, value);
+ if (newValue.type === "invalid") {
+ setIntermediateValue({
+ type: "invalid",
+ value: value,
+ });
+ return;
+ }
+
+ if (newValue.type === "unparsed") {
+ const urlFromProperty = extractUrlFromValue(value);
+ if (urlFromProperty === undefined) {
+ setIntermediateValue({
+ type: "invalid",
+ value: value,
+ });
+ return;
+ }
+
+ if (isAbsoluteURL(urlFromProperty) === true) {
+ props.setProperty(property)(
+ {
+ type: "image",
+ value: {
+ type: "url",
+ url: urlFromProperty,
+ },
+ },
+ options
+ );
+ } else {
+ const usedAsset = Array.from($assets.get().values()).find(
+ (asset) => asset.type === "image" && asset.name === urlFromProperty
+ );
+
+ if (usedAsset === undefined) {
+ setErrors([`Asset ${urlFromProperty} is not found in project `]);
+ setIntermediateValue({
+ type: "invalid",
+ value: value,
+ });
+ return;
+ }
+
+ setErrors([]);
+ props.setProperty(property)(
+ {
+ type: "image",
+ value: {
+ type: "asset",
+ value: usedAsset.id,
+ },
+ },
+ options
+ );
+ }
+ }
+ };
+
+ return (
+ <Flex
+ direction="column"
+ css={{
+ gridColumn: "span 2",
+ px: theme.spacing[9],
+ paddingTop: theme.spacing[5],
+ paddingBottom: theme.spacing[9],
+ gap: theme.spacing[3],
+ }}
+ >
+ <NonResetablePropertyName
+ style={props.currentStyle}
+ properties={[property]}
+ label="Image"
+ />
+
+ <InputErrorsTooltip errors={errors}>
+ <TextArea
+ ref={textAreaRef}
+ css={{ ...textVariants.mono }}
+ rows={2}
+ autoGrow
+ maxRows={4}
+ name="description"
+ color={intermediateValue?.type === "invalid" ? "error" : undefined}
+ value={intermediateValue !== undefined ? intermediateValue.value : ""}
+ onChange={(value) => handleChange(value, { isEphemeral: true })}
+ onKeyDown={(event) => {
+ if (event.key === "Enter" && intermediateValue !== undefined) {
+ handleChange(intermediateValue.value, { isEphemeral: false });
+ event.preventDefault();
+ }
+
+ if (event.key === "Escape") {
+ props.deleteProperty(property, { isEphemeral: true });
+ setIntermediateValue(undefined);
+ event.preventDefault();
+ }
+ }}
+ />
+ </InputErrorsTooltip>
+ </Flex>
+ );
+};
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
index 4cfee0ca36..770fbd0b7b 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx
@@ -70,6 +70,13 @@ export const getLayerName = (layerStyle: StyleInfo, assets: Assets) => {
}
}
+ if (
+ backgroundImageStyle?.type === "image" &&
+ backgroundImageStyle.value.type === "url"
+ ) {
+ return backgroundImageStyle.value.url;
+ }
+
if (backgroundImageStyle?.type === "unparsed") {
const gradientName = gradientNames.find((name) =>
backgroundImageStyle.value.includes(name)
@@ -106,6 +113,21 @@ export const LayerThumbnail = (props: { layerStyle: StyleInfo }) => {
);
}
+ if (
+ backgroundImageStyle?.type === "image" &&
+ backgroundImageStyle.value.type === "url"
+ ) {
+ return (
+ <StyledWebstudioImage
+ key={backgroundImageStyle.value.url}
+ loader={imageLoader}
+ src={backgroundImageStyle.value.url}
+ width={theme.spacing[10]}
+ optimize={true}
+ />
+ );
+ }
+
if (backgroundImageStyle?.type === "unparsed") {
const cssStyle: {
[property in (typeof layeredBackgroundProps)[number]]?: string;
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.tsx
index ea15bb44a0..aa27b9a5b8 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
@@ -62,28 +62,28 @@ const Layer = (props: {
}) => {
const assets = useStore($assets);
- const backgrounImageStyle = props.layerStyle.backgroundImage?.value;
+ const backgroundImageStyle = props.layerStyle.backgroundImage?.value;
const isHidden =
- backgrounImageStyle?.type === "image" ||
- backgrounImageStyle?.type === "unparsed"
- ? Boolean(backgrounImageStyle.hidden)
+ backgroundImageStyle?.type === "image" ||
+ backgroundImageStyle?.type === "unparsed"
+ ? Boolean(backgroundImageStyle.hidden)
: false;
const handleHiddenChange = (hidden: boolean) => {
if (
- backgrounImageStyle?.type === "image" ||
- backgrounImageStyle?.type === "unparsed"
+ backgroundImageStyle?.type === "image" ||
+ backgroundImageStyle?.type === "unparsed"
) {
props.setProperty("backgroundImage")({
- ...backgrounImageStyle,
+ ...backgroundImageStyle,
hidden,
});
}
};
const canDisable =
- backgrounImageStyle?.type !== "image" &&
- backgrounImageStyle?.type !== "unparsed";
+ backgroundImageStyle?.type !== "image" &&
+ backgroundImageStyle?.type !== "unparsed";
return (
<FloatingPanel
diff --git a/apps/builder/app/builder/features/style-panel/style-layers-list.tsx b/apps/builder/app/builder/features/style-panel/style-layers-list.tsx
index 08f3bbf9f2..cb4ae28494 100644
--- a/apps/builder/app/builder/features/style-panel/style-layers-list.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-layers-list.tsx
@@ -151,7 +151,6 @@ export const LayersList = ({
}
const id = String(index);
const properties = extractPropertiesFromLayer(layer);
- const { name, value, color } = properties;
return (
<FloatingPanel
@@ -162,21 +161,21 @@ export const LayersList = ({
property,
layer,
onEditLayer,
- propertyValue: value,
+ propertyValue: properties.value,
onDeleteLayer: handleDeleteLayer,
deleteProperty,
})}
>
<CssValueListItem
id={id}
- draggable={true}
+ draggable={value.value.length > 1}
active={dragItemId === id}
index={index}
- label={<Label truncate>{name}</Label>}
+ label={<Label truncate>{properties.name}</Label>}
hidden={layer.type === "tuple" && layer?.hidden}
thumbnail={
property === "textShadow" || property === "boxShadow" ? (
- <ColorThumb color={color} />
+ <ColorThumb color={properties.color} />
) : undefined
}
buttons={