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
Blocking alerts (#1242)
Oleg Isonen6d4fab40b5ed
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex e922e3a552..3e2d799b31 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -49,6 +49,7 @@ import { AssetsProvider } from "./shared/assets";import type { Asset } from "@webstudio-is/asset-uploader";import { useSearchParams } from "@remix-run/react";import { useSyncInitializeOnce } from "~/shared/hook-utils";+import { BlockingAlerts } from "./features/blocking-alerts";registerContainers();@@ -328,7 +329,6 @@ export const Builder = ({css={{height: "100%",width: "100%",- //minWidth,}}/></Workspace>@@ -349,6 +349,7 @@ export const Builder = ({)}</SidePanel>{isPreviewMode === false && <Footer />}+ <BlockingAlerts /></ChromeWrapper></AssetsProvider>);diff --git a/apps/builder/app/builder/features/blocking-alerts/alert.stories.tsx b/apps/builder/app/builder/features/blocking-alerts/alert.stories.tsxnew file mode 100644index 0000000000..aec5cf1860--- /dev/null+++ b/apps/builder/app/builder/features/blocking-alerts/alert.stories.tsx@@ -0,0 +1,11 @@+import { Alert } from "./alert";++export default { component: Alert };++export const Basic = () => (+ <Alert+ message={+ "Your browser window is too small. Resize your browser to at least 900px wide to continue building with Webstudio."+ }+ />+);diff --git a/apps/builder/app/builder/features/blocking-alerts/alert.tsx b/apps/builder/app/builder/features/blocking-alerts/alert.tsxnew file mode 100644index 0000000000..8769e95ee5--- /dev/null+++ b/apps/builder/app/builder/features/blocking-alerts/alert.tsx@@ -0,0 +1,32 @@+import { css, Flex, Text, theme } from "@webstudio-is/design-system";+import { AlertIcon } from "@webstudio-is/icons";++const containerStyle = css({+ position: "absolute",+ inset: 0,+ zIndex: theme.zIndices.max,+ background: "rgba(0, 0, 0, 0.9)",+});++const contentStyle = css({+ width: theme.spacing[33],+ color: theme.colors.foregroundDestructive,+});++export const Alert = ({ message }: { message: string }) => {+ return (+ <Flex align="center" justify="center" className={containerStyle()}>+ <Flex+ direction="column"+ align="center"+ gap="2"+ className={contentStyle()}+ >+ <AlertIcon size={22} />+ <Text color="contrast" variant="labelsSentenceCase" align="center">+ {message}+ </Text>+ </Flex>+ </Flex>+ );+};diff --git a/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx b/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsxnew file mode 100644index 0000000000..49cd250dc5--- /dev/null+++ b/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx@@ -0,0 +1,46 @@+import { useEffect, useState } from "react";+import { Alert } from "./alert";+import { useWindowResizeDebounced } from "~/shared/dom-hooks";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";++const useTooSmallMessage = () => {+ const [message, setMessage] = useState<string>();+ const check = () => {+ const minWidth = 900;+ const message =+ window.innerWidth >= minWidth+ ? undefined+ : `Your browser window is too small. Resize your browser to at least ${minWidth}px wide to continue building with Webstudio.`;+ setMessage(message);+ };++ useWindowResizeDebounced(check);+ useEffect(check, []);+ return message;+};++const useUnsupportedBrowser = () => {+ const [message, setMessage] = useState<string>();+ useEffect(() => {+ if ("chrome" in window || isFeatureEnabled("unsupportedBrowsers")) {+ return;+ }+ setMessage(+ "Webstudio currently supports Google Chrome and Microsoft Edge. We plan to support more browsers in the near future."+ );+ }, []);+ return message;+};++export const BlockingAlerts = () => {+ // Takes the latest message, order matters+ const message = [useTooSmallMessage(), useUnsupportedBrowser()]+ .filter(Boolean)+ .pop();++ if (message === undefined) {+ return null;+ }++ return <Alert message={message} />;+};diff --git a/apps/builder/app/builder/features/blocking-alerts/index.tsx b/apps/builder/app/builder/features/blocking-alerts/index.tsxnew file mode 100644index 0000000000..2a386c977c--- /dev/null+++ b/apps/builder/app/builder/features/blocking-alerts/index.tsx@@ -0,0 +1 @@+export { BlockingAlerts } from "./blocking-alerts";diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex 52f7180c8d..fa69ce3025 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -1,3 +1,4 @@export const example = false;export const dark = false;export const propertyReset = false;+export const unsupportedBrowsers = false;diff --git a/packages/icons/icons/alert.svg b/packages/icons/icons/alert.svgnew file mode 100644index 0000000000..7c9c12ff1f--- /dev/null+++ b/packages/icons/icons/alert.svg@@ -0,0 +1,6 @@+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">+ <path fill-rule="evenodd" clip-rule="evenodd" d="M9.21309 2.56705C9.99686 1.17402 12.0026 1.17402 12.7863 2.56705L20.8758 16.9447C21.6446 18.3112 20.6571 19.9999 19.0891 19.9999H2.91028C1.34229 19.9999 0.354791 18.3112 1.12366 16.9447L9.21309 2.56705ZM11.479 3.30258C11.2688 2.92884 10.7307 2.92884 10.5204 3.30258L2.43095 17.6802C2.22466 18.0468 2.4896 18.4999 2.91028 18.4999H19.0891C19.5098 18.4999 19.7748 18.0468 19.5685 17.6802L11.479 3.30258Z" />+ <path fill-rule="evenodd" clip-rule="evenodd" d="M10.9995 7.49999C11.4137 7.49999 11.7495 7.83578 11.7495 8.24999V11.9075C11.7495 12.3217 11.4137 12.6575 10.9995 12.6575C10.5853 12.6575 10.2495 12.3217 10.2495 11.9075V8.24999C10.2495 7.83578 10.5853 7.49999 10.9995 7.49999Z" />+ <path fill-rule="evenodd" clip-rule="evenodd" d="M10.0995 15.5832C10.0995 15.0862 10.5025 14.6832 10.9995 14.6832H11.0087C11.5057 14.6832 11.9087 15.0862 11.9087 15.5832C11.9087 16.0803 11.5057 16.4832 11.0087 16.4832H10.9995C10.5025 16.4832 10.0995 16.0803 10.0995 15.5832Z" />+</svg>+\ No newline at end of filediff --git a/packages/icons/src/__generated__/alert.tsx b/packages/icons/src/__generated__/alert.tsxnew file mode 100644index 0000000000..aa5296ebe0--- /dev/null+++ b/packages/icons/src/__generated__/alert.tsx@@ -0,0 +1,15 @@+// Generated from icons/alert.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const AlertIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path d="M9.213 2.567c.784-1.393 2.79-1.393 3.573 0l8.09 14.378C21.645 18.31 20.657 20 19.089 20H2.91c-1.568 0-2.555-1.689-1.786-3.055l8.09-14.378Zm2.266.736a.55.55 0 0 0-.959 0L2.431 17.68a.55.55 0 0 0 .48.82h16.178a.55.55 0 0 0 .48-.82l-8.09-14.377Z" clipRule="evenodd" /><path d="M11 7.5a.75.75 0 0 1 .75.75v3.658a.75.75 0 0 1-1.5 0V8.25A.75.75 0 0 1 11 7.5ZM10.1 15.583a.9.9 0 0 1 .9-.9h.009a.9.9 0 0 1 0 1.8h-.01a.9.9 0 0 1-.9-.9Z" clipRule="evenodd" /></svg>+ );+ }+);++AlertIcon.displayName = "AlertIcon";diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.tsindex 214f4bd5db..4fdefb4f76 100644--- a/packages/icons/src/__generated__/index.ts+++ b/packages/icons/src/__generated__/index.ts@@ -1,3 +1,4 @@+export * from "./alert";export * from "./auto-scroll";export * from "./blockquote";export * from "./box-link";