Skip to content

Commit

Permalink
fix: Don't use unavailable context in TargetBlockedTooltip
Browse files Browse the repository at this point in the history
Issue: https://linear.app/plasmic/issue/PLA-11083
Change-Id: I4a9061065cf613587716c4cb8c2520f2a2b781f6
GitOrigin-RevId: ee00660d0a7f6178092b95ca6e85b0887ddc881d
  • Loading branch information
FMota0 authored and Copybara committed Aug 12, 2024
1 parent 2c21d57 commit 1d85036
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
6 changes: 5 additions & 1 deletion platform/wab/src/wab/client/components/canvas/view-ops.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,11 @@ export class ViewOps {
const targetBlockingCombo = getTargetBlockingCombo([indicator]);
if (targetBlockingCombo) {
return (
<TargetBlockedTooltip displayName="text" combo={targetBlockingCombo} />
<TargetBlockedTooltip
displayName="text"
combo={targetBlockingCombo}
studioCtx={this.studioCtx()}
/>
);
}

Expand Down
24 changes: 13 additions & 11 deletions platform/wab/src/wab/client/components/sidebar/sidebar-helpers.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useLabel } from "@/wab/client/components/aria-utils";
import { useContextMenu } from "@/wab/client/components/ContextMenu";
import { useLabel } from "@/wab/client/components/aria-utils";
import { ColorButton } from "@/wab/client/components/style-controls/ColorButton";
import {
DefinedIndicator,
mergedIndicatorSource,
} from "@/wab/client/components/style-controls/DefinedIndicator";
import StyleCheckbox from "@/wab/client/components/style-controls/StyleCheckbox";
import {
createStyleContextMenu,
ExpsProvider,
createStyleContextMenu,
useStyleComponent,
} from "@/wab/client/components/style-controls/StyleComponent";
import StyleSelect from "@/wab/client/components/style-controls/StyleSelect";
Expand All @@ -21,8 +21,14 @@ import LabeledListItem from "@/wab/client/components/widgets/LabeledListItem";
import { SimpleTextbox } from "@/wab/client/components/widgets/SimpleTextbox";
import TriangleBottomIcon from "@/wab/client/plasmic/plasmic_kit/PlasmicIcon__TriangleBottom";
import { PlasmicStyleToggleButtonGroup__VariantsArgs } from "@/wab/client/plasmic/plasmic_kit_style_controls/PlasmicStyleToggleButtonGroup";
import { StudioCtx, useStudioCtx } from "@/wab/client/studio-ctx/StudioCtx";
import { StudioCtx } from "@/wab/client/studio-ctx/StudioCtx";
import { StandardMarkdown } from "@/wab/client/utils/StandardMarkdown";
import { TokenType } from "@/wab/commons/StyleToken";
import { MaybeWrap } from "@/wab/commons/components/ReactUtil";
import { XDraggable } from "@/wab/commons/components/XDraggable";
import { IRuleSetHelpersX } from "@/wab/shared/RuleSetHelpers";
import { VariantedStylesHelper } from "@/wab/shared/VariantedStylesHelper";
import { VariantCombo, makeVariantName } from "@/wab/shared/Variants";
import {
cx,
ensure,
Expand All @@ -31,17 +37,11 @@ import {
spawn,
withoutNils,
} from "@/wab/shared/common";
import { MaybeWrap } from "@/wab/commons/components/ReactUtil";
import { XDraggable } from "@/wab/commons/components/XDraggable";
import { TokenType } from "@/wab/commons/StyleToken";
import { parseCssNumericNew, roundedCssNumeric } from "@/wab/shared/css";
import {
DefinedIndicatorType,
getTargetBlockingCombo,
} from "@/wab/shared/defined-indicator";
import { IRuleSetHelpersX } from "@/wab/shared/RuleSetHelpers";
import { VariantedStylesHelper } from "@/wab/shared/VariantedStylesHelper";
import { makeVariantName, VariantCombo } from "@/wab/shared/Variants";
import { Select, Tooltip } from "antd";
import cn from "classnames";
import { observer } from "mobx-react";
Expand Down Expand Up @@ -858,8 +858,8 @@ function LabeledToggleButtonGroup_(
export function TargetBlockedTooltip(props: {
displayName?: React.ReactNode;
combo: VariantCombo;
studioCtx?: StudioCtx;
}) {
const studioCtx = useStudioCtx();
const { displayName, combo } = props;
return (
<>
Expand All @@ -869,7 +869,7 @@ export function TargetBlockedTooltip(props: {
<strong>
{combo
.map((variant) =>
makeVariantName({ variant: variant, site: studioCtx.site })
makeVariantName({ variant, site: props.studioCtx?.site })
)
.join(" + ")}
</strong>
Expand Down Expand Up @@ -898,6 +898,7 @@ export function shouldBeDisabled(opts: {
};
label?: React.ReactNode;
indicators: DefinedIndicatorType[];
studioCtx?: StudioCtx;
}) {
if (opts.props.isDisabled) {
return {
Expand All @@ -913,6 +914,7 @@ export function shouldBeDisabled(opts: {
<TargetBlockedTooltip
displayName={opts.label}
combo={targetBlockingCombo}
studioCtx={opts.studioCtx}
/>
),
};
Expand Down

0 comments on commit 1d85036

Please sign in to comment.