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.

feat: Expand HTML editor (#2934)

Oleg Isonen0e4cc4c5bd16
diff --git a/apps/builder/app/builder/features/settings-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
index 7b6e48cb03..568f11faa3 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
@@ -113,6 +113,18 @@ export const CodeControl = ({
prop?.type === "expression" ? prop.value : undefined
);
+ const errorInfo = (
+ <ErrorInfo
+ error={error}
+ onAutoFix={() => {
+ if (error) {
+ setError(undefined);
+ localValue.set(error.expected);
+ }
+ }}
+ />
+ );
+
return (
<VerticalLayout
label={
@@ -123,15 +135,7 @@ export const CodeControl = ({
>
{label}
</Label>
- <ErrorInfo
- error={error}
- onAutoFix={() => {
- if (error) {
- setError(undefined);
- localValue.set(error.expected);
- }
- }}
- />
+ {errorInfo}
</Flex>
}
deletable={deletable}
@@ -139,6 +143,12 @@ export const CodeControl = ({
>
<BindingControl>
<HtmlEditor
+ title={
+ <Flex gap="1" align="center">
+ <Text variant="labelsTitleCase">HTML Code Editor</Text>
+ {errorInfo}
+ </Flex>
+ }
readOnly={overwritable === false}
invalid={error !== undefined}
value={localValue.value}
diff --git a/apps/builder/app/builder/shared/html-editor.tsx b/apps/builder/app/builder/shared/html-editor.tsx
index 82f9788e74..78fefd7cb0 100644
--- a/apps/builder/app/builder/shared/html-editor.tsx
+++ b/apps/builder/app/builder/shared/html-editor.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, useMemo } from "react";
+import { forwardRef, useMemo, type ReactNode, useState } from "react";
import {
keymap,
drawSelection,
@@ -21,8 +21,22 @@ import {
completionKeymap,
} from "@codemirror/autocomplete";
import { html } from "@codemirror/lang-html";
-import { theme, textVariants, css } from "@webstudio-is/design-system";
+import {
+ theme,
+ textVariants,
+ css,
+ Dialog,
+ DialogContent,
+ SmallIconButton,
+ DialogTrigger,
+ DialogTitle,
+ Button,
+ DialogClose,
+ Grid,
+ rawTheme,
+} from "@webstudio-is/design-system";
import { CodeEditor } from "./code-editor";
+import { CrossIcon, MaximizeIcon, MinimizeIcon } from "@webstudio-is/icons";
const autocompletionStyle = css({
"&.cm-tooltip.cm-tooltip-autocomplete": {
@@ -67,6 +81,7 @@ const autocompletionStyle = css({
});
const wrapperStyle = css({
+ position: "relative",
"& .cm-content": {
// 1 line is 16px
// set min 10 lines and max 20 lines
@@ -81,41 +96,45 @@ export const HtmlEditor = forwardRef<
readOnly?: boolean;
invalid?: boolean;
value: string;
+ title?: ReactNode;
onChange: (newValue: string) => void;
onBlur?: (event: FocusEvent) => void;
}
->(({ readOnly = false, invalid = false, value, onChange, onBlur }, ref) => {
- const extensions = useMemo(
- () => [
- highlightActiveLine(),
- highlightSpecialChars(),
- history(),
- drawSelection(),
- dropCursor(),
- indentOnInput(),
- syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
- html({}),
- bracketMatching(),
- closeBrackets(),
- // render autocomplete in body
- // to prevent popover scroll overflow
- tooltips({ parent: document.body }),
- autocompletion({
- icons: false,
- tooltipClass: () => autocompletionStyle.toString(),
- }),
- keymap.of([
- ...closeBracketsKeymap,
- ...defaultKeymap,
- ...historyKeymap,
- ...completionKeymap,
- ]),
- ],
- []
- );
+>(
+ (
+ { readOnly = false, invalid = false, value, title, onChange, onBlur },
+ ref
+ ) => {
+ const extensions = useMemo(
+ () => [
+ highlightActiveLine(),
+ highlightSpecialChars(),
+ history(),
+ drawSelection(),
+ dropCursor(),
+ indentOnInput(),
+ syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+ html({}),
+ bracketMatching(),
+ closeBrackets(),
+ // render autocomplete in body
+ // to prevent popover scroll overflow
+ tooltips({ parent: document.body }),
+ autocompletion({
+ icons: false,
+ tooltipClass: () => autocompletionStyle.toString(),
+ }),
+ keymap.of([
+ ...closeBracketsKeymap,
+ ...defaultKeymap,
+ ...historyKeymap,
+ ...completionKeymap,
+ ]),
+ ],
+ []
+ );
- return (
- <div className={wrapperStyle.toString()} ref={ref}>
+ const editor = (
<CodeEditor
extensions={extensions}
readOnly={readOnly}
@@ -124,8 +143,96 @@ export const HtmlEditor = forwardRef<
onChange={onChange}
onBlur={onBlur}
/>
- </div>
- );
-});
+ );
+
+ return (
+ <div className={wrapperStyle.toString()} ref={ref}>
+ {editor}
+ <CodeEditorDialog title={title} content={editor}>
+ <SmallIconButton
+ icon={<MaximizeIcon />}
+ css={{
+ position: "absolute",
+ top: 2,
+ right: 2,
+ }}
+ />
+ </CodeEditorDialog>
+ </div>
+ );
+ }
+);
HtmlEditor.displayName = "HtmlEditor";
+
+const CodeEditorDialog = ({
+ title,
+ content,
+ children,
+}: {
+ title: ReactNode;
+ content: ReactNode;
+ children: ReactNode;
+}) => {
+ const [isExpanded, setIsExpanded] = useState(false);
+ const width = isExpanded ? "80vw" : "640px";
+ const height = isExpanded ? "80vh" : "480px";
+ const padding = rawTheme.spacing[7];
+
+ return (
+ <Dialog>
+ <DialogTrigger asChild>{children}</DialogTrigger>
+ <DialogContent
+ // Left Aside panels (e.g., Pages, Components) use zIndex: theme.zIndices[1].
+ // For a dialog to appear above these panels, both overlay and content should also have zIndex: theme.zIndices[1].
+ css={{
+ maxWidth: "none",
+ maxHeight: "none",
+ zIndex: theme.zIndices[1],
+ }}
+ overlayCss={{ zIndex: theme.zIndices[1] }}
+ >
+ <Grid
+ css={{
+ padding,
+ width,
+ height,
+ overflow: "hidden",
+ boxSizing: "content-box",
+ "& .cm-content": {
+ maxHeight: `calc(${height} - ${padding})`,
+ },
+ }}
+ >
+ {content}
+ </Grid>
+ {/* Title is at the end intentionally,
+ * to make the close button last in the tab order
+ */}
+ <DialogTitle
+ suffix={
+ <>
+ <Button
+ color="ghost"
+ prefix={isExpanded ? <MinimizeIcon /> : <MaximizeIcon />}
+ aria-label="Expand"
+ onClick={() => {
+ setIsExpanded(isExpanded ? false : true);
+ }}
+ />
+ <DialogClose asChild>
+ <Button
+ color="ghost"
+ prefix={<CrossIcon />}
+ aria-label="Close"
+ />
+ </DialogClose>
+ </>
+ }
+ >
+ {title}
+ </DialogTitle>
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/packages/design-system/src/components/dialog.tsx b/packages/design-system/src/components/dialog.tsx
index 56a041b60a..d69ea8de44 100644
--- a/packages/design-system/src/components/dialog.tsx
+++ b/packages/design-system/src/components/dialog.tsx
@@ -58,16 +58,20 @@ DialogContent.displayName = "DialogContent";
export const DialogTitle = ({
children,
closeLabel = "Close dialog",
+ suffix,
}: {
children: ReactNode;
+ suffix?: ReactNode;
closeLabel?: string;
}) => (
<TitleSlot>
<PanelTitle
suffix={
- <Primitive.Close asChild>
- <CloseButton aria-label={closeLabel} />
- </Primitive.Close>
+ suffix ?? (
+ <DialogClose asChild>
+ <CloseButton aria-label={closeLabel} />
+ </DialogClose>
+ )
}
>
<Primitive.Title className={titleStyle()}>{children}</Primitive.Title>
diff --git a/packages/icons/icons/maximize.svg b/packages/icons/icons/maximize.svg
new file mode 100644
index 0000000000..21f5ad6272
--- /dev/null
+++ b/packages/icons/icons/maximize.svg
@@ -0,0 +1,13 @@
+<svg
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+>
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M10.3333 3.64998C9.97435 3.64998 9.68334 3.35896 9.68334 2.99998C9.68334 2.64099 9.97435 2.34998 10.3333 2.34998H14C14.359 2.34998 14.65 2.64099 14.65 2.99998V6.66664C14.65 7.02563 14.359 7.31664 14 7.31664C13.641 7.31664 13.35 7.02563 13.35 6.66664V4.56921L10.1818 7.73737C9.92801 7.99121 9.51645 7.99121 9.26261 7.73737C9.00877 7.48353 9.00877 7.07197 9.26261 6.81813L12.4308 3.64998H10.3333ZM7.7374 9.26258C7.99124 9.51642 7.99124 9.92798 7.7374 10.1818L4.56924 13.35H6.66667C7.02566 13.35 7.31667 13.641 7.31667 14C7.31667 14.359 7.02566 14.65 6.66667 14.65H3.00001C2.82762 14.65 2.66229 14.5815 2.54039 14.4596C2.41849 14.3377 2.35001 14.1724 2.35001 14L2.35001 10.3333C2.35001 9.97432 2.64102 9.68331 3.00001 9.68331C3.35899 9.68331 3.65001 9.97432 3.65001 10.3333L3.65001 12.4307L6.81816 9.26258C7.072 9.00874 7.48356 9.00874 7.7374 9.26258Z"
+ />
+</svg>
diff --git a/packages/icons/icons/minimize.svg b/packages/icons/icons/minimize.svg
new file mode 100644
index 0000000000..c42fbc177f
--- /dev/null
+++ b/packages/icons/icons/minimize.svg
@@ -0,0 +1,13 @@
+<svg
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+>
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M14.4596 2.54036C14.7135 2.7942 14.7135 3.20575 14.4596 3.45959L11.2915 6.62775H13.3889C13.7479 6.62775 14.0389 6.91877 14.0389 7.27775C14.0389 7.63674 13.7479 7.92775 13.3889 7.92775H9.72223C9.36324 7.92775 9.07223 7.63674 9.07223 7.27775V3.61109C9.07223 3.2521 9.36324 2.96109 9.72223 2.96109C10.0812 2.96109 10.3722 3.2521 10.3722 3.61109V5.70851L13.5404 2.54036C13.7942 2.28652 14.2058 2.28652 14.4596 2.54036ZM2.96112 9.7222C2.96112 9.36321 3.25213 9.0722 3.61112 9.0722H7.27778C7.63677 9.0722 7.92778 9.36321 7.92778 9.7222V13.3889C7.92778 13.7478 7.63677 14.0389 7.27778 14.0389C6.9188 14.0389 6.62778 13.7478 6.62778 13.3889V11.2914L3.45963 14.4596C3.20578 14.7134 2.79423 14.7134 2.54039 14.4596C2.28655 14.2058 2.28655 13.7942 2.54039 13.5404L5.70855 10.3722H3.61112C3.25213 10.3722 2.96112 10.0812 2.96112 9.7222Z"
+ />
+</svg>
diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.ts
index be7967912c..fe0aa7e508 100644
--- a/packages/icons/src/__generated__/index.ts
+++ b/packages/icons/src/__generated__/index.ts
@@ -120,9 +120,11 @@ export * from "./list-item";
export * from "./list-view";
export * from "./list";
export * from "./loading-dots";
+export * from "./maximize";
export * from "./menu-ellipses";
export * from "./mic-off";
export * from "./mic";
+export * from "./minimize";
export * from "./minus";
export * from "./navigation-menu";
export * from "./no-wrap";
diff --git a/packages/icons/src/__generated__/maximize.tsx b/packages/icons/src/__generated__/maximize.tsx
new file mode 100644
index 0000000000..4d0c4e45a4
--- /dev/null
+++ b/packages/icons/src/__generated__/maximize.tsx
@@ -0,0 +1,15 @@
+// Generated from icons/maximize.svg
+
+import { forwardRef } from "react";
+import type { IconProps } from "../types";
+
+// prettier-ignore
+export const MaximizeIcon = forwardRef<SVGSVGElement, IconProps>(
+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path d="M10.333 3.65a.65.65 0 0 1 0-1.3H14a.65.65 0 0 1 .65.65v3.667a.65.65 0 1 1-1.3 0V4.569l-3.168 3.168a.65.65 0 1 1-.92-.919l3.169-3.168h-2.098ZM7.737 9.263a.65.65 0 0 1 0 .919L4.57 13.35h2.098a.65.65 0 1 1 0 1.3H3a.65.65 0 0 1-.65-.65v-3.667a.65.65 0 0 1 1.3 0v2.098l3.168-3.168a.65.65 0 0 1 .92 0Z" clipRule="evenodd" /></svg>
+ );
+ }
+);
+
+MaximizeIcon.displayName = "MaximizeIcon";
diff --git a/packages/icons/src/__generated__/minimize.tsx b/packages/icons/src/__generated__/minimize.tsx
new file mode 100644
index 0000000000..9ce8b9cc0f
--- /dev/null
+++ b/packages/icons/src/__generated__/minimize.tsx
@@ -0,0 +1,15 @@
+// Generated from icons/minimize.svg
+
+import { forwardRef } from "react";
+import type { IconProps } from "../types";
+
+// prettier-ignore
+export const MinimizeIcon = forwardRef<SVGSVGElement, IconProps>(
+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path d="M14.46 2.54a.65.65 0 0 1 0 .92L11.29 6.628h2.098a.65.65 0 1 1 0 1.3H9.722a.65.65 0 0 1-.65-.65V3.61a.65.65 0 1 1 1.3 0V5.71L13.54 2.54a.65.65 0 0 1 .92 0ZM2.96 9.722a.65.65 0 0 1 .65-.65h3.667a.65.65 0 0 1 .65.65v3.667a.65.65 0 0 1-1.3 0V11.29L3.46 14.46a.65.65 0 0 1-.92-.92l3.169-3.168H3.61a.65.65 0 0 1-.65-.65Z" clipRule="evenodd" /></svg>
+ );
+ }
+);
+
+MinimizeIcon.displayName = "MinimizeIcon";
diff --git a/packages/icons/src/__generated__/svg/index.ts b/packages/icons/src/__generated__/svg/index.ts
index 1a8359c51e..a5345dcbc7 100644
--- a/packages/icons/src/__generated__/svg/index.ts
+++ b/packages/icons/src/__generated__/svg/index.ts
@@ -120,9 +120,11 @@ export { ListItemIcon } from "./list-item";
export { ListViewIcon } from "./list-view";
export { ListIcon } from "./list";
export { LoadingDotsIcon } from "./loading-dots";
+export { MaximizeIcon } from "./maximize";
export { MenuEllipsesIcon } from "./menu-ellipses";
export { MicOffIcon } from "./mic-off";
export { MicIcon } from "./mic";
+export { MinimizeIcon } from "./minimize";
export { MinusIcon } from "./minus";
export { NavigationMenuIcon } from "./navigation-menu";
export { NoWrapIcon } from "./no-wrap";
diff --git a/packages/icons/src/__generated__/svg/maximize.ts b/packages/icons/src/__generated__/svg/maximize.ts
new file mode 100644
index 0000000000..9a16a04ff1
--- /dev/null
+++ b/packages/icons/src/__generated__/svg/maximize.ts
@@ -0,0 +1 @@
+export const MaximizeIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path d="M10.333 3.65a.65.65 0 0 1 0-1.3H14a.65.65 0 0 1 .65.65v3.667a.65.65 0 1 1-1.3 0V4.569l-3.168 3.168a.65.65 0 1 1-.92-.919l3.169-3.168h-2.098ZM7.737 9.263a.65.65 0 0 1 0 .919L4.57 13.35h2.098a.65.65 0 1 1 0 1.3H3a.65.65 0 0 1-.65-.65v-3.667a.65.65 0 0 1 1.3 0v2.098l3.168-3.168a.65.65 0 0 1 .92 0Z" clip-rule="evenodd"/></svg>`;
diff --git a/packages/icons/src/__generated__/svg/minimize.ts b/packages/icons/src/__generated__/svg/minimize.ts
new file mode 100644
index 0000000000..f1e87903ad
--- /dev/null
+++ b/packages/icons/src/__generated__/svg/minimize.ts
@@ -0,0 +1 @@
+export const MinimizeIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path d="M14.46 2.54a.65.65 0 0 1 0 .92L11.29 6.628h2.098a.65.65 0 1 1 0 1.3H9.722a.65.65 0 0 1-.65-.65V3.61a.65.65 0 1 1 1.3 0V5.71L13.54 2.54a.65.65 0 0 1 .92 0ZM2.96 9.722a.65.65 0 0 1 .65-.65h3.667a.65.65 0 0 1 .65.65v3.667a.65.65 0 0 1-1.3 0V11.29L3.46 14.46a.65.65 0 0 1-.92-.92l3.169-3.168H3.61a.65.65 0 0 1-.65-.65Z" clip-rule="evenodd"/></svg>`;