Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
*/

.dec-root {
--background: hsl(0 0% 100%);

--foreground: hsl(222.2 84% 4.9%);

--sidebar: hsl(0 0% 98%);

--sidebar-foreground: hsl(240 5.3% 26.1%);
Expand All @@ -43,6 +47,10 @@
}

.dec-root.dark {
--background: hsl(222.2 84% 4.9%);

--foreground: hsl(210 40% 98%);

--sidebar: #2d3748;

--sidebar-foreground: hsl(240 4.8% 95.9%);
Expand All @@ -61,6 +69,10 @@
}

@theme inline {
--color-background: var(--background);

--color-foreground: var(--foreground);

--color-sidebar: var(--sidebar);

--color-sidebar-foreground: var(--sidebar-foreground);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,18 @@ function TooltipContent({
...props
}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
return (
<TooltipPrimitive.Portal>
<TooltipPrimitive.Content
data-slot="tooltip-content"
sideOffset={sideOffset}
className={cn(
"dec:z-50 dec:w-fit dec:origin-(--radix-tooltip-content-transform-origin) dec:animate-in dec:rounded-md dec:bg-foreground dec:px-3 dec:py-1.5 dec:text-xs dec:text-balance dec:text-background dec:fade-in-0 dec:zoom-in-95 dec:data-[side=bottom]:slide-in-from-top-2 dec:data-[side=left]:slide-in-from-right-2 dec:data-[side=right]:slide-in-from-left-2 dec:data-[side=top]:slide-in-from-bottom-2 dec:data-[state=closed]:animate-out dec:data-[state=closed]:fade-out-0 dec:data-[state=closed]:zoom-out-95",
className,
)}
{...props}
>
{children}
<TooltipPrimitive.Arrow className="dec:z-50 dec:size-2.5 dec:translate-y-[calc(-50%_-_2px)] dec:rotate-45 dec:rounded-[2px] dec:bg-foreground dec:fill-foreground" />
</TooltipPrimitive.Content>
</TooltipPrimitive.Portal>
<TooltipPrimitive.Content
data-slot="tooltip-content"
sideOffset={sideOffset}
className={cn(
Comment thread
kumaradityaraj marked this conversation as resolved.
"dec:z-50 dec:w-fit dec:origin-(--radix-tooltip-content-transform-origin) dec:animate-in dec:rounded-sm dec:bg-foreground dec:px-1 dec:py-1 dec:text-[9px] dec:text-balance dec:text-background dec:fade-in-0 dec:zoom-in-95 dec:data-[side=bottom]:slide-in-from-top-2 dec:data-[side=left]:slide-in-from-right-2 dec:data-[side=right]:slide-in-from-left-2 dec:data-[side=top]:slide-in-from-bottom-2 dec:data-[state=closed]:animate-out dec:data-[state=closed]:fade-out-0 dec:data-[state=closed]:zoom-out-95",
className,
)}
{...props}
>
{children}
<TooltipPrimitive.Arrow className="dec:z-50 dec:size-2.5 dec:translate-y-[calc(-50%_-_2px)] dec:rotate-45 dec:rounded-[2px] dec:bg-foreground dec:fill-foreground" />
</TooltipPrimitive.Content>
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { useResolvedColorMode } from "../hooks/useResolvedColorMode";
import { SidebarProvider } from "@/components/ui/sidebar";
import { SidePanel } from "@/side-panel/SidePanel";
import { DiagramEditorErrorBoundary } from "./error-pages/DiagramEditorErrorBoundary";
import { TooltipProvider } from "@/components/ui/tooltip";

/**
* DiagramEditor component API
Expand Down Expand Up @@ -112,16 +113,18 @@ export const DiagramEditor = (props: DiagramEditorProps) => {
isReadOnly={props.isReadOnly}
locale={locale}
>
<SidebarProvider defaultOpen={false}>
<div className="dec-diagram-content">
<DiagramEditorContent
diagramRef={diagramRef}
diagramDivRef={diagramDivRef}
colorMode={resolvedColorMode}
/>
</div>
<SidePanel />
</SidebarProvider>
<TooltipProvider>
<SidebarProvider defaultOpen={false}>
<div className="dec-diagram-content">
<DiagramEditorContent
diagramRef={diagramRef}
diagramDivRef={diagramDivRef}
colorMode={resolvedColorMode}
/>
</div>
<SidePanel />
</SidebarProvider>
</TooltipProvider>
</DiagramEditorContextProvider>
</ReactFlowProvider>
</DiagramEditorErrorBoundary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
.dec-root.dark .dec-task-node-badge-custom {
color: color-mix(in srgb, var(--task-node-color) 18%, white);
background-color: color-mix(in srgb, var(--task-node-color) 40%, transparent);
}
}ho

.dec-root .dec-task-node-badge {
@apply dec:ml-auto
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
terminalNodeConfigMap,
} from "./taskNodeConfig";
import { getCallSubType, getListenSubType, getRunSubType } from "../../core";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { CircleAlert } from "lucide-react";

export const ReactFlowNodeTypes: RF.NodeTypes = {
Expand Down Expand Up @@ -93,14 +94,17 @@ function TaskNodeBadge({ badge, testId }: BadgeProps) {
const isUnknown = !KNOWN_BADGES.has(badge.toLowerCase());

if (isUnknown) {
/* TODO: instead of using the browser default to display tool tip like below, replace with tooltip component when we add it */
return (
<span title={badge} className="dec-task-node-badge-custom" data-testid={`${testId}-custom`}>
{badge}
</span>
<Tooltip>
<TooltipTrigger asChild>
<span className="dec-task-node-badge-custom" data-testid={`${testId}-custom`}>
Comment thread
kumaradityaraj marked this conversation as resolved.
{badge}
</span>
</TooltipTrigger>
Comment thread
kumaradityaraj marked this conversation as resolved.
<TooltipContent>{badge}</TooltipContent>
</Tooltip>
);
}

return (
<span className="dec-task-node-badge" data-testid={testId}>
{badge}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
import { DEFAULT_NODE_SIZE } from "../../../src/react-flow/diagram/autoLayout";
import { en } from "../../../src/i18n/locales/en";
import { renderWithProviders } from "../../test-utils/render-helpers";
import { TooltipProvider } from "../../../src/components/ui/tooltip";

function testNode(
id: string,
Expand Down Expand Up @@ -256,19 +257,20 @@ describe("React Flow custom node types", () => {
}),
];
render(
<div>
<RF.ReactFlow
nodeTypes={ReactFlowNodeTypes}
nodes={nodesWithUnknownBadges}
edges={allEdges}
/>
</div>,
<TooltipProvider>
<div>
<RF.ReactFlow
nodeTypes={ReactFlowNodeTypes}
nodes={nodesWithUnknownBadges}
edges={allEdges}
/>
</div>
</TooltipProvider>,
);

const callBadge = screen.getByTestId("call-node-n1-badge-custom");
expect(callBadge).toBeInTheDocument();
expect(callBadge.textContent).toBe("customCall");
expect(callBadge).toHaveAttribute("title", "customCall");
});
Comment thread
kumaradityaraj marked this conversation as resolved.

it("should render while/compete badges on container nodes", () => {
Expand Down
Loading
Loading