Skip to content

merging dev to test #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaX10bt merged 3 commits into from
Aug 7, 2025
Merged

merging dev to test #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87637b3
fix(668): fix
IgorKrupenja Aug 7, 2025
52daff3
fix(668): fix steps
IgorKrupenja Aug 7, 2025
6d98c59
Merge pull request #669 from IgorKrupenja/668-dropdown-position
jaX10bt Aug 7, 2025
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
2 changes: 1 addition & 1 deletion GUI/src/components/Dropdown/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const Dropdown: FC<DropdownProps> = ({ open, onOpenChange, trigger, title, child
<DropdownMenu.Root open={open} onOpenChange={onOpenChange}>
<DropdownMenu.Trigger asChild>{trigger}</DropdownMenu.Trigger>
<DropdownMenu.Portal>
<DropdownMenu.Content className="dropdown" sideOffset={5} side="bottom" align="start" avoidCollisions={false}>
<DropdownMenu.Content className="dropdown" sideOffset={5}>
<Track className="dropdown__header" gap={8} justify="between" align="center">
<DropdownMenu.Label className="dropdown__title">{title}</DropdownMenu.Label>
<button onClick={onClose}>
Expand Down
1 change: 1 addition & 0 deletions GUI/src/components/Flow/EdgeTypes/CustomEdge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ function CustomEdge({
const allowedSteps = [
StepType.Condition,
StepType.Assign,
StepType.Textfield,
StepType.MultiChoiceQuestion,
StepType.FinishingStepRedirect,
StepType.FinishingStepEnd,
Expand Down
Loading