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: improve code editor (#3181)
Bogdan Chadkin6d63dac7fd7d
diff --git a/apps/builder/app/builder/shared/code-editor.tsx b/apps/builder/app/builder/shared/code-editor.tsxindex 4b094b5717..b055a30426 100644--- a/apps/builder/app/builder/shared/code-editor.tsx+++ b/apps/builder/app/builder/shared/code-editor.tsx@@ -5,7 +5,20 @@ import {StateEffect,type Extension,} from "@codemirror/state";-import { EditorView } from "@codemirror/view";+import {+ EditorView,+ drawSelection,+ dropCursor,+ keymap,+} from "@codemirror/view";+import {+ defaultKeymap,+ history,+ historyKeymap,+ indentWithTab,+} from "@codemirror/commands";+import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";+import { tags } from "@lezer/highlight";import {theme,textVariants,@@ -85,6 +98,38 @@ const editorContentStyle = css({},});+// https://thememirror.net/clouds+const highlightStyle = HighlightStyle.define([+ {+ tag: tags.comment,+ color: "#BCC8BA",+ },+ {+ tag: [tags.string, tags.special(tags.brace), tags.regexp],+ color: "#5D90CD",+ },+ {+ tag: [tags.number, tags.bool, tags.null],+ color: "#46A609",+ },+ {+ tag: tags.keyword,+ color: "#AF956F",+ },+ {+ tag: [tags.definitionKeyword, tags.modifier],+ color: "#C52727",+ },+ {+ tag: [tags.angleBracket, tags.tagName, tags.attributeName],+ color: "#606060",+ },+ {+ tag: tags.self,+ color: "#000",+ },+]);+type EditorContentProps = {extensions: Extension[];readOnly?: boolean;@@ -141,6 +186,11 @@ const EditorContent = ({view.dispatch({effects: StateEffect.reconfigure.of([...extensions,+ history(),+ drawSelection(),+ dropCursor(),+ syntaxHighlighting(highlightStyle, { fallback: true }),+ keymap.of([...defaultKeymap, ...historyKeymap, indentWithTab]),EditorView.lineWrapping,EditorView.editable.of(readOnly === false),EditorState.readOnly.of(readOnly === true),@@ -161,6 +211,11 @@ const EditorContent = ({blur(event) {onBlurRef.current?.(event);},+ cut(event) {+ // prevent catching cut by global copy paste+ // with target outside of contenteditable+ event.stopPropagation();+ },}),]),});diff --git a/apps/builder/app/builder/shared/expression-editor.tsx b/apps/builder/app/builder/shared/expression-editor.tsxindex b257869fb4..37173364d9 100644--- a/apps/builder/app/builder/shared/expression-editor.tsx+++ b/apps/builder/app/builder/shared/expression-editor.tsx@@ -1,4 +1,4 @@-import { useMemo } from "react";+import { useEffect, useMemo } from "react";import { matchSorter } from "match-sorter";import type { SyntaxNode } from "@lezer/common";import { Facet } from "@codemirror/state";@@ -10,23 +10,14 @@ import {WidgetType,ViewPlugin,keymap,- drawSelection,- dropCursor,EditorView,tooltips,} from "@codemirror/view";-import { defaultKeymap, history, historyKeymap } from "@codemirror/commands";-import {- bracketMatching,- defaultHighlightStyle,- syntaxHighlighting,- syntaxTree,-} from "@codemirror/language";+import { bracketMatching, syntaxTree } from "@codemirror/language";import {type Completion,type CompletionSource,autocompletion,- startCompletion,closeBrackets,closeBracketsKeymap,completionKeymap,@@ -373,12 +364,8 @@ export const ExpressionEditor = ({}) => {const extensions = useMemo(() => [- history(),- drawSelection(),- dropCursor(),bracketMatching(),closeBrackets(),- syntaxHighlighting(defaultHighlightStyle, { fallback: true }),javascript({}),VariablesData.of({ scope, aliases }),// render autocomplete in body@@ -390,23 +377,29 @@ export const ExpressionEditor = ({tooltipClass: () => autocompletionStyle.toString(),}),variables,- keymap.of([- ...closeBracketsKeymap,- ...defaultKeymap,- ...historyKeymap,- ...completionKeymap,- // use tab to trigger completion- {- key: "Tab",- preventDefault: true,- stopPropagation: true,- run: startCompletion,- },- ]),+ keymap.of([...closeBracketsKeymap, ...completionKeymap]),],[scope, aliases]);+ // prevent clicking on autocomplete options propagating to body+ // and closing dialogs and popovers+ useEffect(() => {+ const handlePointerDown = (event: PointerEvent) => {+ if (+ event.target instanceof HTMLElement &&+ event.target.closest(".cm-tooltip-autocomplete")+ ) {+ event.stopPropagation();+ }+ };+ const options = { capture: true };+ document.addEventListener("pointerdown", handlePointerDown, options);+ return () => {+ document.removeEventListener("pointerdown", handlePointerDown, options);+ };+ }, []);+return (<div className={wrapperStyle.toString()}><CodeEditordiff --git a/apps/builder/app/builder/shared/html-editor.tsx b/apps/builder/app/builder/shared/html-editor.tsxindex 9e438946f2..30f72626b6 100644--- a/apps/builder/app/builder/shared/html-editor.tsx+++ b/apps/builder/app/builder/shared/html-editor.tsx@@ -1,19 +1,11 @@-import { forwardRef, useMemo, type ComponentProps } from "react";+import { forwardRef, useMemo, type ComponentProps, useEffect } from "react";import {keymap,- drawSelection,- dropCursor,tooltips,highlightSpecialChars,highlightActiveLine,} from "@codemirror/view";-import { defaultKeymap, history, historyKeymap } from "@codemirror/commands";-import {- bracketMatching,- defaultHighlightStyle,- indentOnInput,- syntaxHighlighting,-} from "@codemirror/language";+import { bracketMatching, indentOnInput } from "@codemirror/language";import {autocompletion,closeBrackets,@@ -29,6 +21,8 @@ const autocompletionStyle = css({...textVariants.mono,border: "none",backgroundColor: "transparent",+ // override none set on body by radix popover+ pointerEvents: "auto","& ul": {minWidth: 160,maxWidth: 260,@@ -48,7 +42,7 @@ const autocompletionStyle = css({color: theme.colors.foregroundMain,padding: theme.spacing[3],borderRadius: theme.borderRadius[3],- "&[aria-selected]": {+ "&[aria-selected], &:hover": {color: theme.colors.foregroundMain,backgroundColor: theme.colors.backgroundItemMenuItemHover,},@@ -81,11 +75,7 @@ export const HtmlEditor = forwardRef<() => [highlightActiveLine(),highlightSpecialChars(),- history(),- drawSelection(),- dropCursor(),indentOnInput(),- syntaxHighlighting(defaultHighlightStyle, { fallback: true }),html({}),bracketMatching(),closeBrackets(),@@ -95,17 +85,31 @@ export const HtmlEditor = forwardRef<autocompletion({icons: false,tooltipClass: () => autocompletionStyle.toString(),+ closeOnBlur: false,}),- keymap.of([- ...closeBracketsKeymap,- ...defaultKeymap,- ...historyKeymap,- ...completionKeymap,- ]),+ keymap.of([...closeBracketsKeymap, ...completionKeymap]),],[]);+ // prevent clicking on autocomplete options propagating to body+ // and closing dialogs and popovers+ useEffect(() => {+ const handlePointerDown = (event: PointerEvent) => {+ if (+ event.target instanceof HTMLElement &&+ event.target.closest(".cm-tooltip-autocomplete")+ ) {+ event.stopPropagation();+ }+ };+ const options = { capture: true };+ document.addEventListener("pointerdown", handlePointerDown, options);+ return () => {+ document.removeEventListener("pointerdown", handlePointerDown, options);+ };+ }, []);+return (<div className={wrapperStyle()} ref={ref}><CodeEditor {...props} extensions={extensions} />diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex b450e4a610..88ebbb89aa 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -47,7 +47,6 @@ const createDomainContext = (request: Request) => {const getRequestOrigin = (request: Request) => {const url = new URL(request.url);- console.info("getRequestOrigin", [...request.headers.entries()]);// vercel overwrites x-forwarded-host on edge level even if our header is set// as workaround we use custom header x-forwarded-ws-host to get the original hostdiff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 1652282e25..d986c747bc 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -22,13 +22,13 @@"middleware:dev": "DOTENV_CONFIG_PATH=.env.preview tsx watch -r dotenv/config ./middleware.js"},"dependencies": {- "@codemirror/autocomplete": "^6.11.1",- "@codemirror/commands": "^6.3.2",- "@codemirror/lang-html": "^6.4.7",- "@codemirror/lang-javascript": "^6.2.1",- "@codemirror/language": "^6.9.3",- "@codemirror/state": "^6.3.3",- "@codemirror/view": "^6.22.3",+ "@codemirror/autocomplete": "^6.16.0",+ "@codemirror/commands": "^6.3.3",+ "@codemirror/lang-html": "^6.4.9",+ "@codemirror/lang-javascript": "^6.2.2",+ "@codemirror/language": "^6.10.1",+ "@codemirror/state": "^6.4.1",+ "@codemirror/view": "^6.26.3","@floating-ui/dom": "^1.5.3","@fontsource-variable/inter": "^5.0.13","@fontsource-variable/manrope": "^5.0.15",@@ -39,6 +39,7 @@"@lexical/selection": "^0.14.3","@lexical/utils": "^0.14.3","@lezer/common": "^1.2.1",+ "@lezer/highlight": "^1.2.0","@nanostores/react": "^0.7.1","@radix-ui/react-select": "^2.0.0","@radix-ui/react-tooltip": "^1.0.7",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 8b77725136..c30501eac8 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -69,26 +69,26 @@ importers:apps/builder:dependencies:'@codemirror/autocomplete':- specifier: ^6.11.1- version: 6.11.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])+ specifier: ^6.16.0+ version: 6.16.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])'@codemirror/commands':- specifier: ^6.3.2- version: 6.3.2+ specifier: ^6.3.3+ version: 6.3.3'@codemirror/lang-html':- specifier: ^6.4.7- version: 6.4.7+ specifier: ^6.4.9+ version: 6.4.9'@codemirror/lang-javascript':- specifier: ^6.2.1- version: 6.2.1+ specifier: ^6.2.2+ version: 6.2.2'@codemirror/language':- specifier: ^6.9.3- version: 6.9.3+ specifier: ^6.10.1+ version: 6.10.1'@codemirror/state':- specifier: ^6.3.3- version: 6.3.3+ specifier: ^6.4.1+ version: 6.4.1'@codemirror/view':- specifier: ^6.22.3- version: 6.22.3+ specifier: ^6.26.3+ version: 6.26.3'@floating-ui/dom':specifier: ^1.5.3version: 1.5.3@@ -119,6 +119,9 @@ importers:'@lezer/common':specifier: ^1.2.1version: 1.2.1+ '@lezer/highlight':+ specifier: ^1.2.0+ version: 1.2.0'@nanostores/react':specifier: ^0.7.1version: 0.7.1([email protected])([email protected])@@ -3649,72 +3652,72 @@ packages:/@cloudflare/[email protected]:resolution: {integrity: sha512-sEVOhyOgXUwfLkgHqbLZa/sfkSYrh7/zLmI6EZNibPaVPvAnAcItbNNl3SAlLyLKuwf8m4wAIAgu9meKWCvXjg==}- /@codemirror/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected]):- resolution: {integrity: sha512-L5UInv8Ffd6BPw0P3EF7JLYAMeEbclY7+6Q11REt8vhih8RuLreKtPy/xk8wPxs4EQgYqzI7cdgpiYwWlbS/ow==}+ /@codemirror/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected]):+ resolution: {integrity: sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg==}peerDependencies:'@codemirror/language': ^6.0.0'@codemirror/state': ^6.0.0'@codemirror/view': ^6.0.0'@lezer/common': ^1.0.0dependencies:- '@codemirror/language': 6.9.3- '@codemirror/state': 6.3.3- '@codemirror/view': 6.22.3+ '@codemirror/language': 6.10.1+ '@codemirror/state': 6.4.1+ '@codemirror/view': 6.26.3'@lezer/common': 1.2.1dev: false- /@codemirror/[email protected]:- resolution: {integrity: sha512-tjoi4MCWDNxgIpoLZ7+tezdS9OEB6pkiDKhfKx9ReJ/XBcs2G2RXIu+/FxXBlWsPTsz6C9q/r4gjzrsxpcnqCQ==}+ /@codemirror/[email protected]:+ resolution: {integrity: sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==}dependencies:- '@codemirror/language': 6.9.3- '@codemirror/state': 6.3.3- '@codemirror/view': 6.22.3+ '@codemirror/language': 6.10.1+ '@codemirror/state': 6.4.1+ '@codemirror/view': 6.26.3'@lezer/common': 1.2.1dev: false- /@codemirror/[email protected](@codemirror/[email protected]):+ /@codemirror/[email protected](@codemirror/[email protected]):resolution: {integrity: sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==}dependencies:- '@codemirror/autocomplete': 6.11.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])- '@codemirror/language': 6.9.3- '@codemirror/state': 6.3.3+ '@codemirror/autocomplete': 6.16.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])+ '@codemirror/language': 6.10.1+ '@codemirror/state': 6.4.1'@lezer/common': 1.2.1'@lezer/css': 1.1.4transitivePeerDependencies:- '@codemirror/view'dev: false- /@codemirror/[email protected]:- resolution: {integrity: sha512-y9hWSSO41XlcL4uYwWyk0lEgTHcelWWfRuqmvcAmxfCs0HNWZdriWo/EU43S63SxEZpc1Hd50Itw7ktfQvfkUg==}+ /@codemirror/[email protected]:+ resolution: {integrity: sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==}dependencies:- '@codemirror/autocomplete': 6.11.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])- '@codemirror/lang-css': 6.2.1(@codemirror/[email protected])- '@codemirror/lang-javascript': 6.2.1- '@codemirror/language': 6.9.3- '@codemirror/state': 6.3.3- '@codemirror/view': 6.22.3+ '@codemirror/autocomplete': 6.16.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])+ '@codemirror/lang-css': 6.2.1(@codemirror/[email protected])+ '@codemirror/lang-javascript': 6.2.2+ '@codemirror/language': 6.10.1+ '@codemirror/state': 6.4.1+ '@codemirror/view': 6.26.3'@lezer/common': 1.2.1'@lezer/css': 1.1.4'@lezer/html': 1.3.7dev: false- /@codemirror/[email protected]:- resolution: {integrity: sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==}+ /@codemirror/[email protected]:+ resolution: {integrity: sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==}dependencies:- '@codemirror/autocomplete': 6.11.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])- '@codemirror/language': 6.9.3+ '@codemirror/autocomplete': 6.16.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected])+ '@codemirror/language': 6.10.1'@codemirror/lint': 6.4.2- '@codemirror/state': 6.3.3- '@codemirror/view': 6.22.3+ '@codemirror/state': 6.4.1+ '@codemirror/view': 6.26.3'@lezer/common': 1.2.1'@lezer/javascript': 1.4.10dev: false- /@codemirror/[email protected]:- resolution: {integrity: sha512-qq48pYzoi6ldYWV/52+Z9Ou6QouVI+8YwvxFbUypI33NbjG2UeRHKENRyhwljTTiOqjQ33FjyZj6EREQ9apAOQ==}+ /@codemirror/[email protected]:+ resolution: {integrity: sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==}dependencies:- '@codemirror/state': 6.3.3- '@codemirror/view': 6.22.3+ '@codemirror/state': 6.4.1+ '@codemirror/view': 6.26.3'@lezer/common': 1.2.1'@lezer/highlight': 1.2.0'@lezer/lr': 1.3.14@@ -3724,19 +3727,19 @@ packages:/@codemirror/[email protected]:resolution: {integrity: sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==}dependencies:- '@codemirror/state': 6.3.3- '@codemirror/view': 6.22.3+ '@codemirror/state': 6.4.1+ '@codemirror/view': 6.26.3crelt: 1.0.6dev: false- /@codemirror/[email protected]:- resolution: {integrity: sha512-0wufKcTw2dEwEaADajjHf6hBy1sh3M6V0e+q4JKIhLuiMSe5td5HOWpUdvKth1fT1M9VYOboajoBHpkCd7PG7A==}+ /@codemirror/[email protected]:+ resolution: {integrity: sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==}dev: false- /@codemirror/[email protected]:- resolution: {integrity: sha512-rqnq+Zospwoi3x1vZ8BGV1MlRsaGljX+6qiGYmIpJ++M+LCC+wjfDaPklhwpWSgv7pr/qx29KiAKQBH5+DOn4w==}+ /@codemirror/[email protected]:+ resolution: {integrity: sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw==}dependencies:- '@codemirror/state': 6.3.3+ '@codemirror/state': 6.4.1style-mod: 4.1.0w3c-keyname: 2.2.8dev: false