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.

experimental: Focus mode for style panel (#4827)

Oleg Isonen5ad5a7154b83
diff --git a/apps/builder/app/builder/features/settings-panel/variables-section.tsx b/apps/builder/app/builder/features/settings-panel/variables-section.tsx
index b6f995c98b..de64fdb6db 100644
--- a/apps/builder/app/builder/features/settings-panel/variables-section.tsx
+++ b/apps/builder/app/builder/features/settings-panel/variables-section.tsx
@@ -315,10 +315,7 @@ const VariablesList = () => {
export const VariablesSection = () => {
const containerRef = useRef<HTMLDivElement>(null);
- const [isOpen, setIsOpen] = useOpenState({
- label: "variables",
- isOpenDefault: true,
- });
+ const [isOpen, setIsOpen] = useOpenState({ label: "variables" });
return (
<VariablePopoverProvider value={{ containerRef }}>
<CollapsibleSectionRoot
diff --git a/apps/builder/app/builder/features/style-panel/shared/style-section.tsx b/apps/builder/app/builder/features/style-panel/shared/style-section.tsx
index 925c07e1ed..314d759aaa 100644
--- a/apps/builder/app/builder/features/style-panel/shared/style-section.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/style-section.tsx
@@ -41,6 +41,8 @@ export const StyleSection = (props: {
// @todo remove to keep sections consistent
fullWidth?: boolean;
children: ReactNode;
+ accordion?: string;
+ initialOpen?: string;
}) => {
const { label, children, properties, fullWidth } = props;
const [isOpen, setIsOpen] = useOpenState(props);
diff --git a/apps/builder/app/builder/features/style-panel/style-panel.tsx b/apps/builder/app/builder/features/style-panel/style-panel.tsx
index 7acb6c7a72..be36c6d753 100644
--- a/apps/builder/app/builder/features/style-panel/style-panel.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-panel.tsx
@@ -14,6 +14,8 @@ import { sections } from "./sections";
import { toValue } from "@webstudio-is/css-engine";
import { $instanceTags, useParentComputedStyleDecl } from "./shared/model";
import { $selectedInstance } from "~/shared/awareness";
+import { CollapsibleSectionContext } from "~/builder/shared/collapsible-section";
+import { isFeatureEnabled } from "@webstudio-is/feature-flags";
const $selectedInstanceTag = computed(
[$selectedInstance, $instanceTags],
@@ -72,7 +74,16 @@ export const StylePanel = () => {
<StyleSourcesSection />
</Box>
<Separator />
- <ScrollArea>{all}</ScrollArea>
+ <ScrollArea>
+ <CollapsibleSectionContext.Provider
+ value={{
+ accordion: isFeatureEnabled("stylePanelModes"),
+ initialOpen: "Layout",
+ }}
+ >
+ {all}
+ </CollapsibleSectionContext.Provider>
+ </ScrollArea>
</>
);
};
diff --git a/apps/builder/app/builder/shared/collapsible-section.tsx b/apps/builder/app/builder/shared/collapsible-section.tsx
index 4508fcb073..5cff9df844 100644
--- a/apps/builder/app/builder/shared/collapsible-section.tsx
+++ b/apps/builder/app/builder/shared/collapsible-section.tsx
@@ -9,30 +9,57 @@ import {
Separator,
theme,
} from "@webstudio-is/design-system";
-import type { ComponentProps, ReactNode } from "react";
+import {
+ createContext,
+ useContext,
+ type ComponentProps,
+ type ReactNode,
+} from "react";
import { PlusIcon } from "@webstudio-is/icons";
import type { Simplify } from "type-fest";
+type Label = string;
+
type UseOpenStateProps = {
- label: string;
- isOpenDefault?: boolean;
+ label: Label;
isOpen?: boolean;
};
-const stateContainer = atom<{ [label: string]: boolean }>({});
+export const CollapsibleSectionContext = createContext<{
+ accordion?: boolean;
+ initialOpen?: Label;
+}>({});
+
+const $stateContainer = atom<{
+ [label: string]: boolean;
+}>({});
// Preserves the open/close state even when component gets unmounted
export const useOpenState = ({
label,
- isOpenDefault = true,
isOpen: isOpenForced,
}: UseOpenStateProps): [boolean, (value: boolean) => void] => {
- const state = useStore(stateContainer);
- const isOpen = label in state ? state[label] : isOpenDefault;
+ const state = useStore($stateContainer);
+ const { accordion, initialOpen } = useContext(CollapsibleSectionContext);
const setIsOpen = (isOpen: boolean) => {
- stateContainer.set({ ...state, [label]: isOpen });
+ const update = { ...state };
+ if (isOpen && accordion) {
+ // In accordion mode we close everything else within that accordion.
+ for (const key in update) {
+ update[key] = false;
+ }
+ }
+ update[label] = isOpen;
+ $stateContainer.set(update);
};
- return [isOpenForced === undefined ? isOpen : isOpenForced, setIsOpen];
+
+ // Set initial value for accordion mode.
+ if (accordion && state[label] === undefined) {
+ state[label] = initialOpen === label;
+ }
+
+ const isOpenCurrent = state[label];
+ return [isOpenForced ?? isOpenCurrent ?? true, setIsOpen];
};
type CollapsibleSectionBaseProps = {
diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.ts
index aa21810002..8355e6d605 100644
--- a/packages/feature-flags/src/flags.ts
+++ b/packages/feature-flags/src/flags.ts
@@ -9,3 +9,4 @@ export const staticExport = false;
export const contentEditableMode = false;
export const command = false;
export const headSlotComponent = false;
+export const stylePanelModes = false;