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

[Overflow] Add refresh method, add VisibleOnLoad parameter #2236

Merged
merged 9 commits into from
Jun 24, 2024
Merged

[Overflow] Add refresh method, add VisibleOnLoad parameter #2236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88ebac9
- Rename functions in js to be in line with rest of scripts
vnbaaij Jun 20, 2024
9623064
Merge branch 'dev' into users/vnbaaij/overflow-work
vnbaaij Jun 20, 2024
67d9593
Merge branch 'dev' into users/vnbaaij/overflow-work
vnbaaij Jun 22, 2024
b6f8db1
- Clear out IssueTester
vnbaaij Jun 22, 2024
5c74865
Merge branch 'users/vnbaaij/overflow-work' of https://github.com/micr…
vnbaaij Jun 22, 2024
fb78a32
Merge branch 'dev' into users/vnbaaij/overflow-work
vnbaaij Jun 22, 2024
815334c
Merge branch 'dev' into users/vnbaaij/overflow-work
vnbaaij Jun 24, 2024
c178a28
Process review comments and extend example
vnbaaij Jun 24, 2024
529cc03
Merge branch 'dev' into users/vnbaaij/overflow-work
vnbaaij Jun 24, 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
110 changes: 110 additions & 0 deletions examples/Demo/Shared/Pages/Lab/IssueTester.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,111 @@
@page "/issue-tester"
@using System.Collections.ObjectModel

<button id="myPopoverButton" style="width: 200px; height: 30px; overflow-x: visible; border-width: 1px; border-radius: 4px; box-sizing: content-box; padding: 4px;" @onclick="() => _showPopover = !_showPopover">
<FluentOverflow Style="width: 100%;" @ref="@_overflow">
<ChildContent>
@foreach (var item in categoryItems)
{
<FluentOverflowItem Style="background-color: #ffd800; border-radius: 4px;">
<FluentBadge Appearance="Appearance.Lightweight">@item.Name</FluentBadge>
</FluentOverflowItem>
}
</ChildContent>
<MoreButtonTemplate>
<FluentBadge Appearance="Appearance.Lightweight" Style="width: 32px; border-radius: 4px; background-color: #ffd800;">
@($"+{context.ItemsOverflow.Count()}")
</FluentBadge>
</MoreButtonTemplate>
</FluentOverflow>
</button>

<FluentPopover AnchorId="myPopoverButton" Style="width: 300px" @bind-Open="_showPopover">
<Body>
<FluentGrid Justify="JustifyContent.FlexStart" Spacing="3">
<FluentGridItem xs="11">
<FluentSortableList Items="categoryItems" OnUpdate="@SortListAsync" Style="width: 100%;">
<ItemTemplate>
<FluentTextField @bind-value="@context.Name" Minlength="4" Style="width: 80%; margin-right: 15px;"></FluentTextField>
<FluentIcon Value="@(new Icons.Regular.Size16.ChevronUpDown())" />
</ItemTemplate>
</FluentSortableList>
</FluentGridItem>
<FluentGridItem xs="11">
<FluentButton Appearance="Appearance.Stealth" OnClick="@Save">
<FluentIcon Value="@(new Icons.Regular.Size28.Save())" />
</FluentButton>
</FluentGridItem>
</FluentGrid>
</Body>
</FluentPopover>

@code
{
protected FluentOverflow? _overflow;
protected string ClassValue => "customOverflow";
protected string CategoryButton => "categoryButton";

bool _showPopover;

[Parameter]
public ObservableCollection<string> InitialItems { get; set; } = ["aaaaa", "bbbbb", "ccccc"];

[Parameter]
public EventCallback<ObservableCollection<string>> ItemsUpdated { get; set; }

public class Item
{
public int Id { get; set; }
public string Name { get; set; } = "";

}

public ObservableCollection<Item> categoryItems = new ObservableCollection<Item>();

protected override void OnInitialized()
{
if (InitialItems != null)
{
categoryItems = new ObservableCollection<Item>(InitialItems.Select((name, index) => new Item { Id = index, Name = name }));
}
}

private async Task SortListAsync(FluentSortableListEventArgs args)
{
if (args is null || args.OldIndex == args.NewIndex)
{
return;
}

var oldIndex = args.OldIndex;
var newIndex = args.NewIndex;

var items = this.categoryItems;
var itemToMove = items[oldIndex];
items.RemoveAt(oldIndex);

if (newIndex < items.Count)
{
items.Insert(newIndex, itemToMove);
}
else
{
items.Add(itemToMove);
}
itemToMove.Id = newIndex;

if (_overflow is not null)
{
await _overflow.RefreshAsync();
}
}
private async Task Save()
{
var updatedItems = categoryItems.OrderBy(i => i.Id).Select(i => i.Name).ToList();
if (_overflow is not null)
{
await _overflow.RefreshAsync();
}
await ItemsUpdated.InvokeAsync(new ObservableCollection<string>(updatedItems));
}
}
25 changes: 16 additions & 9 deletions examples/Demo/Shared/Pages/Overflow/Examples/OverflowDefaultExample.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<div style="background-color: var(--neutral-layer-4); overflow: auto; resize: horizontal; padding: 10px;">
<FluentOverflow Style="width: 100%;">
<FluentOverflowItem><FluentBadge>Blazor</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Microsoft</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Azure</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>DevOps</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Framework</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Office</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Installation</FluentBadge></FluentOverflowItem>
</FluentOverflow>
<FluentOverflow Style="width: 100%;">
<FluentOverflowItem><FluentBadge>Blazor</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Microsoft</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Azure</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>DevOps</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Framework</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Office</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Installation</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Blazor</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Microsoft</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Azure</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>DevOps</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Framework</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Office</FluentBadge></FluentOverflowItem>
<FluentOverflowItem><FluentBadge>Installation</FluentBadge></FluentOverflowItem>
</FluentOverflow>
</div>
2 changes: 1 addition & 1 deletion src/Core/Components/AppBar/FluentAppBar.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
// Overflow
_jsModuleOverflow = await JSRuntime.InvokeAsync<IJSObjectReference>("import", JAVASCRIPT_FILE);

