Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
6 changes: 3 additions & 3 deletions src/Core/Components/AppBar/FluentAppBar.razor
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@if (AppsOverflow.Any())
{
<FluentKeyCode Anchor="@($"appbar-more-{Id}")" OnKeyDown="@HandlePopoverKeyDownAsync" />
<div id="@($"appbar-more-{Id}")" class="fluent-appbar-item" style="min-width: var(--appbar-item-size);" tabindex="0" fixed title="@Localizer[Localization.LanguageResource.AppBar_MoreItems]" @onclick="@TogglePopoverAsync">
<div id="@($"appbar-more-{Id}")" class="fluent-appbar-more-item" style="min-width: var(--appbar-item-size);" tabindex="0" fixed="fixed" title="@Localizer[Localization.LanguageResource.AppBar_MoreItems]" @onclick="@TogglePopoverAsync">
<FluentStack Orientation="Orientation.Vertical"
HorizontalAlignment="HorizontalAlignment.Center"
VerticalAlignment="VerticalAlignment.Center"
Expand All @@ -38,8 +38,8 @@
@*ToDo: Make styling configurable *@
<FluentPopover @bind-Opened="_showMoreItems"
AnchorId="@($"appbar-more-{Id}")"
OffsetVertical="-48"
OffsetHorizontal="68">
OffsetVertical="-68"
OffsetHorizontal="320">
Comment thread
vnbaaij marked this conversation as resolved.
Outdated
<ChildContent>
<div class="fluent-appbar-popover">
@if (PopoverShowSearch)
Expand Down
19 changes: 13 additions & 6 deletions src/Core/Components/AppBar/FluentAppBar.razor.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
background-color: var(--colorNeutralBackground2);
}

.fluent-appbar .fluent-appbar-item {
.fluent-appbar .fluent-appbar-item, .fluent-appbar .fluent-appbar-more-item {
Comment thread
vnbaaij marked this conversation as resolved.
--appbar-active-indicator-width: 2px;
cursor: pointer;
width: var(--appbar-item-size);
Expand Down Expand Up @@ -91,18 +91,25 @@
.fluent-appbar-item:hover svg[part="icon-rest"],
.fluent-appbar-item:not(:hover):not(.active) svg[part="icon-active"],
.fluent-appbar-item:not(:hover) a.active svg[part="icon-rest"],
.fluent-appbar-item[overflow] {
display: none;
.fluent-appbar-item[overflow],
.fluent-appbar-more-item:hover svg[part="icon-rest"],
.fluent-appbar-more-item:not(:hover):not(.active) svg[part="icon-active"],
.fluent-appbar-more-item:not(:hover) a.active svg[part="icon-rest"],
.fluent-appbar-more-item[overflow] {
Comment thread
vnbaaij marked this conversation as resolved.
display: none;
Comment thread
vnbaaij marked this conversation as resolved.
}

.fluent-appbar-item:not(:hover) .active svg[part="icon-active"] {
.fluent-appbar-item:not(:hover) .active svg[part="icon-active"],
.fluent-appbar-more-item:not(:hover) .active svg[part="icon-active"] {
display: block;
}

.fluent-appbar-item[inpopover]:not(:hover) a.active svg[part="icon-active"] {
.fluent-appbar-item[inpopover]:not(:hover) a.active svg[part="icon-active"],
.fluent-appbar-more-item[inpopover]:not(:hover) a.active svg[part="icon-active"] {
display: none;
}

.fluent-appbar-item[inpopover=true]:not(:hover) a.active svg[part="icon-rest"] {
.fluent-appbar-item[inpopover=true]:not(:hover) a.active svg[part="icon-rest"],
.fluent-appbar-more-item[inpopover=true]:not(:hover) a.active svg[part="icon-rest"] {
display: block;
}
2 changes: 1 addition & 1 deletion tests/Core/Components/AppBar/FluentAppBarTests.razor
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@
cut.Render();

// Show popover by clicking the "More" button
var moreButton = cut.Find(".fluent-appbar-item[fixed]");
var moreButton = cut.Find(".fluent-appbar-more-item[fixed]");
await moreButton.ClickAsync();
cut.Render();

Expand Down
Loading