Skip to content
Snippets Groups Projects
Commit d2bd1eda authored by Leonardo's avatar Leonardo
Browse files

Revert "fix: popover trigger used outside popover"

This reverts commit b3fa44e3.
parent b3fa44e3
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ import logo_white from './gp-logo-white.svg';
import logo from './gp-logo.svg';
import { useAuthorizationCache, useAuth } from '@graphpolaris/shared/lib/data-access';
import DatabaseSelector from './DatabaseManagement/dbConnectionSelector';
import { DropdownItem } from '@graphpolaris/shared/lib/components/dropdowns';
import { DropdownItem, DropdownItemContainer } from '@graphpolaris/shared/lib/components/dropdowns';
import GpLogo from './gp-logo';
import { Popover, PopoverContent, PopoverTrigger } from '@graphpolaris/shared/lib/components/layout/Popover';
......
......@@ -12,11 +12,10 @@ type DropdownTriggerProps = {
disabled?: boolean;
variant?: 'primary' | 'ghost' | 'outline';
className?: string;
popover?: boolean;
onClick?: () => void;
};
export function DropdownTrigger({ title, size, disabled, variant, className, onClick, popover = true }: DropdownTriggerProps) {
export function DropdownTrigger({ title, size, disabled, variant, className, onClick }: DropdownTriggerProps) {
const paddingClass = size === 'xs' ? 'py-0' : size === 'sm' ? 'px-1 py-1' : size === 'md' ? 'px-2 py-1' : 'px-4 py-2';
const textSizeClass = size === 'xs' ? 'text-xs' : size === 'sm' ? 'text-sm' : size === 'md' ? 'text-base' : 'text-lg';
......@@ -26,25 +25,16 @@ export function DropdownTrigger({ title, size, disabled, variant, className, onC
: variant === 'ghost'
? 'bg-transparent shadow-none'
: 'border rounded bg-transparent';
const inner = (
<div
className={`inline-flex w-full truncate justify-between items-center gap-x-1.5 ${variantClass} ${textSizeClass} ${paddingClass} text-secondary-900 shadow-sm hover:bg-secondary-50 disabled:bg-secondary-100 disabled:cursor-not-allowed disabled:text-secondary-400 pl-1 truncate${className ? ` ${className}` : ''}`}
>
<span className={`text-${size}`}>{title}</span>
<Icon component={<ArrowDropDown />} size={16} />
</div>
return (
<PopoverTrigger onClick={onClick}>
<div
className={`inline-flex w-full truncate justify-between items-center gap-x-1.5 ${variantClass} ${textSizeClass} ${paddingClass} text-secondary-900 shadow-sm hover:bg-secondary-50 disabled:bg-secondary-100 disabled:cursor-not-allowed disabled:text-secondary-400 pl-1 truncate${className ? ` ${className}` : ''}`}
>
<span className={`text-${size}`}>{title}</span>
<Icon component={<ArrowDropDown />} size={16} />
</div>
</PopoverTrigger>
);
if (popover) {
return <PopoverTrigger onClick={onClick}>{inner}</PopoverTrigger>;
} else
return (
<button className="w-full" onClick={onClick}>
{' '}
{inner}
</button>
);
}
type DropdownItemContainerProps = {
......
......@@ -8,6 +8,7 @@ import {
} from '@graphpolaris/shared/lib/data-access/store/mlSlice';
import { FormDiv, FormCard, FormBody, FormTitle, FormHBar } from '@graphpolaris/shared/lib/components/forms';
import { Input } from '@graphpolaris/shared/lib/components/inputs';
import { PopoverTrigger } from '@graphpolaris/shared/lib/components/layout/Popover';
export const QueryMLDialog = () => {
const dispatch = useAppDispatch();
......
......@@ -74,7 +74,6 @@ export function QueryLogicPill(node: SchemaReactflowLogicNode) {
<div className={`py-1 h-fit border-[1px] border-secondary-200 ${data.selected ? 'bg-secondary-400' : 'bg-secondary-100'}`}>
{/* <div className="m-1 mx-2 text-left">{output.name}</div> */}
<DropdownTrigger
popover={false}
title={output.name}
variant="ghost"
size="xs"
......
import React from 'react';
import { Button, DropdownItem } from '../../components';
import { Button, DropdownTrigger, DropdownItemContainer, DropdownItem, Icon, DropdownContainer } from '../../components';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../components/tooltip';
import { Add, Close, Fullscreen } from '@mui/icons-material';
import { ControlContainer } from '../../components/controls';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment