Skip to content

fix: toggle button group updates #336

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 3 commits into from
Nov 6, 2020
Merged

fix: toggle button group updates #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54d61a9
fix: toggle button group updates
arjunlalb Nov 6, 2020
a0e4309
fix: use enum instead of string
arjunlalb Nov 6, 2020
ff6afa5
fix: update export
arjunlalb Nov 6, 2020
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
2 changes: 1 addition & 1 deletion projects/components/src/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export { TitledContentModule } from './titled-content/titled-content.module';

// Toggle Button
export { ToggleButtonComponent } from './toggle-button-group/button/toggle-button.component';
export { ToggleButtonGroupComponent } from './toggle-button-group/toggle-button-group.component';
export * from './toggle-button-group/toggle-button-group.component';
export { ToggleButtonModule } from './toggle-button-group/toggle-button.module';
export { ToggleViewMode } from './toggle-button-group/toggle-button';

Expand Down
8 changes: 4 additions & 4 deletions projects/components/src/toggle-button-group/button/toggle-button.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
}

.first {
border-radius: 4px 0px 0px 4px;
border-radius: 4px 0 0 4px;
}

.last {
border-radius: 0px 4px 4px 0px;
border-radius: 0 4px 4px 0;
border-right: 1px solid $color-border;
}
}
Expand All @@ -85,8 +85,8 @@

.button {
@include body-1-medium;
border-radius: 4px;
padding: 0px 20px;
border-radius: 6px;
padding: 0 20px;

&:not(.selected) {
border: 1px solid $color-border;
Expand Down
10 changes: 9 additions & 1 deletion projects/components/src/toggle-button-group/toggle-button-group.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { ToggleButtonState, ToggleViewMode } from './toggle-button';
providers: [SubscriptionLifecycle],
changeDetection: ChangeDetectionStrategy.OnPush,
template: `
<div class="toggle-button-group">
<div class="toggle-button-group" [ngStyle]="{ 'justify-content': this.justifyContent }">
<ng-content select="ht-toggle-button"></ng-content>
</div>
`
Expand All @@ -39,6 +39,9 @@ export class ToggleButtonGroupComponent implements OnChanges, AfterViewInit {
@Input()
public disableInitialSelection?: boolean;

@Input()
public justifyContent: ToggleButtonsJustifyMode = ToggleButtonsJustifyMode.Default;

@Output()
public readonly selectedLabelChange: EventEmitter<string> = new EventEmitter();

Expand Down Expand Up @@ -118,3 +121,8 @@ export class ToggleButtonGroupComponent implements OnChanges, AfterViewInit {
this.buttons.forEach(button => button.setState(state));
}
}

export enum ToggleButtonsJustifyMode {
SpaceBetween = 'space-between',
Default = 'initial'
}