await _jsModuleOverflow.InvokeVoidAsync("FluentOverflowInitialize", _dotNetHelper, Id, false, OVERFLOW_SELECTOR);
await _jsModuleOverflow.InvokeVoidAsync("fluentOverflowInitialize", _dotNetHelper, Id, false, OVERFLOW_SELECTOR);
}
}

Expand Down
12 changes: 11 additions & 1 deletion src/Core/Components/Overflow/FluentOverflow.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public partial class FluentOverflow : FluentComponentBase, IAsyncDisposable
private readonly List<FluentOverflowItem> _items = [];
private DotNetObjectReference<FluentOverflow>? _dotNetHelper = null;
private IJSObjectReference _jsModule = default!;
//private string _visibility = "hidden";

/// <summary />
protected string? ClassValue => new CssBuilder(Class)
Expand All @@ -24,6 +25,7 @@ public partial class FluentOverflow : FluentComponentBase, IAsyncDisposable

/// <summary />
protected string? StyleValue => new StyleBuilder(Style)
//.AddStyle("visibility", _visibility)
.Build();

[Inject]
Expand Down Expand Up @@ -88,8 +90,16 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
{
_jsModule = await JSRuntime.InvokeAsync<IJSObjectReference>("import", JAVASCRIPT_FILE);
_dotNetHelper = DotNetObjectReference.Create(this);
await _jsModule.InvokeVoidAsync("fluentOverflowInitialize", _dotNetHelper, Id, IsHorizontal, Selectors);
vnbaaij marked this conversation as resolved.
Show resolved Hide resolved
//_visibility = "visible";
}
}

await _jsModule.InvokeVoidAsync("FluentOverflowInitialize", _dotNetHelper, Id, IsHorizontal, Selectors);
public async Task RefreshAsync()
{
if (_jsModule is not null)
{
await _jsModule.InvokeVoidAsync("fluentOverflowRefresh", _dotNetHelper, Id, IsHorizontal, Selectors);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/Core/Components/Overflow/FluentOverflow.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let resizeObserver;
let observerAddRemove;

export function FluentOverflowInitialize(dotNetHelper, id, isHorizontal, querySelector) {
export function fluentOverflowInitialize(dotNetHelper, id, isHorizontal, querySelector) {
var localSelector = querySelector;
if (!localSelector) {
// cannot use :scope for node.matches() further down
Expand All @@ -23,13 +23,13 @@ export function FluentOverflowInitialize(dotNetHelper, id, isHorizontal, querySe
return;
}

FluentOverflowResized(dotNetHelper, id, isHorizontal, querySelector);
fluentOverflowRefresh(dotNetHelper, id, isHorizontal, querySelector);
});
});

// Create a ResizeObserver, started later
resizeObserver = new ResizeObserver((entries) => {
FluentOverflowResized(dotNetHelper, id, isHorizontal, querySelector);
fluentOverflowRefresh(dotNetHelper, id, isHorizontal, querySelector);
});

// Start the resize observation
Expand All @@ -42,7 +42,7 @@ export function FluentOverflowInitialize(dotNetHelper, id, isHorizontal, querySe

// When the Element[id] is resized, set overflow attribute to all element outside of this element.
// Except for elements with fixed attribute.
export function FluentOverflowResized(dotNetHelper, id, isHorizontal, querySelector) {
export function fluentOverflowRefresh(dotNetHelper, id, isHorizontal, querySelector) {
let container = document.getElementById(id); // Container
if (!container) return;

Expand Down
2 changes: 1 addition & 1 deletion src/Core/Components/Tabs/FluentTabs.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
"./_content/Microsoft.FluentUI.AspNetCore.Components/Components/Overflow/FluentOverflow.razor.js");

var horizontal = Orientation == Orientation.Horizontal;
await _jsModuleOverflow.InvokeVoidAsync("FluentOverflowInitialize", _dotNetHelper, Id, horizontal, FLUENT_TAB_TAG);
await _jsModuleOverflow.InvokeVoidAsync("fluentOverflowInitialize", _dotNetHelper, Id, horizontal, FLUENT_TAB_TAG);
}
}

Expand Down
Loading