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.

Remove global tooltip provider (#2012)

Bogdan Chadkin4460bba4aecd
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index b5392c87cc..942d01d943 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -1,5 +1,6 @@
import { useCallback, useEffect } from "react";
import { useUnmount } from "react-use";
+import { TooltipProvider } from "@radix-ui/react-tooltip";
import { type Publish, usePublish } from "~/shared/pubsub";
import type { Build } from "@webstudio-is/project-build";
import type { Project } from "@webstudio-is/project";
@@ -297,40 +298,42 @@ export const Builder = ({
});
return (
- <ChromeWrapper isPreviewMode={isPreviewMode}>
- <Topbar gridArea="header" project={project} publish={publish} />
- <Main>
- <Workspace onTransitionEnd={onTransitionEnd} publish={publish}>
- <CanvasIframe
- ref={iframeRefCallback}
- src={canvasUrl}
- pointerEvents={isCanvasPointerEventsEnabled ? "auto" : "none"}
- title={project.title}
- css={{
- height: "100%",
- width: "100%",
- backgroundColor: "#fff",
- }}
- />
- </Workspace>
- </Main>
- <SidePanel gridArea="sidebar" isPreviewMode={isPreviewMode}>
- <SidebarLeft publish={publish} />
- </SidePanel>
- <NavigatorPanel
- isPreviewMode={isPreviewMode}
- navigatorLayout={navigatorLayout}
- publish={publish}
- />
- <SidePanel
- gridArea="inspector"
- isPreviewMode={isPreviewMode}
- css={{ overflow: "hidden" }}
- >
- <Inspector publish={publish} navigatorLayout={navigatorLayout} />
- </SidePanel>
- {isPreviewMode === false && <Footer />}
- <BlockingAlerts />
- </ChromeWrapper>
+ <TooltipProvider>
+ <ChromeWrapper isPreviewMode={isPreviewMode}>
+ <Topbar gridArea="header" project={project} publish={publish} />
+ <Main>
+ <Workspace onTransitionEnd={onTransitionEnd} publish={publish}>
+ <CanvasIframe
+ ref={iframeRefCallback}
+ src={canvasUrl}
+ pointerEvents={isCanvasPointerEventsEnabled ? "auto" : "none"}
+ title={project.title}
+ css={{
+ height: "100%",
+ width: "100%",
+ backgroundColor: "#fff",
+ }}
+ />
+ </Workspace>
+ </Main>
+ <SidePanel gridArea="sidebar" isPreviewMode={isPreviewMode}>
+ <SidebarLeft publish={publish} />
+ </SidePanel>
+ <NavigatorPanel
+ isPreviewMode={isPreviewMode}
+ navigatorLayout={navigatorLayout}
+ publish={publish}
+ />
+ <SidePanel
+ gridArea="inspector"
+ isPreviewMode={isPreviewMode}
+ css={{ overflow: "hidden" }}
+ >
+ <Inspector publish={publish} navigatorLayout={navigatorLayout} />
+ </SidePanel>
+ {isPreviewMode === false && <Footer />}
+ <BlockingAlerts />
+ </ChromeWrapper>
+ </TooltipProvider>
);
};
diff --git a/apps/builder/app/root.tsx b/apps/builder/app/root.tsx
index 30a223ff62..7aab5593c2 100644
--- a/apps/builder/app/root.tsx
+++ b/apps/builder/app/root.tsx
@@ -1,9 +1,7 @@
// Our root outlet doesn't contain a layout because we have 2 types of documents: canvas and builder and we need to decide down the line which one to render, thre is no single root document.
-import { TooltipProvider } from "@radix-ui/react-tooltip";
import { Outlet } from "@remix-run/react";
import { setEnv } from "@webstudio-is/feature-flags";
-import { withSentry } from "@sentry/remix";
-import { ErrorBoundary } from "@sentry/remix";
+import { withSentry, ErrorBoundary } from "@sentry/remix";
import env from "./shared/env";
import type { ComponentProps } from "react";
@@ -13,9 +11,7 @@ type OutletProps = ComponentProps<typeof Outlet>;
const RootWithErrorBoundary = (props: OutletProps) => (
<ErrorBoundary>
- <TooltipProvider>
- <Outlet {...props} />
- </TooltipProvider>
+ <Outlet {...props} />
</ErrorBoundary>
);
diff --git a/packages/sdk-components-react-radix/src/tooltip.tsx b/packages/sdk-components-react-radix/src/tooltip.tsx
index 9d0c7d9f3f..70c2c62cc9 100644
--- a/packages/sdk-components-react-radix/src/tooltip.tsx
+++ b/packages/sdk-components-react-radix/src/tooltip.tsx
@@ -46,7 +46,9 @@ export const Tooltip = forwardRef<
return (
<div ref={ref} style={DisplayContentsStyle} {...webstudioAttributes}>
- <TooltipPrimitive.Root open={open} {...restProps} />
+ <TooltipPrimitive.Provider>
+ <TooltipPrimitive.Root open={open} {...restProps} />
+ </TooltipPrimitive.Provider>
</div>
);
});