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(components/lists): selectable repeater items do not log a checkbox label deprecation warning #2641

Merged
merged 2 commits into from
Aug 26, 2024
Merged
Changes from 1 commit
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div
#itemRef
class="sky-repeater-item sky-padding-even-default"
[attr.aria-label]="itemName"
[attr.aria-labelledby]="itemName || titleId"
Expand All @@ -11,7 +12,6 @@
'sky-repeater-item-selected': isSelected
}"
(click)="onRepeaterItemClick($event)"
#itemRef
>
<div #inlineDelete>
<ng-content select="sky-inline-delete" />
Expand All @@ -24,21 +24,21 @@
[template]="inlineFormTemplate"
(close)="onInlineFormClose($event)"
>
<ng-container *ngTemplateOutlet="skyRepeaterItemLeft"></ng-container>
<ng-container *ngTemplateOutlet="skyRepeaterItemRight"></ng-container>
<ng-container *ngTemplateOutlet="skyRepeaterItemLeft" />
<ng-container *ngTemplateOutlet="skyRepeaterItemRight" />
</sky-inline-form>
</ng-container>

<ng-container *ngIf="!inlineFormTemplate">
<ng-container *ngTemplateOutlet="skyRepeaterItemLeft"></ng-container>
<ng-container *ngTemplateOutlet="skyRepeaterItemRight"></ng-container>
<ng-container *ngTemplateOutlet="skyRepeaterItemLeft" />
<ng-container *ngTemplateOutlet="skyRepeaterItemRight" />
</ng-container>
</div>

<ng-template #skyRepeaterItemLeft>
<div
[attr.role]="!showInlineForm ? (itemRole$ | async)?.content : undefined"
class="sky-repeater-item-left"
[attr.role]="!showInlineForm ? (itemRole$ | async)?.content : undefined"
>
<ng-container *ngIf="reorderable">
<span
Expand All @@ -54,6 +54,7 @@
>{{ reorderButtonLabel }}</span
>
<button
#grabHandle
class="sky-btn sky-tile-tools-control sky-repeater-item-grab-handle"
type="button"
[attr.aria-describedby]="contentId + '-reorder-instructions'"
Expand All @@ -64,7 +65,6 @@
"
(blur)="onReorderHandleBlur($event)"
(keydown)="onReorderHandleKeyDown($event)"
#grabHandle
>
<sky-icon icon="arrows-v" />
</button>
Expand All @@ -73,36 +73,35 @@
*ngIf="selectable"
class="sky-repeater-item-checkbox"
[checked]="isSelected"
[label]="
[labelText]="
itemName
? ('skyux_repeater_item_checkbox_label' | skyLibResources: itemName)
: ('skyux_repeater_item_checkbox_label_default' | skyLibResources)
"
(change)="onCheckboxChange($event)"
>
</sky-checkbox>
/>
<div
#contextMenuEl
class="sky-repeater-item-context-menu"
[hidden]="contextMenuEl.children.length === 0"
#contextMenuEl
>
<ng-content select="sky-repeater-item-context-menu" />
</div>
</div>
</ng-template>

<ng-template #skyRepeaterItemRight>
<div class="sky-repeater-item-right" #itemHeaderRef>
<div #itemHeaderRef class="sky-repeater-item-right">
<div
class="sky-repeater-item-header"
[attr.role]="(itemRole$ | async)?.title"
[hidden]="titleRef.children.length === 0"
(click)="headerClick()"
>
<div
#titleRef
class="sky-repeater-item-title sky-font-emphasized"
[attr.id]="titleId"
#titleRef
>
<ng-content select="sky-repeater-item-title" />
</div>
Expand Down Expand Up @@ -136,8 +135,7 @@
"
[direction]="isExpanded ? 'up' : 'down'"
(directionChange)="chevronDirectionChange($event)"
>
</sky-chevron>
/>
</div>
<!-- Used for when the chevron is hidden to ensure that the right side is the same height as the left.-->
<div
Expand All @@ -151,11 +149,11 @@
></div>
</div>
<div
#itemContentRef
class="sky-repeater-item-content"
[id]="contentId"
[@.disabled]="animationDisabled"
[@skyAnimationSlide]="slideDirection"
#itemContentRef
[attr.role]="(itemRole$ | async)?.content"
>
<ng-content select="sky-repeater-item-content" />
Expand Down
Loading