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.

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

fix(core): address Avatar Group issues #12530

Closed
wants to merge 29 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
22be6e6
fix(core): avatar group bugs
khotcholava Sep 25, 2024
4a87b4d
fix(core): avatar group bugs
khotcholava Sep 26, 2024
b39b871
fix(core): avatar group
khotcholava Sep 30, 2024
aedf05e
Merge branch 'main' into fix(core)-avatar-group-bugs
khotcholava Oct 10, 2024
b32ae7e
fix(core): Resolve focus retention & rendering issues, add feature en…
khotcholava Oct 10, 2024
fe4920e
fix(core): Resolve focus retention & rendering issues, add feature en…
khotcholava Oct 10, 2024
0ead287
Make avatar group circle
khotcholava Oct 11, 2024
1f11a17
Make avatar group circle
khotcholava Oct 11, 2024
da922ad
Implemented first selection of popover avatar items
khotcholava Oct 14, 2024
f587f50
fix(core): avatar group
khotcholava Oct 15, 2024
4373cde
fix(core): Resolve focus retention & rendering issues, add feature en…
khotcholava Oct 25, 2024
b6af950
Merge branch 'main' into fix(core)-avatar-group-bugs
khotcholava Oct 29, 2024
3768cb9
Merge branch 'main' into fix(core)-avatar-group-bugs
khotcholavaSuzy Nov 7, 2024
f79c75e
fix(core): avatar groups
khotcholavaSuzy Nov 7, 2024
3405d09
fix(core): avatar groups
khotcholavaSuzy Nov 7, 2024
3a61be4
fix(core): avatar groups
khotcholavaSuzy Nov 7, 2024
8b1e6de
fix(core): avatar groups
khotcholavaSuzy Nov 8, 2024
8251f84
Merge branch 'main' into fix(core)-avatar-group-bugs
mikerodonnell89 Nov 12, 2024
d20946e
fix(core): avatar groups
khotcholavaSuzy Nov 13, 2024
cb1c93d
fix(core): avatar group fixed first item focus
khotcholavaSuzy Nov 27, 2024
d353a20
fix(core): avatar group fixed first item focus
khotcholavaSuzy Nov 27, 2024
18fc966
fix e2e test
khotcholava Dec 2, 2024
827ef21
Fixed popover focus
khotcholava Dec 2, 2024
d4bd252
fix e2e test
khotcholava Dec 2, 2024
bc16f40
Merge remote-tracking branch 'origin/fix(core)-avatar-group-bugs' int…
khotcholava Dec 2, 2024
728a86b
fixed time picker tests
khotcholava Dec 3, 2024
87c2469
fixed time picker tests
khotcholava Dec 3, 2024
fada1bc
Merge branch 'main' into fix(core)-avatar-group-bugs
khotcholava Dec 20, 2024
3420564
Merge branch 'main' into fix(core)-avatar-group-bugs
mikerodonnell89 Jan 2, 2025
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
Prev Previous commit
Next Next commit
fix(core): avatar group
- Fixed focus on avatar group
khotcholava committed Sep 30, 2024
commit b39b8712cf9f4e497724672a50a60ed22ed6cfd8
16 changes: 10 additions & 6 deletions libs/core/avatar-group/avatar-group.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ng-content></ng-content>
<pre>{{_avatars.length}}</pre>
<pre>{{ _avatars.length }}</pre>
@if (type === 'individual') {
<fd-avatar-group-host
#avatarGroupHostComponent
@@ -15,9 +15,7 @@
(resized)="_detectChanges()"
>
@for (item of _avatars; track item) {
<fd-popover
[placement]="popoverPlacement"
[noArrow]="false" [focusAutoCapture]="true">
<fd-popover [placement]="popoverPlacement" [noArrow]="false" [focusAutoCapture]="true">
<fd-popover-control tabindex="-1" (click)="outletItem.element.focus()">
<ng-template
#outletItem="fdAvatarGroupItemPortal"
@@ -56,7 +54,13 @@
</fd-popover>
</fd-avatar-group-host>
} @else {
<fd-popover [placement]="popoverPlacement" [noArrow]="false" [focusAutoCapture]="true" fdkResizeObserver (resized)="_detectChanges()">
<fd-popover
[placement]="popoverPlacement"
[noArrow]="false"
[focusAutoCapture]="false"
fdkResizeObserver
(resized)="_detectChanges()"
>
<fd-popover-control>
<fd-avatar-group-host
[maxVisibleItems]="maxVisibleItems"
@@ -101,7 +105,7 @@
[ngTemplateOutletContext]="{ hiddenItems: hiddenItems }"
/>
} @else {
<fd-avatar-group-overflow-button [circle]="circle" [size]="size" [colorAccent]="1">
<fd-avatar-group-overflow-button [circle]="circle" [size]="size" [colorAccent]="1">
+{{ hiddenItems.length }}
</fd-avatar-group-overflow-button>
}
4 changes: 2 additions & 2 deletions libs/core/avatar-group/avatar-group.component.ts
Original file line number Diff line number Diff line change
@@ -17,7 +17,8 @@ import {
import {
DynamicPortalComponent,
FocusableItemDirective,
FocusableListDirective, Nullable,
FocusableListDirective,
Nullable,
ResizeObserverDirective,
RtlService
} from '@fundamental-ngx/cdk/utils';
@@ -111,7 +112,6 @@ export class AvatarGroupComponent implements AvatarGroupHostConfig {
@Input()
maxVisibleItems: Nullable<number> = null;


/** @hidden */
@ViewChildren(AvatarGroupItemRendererDirective)
_avatarRenderers: QueryList<AvatarGroupItemRendererDirective>;