feat: enhance OutputComponent dropdown functionality and styling (#8458)
* refactor: update OutputComponent styles and enhance dropdown functionality * Adjusted text size in OutputComponent for better readability. * Improved dropdown button styling and added hover effects. * Enhanced dropdown content layout to display output types alongside names. * Added console log for outputs to assist in debugging. * refactor: remove console log from OutputComponent for cleaner code * refactor: streamline GenericNode component and enhance NodeOutputs functionality * Removed conditional rendering for hidden outputs in GenericNode for cleaner code. * Introduced hasExistingHiddenOutputs prop to NodeOutputs for better state management. * Updated OutputComponent styles for improved visual consistency and output type display. * style: update OutputComponent padding for improved layout * Added padding to the OutputComponent for better spacing and visual consistency.
This commit is contained in:
parent
e5e54ea606
commit
2e0c87023e
4 changed files with 32 additions and 95 deletions
|
|
@ -12,6 +12,7 @@ export default function NodeOutputs({
|
||||||
showHiddenOutputs,
|
showHiddenOutputs,
|
||||||
selectedOutput,
|
selectedOutput,
|
||||||
handleSelectOutput,
|
handleSelectOutput,
|
||||||
|
hasExistingHiddenOutputs = false,
|
||||||
}: {
|
}: {
|
||||||
outputs: any;
|
outputs: any;
|
||||||
keyPrefix: string;
|
keyPrefix: string;
|
||||||
|
|
@ -23,6 +24,7 @@ export default function NodeOutputs({
|
||||||
showHiddenOutputs: boolean;
|
showHiddenOutputs: boolean;
|
||||||
selectedOutput: any;
|
selectedOutput: any;
|
||||||
handleSelectOutput: any;
|
handleSelectOutput: any;
|
||||||
|
hasExistingHiddenOutputs?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const hasLoopOutput = outputs.some((output) => output.allows_loop);
|
const hasLoopOutput = outputs.some((output) => output.allows_loop);
|
||||||
const hasGroupOutputs = outputs.some((output) => output.group_outputs);
|
const hasGroupOutputs = outputs.some((output) => output.group_outputs);
|
||||||
|
|
@ -105,7 +107,7 @@ export default function NodeOutputs({
|
||||||
(out) => out.name === displayOutput.name,
|
(out) => out.name === displayOutput.name,
|
||||||
) ?? 0
|
) ?? 0
|
||||||
}
|
}
|
||||||
lastOutput={true}
|
lastOutput={!hasExistingHiddenOutputs}
|
||||||
data={data}
|
data={data}
|
||||||
types={types}
|
types={types}
|
||||||
selected={selected}
|
selected={selected}
|
||||||
|
|
|
||||||
|
|
@ -52,53 +52,6 @@ const SnowflakeIcon = memo(() => (
|
||||||
<IconComponent className="h-5 w-5 text-ice" name="Snowflake" />
|
<IconComponent className="h-5 w-5 text-ice" name="Snowflake" />
|
||||||
));
|
));
|
||||||
|
|
||||||
const HideShowButton = memo(
|
|
||||||
({
|
|
||||||
disabled,
|
|
||||||
onClick,
|
|
||||||
hidden,
|
|
||||||
isToolMode,
|
|
||||||
title,
|
|
||||||
}: {
|
|
||||||
disabled: boolean;
|
|
||||||
onClick: () => void;
|
|
||||||
hidden: boolean;
|
|
||||||
isToolMode: boolean;
|
|
||||||
title: string;
|
|
||||||
}) => (
|
|
||||||
<Button
|
|
||||||
disabled={disabled}
|
|
||||||
unstyled
|
|
||||||
onClick={onClick}
|
|
||||||
data-testid={`input-inspection-${title.toLowerCase()}`}
|
|
||||||
>
|
|
||||||
<ShadTooltip
|
|
||||||
content={
|
|
||||||
disabled
|
|
||||||
? "Connected outputs can't be hidden."
|
|
||||||
: hidden
|
|
||||||
? "Show output"
|
|
||||||
: "Hide output"
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<EyeIcon
|
|
||||||
hidden={hidden}
|
|
||||||
className={cn(
|
|
||||||
"icon-size",
|
|
||||||
disabled
|
|
||||||
? "text-placeholder-foreground opacity-60"
|
|
||||||
: isToolMode
|
|
||||||
? "text-background hover:text-secondary-hover"
|
|
||||||
: "text-placeholder-foreground hover:text-primary-hover",
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</ShadTooltip>
|
|
||||||
</Button>
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
const InspectButton = memo(
|
const InspectButton = memo(
|
||||||
forwardRef(
|
forwardRef(
|
||||||
(
|
(
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ export default function OutputComponent({
|
||||||
const singleOutput = displayProxy(
|
const singleOutput = displayProxy(
|
||||||
<span
|
<span
|
||||||
className={cn(
|
className={cn(
|
||||||
"text-xs font-medium",
|
"px-2 py-1 text-[13px] font-medium",
|
||||||
isToolMode && "text-secondary",
|
isToolMode && "text-secondary",
|
||||||
frozen ? "text-ice" : "",
|
frozen ? "text-ice" : "",
|
||||||
)}
|
)}
|
||||||
|
|
@ -67,22 +67,24 @@ export default function OutputComponent({
|
||||||
<DropdownMenuTrigger asChild>
|
<DropdownMenuTrigger asChild>
|
||||||
<Button
|
<Button
|
||||||
unstyled
|
unstyled
|
||||||
className="flex items-center gap-2"
|
className="group flex items-center gap-2"
|
||||||
data-testid={`dropdown-output-${outputName?.toLowerCase()}`}
|
data-testid={`dropdown-output-${outputName?.toLowerCase()}`}
|
||||||
>
|
>
|
||||||
{name}
|
<div className="flex items-center gap-1 truncate rounded-md px-2 py-1 text-[13px] font-medium group-hover:bg-primary/10">
|
||||||
<ForwardedIconComponent
|
{name}
|
||||||
name="ChevronDown"
|
<ForwardedIconComponent
|
||||||
className="h-4 w-4 text-muted-foreground"
|
name="ChevronDown"
|
||||||
/>
|
className="h-4 w-4 text-muted-foreground"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</Button>
|
</Button>
|
||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuContent>
|
<DropdownMenuContent className="min-w-[200px] max-w-[250px]">
|
||||||
{outputs.map((output) => (
|
{outputs.map((output) => (
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
key={output.name}
|
key={output.name}
|
||||||
data-testid={`dropdown-item-output-${outputName?.toLowerCase()}-${output.display_name?.toLowerCase()}`}
|
data-testid={`dropdown-item-output-${outputName?.toLowerCase()}-${output.display_name?.toLowerCase()}`}
|
||||||
className="cursor-pointer px-3 py-2"
|
className="cursor-pointer justify-between px-3 py-2"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
handleSelectOutput && handleSelectOutput(output);
|
handleSelectOutput && handleSelectOutput(output);
|
||||||
}}
|
}}
|
||||||
|
|
@ -90,6 +92,9 @@ export default function OutputComponent({
|
||||||
<span className="truncate text-[13px]">
|
<span className="truncate text-[13px]">
|
||||||
{output.display_name ?? output.name}
|
{output.display_name ?? output.name}
|
||||||
</span>
|
</span>
|
||||||
|
<span className="ml-4 text-[13px] text-muted-foreground">
|
||||||
|
{output.types.join(", ")}
|
||||||
|
</span>
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
))}
|
))}
|
||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
|
|
|
||||||
|
|
@ -587,45 +587,22 @@ function GenericNode({
|
||||||
showHiddenOutputs={showHiddenOutputs}
|
showHiddenOutputs={showHiddenOutputs}
|
||||||
selectedOutput={selectedOutput}
|
selectedOutput={selectedOutput}
|
||||||
handleSelectOutput={handleSelectOutput}
|
handleSelectOutput={handleSelectOutput}
|
||||||
|
hasExistingHiddenOutputs={
|
||||||
|
!!hiddenOutputs && hiddenOutputs.length > 0
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<MemoizedNodeOutputs
|
||||||
|
outputs={hiddenOutputs}
|
||||||
|
keyPrefix="hidden"
|
||||||
|
data={data}
|
||||||
|
types={types}
|
||||||
|
selected={selected ?? false}
|
||||||
|
showNode={showNode}
|
||||||
|
isToolMode={isToolMode}
|
||||||
|
showHiddenOutputs={true}
|
||||||
|
selectedOutput={selectedOutput}
|
||||||
|
handleSelectOutput={handleSelectOutput}
|
||||||
/>
|
/>
|
||||||
{showHiddenOutputs && (
|
|
||||||
<MemoizedNodeOutputs
|
|
||||||
outputs={hiddenOutputs}
|
|
||||||
keyPrefix="hidden"
|
|
||||||
data={data}
|
|
||||||
types={types}
|
|
||||||
selected={selected ?? false}
|
|
||||||
showNode={showNode}
|
|
||||||
isToolMode={isToolMode}
|
|
||||||
showHiddenOutputs={true}
|
|
||||||
selectedOutput={selectedOutput}
|
|
||||||
handleSelectOutput={handleSelectOutput}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{hiddenOutputs && hiddenOutputs.length > 0 && (
|
|
||||||
<ShadTooltip
|
|
||||||
content={
|
|
||||||
showHiddenOutputs
|
|
||||||
? `${TOOLTIP_HIDDEN_OUTPUTS} (${hiddenOutputs?.length})`
|
|
||||||
: `${TOOLTIP_OPEN_HIDDEN_OUTPUTS} (${hiddenOutputs?.length})`
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className={cn(
|
|
||||||
"absolute left-1/2 flex -translate-x-1/2 justify-center",
|
|
||||||
(shownOutputs && shownOutputs.length > 0) ||
|
|
||||||
showHiddenOutputs
|
|
||||||
? "bottom-[-0.8rem]"
|
|
||||||
: "bottom-[-0.8rem]",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<HiddenOutputsButton
|
|
||||||
showHiddenOutputs={showHiddenOutputs}
|
|
||||||
onClick={() => setShowHiddenOutputs(!showHiddenOutputs)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</ShadTooltip>
|
|
||||||
)}
|
|
||||||
</>
|
</>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue