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.

Panel tabs (#1653)

Roman Pominov12e40146563e
diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsx
index ab7c809a78..f00234f414 100644
--- a/apps/builder/app/builder/features/inspector/inspector.tsx
+++ b/apps/builder/app/builder/features/inspector/inspector.tsx
@@ -1,17 +1,16 @@
-import { useEffect, useRef, useState } from "react";
+import { useRef, useState } from "react";
import { useStore } from "@nanostores/react";
import type { Publish } from "~/shared/pubsub";
import {
- DeprecatedText2,
- Tabs,
- TabsList,
- TabsTrigger,
- TabsContent,
+ PanelTabs,
+ PanelTabsList,
+ PanelTabsTrigger,
+ PanelTabsContent,
Card,
Text,
Box,
- Flex,
EnhancedTooltipProvider,
+ Flex,
} from "@webstudio-is/design-system";
import { StylePanel } from "~/builder/features/style-panel";
import { PropsPanelContainer } from "~/builder/features/props-panel";
@@ -39,14 +38,6 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {
const [tab, setTab] = useState("style");
const isDragging = useStore(isDraggingStore);
- useEffect(() => {
- if (selectedInstance?.component === "Slot") {
- if (tab === "style" || tab === "props") {
- setTab("settings");
- }
- }
- }, [selectedInstance, tab]);
-
if (navigatorLayout === "docked" && isDragging) {
return <NavigatorTree />;
}
@@ -71,39 +62,41 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {
skipDelayDuration={0}
>
<FloatingPanelProvider container={tabsRef}>
- <Flex as={Tabs} grow ref={tabsRef} value={tab} onValueChange={setTab}>
- <TabsList>
- <TabsTrigger
- value="style"
- disabled={selectedInstance.component === "Slot"}
- >
- <DeprecatedText2>Style</DeprecatedText2>
- </TabsTrigger>
- {/* @note: events would be part of props */}
- <TabsTrigger
- value="props"
- disabled={selectedInstance.component === "Slot"}
- >
- <DeprecatedText2>Properties</DeprecatedText2>
- </TabsTrigger>
- <TabsTrigger value="settings">
- <DeprecatedText2>Settings</DeprecatedText2>
- </TabsTrigger>
- </TabsList>
- <TabsContent value="style" css={contentStyle}>
- <StylePanel publish={publish} selectedInstance={selectedInstance} />
- </TabsContent>
- <TabsContent value="props" css={contentStyle}>
- <PropsPanelContainer
- publish={publish}
- key={selectedInstance.id /* Re-render when instance changes */}
- selectedInstance={selectedInstance}
- />
- </TabsContent>
- <TabsContent value="settings" css={contentStyle}>
- <SettingsPanel />
- </TabsContent>
- </Flex>
+ <PanelTabs
+ ref={tabsRef}
+ value={selectedInstance?.component === "Slot" ? "settings" : tab}
+ onValueChange={setTab}
+ asChild
+ >
+ <Flex direction="column">
+ <PanelTabsList>
+ {selectedInstance.component !== "Slot" && (
+ <>
+ <PanelTabsTrigger value="style">Style</PanelTabsTrigger>
+ {/* @note: events would be part of props */}
+ <PanelTabsTrigger value="props">Properties</PanelTabsTrigger>
+ </>
+ )}
+ <PanelTabsTrigger value="settings">Settings</PanelTabsTrigger>
+ </PanelTabsList>
+ <PanelTabsContent value="style" css={contentStyle} tabIndex={-1}>
+ <StylePanel
+ publish={publish}
+ selectedInstance={selectedInstance}
+ />
+ </PanelTabsContent>
+ <PanelTabsContent value="props" css={contentStyle} tabIndex={-1}>
+ <PropsPanelContainer
+ publish={publish}
+ key={selectedInstance.id /* Re-render when instance changes */}
+ selectedInstance={selectedInstance}
+ />
+ </PanelTabsContent>
+ <PanelTabsContent value="settings" css={contentStyle} tabIndex={-1}>
+ <SettingsPanel />
+ </PanelTabsContent>
+ </Flex>
+ </PanelTabs>
</FloatingPanelProvider>
</EnhancedTooltipProvider>
);
diff --git a/packages/design-system/src/components/panel-tabs.stories.tsx b/packages/design-system/src/components/panel-tabs.stories.tsx
new file mode 100644
index 0000000000..91a5078bb8
--- /dev/null
+++ b/packages/design-system/src/components/panel-tabs.stories.tsx
@@ -0,0 +1,48 @@
+import { StoryGrid } from "./storybook";
+import {
+ PanelTabs,
+ PanelTabsList,
+ PanelTabsTrigger,
+ PanelTabsContent,
+} from "./panel-tabs";
+import { Box } from "./box";
+import { Text } from "./text";
+import { theme } from "../stitches.config";
+
+export default {
+ title: "Library/Panel Tabs",
+};
+
+const Wrap = ({ children }: { children: React.ReactNode }) => (
+ <div style={{ width: 240, border: "dashed 3px #e3e3e3" }}>{children}</div>
+);
+
+const Content = ({ children }: { children: React.ReactNode }) => (
+ <Box css={{ padding: theme.spacing[5] }}>
+ <Text>{children}</Text>
+ </Box>
+);
+
+export const Demo = () => (
+ <StoryGrid>
+ <Wrap>
+ <PanelTabs defaultValue="1">
+ <PanelTabsList>
+ <PanelTabsTrigger value="1">Tab 1</PanelTabsTrigger>
+ <PanelTabsTrigger value="2">Tab 2</PanelTabsTrigger>
+ <PanelTabsTrigger value="3">Tab 3</PanelTabsTrigger>
+ </PanelTabsList>
+ <PanelTabsContent value="1">
+ <Content>Content 1</Content>
+ </PanelTabsContent>
+ <PanelTabsContent value="2">
+ <Content>Content 2</Content>
+ </PanelTabsContent>
+ <PanelTabsContent value="3">
+ <Content>Content 3</Content>
+ </PanelTabsContent>
+ </PanelTabs>
+ </Wrap>
+ </StoryGrid>
+);
+Demo.storyName = "Panel Tabs";
diff --git a/packages/design-system/src/components/panel-tabs.tsx b/packages/design-system/src/components/panel-tabs.tsx
new file mode 100644
index 0000000000..01d98ffd78
--- /dev/null
+++ b/packages/design-system/src/components/panel-tabs.tsx
@@ -0,0 +1,46 @@
+/**
+ * Implementation of "Panel Tabs List" and "Panel Tab Trigger" components from:
+ * https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=2647-9488
+ */
+
+import * as Primitive from "@radix-ui/react-tabs";
+import { textVariants } from "./text";
+import { styled, theme } from "../stitches.config";
+
+export const PanelTabs = styled(Primitive.Root, {
+ display: "flex",
+ flexDirection: "column",
+});
+
+export const PanelTabsList = styled(Primitive.List, {
+ display: "flex",
+ paddingRight: theme.spacing[5],
+ paddingLeft: theme.spacing[5],
+ paddingTop: theme.spacing[3],
+ paddingBottom: theme.spacing[3],
+});
+
+export const PanelTabsTrigger = styled(Primitive.Trigger, {
+ all: "unset", // reset <button>
+ ...textVariants.titles,
+ color: theme.colors.foregroundTextMoreSubtle,
+ padding: theme.spacing[5],
+ borderRadius: theme.borderRadius[4],
+
+ "&:hover": {
+ backgroundColor: theme.colors.backgroundHover,
+ color: theme.colors.foregroundMain,
+ },
+
+ "&:focus-visible": {
+ outline: `2px solid ${theme.colors.borderFocus}`,
+ outlineOffset: "-2px",
+ },
+
+ "&[data-state=active]": { color: theme.colors.foregroundMain },
+});
+
+export const PanelTabsContent = styled(Primitive.Content, {
+ "&:focus": { outline: "none" },
+ "&[data-state=inactive]": { display: "none" },
+});
diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts
index a450604111..ec94ace427 100644
--- a/packages/design-system/src/index.ts
+++ b/packages/design-system/src/index.ts
@@ -37,6 +37,7 @@ export * from "./components/checkbox";
export * from "./components/component-card";
export * from "./components/input-field";
export * from "./components/nested-input-button";
+export * from "./components/panel-tabs";
// Not aligned