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.

Add border radius and other fixes to cascade indicator (#1472)

Oleg Isonendc681c3068f5
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx
new file mode 100644
index 0000000000..c0da6ce1c9
--- /dev/null
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx
@@ -0,0 +1,20 @@
+import { useStore } from "@nanostores/react";
+import {
+ breakpointsStore,
+ selectedBreakpointStore,
+} from "~/shared/nano-states";
+import { BreakpointsSelector } from "./breakpoints-selector";
+
+export const BreakpointsSelectorContainer = () => {
+ const breakpoints = useStore(breakpointsStore);
+ const selectedBreakpoint = useStore(selectedBreakpointStore);
+ if (selectedBreakpoint === undefined) {
+ return null;
+ }
+ return (
+ <BreakpointsSelector
+ breakpoints={breakpoints}
+ selectedBreakpoint={selectedBreakpoint}
+ />
+ );
+};
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.stories.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.stories.tsx
new file mode 100644
index 0000000000..1e2aaf2868
--- /dev/null
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.stories.tsx
@@ -0,0 +1,84 @@
+import { StorySection } from "@webstudio-is/design-system";
+import { BreakpointsSelector } from "./breakpoints-selector";
+import type { Breakpoint, Breakpoints } from "@webstudio-is/project-build";
+import { nanoid } from "nanoid";
+
+const createBreakpoints = (breakpoints: Array<Breakpoint>): Breakpoints => {
+ const breakpointsMap: [Breakpoint["id"], Breakpoint][] = breakpoints.map(
+ (breakpoint) => {
+ const id = nanoid();
+ return [
+ id,
+ {
+ ...breakpoint,
+ id,
+ },
+ ];
+ }
+ );
+ return new Map(breakpointsMap);
+};
+
+export const Story = () => {
+ const mixed = createBreakpoints([
+ { id: "placeholder", label: "Extra Large", minWidth: 1440 },
+ { id: "placeholder", label: "Large", minWidth: 1280 },
+ { id: "placeholder", label: "Base" },
+ { id: "placeholder", label: "Tablet", maxWidth: 991 },
+ { id: "placeholder", label: "Mobile landscape", maxWidth: 767 },
+ { id: "placeholder", label: "Mobile portrait", maxWidth: 479 },
+ ]);
+ const selectedBreakpointMixed = Array.from(mixed.values()).at(2);
+
+ const max = createBreakpoints([
+ { id: "placeholder", label: "Base" },
+ { id: "placeholder", label: "Tablet", maxWidth: 991 },
+ { id: "placeholder", label: "Mobile landscape", maxWidth: 767 },
+ { id: "placeholder", label: "Mobile portrait", maxWidth: 479 },
+ ]);
+ const selectedBreakpointMax = Array.from(max.values()).at(0);
+
+ const min = createBreakpoints([
+ { id: "placeholder", label: "Extra Large", minWidth: 1440 },
+ { id: "placeholder", label: "Large", minWidth: 1280 },
+ { id: "placeholder", label: "Base" },
+ ]);
+ const selectedBreakpointMin = Array.from(min.values()).at(2);
+
+ if (
+ selectedBreakpointMixed === undefined ||
+ selectedBreakpointMax === undefined ||
+ selectedBreakpointMin === undefined
+ ) {
+ return null;
+ }
+
+ return (
+ <>
+ <StorySection title="All">
+ <BreakpointsSelector
+ breakpoints={mixed}
+ selectedBreakpoint={selectedBreakpointMixed}
+ />
+ </StorySection>
+ <StorySection title="Max-width">
+ <BreakpointsSelector
+ breakpoints={max}
+ selectedBreakpoint={selectedBreakpointMax}
+ />
+ </StorySection>
+ <StorySection title="Min-width">
+ <BreakpointsSelector
+ breakpoints={min}
+ selectedBreakpoint={selectedBreakpointMin}
+ />
+ </StorySection>
+ </>
+ );
+};
+
+Story.storyName = "breakpoints-selector";
+
+export default {
+ component: Story,
+};
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx
index 937fdd45e8..5c9a9b04b0 100644
--- a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx
+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx
@@ -1,4 +1,3 @@
-import { useStore } from "@nanostores/react";
import {
Toolbar,
ToolbarToggleGroup,
@@ -8,24 +7,23 @@ import { useCallback, useRef } from "react";
import { CascadeIndicator } from "./cascade-indicator";
import { BpStarOffIcon, BpStarOnIcon } from "@webstudio-is/icons";
import { useSetInitialCanvasWidth } from ".";
-import {
- breakpointsStore,
- selectedBreakpointStore,
- selectedBreakpointIdStore,
-} from "~/shared/nano-states";
+import { selectedBreakpointIdStore } from "~/shared/nano-states";
import { groupBreakpoints } from "~/shared/breakpoints";
+import type { Breakpoint, Breakpoints } from "@webstudio-is/project-build";
+
+type BreakpointsSelector = {
+ breakpoints: Breakpoints;
+ selectedBreakpoint: Breakpoint;
+};
-export const BreakpointsSelector = () => {
- const breakpoints = useStore(breakpointsStore);
- const selectedBreakpoint = useStore(selectedBreakpointStore);
+export const BreakpointsSelector = ({
+ breakpoints,
+ selectedBreakpoint,
+}: BreakpointsSelector) => {
const refs = useRef(new Map<string, HTMLButtonElement>());
const setInitialCanvasWidth = useSetInitialCanvasWidth();
const getButtonById = useCallback((id: string) => refs.current.get(id), []);
- if (selectedBreakpoint === undefined) {
- return null;
- }
-
return (
<Toolbar>
<ToolbarToggleGroup
@@ -66,7 +64,11 @@ export const BreakpointsSelector = () => {
);
}
)}
- <CascadeIndicator getButtonById={getButtonById} />
+ <CascadeIndicator
+ getButtonById={getButtonById}
+ selectedBreakpoint={selectedBreakpoint}
+ breakpoints={breakpoints}
+ />
</ToolbarToggleGroup>
</Toolbar>
);
diff --git a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx
index 3813172162..f235c7b67f 100644
--- a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx
+++ b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx
@@ -1,8 +1,7 @@
import { useStore } from "@nanostores/react";
import { css, theme } from "@webstudio-is/design-system";
import { useEffect, useState } from "react";
-import { selectedBreakpointStore } from "~/shared/nano-states";
-import type { Breakpoint } from "@webstudio-is/project-build";
+import type { Breakpoint, Breakpoints } from "@webstudio-is/project-build";
import { breakpointsStore } from "~/shared/nano-states";
import { isBaseBreakpoint } from "~/shared/breakpoints";
@@ -10,6 +9,7 @@ const cascadeIndicatorStyle = css({
position: "absolute",
bottom: 0,
height: 3,
+ borderRadius: 2,
transition: "150ms width, 150ms left, 150ms right",
'&[data-direction="left"]': {
background: theme.colors.backgroundGradientHorizontal,
@@ -19,29 +19,66 @@ const cascadeIndicatorStyle = css({
},
});
+const hasMinAndMax = (breakpoints: Breakpoints) => {
+ let hasMin = false;
+ let hasMax = false;
+ for (const breakpoint of breakpoints.values()) {
+ if (breakpoint.minWidth !== undefined) {
+ hasMin = true;
+ }
+ if (breakpoint.maxWidth !== undefined) {
+ hasMax = true;
+ }
+ }
+
+ return { hasMin, hasMax };
+};
+
const calcIndicatorStyle = ({
buttonLeft,
buttonWidth,
containerWidth,
selectedBreakpoint,
+ breakpoints,
}: {
buttonLeft: number;
buttonWidth: number;
containerWidth: number;
selectedBreakpoint: Breakpoint;
+ breakpoints: Breakpoints;
}) => {
if (isBaseBreakpoint(selectedBreakpoint)) {
- return {
- left: {
- left: 0,
- width: buttonLeft + buttonWidth / 2,
- },
- right: {
- width: containerWidth - buttonLeft - buttonWidth / 2,
- left: buttonLeft + buttonWidth / 2,
- },
- };
+ const { hasMin, hasMax } = hasMinAndMax(breakpoints);
+ if (hasMin && hasMax) {
+ return {
+ left: {
+ left: 0,
+ width: buttonLeft + buttonWidth / 2,
+ borderTopRightRadius: 0,
+ borderBottomRightRadius: 0,
+ },
+ right: {
+ width: containerWidth - buttonLeft - buttonWidth / 2,
+ left: buttonLeft + buttonWidth / 2,
+ borderTopLeftRadius: 0,
+ borderBottomLeftRadius: 0,
+ },
+ };
+ }
+ if (hasMin) {
+ return {
+ left: {
+ left: 0,
+ width: buttonLeft + buttonWidth,
+ },
+ right: {
+ width: 0,
+ right: 0,
+ },
+ };
+ }
}
+
if (selectedBreakpoint.minWidth !== undefined) {
return {
left: {
@@ -116,16 +153,22 @@ const useSizes = ({
// When you have base breakpoint selected which has neither min nor max width, both indicators are shown.
export const CascadeIndicator = ({
getButtonById,
+ selectedBreakpoint,
+ breakpoints,
}: {
getButtonById: (id: string) => HTMLButtonElement | undefined;
+ selectedBreakpoint: Breakpoint;
+ breakpoints: Breakpoints;
}) => {
- const selectedBreakpoint = useStore(selectedBreakpointStore);
const sizes = useSizes({ getButtonById, selectedBreakpoint });
if (selectedBreakpoint === undefined || sizes === undefined) {
return null;
}
-
- const indicatorStyle = calcIndicatorStyle({ ...sizes, selectedBreakpoint });
+ const indicatorStyle = calcIndicatorStyle({
+ ...sizes,
+ selectedBreakpoint,
+ breakpoints,
+ });
return (
<>
<div
diff --git a/apps/builder/app/builder/features/breakpoints/index.ts b/apps/builder/app/builder/features/breakpoints/index.ts
index 60ee353edc..bd42273fee 100644
--- a/apps/builder/app/builder/features/breakpoints/index.ts
+++ b/apps/builder/app/builder/features/breakpoints/index.ts
@@ -1,3 +1,3 @@
export * from "./breakpoints-settings";
-export * from "./breakpoints-selector";
+export * from "./breakpoints-selector-container";
export * from "./use-set-initial-canvas-width";
diff --git a/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts b/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts
index b3c7b2aff7..325bb4b477 100644
--- a/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts
+++ b/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts
@@ -12,6 +12,7 @@ import {
} from "~/shared/nano-states";
import { findInitialWidth } from "./find-initial-width";
+// Set canvas width based on workspace width, breakpoints and passed breakpoint id.
export const useSetInitialCanvasWidth = () => {
const [, setCanvasWidth] = useCanvasWidth();
const workspaceRect = useStore(workspaceRectStore);
diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsx
index c8c5ff6828..5ca41e7351 100644
--- a/apps/builder/app/builder/features/topbar/topbar.tsx
+++ b/apps/builder/app/builder/features/topbar/topbar.tsx
@@ -15,7 +15,10 @@ import { ShareButton } from "./share";
import { PublishButton } from "./publish";
import { SyncStatus } from "./sync-status";
import { Menu } from "./menu";
-import { BreakpointsSelector, BreakpointsSettings } from "../breakpoints";
+import {
+ BreakpointsSelectorContainer,
+ BreakpointsSettings,
+} from "../breakpoints";
import { ViewMode } from "./view-mode";
const topbarContainerStyle = css({
@@ -53,7 +56,7 @@ export const Topbar = ({ gridArea, project, publish }: TopbarProps) => {
<BreakpointsSettings />
</Flex>
<Flex grow align="center" justify="center">
- <BreakpointsSelector />
+ <BreakpointsSelectorContainer />
</Flex>
<Toolbar>
<ToolbarToggleGroup