Skip to content

Commit d7053c0

Browse files
committed
Fix an issue with top right header where icons and tooltips were not using the proper API and props
1 parent 020781a commit d7053c0

File tree

2 files changed

+21
-34
lines changed

2 files changed

+21
-34
lines changed

src/lib/themes/svelte/carbon/Menu/TopRightMenu.svelte

+21-34
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
import HeaderPanelLinks from 'carbon-components-svelte/src/UIShell/HeaderPanelLinks.svelte';
77
import HeaderUtilities from 'carbon-components-svelte/src/UIShell/HeaderUtilities.svelte';
88
import HeaderGlobalAction from 'carbon-components-svelte/src/UIShell/HeaderGlobalAction.svelte';
9-
import TooltipDefinition from 'carbon-components-svelte/src/TooltipDefinition/TooltipDefinition.svelte';
109
11-
import Link from 'carbon-icons-svelte/lib/Link.svelte';
10+
import LinkIcon from 'carbon-icons-svelte/lib/Link.svelte';
1211
import Menu from 'carbon-icons-svelte/lib/Menu.svelte';
1312
1413
import Icon from '$lib/Layout/Icon.svelte';
@@ -43,7 +42,7 @@
4342
{subLink.label ? $_(subLink.label) : ''}
4443
</HeaderPanelLink>
4544
{:else}
46-
<HeaderPanelLink icon={subLink.icon || Link} {...link.options.htmlAttributes}>
45+
<HeaderPanelLink icon={subLink.icon || LinkIcon} {...link.options.htmlAttributes}>
4746
{subLink.label ? $_(subLink.label) : ''}
4847
</HeaderPanelLink>
4948
{/if}
@@ -53,39 +52,27 @@
5352
{:else if link instanceof Divider}
5453
<HeaderPanelDivider>{link.label ? $_(link.label) : ''}</HeaderPanelDivider>
5554
{:else if link instanceof UrlAction}
56-
<TooltipDefinition tooltipText={link.label ? $_(link.label) : ''}>
57-
<HeaderGlobalAction
58-
on:click={function () {
59-
this.querySelector('a').click();
60-
}}
61-
on:mouseenter={() => (link.options.isOpen = true)}
62-
on:mouseleave={() => (link.options.isOpen = false)}
63-
{...link.options.htmlAttributes}
64-
>
65-
<a href={link.url()} style="color: var(--cds-icon-on-color);">
66-
<Icon icon={link.icon || Link} size={20} style="fill: var(--cds-icon-on-color);" />
67-
</a>
68-
</HeaderGlobalAction>
69-
</TooltipDefinition>
55+
<HeaderGlobalAction
56+
icon={link.icon || LinkIcon}
57+
iconDescription={link.label ? $_(link.label) : ''}
58+
href={link.url()}
59+
{...link.options.htmlAttributes}
60+
/>
7061
{:else if link instanceof CallbackAction}
71-
<TooltipDefinition tooltipText={link.label ? $_(link.label) : ''}>
72-
<HeaderGlobalAction
73-
on:click={() => link.call()}
74-
on:mouseenter={() => (link.options.isOpen = true)}
75-
on:mouseleave={() => (link.options.isOpen = false)}
76-
{...link.options.htmlAttributes}
77-
>
78-
<Icon icon={link.icon || Link} size={20} style="fill: var(--cds-icon-on-color);" />
79-
</HeaderGlobalAction>
80-
</TooltipDefinition>
62+
<HeaderGlobalAction
63+
icon={link.icon || LinkIcon}
64+
iconDescription={link.label ? $_(link.label) : ''}
65+
on:click={() => link.call()}
66+
{...link.options.htmlAttributes}
67+
>
68+
<Icon icon={link.icon || LinkIcon} size={20} style="fill: var(--cds-icon-on-color);" />
69+
</HeaderGlobalAction>
8170
{:else}
82-
<TooltipDefinition tooltipText={link.label ? $_(link.label) : ''}>
83-
<HeaderGlobalAction
84-
on:mouseenter={() => (link.options.isOpen = true)}
85-
on:mouseleave={() => (link.options.isOpen = false)}
86-
{...link.options.htmlAttributes}
87-
></HeaderGlobalAction>
88-
</TooltipDefinition>
71+
<HeaderGlobalAction
72+
icon={link.icon || LinkIcon}
73+
iconDescription={link.label ? $_(link.label) : ''}
74+
{...link.options.htmlAttributes}
75+
></HeaderGlobalAction>
8976
{/if}
9077
{/each}
9178
</HeaderUtilities>

src/routes/admin/test/+page.svelte

Whitespace-only changes.

0 commit comments

Comments
 (0)