Skip to content

fix: updating checkbox component in multi-select #730

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

Merged
merged 6 commits into from
Mar 30, 2021
Merged

fix: updating checkbox component in multi-select #730

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73beda7
fix: updating checkbox component in multi-select
Mar 29, 2021
5d6b76e
fix: fixing uts
Mar 29, 2021
087be40
fix: refactoring uts
Mar 29, 2021
0eb4e99
fix: fixing uts
Mar 29, 2021
5d87aa4
fix: roll back to last PR with variable renaming
Mar 30, 2021
6432432
fix: linter
Mar 30, 2021
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
7 changes: 6 additions & 1 deletion projects/components/src/multi-select/multi-select.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,16 @@
height: 34px;
padding: 4px 16px;
cursor: pointer;
font-size: 14px;
font-size: 15px;
align-items: center;

.checkbox {
margin: 0px;
color: $gray-3;

::ng-deep .mat-ripple {
display: none;
}
}

.icon {
Expand Down
12 changes: 7 additions & 5 deletions projects/components/src/multi-select/multi-select.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { createHostFactory, mockProvider, SpectatorHost } from '@ngneat/spectato
import { MockComponent } from 'ng-mocks';
import { NEVER } from 'rxjs';
import { ButtonComponent } from '../button/button.component';
import { CheckboxComponent } from '../checkbox/checkbox.component';
import { DividerComponent } from '../divider/divider.component';
import { LabelComponent } from '../label/label.component';
import { LoadAsyncModule } from '../load-async/load-async.module';
Expand All @@ -30,7 +31,8 @@ describe('Multi Select Component', () => {
MockComponent(LabelComponent),
MockComponent(DividerComponent),
MockComponent(SearchBoxComponent),
MockComponent(ButtonComponent)
MockComponent(ButtonComponent),
MockComponent(CheckboxComponent)
],
shallow: true
});
Expand Down Expand Up @@ -91,7 +93,7 @@ describe('Multi Select Component', () => {
});

spectator.tick();
const selectedElements = spectator.queryAll('input:checked', { root: true });
const selectedElements = spectator.queryAll(CheckboxComponent);
expect(selectedElements.length).toBe(2);
}));

Expand Down Expand Up @@ -121,7 +123,7 @@ describe('Multi Select Component', () => {
expect(spectator.query('.multi-select-content', { root: true })).toExist();
expect(optionElements.length).toBe(6);

const selectedElements = spectator.queryAll('input:checked', { root: true });
const selectedElements = spectator.queryAll(CheckboxComponent);
expect(selectedElements.length).toBe(2);

optionElements.forEach((element, index) => {
Expand Down Expand Up @@ -216,7 +218,7 @@ describe('Multi Select Component', () => {
spectator.click(clearSelectedButton!);

spectator.tick();
expect(spectator.queryAll('input:checked', { root: true }).length).toBe(0);
expect(spectator.queryAll(CheckboxComponent).length).toBe(0);
expect(onChange).toHaveBeenCalledTimes(1);
expect(onChange).toHaveBeenLastCalledWith([]);
expect(spectator.query(LabelComponent)?.label).toEqual('Select options');
Expand All @@ -226,7 +228,7 @@ describe('Multi Select Component', () => {
spectator.click(allOptionElement!);

spectator.tick();
const selectedElements = spectator.queryAll('input:checked', { root: true });
const selectedElements = spectator.queryAll(CheckboxComponent);
expect(selectedElements.length).toBe(6);

expect(onChange).toHaveBeenCalledWith(selectionOptions.map(option => option.value));
Expand Down
2 changes: 1 addition & 1 deletion projects/components/src/multi-select/multi-select.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ import { MultiSelectJustify } from './multi-select-justify';
(click)="this.onSelectionChange(item)"
class="multi-select-option"
>
<input class="checkbox" type="checkbox" [checked]="this.isSelectedItem(item)" />
<ht-checkbox class="checkbox" [checked]="this.isSelectedItem(item)"></ht-checkbox>
<ht-icon
class="icon"
*ngIf="item.icon"
Expand Down
4 changes: 3 additions & 1 deletion projects/components/src/multi-select/multi-select.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ButtonModule } from '../button/button.module';
import { TraceCheckboxModule } from '../checkbox/checkbox.module';
import { DividerModule } from '../divider/divider.module';
import { IconModule } from '../icon/icon.module';
import { LabelModule } from '../label/label.module';
Expand All @@ -18,7 +19,8 @@ import { MultiSelectComponent } from './multi-select.component';
DividerModule,
TraceSearchBoxModule,
ButtonModule,
LoadAsyncModule
LoadAsyncModule,
TraceCheckboxModule
],
declarations: [MultiSelectComponent],
exports: [MultiSelectComponent]
Expand Down