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: allow small screen size in preview (#3897)

Oleg Isonen76e4b467c55e
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index fd838fc0cc..450ee7c6b2 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -40,8 +40,6 @@ import {
$publisherHost,
$imageLoader,
$textEditingInstanceSelector,
- $selectedInstanceRenderState,
- $canvasIframeState,
} from "~/shared/nano-states";
import { type Settings } from "./shared/client-settings";
import { getBuildUrl } from "~/shared/router-utils";
@@ -53,15 +51,18 @@ import { subscribeCommands } from "~/builder/shared/commands";
import { AiCommandBar } from "./features/ai/ai-command-bar";
import { ProjectSettings } from "./features/project-settings";
import type { UserPlanFeatures } from "~/shared/db/user-plan-features.server";
-import { $isCloneDialogOpen, $userPlanFeatures } from "./shared/nano-states";
+import {
+ $dataLoadingState,
+ $isCloneDialogOpen,
+ $loadingState,
+ $userPlanFeatures,
+} from "./shared/nano-states";
import { CloneProjectDialog } from "~/shared/clone-project";
import type { TokenPermissions } from "@webstudio-is/authorization-token";
import { useToastErrors } from "~/shared/error/toast-error";
import { canvasApi } from "~/shared/canvas-api";
import { loadBuilderData, setBuilderData } from "~/shared/builder-data";
import { WebstudioIcon } from "@webstudio-is/icons";
-import { computed } from "nanostores";
-import { $dataLoadingState } from "~/shared/nano-states/builder";
import { initBuilderApi } from "~/shared/builder-api";
import { updateWebstudioData } from "~/shared/instance-utils";
import { migrateWebstudioDataMutable } from "~/shared/webstudio-data-migrator";
@@ -184,7 +185,6 @@ const ChromeWrapper = ({ children, isPreviewMode }: ChromeWrapperProps) => {
<Grid
css={{
height: "100vh",
- minWidth: 530, // Enough space to show left sidebars before it becomes broken or unusable
overflow: "hidden",
display: "grid",
gridTemplateRows: "auto 1fr auto",
@@ -248,40 +248,6 @@ const revealAnimation = ({
},
});
-const $loadingState = computed(
- [
- $dataLoadingState,
- $selectedInstanceRenderState,
- $canvasIframeState,
- $isPreviewMode,
- ],
- (
- dataLoadingState,
- selectedInstanceRenderState,
- canvasIframeState,
- isPreviewMode
- ) => {
- const readyStates = new Map<
- "dataLoadingState" | "selectedInstanceRenderState" | "canvasIframeState",
- boolean
- >([
- ["dataLoadingState", dataLoadingState === "loaded"],
- [
- "selectedInstanceRenderState",
- selectedInstanceRenderState === "mounted" || isPreviewMode,
- ],
- ["canvasIframeState", canvasIframeState === "ready"],
- ]);
-
- const readyCount = Array.from(readyStates.values()).filter(Boolean).length;
- const progress = Math.round((readyCount / readyStates.size) * 100);
- const state: "ready" | "loading" =
- readyCount === readyStates.size ? "ready" : "loading";
-
- return { state, progress, readyStates };
- }
-);
-
const ProgressIndicator = ({ value }: { value: number }) => {
const [isDone, setIsDone] = useState(false);
const [fakeValue, setFakeValue] = useState(value);
@@ -560,7 +526,6 @@ export const Builder = ({
<Inspector navigatorLayout={navigatorLayout} />
</SidePanel>
{isPreviewMode === false && <Footer />}
- <BlockingAlerts />
<CloneProjectDialog
isOpen={isCloneDialogOpen}
onOpenChange={$isCloneDialogOpen.set}
@@ -568,6 +533,7 @@ export const Builder = ({
/>
</ChromeWrapper>
<ProgressIndicator value={loadingState.progress} />
+ <BlockingAlerts />
</div>
</TooltipProvider>
);
diff --git a/apps/builder/app/builder/features/blocking-alerts/alert.tsx b/apps/builder/app/builder/features/blocking-alerts/alert.tsx
index 6ab298222b..08f2fdead1 100644
--- a/apps/builder/app/builder/features/blocking-alerts/alert.tsx
+++ b/apps/builder/app/builder/features/blocking-alerts/alert.tsx
@@ -1,15 +1,21 @@
import type { ReactNode } from "react";
-import { css, Flex, Text, theme } from "@webstudio-is/design-system";
+import {
+ css,
+ Flex,
+ Popover,
+ PopoverContent,
+ Text,
+ theme,
+} from "@webstudio-is/design-system";
import { AlertIcon } from "@webstudio-is/icons";
const containerStyle = css({
position: "absolute",
- top: 0,
+ top: theme.spacing[15],
left: 0,
width: "100vw",
height: "100vh",
- zIndex: theme.zIndices.max,
- background: "rgba(0, 0, 0, 0.9)",
+ background: "rgba(0, 0, 0, 0.7)",
});
const contentStyle = css({
@@ -19,18 +25,22 @@ const contentStyle = css({
export const Alert = ({ message }: { message: string | ReactNode }) => {
return (
- <Flex align="center" justify="center" className={containerStyle()}>
- <Flex
- direction="column"
- align="center"
- gap="2"
- className={contentStyle()}
- >
- <AlertIcon size={22} />
- <Text color="contrast" align="center">
- {message}
- </Text>
- </Flex>
- </Flex>
+ <Popover open>
+ <PopoverContent css={{ zIndex: theme.zIndices.max }}>
+ <Flex align="center" justify="center" className={containerStyle()}>
+ <Flex
+ direction="column"
+ align="center"
+ gap="2"
+ className={contentStyle()}
+ >
+ <AlertIcon size={22} />
+ <Text color="contrast" align="center">
+ {message}
+ </Text>
+ </Flex>
+ </Flex>
+ </PopoverContent>
+ </Popover>
);
};
diff --git a/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx b/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx
index 02535ada2b..df12c3f764 100644
--- a/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx
+++ b/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx
@@ -3,6 +3,9 @@ import { Alert } from "./alert";
import { useWindowResizeDebounced } from "~/shared/dom-hooks";
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import { Link } from "@webstudio-is/design-system";
+import { $isPreviewMode } from "~/shared/nano-states";
+import { useStore } from "@nanostores/react";
+import { $loadingState } from "~/builder/shared/nano-states";
const useTooSmallMessage = () => {
const [message, setMessage] = useState<string>();
@@ -87,13 +90,21 @@ const useUnsupportedBrowser = () => {
};
export const BlockingAlerts = () => {
+ const isPreviewMode = useStore($isPreviewMode);
+ const loadingState = useStore($loadingState);
+
// Takes the latest message, order matters
const message = [useTooSmallMessage(), useUnsupportedBrowser()]
.filter(Boolean)
.pop();
- if (message === undefined) {
- return null;
+ if (
+ message === undefined ||
+ // We want user to be able to test in unsupported browsers in preview mode.
+ isPreviewMode ||
+ loadingState.state !== "ready"
+ ) {
+ return;
}
return <Alert message={message} />;
diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsx
index d87bff6ee2..d7d50b63ae 100644
--- a/apps/builder/app/builder/features/topbar/topbar.tsx
+++ b/apps/builder/app/builder/features/topbar/topbar.tsx
@@ -58,6 +58,14 @@ const topbarContainerStyle = css({
color: theme.colors.foregroundContrastMain,
});
+// We are hiding some elements on mobile because we want to let user
+// test in preview mode with device simulators
+const hideOnMobile: CSS = {
+ "@media (max-width: 640px)": {
+ display: "none",
+ },
+};
+
type TopbarProps = {
css: CSS;
project: Project;
@@ -79,11 +87,11 @@ export const Topbar = ({ css, project, hasProPlan }: TopbarProps) => {
<PagesButton />
<AddressBarPopover />
</Flex>
- <Flex css={{ minWidth: theme.spacing[23] }}>
+ <Flex css={{ minWidth: theme.spacing[23], ...hideOnMobile }}>
<BreakpointsPopover />
</Flex>
<Flex grow></Flex>
- <Flex align="center" justify="center">
+ <Flex align="center" justify="center" css={hideOnMobile}>
<BreakpointsSelectorContainer />
</Flex>
</>
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx
index cfa67c492d..a822f02c5d 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx
@@ -4,7 +4,6 @@ import {
css,
disableCanvasPointerEvents,
numericScrubControl,
- rawTheme,
theme,
} from "@webstudio-is/design-system";
import { useEffect, useRef } from "react";
@@ -19,7 +18,7 @@ import {
const handlesContainerStyle = css({
position: "absolute",
top: 0,
- width: theme.spacing[3],
+ width: 5,
bottom: 0,
cursor: "col-resize",
pointerEvents: "auto",
@@ -33,15 +32,15 @@ const handlesContainerStyle = css({
"& svg": {
position: "absolute",
top: "50%",
- right: theme.spacing[3],
+ right: 0,
transform: "translateX(100%)",
color: theme.colors.foregroundSubtle,
},
"&[data-align=left]": {
- left: `-${rawTheme.spacing[3]}`,
+ left: 0,
},
"&[data-align=right]": {
- right: `-${rawTheme.spacing[3]}`,
+ right: 0,
},
"&[data-state=resizing]::before": {
display: "none",
diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsx
index 05c08df0be..2cd63bbfd1 100644
--- a/apps/builder/app/builder/features/workspace/workspace.tsx
+++ b/apps/builder/app/builder/features/workspace/workspace.tsx
@@ -19,9 +19,6 @@ const workspaceStyle = css({
position: "relative",
// Prevent scrollIntoView from scrolling the whole page
overflow: "clip",
- // This spacing is needed to still be able to grab the canvas edge, otherwise you will always drag
- // the browser window instead of the canvas.
- px: theme.spacing[5],
});
const canvasContainerStyle = css({
@@ -56,7 +53,8 @@ const getCanvasStyle = (
) => {
let canvasHeight;
- if (workspaceRect?.height) {
+ // For some reason scale is 0 in chrome dev tools mobile touch simulated vervsion.
+ if (workspaceRect?.height && scale !== 0) {
canvasHeight = workspaceRect.height / (scale / 100);
}
diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.ts
index 6d1ba8fdea..283243b6e0 100644
--- a/apps/builder/app/builder/shared/nano-states/index.ts
+++ b/apps/builder/app/builder/shared/nano-states/index.ts
@@ -1,6 +1,11 @@
import { atom, computed } from "nanostores";
import type { TabName } from "~/builder/features/sidebar-left/types";
import type { UserPlanFeatures } from "~/shared/db/user-plan-features.server";
+import {
+ $isPreviewMode,
+ $selectedInstanceRenderState,
+} from "~/shared/nano-states/misc";
+import { $canvasIframeState } from "~/shared/nano-states/canvas";
export const $isShareDialogOpen = atom<boolean>(false);
@@ -41,3 +46,39 @@ export const $userPlanFeatures = atom<UserPlanFeatures>({
hasSubscription: false,
hasProPlan: false,
});
+
+export const $dataLoadingState = atom<"idle" | "loading" | "loaded">("idle");
+
+export const $loadingState = computed(
+ [
+ $dataLoadingState,
+ $selectedInstanceRenderState,
+ $canvasIframeState,
+ $isPreviewMode,
+ ],
+ (
+ dataLoadingState,
+ selectedInstanceRenderState,
+ canvasIframeState,
+ isPreviewMode
+ ) => {
+ const readyStates = new Map<
+ "dataLoadingState" | "selectedInstanceRenderState" | "canvasIframeState",
+ boolean
+ >([
+ ["dataLoadingState", dataLoadingState === "loaded"],
+ [
+ "selectedInstanceRenderState",
+ selectedInstanceRenderState === "mounted" || isPreviewMode,
+ ],
+ ["canvasIframeState", canvasIframeState === "ready"],
+ ]);
+
+ const readyCount = Array.from(readyStates.values()).filter(Boolean).length;
+ const progress = Math.round((readyCount / readyStates.size) * 100);
+ const state: "ready" | "loading" =
+ readyCount === readyStates.size ? "ready" : "loading";
+
+ return { state, progress, readyStates };
+ }
+);
diff --git a/apps/builder/app/shared/nano-states/builder.ts b/apps/builder/app/shared/nano-states/builder.ts
deleted file mode 100644
index 7dccd98663..0000000000
--- a/apps/builder/app/shared/nano-states/builder.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { atom } from "nanostores";
-
-export const $dataLoadingState = atom<"idle" | "loading" | "loaded">("idle");
diff --git a/apps/builder/app/shared/nano-states/components.ts b/apps/builder/app/shared/nano-states/components.ts
index dd52ba2236..3bbc067827 100644
--- a/apps/builder/app/shared/nano-states/components.ts
+++ b/apps/builder/app/shared/nano-states/components.ts
@@ -13,7 +13,7 @@ import {
import type { Instance } from "@webstudio-is/sdk";
import { decodeDataSourceVariable } from "@webstudio-is/sdk";
import type { InstanceSelector } from "../tree-utils";
-import { $dataSources, $memoryProps, $props } from "./nano-states";
+import { $dataSources, $memoryProps, $props } from "./misc";
import { $instances, $selectedInstanceSelector } from "./instances";
import { $selectedPage } from "./pages";
import { $dataSourceVariables } from "./variables";
diff --git a/apps/builder/app/shared/nano-states/index.ts b/apps/builder/app/shared/nano-states/index.ts
index 005656ab03..7ae895eb2b 100644
--- a/apps/builder/app/shared/nano-states/index.ts
+++ b/apps/builder/app/shared/nano-states/index.ts
@@ -1,4 +1,4 @@
-export * from "./nano-states";
+export * from "./misc";
export * from "./breakpoints";
export * from "./instances";
export * from "./props";
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/misc.ts
similarity index 100%
rename from apps/builder/app/shared/nano-states/nano-states.ts
rename to apps/builder/app/shared/nano-states/misc.ts
diff --git a/apps/builder/app/shared/nano-states/props.test.ts b/apps/builder/app/shared/nano-states/props.test.ts
index d77efc2253..e077c9346c 100644
--- a/apps/builder/app/shared/nano-states/props.test.ts
+++ b/apps/builder/app/shared/nano-states/props.test.ts
@@ -14,7 +14,7 @@ import {
computeExpression,
} from "./props";
import { $pages, $selectedPageId } from "./pages";
-import { $assets, $dataSources, $props, $resources } from "./nano-states";
+import { $assets, $dataSources, $props, $resources } from "./misc";
import { $params } from "~/canvas/stores";
import { $dataSourceVariables, $resourceValues } from "./variables";
diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.ts
index 5cf86c6db4..1b017d1ccd 100644
--- a/apps/builder/app/shared/nano-states/props.ts
+++ b/apps/builder/app/shared/nano-states/props.ts
@@ -30,7 +30,7 @@ import {
$uploadingFilesDataStore,
$memoryProps,
$isPreviewMode,
-} from "./nano-states";
+} from "./misc";
import { $selectedPage, $pages } from "./pages";
import type { InstanceSelector } from "../tree-utils";
import { $params } from "~/canvas/stores";
diff --git a/apps/builder/app/shared/nano-states/variables.ts b/apps/builder/app/shared/nano-states/variables.ts
index e4f2fa0f9c..d7cfeab5ce 100644
--- a/apps/builder/app/shared/nano-states/variables.ts
+++ b/apps/builder/app/shared/nano-states/variables.ts
@@ -4,7 +4,7 @@ import {
matchPathnamePattern,
tokenizePathnamePattern,
} from "~/builder/shared/url-pattern";
-import { $publishedOrigin } from "./nano-states";
+import { $publishedOrigin } from "./misc";
import { $selectedPage } from "./pages";
export const $dataSourceVariables = atom<Map<DataSource["id"], unknown>>(
diff --git a/packages/design-system/src/components/primitives/numeric-gesture-control.ts b/packages/design-system/src/components/primitives/numeric-gesture-control.ts
index 01cefed45b..37ce712636 100644
--- a/packages/design-system/src/components/primitives/numeric-gesture-control.ts
+++ b/packages/design-system/src/components/primitives/numeric-gesture-control.ts
@@ -69,6 +69,16 @@ const getValueDefault = (
return clamp(value, minValue, maxValue);
};
+const preventContextMenu = () => {
+ const handler = (event: MouseEvent) => {
+ event.preventDefault();
+ };
+ window.addEventListener("contextmenu", handler);
+ return () => {
+ window.removeEventListener("contextmenu", handler);
+ };
+};
+
export const numericScrubControl = (
targetNode: HTMLElement | SVGElement,
options: NumericScrubOptions
@@ -95,8 +105,8 @@ export const numericScrubControl = (
};
let exitPointerLock: (() => void) | undefined = undefined;
-
- let originalUserSelect = "";
+ let restoreUserSelect: (() => void) | undefined = undefined;
+ let restoreContextMenu: (() => void) | undefined = undefined;
const cleanup = () => {
targetNode.removeEventListener("pointermove", handleEvent);
@@ -109,14 +119,10 @@ export const numericScrubControl = (
clearTimeout(state.timerId);
exitPointerLock?.();
exitPointerLock = undefined;
- if (originalUserSelect) {
- targetNode.ownerDocument.documentElement.style.userSelect =
- originalUserSelect;
- } else {
- targetNode.ownerDocument.documentElement.style.removeProperty(
- "user-select"
- );
- }
+ restoreUserSelect?.();
+ restoreUserSelect = undefined;
+ restoreContextMenu?.();
+ restoreContextMenu = undefined;
};
// Cannot define `event:` as PointerEvent,
@@ -165,9 +171,11 @@ export const numericScrubControl = (
}, 150);
targetNode.addEventListener("pointermove", handleEvent);
- originalUserSelect =
- targetNode.ownerDocument.documentElement.style.userSelect;
- targetNode.ownerDocument.documentElement.style.userSelect = "none";
+ // Pointer event will stop firing on touch after ~300ms because browser starts scrolling the page.
+ restoreUserSelect = setRootStyle(targetNode, "user-select", "none");
+ // In chrome mobile touch simulation, you will get the context menu because tapping and holding
+ // results in a right click.
+ restoreContextMenu = preventContextMenu();
break;
}
case "pointermove": {
@@ -231,11 +239,41 @@ export const numericScrubControl = (
};
};
+// If the same property was set while its already in a temporal state, something is wrong with
+// the logic on call-site and we need to inform the developer.
+const rootStyleTracker = new Map<string, boolean>();
+
+const setRootStyle = (
+ targetNode: HTMLElement | SVGElement,
+ property: string,
+ value: string
+) => {
+ if (rootStyleTracker.has(property)) {
+ throw new Error(
+ "setRootStyle is called while the property is already in a temporal state."
+ );
+ }
+ const root = targetNode.ownerDocument.documentElement;
+ const originalValue = root.style.getPropertyValue(property);
+ root.style.setProperty(property, value);
+ rootStyleTracker.set(property, true);
+ return () => {
+ rootStyleTracker.delete(property);
+ if (originalValue) {
+ root.style.setProperty(property, originalValue);
+ return;
+ }
+ root.style.removeProperty(property);
+ };
+};
+
const requestPointerLock = (
state: NumericScrubState,
event: PointerEvent,
targetNode: HTMLElement | SVGElement
) => {
+ // After ~0.3 seconds starts touch events as page scrolling.
+ const restoreTouchAction = setRootStyle(targetNode, "touch-action", "none");
// The pointer lock api nukes the cursor on requestng a pointer lock,
// creating and managing the visual que of the cursor is thus left to the author
// we create and append an svg that serves as the visual que of where the cursor currently is
@@ -274,22 +312,24 @@ const requestPointerLock = (
state.cursor.remove();
state.cursor = undefined;
}
-
+ restoreTouchAction();
targetNode.ownerDocument.exitPointerLock();
};
- } else {
- const { pointerId } = event;
- targetNode.ownerDocument.documentElement.style.setProperty(
- "cursor",
- state.direction === "horizontal" ? "ew-resize" : "ns-resize"
- );
- targetNode.setPointerCapture(pointerId);
-
- return () => {
- targetNode.ownerDocument.documentElement.style.removeProperty("cursor");
- targetNode.releasePointerCapture(pointerId);
- };
}
+
+ const { pointerId } = event;
+ const restoreCursor = setRootStyle(
+ targetNode,
+ "cursor",
+ state.direction === "horizontal" ? "ew-resize" : "ns-resize"
+ );
+ targetNode.setPointerCapture(pointerId);
+
+ return () => {
+ restoreCursor();
+ restoreTouchAction();
+ targetNode.releasePointerCapture(pointerId);
+ };
};
const shouldUsePointerLock = "chrome" in globalThis;