Skip to content

Commit a9700b6

Browse files
committed
fix(toolbar): Fixed toolbar-hiding action buttons -11.1.x
1 parent 7378d40 commit a9700b6

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

projects/igniteui-angular/src/lib/core/i18n/grid-resources.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ export const GridResourceStringsEN: IGridResourceStrings = {
222222
igx_grid_advanced_filter_column_placeholder: 'Select column',
223223
igx_grid_advanced_filter_value_placeholder: 'Value',
224224
igx_grid_pinned_row_indicator: 'Pinned',
225-
igx_grid_hiding_check_all_label: 'Hide All',
226-
igx_grid_hiding_uncheck_all_label: 'Show All',
225+
igx_grid_hiding_check_all_label: 'Show All',
226+
igx_grid_hiding_uncheck_all_label: 'Hide All',
227227
igx_grid_pinning_check_all_label: 'Pin All',
228228
igx_grid_pinning_uncheck_all_label: 'Unpin All',
229229
igx_grid_toolbar_actions_filter_prompt: 'Filter columns list ...',

projects/igniteui-angular/src/lib/grids/column-actions/column-hiding.directive.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@ export class IgxColumnHidingDirective extends IgxColumnActionsBaseDirective {
1919
* @hidden @internal
2020
*/
2121
public get checkAllLabel(): string {
22-
return this.columnActions.grid?.resourceStrings.igx_grid_hiding_check_all_label ?? 'Hide All';
22+
return this.columnActions.grid?.resourceStrings.igx_grid_hiding_check_all_label ?? 'Show All';
2323
}
2424

2525
/**
2626
* @hidden @internal
2727
*/
2828
public get uncheckAllLabel(): string {
29-
return this.columnActions.grid?.resourceStrings.igx_grid_hiding_uncheck_all_label ?? 'Show All';
29+
return this.columnActions.grid?.resourceStrings.igx_grid_hiding_uncheck_all_label ?? 'Hide All';
3030
}
3131
/**
3232
* @hidden @internal
3333
*/
3434
public checkAll() {
35-
this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(true));
35+
this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(false));
3636

3737
}
3838

3939
/**
4040
* @hidden @internal
4141
*/
4242
public uncheckAll() {
43-
this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(false));
43+
this.columnActions.filteredColumns.forEach(c => c.toggleVisibility(true));
4444
}
4545

4646
/**
@@ -63,10 +63,10 @@ export class IgxColumnHidingDirective extends IgxColumnActionsBaseDirective {
6363
}
6464

6565
public get allChecked() {
66-
return this.columnActions.filteredColumns.every(col => this.columnChecked(col));
66+
return this.columnActions.filteredColumns.every(col => !this.columnChecked(col));
6767
}
6868

6969
public get allUnchecked() {
70-
return this.columnActions.filteredColumns.every(col => !this.columnChecked(col));
70+
return this.columnActions.filteredColumns.every(col => this.columnChecked(col));
7171
}
7272
}

projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,8 @@ describe('Column Hiding UI #grid', () => {
579579

580580
const showAll = GridFunctions.getColumnChooserButton(columnChooserElement, 'Show All');
581581
const hideAll = GridFunctions.getColumnChooserButton(columnChooserElement, 'Hide All').nativeElement;
582-
ControlsFunction.verifyButtonIsDisabled(showAll.nativeElement, false);
583-
ControlsFunction.verifyButtonIsDisabled(hideAll);
582+
ControlsFunction.verifyButtonIsDisabled(showAll.nativeElement);
583+
ControlsFunction.verifyButtonIsDisabled(hideAll, false);
584584

585585
showAll.triggerEventHandler('click', new Event('click'));
586586
fix.detectChanges();
@@ -600,11 +600,11 @@ describe('Column Hiding UI #grid', () => {
600600
fix.detectChanges();
601601
tick();
602602

603-
ControlsFunction.verifyButtonIsDisabled(showAll.nativeElement, false);
603+
ControlsFunction.verifyButtonIsDisabled(showAll.nativeElement);
604604
ControlsFunction.verifyButtonIsDisabled(hideAll, false);
605605

606606
checkbox = GridFunctions.getColumnChooserItemElement(columnChooserElement, 'ProductName');
607-
expect(GridFunctions.getColumnChooserItemInput(checkbox).checked).toBe(false);
607+
expect(GridFunctions.getColumnChooserItemInput(checkbox).checked).toBe(true);
608608

609609
showAll.triggerEventHandler('click', new Event('click'));
610610
fix.detectChanges();
@@ -616,11 +616,11 @@ describe('Column Hiding UI #grid', () => {
616616
expect(columnChooser.filterCriteria).toBe('', 'Filter criteria is not empty string!');
617617

618618
checkbox = GridFunctions.getColumnChooserItemElement(columnChooserElement, 'ID');
619-
expect(GridFunctions.getColumnChooserItemInput(checkbox).checked).toBe(false);
619+
expect(GridFunctions.getColumnChooserItemInput(checkbox).checked).toBe(true);
620620
checkbox = GridFunctions.getColumnChooserItemElement(columnChooserElement, 'ProductName');
621621
expect(GridFunctions.getColumnChooserItemInput(checkbox).checked).toBe(true);
622622

623-
ControlsFunction.verifyButtonIsDisabled(showAll.nativeElement, false);
623+
ControlsFunction.verifyButtonIsDisabled(showAll.nativeElement);
624624
ControlsFunction.verifyButtonIsDisabled(hideAll, false);
625625
}));
626626

0 commit comments

Comments
 (0)