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.

fix: when clicking on canvas reset active sidebar panel state (#3986)

Oleg Isonen419129a37e11
diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.ts
index f10d74fd79..0e363e86de 100644
--- a/apps/builder/app/builder/shared/commands.ts
+++ b/apps/builder/app/builder/shared/commands.ts
@@ -27,7 +27,6 @@ import {
toggleActiveSidebarPanel,
} from "./nano-states";
import { toast } from "@webstudio-is/design-system";
-import { getSetting } from "./client-settings";
const makeBreakpointCommand = <CommandName extends string>(
name: CommandName,
@@ -112,10 +111,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({
name: "clickCanvas",
handler: () => {
$breakpointsMenuView.set(undefined);
- // Only close the panel if its covering the canvas.
- if (getSetting("navigatorLayout") === "docked") {
- setActiveSidebarPanel("none");
- }
+ setActiveSidebarPanel(undefined);
},
},
@@ -126,7 +122,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({
defaultHotkeys: ["meta+shift+p", "ctrl+shift+p"],
handler: () => {
$isPreviewMode.set($isPreviewMode.get() === false);
- setActiveSidebarPanel();
+ setActiveSidebarPanel(undefined);
},
},
{
diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.ts
index 9cdd113f26..181177070c 100644
--- a/apps/builder/app/builder/shared/nano-states/index.ts
+++ b/apps/builder/app/builder/shared/nano-states/index.ts
@@ -50,18 +50,8 @@ export const $userPlanFeatures = atom<UserPlanFeatures>({
export const $dataLoadingState = atom<"idle" | "loading" | "loaded">("idle");
export const $loadingState = computed(
- [
- $dataLoadingState,
- $selectedInstanceRenderState,
- $canvasIframeState,
- $isPreviewMode,
- ],
- (
- dataLoadingState,
- selectedInstanceRenderState,
- canvasIframeState,
- isPreviewMode
- ) => {
+ [$dataLoadingState, $selectedInstanceRenderState, $canvasIframeState],
+ (dataLoadingState, selectedInstanceRenderState, canvasIframeState) => {
const readyStates = new Map<
"dataLoadingState" | "selectedInstanceRenderState" | "canvasIframeState",
boolean
@@ -69,7 +59,7 @@ export const $loadingState = computed(
["dataLoadingState", dataLoadingState === "loaded"],
[
"selectedInstanceRenderState",
- selectedInstanceRenderState === "mounted" || isPreviewMode,
+ selectedInstanceRenderState !== "pending",
],
["canvasIframeState", canvasIframeState === "ready"],
]);
diff --git a/apps/builder/app/canvas/instance-selected.ts b/apps/builder/app/canvas/instance-selected.ts
index 683a99a2f6..4c209668b3 100644
--- a/apps/builder/app/canvas/instance-selected.ts
+++ b/apps/builder/app/canvas/instance-selected.ts
@@ -308,7 +308,7 @@ const subscribeSelectedInstance = (
return () => {
clearTimeout(updateStoreTimeouHandle);
hideOutline();
- $selectedInstanceRenderState.set("pending");
+ $selectedInstanceRenderState.set("notMounted");
resizeObserver.disconnect();
mutationObserver.disconnect();
bodyStyleMutationObserver.disconnect();