Skip to content

Fix dropdown styling #70

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
YashK2005 merged 3 commits into from
Nov 11, 2025
Merged

Fix dropdown styling #70

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
705d7d9
fix dropdown styling
YashK2005 Nov 11, 2025
5d36e43
fix provinces dropdown
YashK2005 Nov 11, 2025
73c3688
lint
YashK2005 Nov 11, 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
8 changes: 7 additions & 1 deletion frontend/src/components/intake/personal-info-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ interface PersonalInfoFormData {
interface PersonalInfoFormProps {
formType: 'participant' | 'volunteer';
onSubmit: (experienceData: ExperienceData, personalData: PersonalData) => void;
onDropdownOpenChange?: (isOpen: boolean) => void;
}

export function PersonalInfoForm({ formType, onSubmit }: PersonalInfoFormProps) {
export function PersonalInfoForm({
formType,
onSubmit,
onDropdownOpenChange,
}: PersonalInfoFormProps) {
const router = useRouter();
const {
control,
Expand Down Expand Up @@ -321,6 +326,7 @@ export function PersonalInfoForm({ formType, onSubmit }: PersonalInfoFormProps)
onSelectionChange={field.onChange}
placeholder="Province"
error={!!errors.province}
onOpenChange={onDropdownOpenChange}
/>
)}
/>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/ui/multi-select-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const MultiSelectDropdown: React.FC<MultiSelectDropdownProps> = ({
};

return (
<Box position="relative" w="full" ref={dropdownRef} zIndex={1}>
<Box position="relative" w="full" ref={dropdownRef}>
<button
type="button"
onClick={() => setIsOpen(!isOpen)}
Expand Down Expand Up @@ -149,7 +149,7 @@ export const MultiSelectDropdown: React.FC<MultiSelectDropdownProps> = ({
border="1px solid #d1d5db"
borderRadius="6px"
boxShadow="0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)"
zIndex={1000}
zIndex={9999}
>
{options.map((option) => {
const isSelected = selectedValues.includes(option);
Expand Down
18 changes: 14 additions & 4 deletions frontend/src/components/ui/single-select-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ interface SingleSelectDropdownProps {
onSelectionChange: (value: string) => void;
placeholder: string;
error?: boolean;
onOpenChange?: (isOpen: boolean) => void;
}

export const SingleSelectDropdown: React.FC<SingleSelectDropdownProps> = ({
Expand All @@ -16,15 +17,23 @@ export const SingleSelectDropdown: React.FC<SingleSelectDropdownProps> = ({
onSelectionChange,
placeholder,
error,
onOpenChange,
}) => {
const [isOpen, setIsOpen] = useState(false);
const dropdownRef = useRef<HTMLDivElement>(null);

const handleToggle = () => {
const newIsOpen = !isOpen;
setIsOpen(newIsOpen);
onOpenChange?.(newIsOpen);
};

// Close dropdown when clicking outside
useEffect(() => {
const handleClickOutside = (event: MouseEvent) => {
if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
setIsOpen(false);
onOpenChange?.(false);
}
};

Expand All @@ -35,11 +44,12 @@ export const SingleSelectDropdown: React.FC<SingleSelectDropdownProps> = ({
return () => {
document.removeEventListener('mousedown', handleClickOutside);
};
}, [isOpen]);
}, [isOpen, onOpenChange]);

const handleSelect = (option: string) => {
onSelectionChange(option);
setIsOpen(false);
onOpenChange?.(false);
};

const handleRemove = (e: React.MouseEvent) => {
Expand All @@ -48,10 +58,10 @@ export const SingleSelectDropdown: React.FC<SingleSelectDropdownProps> = ({
};

return (
<Box position="relative" w="full" ref={dropdownRef} zIndex={1}>
<Box position="relative" w="full" ref={dropdownRef}>
<button
type="button"
onClick={() => setIsOpen(!isOpen)}
onClick={handleToggle}
style={{
width: '100%',
minHeight: '40px',
Expand Down Expand Up @@ -143,7 +153,7 @@ export const SingleSelectDropdown: React.FC<SingleSelectDropdownProps> = ({
border="1px solid #d1d5db"
borderRadius="6px"
boxShadow="0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)"
zIndex={1000}
zIndex={9999}
>
{options.map((option) => (
<Box
Expand Down
16 changes: 14 additions & 2 deletions frontend/src/pages/participant/intake/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export default function ParticipantIntakePage() {
formType: 'participant',
});
const [, setSubmitting] = useState(false);
const [hasDropdownOpen, setHasDropdownOpen] = useState(false);

const computeFlowSteps = (data: IntakeFormData) => {
const { hasBloodCancer, caringForSomeone } = data;
Expand Down Expand Up @@ -226,7 +227,14 @@ export default function ParticipantIntakePage() {
return (
<ProtectedPage allowedRoles={[UserRole.PARTICIPANT, UserRole.ADMIN]}>
<FormStatusGuard allowedStatuses={[FormStatus.INTAKE_TODO]}>
<Flex minH="100vh" bg={COLORS.lightGray} justify="center" py={12} overflow="visible">
<Flex
minH="100vh"
bg={COLORS.lightGray}
justify="center"
py={12}
overflow="visible"
pb={hasDropdownOpen ? '50vh' : 12}
>
<Box
w="full"
maxW="1200px"
Expand All @@ -238,7 +246,11 @@ export default function ParticipantIntakePage() {
position="relative"
>
{currentStepType === 'experience-personal' && (
<PersonalInfoForm formType="participant" onSubmit={handleExperiencePersonalSubmit} />
<PersonalInfoForm
formType="participant"
onSubmit={handleExperiencePersonalSubmit}
onDropdownOpenChange={setHasDropdownOpen}
/>
)}

{currentStepType === 'demographics-cancer' && (
Expand Down
16 changes: 14 additions & 2 deletions frontend/src/pages/volunteer/intake/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export default function VolunteerIntakePage() {
formType: 'volunteer',
});
const [, setSubmitting] = useState(false);
const [hasDropdownOpen, setHasDropdownOpen] = useState(false);

// Determine flow based on experience type selections
const computeFlowSteps = (data: IntakeFormData) => {
Expand Down Expand Up @@ -235,7 +236,14 @@ export default function VolunteerIntakePage() {
return (
<ProtectedPage allowedRoles={[UserRole.VOLUNTEER, UserRole.ADMIN]}>
<FormStatusGuard allowedStatuses={[FormStatus.INTAKE_TODO]}>
<Flex minH="100vh" bg={COLORS.lightGray} justify="center" py={12} overflow="visible">
<Flex
minH="100vh"
bg={COLORS.lightGray}
justify="center"
py={12}
overflow="visible"
pb={hasDropdownOpen ? '30vh' : 12}
>
<Box
w="full"
maxW="1200px"
Expand All @@ -247,7 +255,11 @@ export default function VolunteerIntakePage() {
position="relative"
>
{currentStepType === 'experience-personal' && (
<PersonalInfoForm formType="volunteer" onSubmit={handleExperiencePersonalSubmit} />
<PersonalInfoForm
formType="volunteer"
onSubmit={handleExperiencePersonalSubmit}
onDropdownOpenChange={setHasDropdownOpen}
/>
)}

{currentStepType === 'demographics-cancer' && (
Expand Down