Skip to content
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

Jump to bottom

feat: InlineSelect ability #5963

Merged
merged 11 commits into from
Oct 6, 2023
Merged

feat: InlineSelect ability #5963

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3590061
feat: InlineSelect ability
canerakdas Oct 4, 2023
482c905
refactor: Unnecessary optional chaining removed
canerakdas Oct 4, 2023
7ff196e
chore: css indentation
canerakdas Oct 4, 2023
e52f9e4
refactor: Inline Select style updates and improvements
canerakdas Oct 4, 2023
4c85763
refactor: Removed unnecessary added types
canerakdas Oct 4, 2023
c3f33ec
refactor: Tailwind border radius values adjusted
canerakdas Oct 5, 2023
a08869b
refactor: Inline select dropdown radius
canerakdas Oct 5, 2023
259c27d
refactor: Unnecessary pixel usage
canerakdas Oct 5, 2023
b6687ff
Merge remote-tracking branch 'upstream/main' into inline-select/5913
canerakdas Oct 5, 2023
bef63cf
refactor: Inline select trigger border-radius
canerakdas Oct 5, 2023
1e66e11
refactor: Revert rounded-xs to rounded
canerakdas Oct 5, 2023
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
12 changes: 12 additions & 0 deletions components/Common/Select/index.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
dark:focus:border-neutral-600
dark:focus:ring-neutral-600
dark:data-[placeholder]:text-neutral-200;

& span {
@apply flex
items-center
gap-2;
}
}

.icon {
Expand Down Expand Up @@ -75,6 +81,12 @@
data-[highlighted]:outline-none
dark:text-neutral-200
dark:data-[highlighted]:bg-green-600;

& span {
@apply flex
items-center
gap-2;
}
}

.label {
Expand Down
34 changes: 34 additions & 0 deletions components/Common/Select/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,38 @@ export const DropdownLabel: Story = {
},
};

export const InlineSelect: Story = {
args: {
values: [
{
value: 'ubuntu',
label: 'Ubuntu',
iconImageUrl: '/static/images/logos/platform-linux.svg',
},
{
value: 'apple',
label: 'Apple',
iconImageUrl: '/static/images/logos/platform-apple.svg',
},
{
value: 'microsoft',
label: 'Microsoft',
iconImageUrl: '/static/images/logos/platform-microsoft.svg',
},
{
value: 'homebrew',
label: 'Homebrew',
iconImageUrl: '/static/images/logos/platform-homebrew.svg',
},
{
value: 'placeholder',
label: 'Placeholder',
iconImageUrl: '/static/images/logos/platform-placeholder.svg',
},
],
dropdownLabel: 'Platform',
placeholder: 'Select a platform',
},
};

export default { component: Select } as Meta;
17 changes: 14 additions & 3 deletions components/Common/Select/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { ChevronDownIcon } from '@heroicons/react/24/outline';
import * as Primitive from '@radix-ui/react-select';
import Image from 'next/image';
import { useId } from 'react';
import type { FC } from 'react';

import styles from './index.module.css';

type SelectProps = {
values: ({ label: string; value: string } | string)[];
values: ({ label: string; value: string; iconImageUrl?: string } | string)[];
canerakdas marked this conversation as resolved.
Show resolved Hide resolved
defaultValue?: string;
placeholder?: string;
dropdownLabel?: string;
Expand Down Expand Up @@ -34,7 +35,7 @@ const Select: FC<SelectProps> = ({
<Primitive.Root defaultValue={defaultValue} onValueChange={onChange}>
<Primitive.Trigger
className={styles.trigger}
aria-label={label}
aria-label={label || dropdownLabel}
id={id}
>
<Primitive.Value placeholder={placeholder} />
Expand All @@ -59,7 +60,17 @@ const Select: FC<SelectProps> = ({
value={value}
className={`${styles.item} ${styles.text}`}
>
<Primitive.ItemText>{label}</Primitive.ItemText>
<Primitive.ItemText>
{typeof item !== 'string' && item.iconImageUrl && (
canerakdas marked this conversation as resolved.
Show resolved Hide resolved
<Image
src={item.iconImageUrl}
alt={label}
width={16}
height={16}
/>
)}
{label}
</Primitive.ItemText>
</Primitive.Item>
);
})}
Expand Down
Loading