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 delay to spacing tooltip (#686)

Ivan Starkov461cd919019a
diff --git a/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx b/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx
index e451163989..02fa859920 100644
--- a/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx
+++ b/apps/designer/app/designer/features/style-panel/sections/spacing/spacing.tsx
@@ -56,12 +56,9 @@ const Cell = ({
onChange={onChange}
onClose={onPopoverClose}
/>
- <SpacingTooltip
- property={property}
- isOpen={
- isActive && isPopoverOpen === false && scrubStatus.isActive === false
- }
- />
+ {isActive && isPopoverOpen === false && scrubStatus.isActive === false ? (
+ <SpacingTooltip property={property} />
+ ) : null}
<ValueText
css={{
// We want value to have `default` cursor to indicate that it's clickable,
diff --git a/apps/designer/app/designer/features/style-panel/sections/spacing/tooltip.tsx b/apps/designer/app/designer/features/style-panel/sections/spacing/tooltip.tsx
index 59a772c11b..bcf850f0ac 100644
--- a/apps/designer/app/designer/features/style-panel/sections/spacing/tooltip.tsx
+++ b/apps/designer/app/designer/features/style-panel/sections/spacing/tooltip.tsx
@@ -1,5 +1,11 @@
-import { styled, Tooltip } from "@webstudio-is/design-system";
+import {
+ styled,
+ Tooltip,
+ useEnhancedTooltipProps,
+} from "@webstudio-is/design-system";
import { SpacingStyleProperty } from "./types";
+import { useDebounce } from "use-debounce";
+import { useState } from "react";
// trigger is used only for positioning
const Trigger = styled("div", {
@@ -35,17 +41,25 @@ const sides = {
export const SpacingTooltip = ({
property,
- isOpen,
}: {
property: SpacingStyleProperty;
- isOpen: boolean;
-}) => (
- <Tooltip
- open={isOpen}
- content={labels[property]}
- side={sides[property]}
- disableHoverableContent
- >
- <Trigger />
- </Tooltip>
-);
+}) => {
+ const { delayDuration } = useEnhancedTooltipProps();
+ const [initialOpen, setInitialOpen] = useState(false);
+ const [open] = useDebounce(initialOpen, delayDuration ?? 0);
+
+ if (initialOpen === false) {
+ setInitialOpen(true);
+ }
+
+ return (
+ <Tooltip
+ open={open}
+ content={labels[property]}
+ side={sides[property]}
+ disableHoverableContent
+ >
+ <Trigger />
+ </Tooltip>
+ );
+};
diff --git a/packages/design-system/src/components/enhanced-tooltip.tsx b/packages/design-system/src/components/enhanced-tooltip.tsx
index fb16b579fb..b0c8f5fdc1 100644
--- a/packages/design-system/src/components/enhanced-tooltip.tsx
+++ b/packages/design-system/src/components/enhanced-tooltip.tsx
@@ -45,6 +45,8 @@ export const EnhancedTooltipProvider = ({
);
};
+export const useEnhancedTooltipProps = () => useContext(EnhancedTooltipContext);
+
/**
* EnhancedTooltip has the following differences from the radix-ui
* 1. Don't show the tooltip if any click or key-down was made inside Tooltip.Trigger
diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts
index 1b516452da..89b061f925 100644
--- a/packages/design-system/src/index.ts
+++ b/packages/design-system/src/index.ts
@@ -27,6 +27,7 @@ export { Tooltip, InputErrorsTooltip } from "./components/tooltip";
export {
EnhancedTooltip,
EnhancedTooltipProvider,
+ useEnhancedTooltipProps,
} from "./components/enhanced-tooltip";
export { Button } from "./components/button";
export { DeprecatedIconButton } from "./components/__DEPRECATED__/icon-button";