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

MenuItem updates #2361

Merged
merged 4 commits into from
Oct 1, 2024
Merged

MenuItem updates #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5e5b6c
Fix centered option for MenuItem
laurakwhit Sep 30, 2024
bacbbd3
Update Menu stories
laurakwhit Sep 30, 2024
dba2ee3
Center selected icon with label in MenuItem
laurakwhit Sep 30, 2024
1fb4ace
Align checkboxes in EventTypeFilter to start
laurakwhit Sep 30, 2024
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
1 change: 1 addition & 0 deletions src/lib/components/lines-and-dots/event-type-filter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
on:click={() => {
onOptionClick(option);
}}
class="items-start"
>
<Checkbox
on:click={() => onOptionClick(option)}
Expand Down
45 changes: 25 additions & 20 deletions src/lib/holocene/menu/menu-item.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,15 @@
<a
{href}
role="menuitem"
class={merge('menu-item', 'm-1', 'px-3', 'py-2', className)}
class={merge(
'menu-item',
'm-1 px-3 py-2',
'flex items-center gap-2',
className,
)}
class:disabled
class:hoverable
class:justify-center={centered}
aria-hidden={disabled ? 'true' : 'false'}
aria-disabled={disabled}
tabindex={disabled ? -1 : 0}
Expand All @@ -122,7 +128,12 @@
{:else}
<li
role="menuitem"
class={merge('menu-item', 'm-1', 'px-3', 'py-2', className)}
class={merge(
'menu-item',
'm-1 px-3 py-2',
'flex items-center gap-2',
className,
)}
class:destructive
class:disabled
class:selected
Expand All @@ -134,22 +145,16 @@
{...$$restProps}
>
<slot name="leading" />
<div class:centered class="menu-item-wrapper">
{#if description}
<div class="flex flex-col">
<slot />
<span class="menu-item-description">
{description}
</span>
</div>
{:else}
<div class="grow">
<div class:centered class="menu-item-wrapper">
<slot />
{/if}
{#if selected !== undefined}
<div class="flex h-6 w-6 shrink-0">
{#if selected}
<Icon name="checkmark" />
{/if}
{#if selected}
<Icon name="checkmark" class="shrink-0" />
{/if}
</div>
{#if description}
<div class="menu-item-description" class:text-center={centered}>
{description}
</div>
{/if}
</div>
Expand All @@ -159,7 +164,7 @@

<style lang="postcss">
.menu-item {
@apply flex cursor-pointer flex-row items-center gap-2 rounded border border-transparent text-sm font-medium focus-visible:border-inverse focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70 dark:focus-visible:border-interactive;
@apply cursor-pointer rounded border border-transparent text-sm font-medium focus-visible:border-inverse focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70 dark:focus-visible:border-interactive;

&.hoverable {
@apply hover:surface-interactive-secondary focus-visible:surface-interactive-secondary;
Expand All @@ -179,14 +184,14 @@
}

.menu-item-wrapper {
@apply flex grow items-center justify-between gap-2;
@apply flex items-center justify-between gap-2;

&.centered {
@apply justify-center;
}
}

.menu-item-description {
@apply text-xs font-normal text-subtle;
@apply mr-6 text-xs font-normal text-subtle;
}
</style>
42 changes: 26 additions & 16 deletions src/lib/holocene/menu/menu.stories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
position: {
name: 'Position',
control: 'inline-radio',
options: ['left', 'right'],
options: ['left', 'right', 'top-left', 'top-right'],
},
menuElement: {
name: 'Menu Element',
Expand All @@ -51,21 +51,31 @@
</script>

<Template let:args let:context>
<MenuContainer>
<MenuButton hasIndicator variant={args.variant} controls={context.id}>
<Icon slot="leading" name="temporal-logo" />
Menu
</MenuButton>
<Menu id={context.id}>
<MenuItem href="https://temporal.io" on:click={action('click')}>
Link
</MenuItem>
<MenuItem disabled href="https://temporal.io">Disabled Link</MenuItem>
<MenuItem on:click={action('click')} selected>Selected</MenuItem>
<MenuItem on:click={action('click')}>Standard</MenuItem>
<MenuItem on:click={action('click')} destructive>Destructive</MenuItem>
</Menu>
</MenuContainer>
<div class="flex items-center justify-center">
<MenuContainer>
<MenuButton hasIndicator variant={args.variant} controls={context.id}>
<Icon slot="leading" name="temporal-logo" />
Menu
</MenuButton>
<Menu id={context.id} class="w-64" {...args}>
<MenuItem href="https://temporal.io" on:click={action('click')}>
Link
</MenuItem>
<MenuItem disabled href="https://temporal.io">Disabled Link</MenuItem>
<MenuItem on:click={action('click')} selected>Selected</MenuItem>
<MenuItem
on:click={action('click')}
description="Selected description"
selected>Selected With Description</MenuItem
>
<MenuItem on:click={action('click')}>Standard</MenuItem>
<MenuItem on:click={action('click')} description="Standard description"
>Standard With Description</MenuItem
>
<MenuItem on:click={action('click')} destructive>Destructive</MenuItem>
</Menu>
</MenuContainer>
</div>
</Template>

<Story name="Primary" args={{ variant: 'primary' }} />
Expand Down
Loading