From 54d61a98fee04f533cdcb52e305dac7c8c6731d8 Mon Sep 17 00:00:00 2001 From: Arjunlal B Date: Fri, 6 Nov 2020 16:48:52 +0530 Subject: [PATCH 1/3] fix: toggle button group updates --- .../button/toggle-button.component.scss | 8 ++++---- .../toggle-button-group/toggle-button-group.component.ts | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/projects/components/src/toggle-button-group/button/toggle-button.component.scss b/projects/components/src/toggle-button-group/button/toggle-button.component.scss index 1b56b736b..e09f7ee6e 100644 --- a/projects/components/src/toggle-button-group/button/toggle-button.component.scss +++ b/projects/components/src/toggle-button-group/button/toggle-button.component.scss @@ -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; } } @@ -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; diff --git a/projects/components/src/toggle-button-group/toggle-button-group.component.ts b/projects/components/src/toggle-button-group/toggle-button-group.component.ts index e02975e35..1a370848d 100644 --- a/projects/components/src/toggle-button-group/toggle-button-group.component.ts +++ b/projects/components/src/toggle-button-group/toggle-button-group.component.ts @@ -21,7 +21,7 @@ import { ToggleButtonState, ToggleViewMode } from './toggle-button'; providers: [SubscriptionLifecycle], changeDetection: ChangeDetectionStrategy.OnPush, template: ` -
+
` @@ -39,6 +39,9 @@ export class ToggleButtonGroupComponent implements OnChanges, AfterViewInit { @Input() public disableInitialSelection?: boolean; + @Input() + public justifyContent?: string; + @Output() public readonly selectedLabelChange: EventEmitter = new EventEmitter(); From a0e43099d2561f0930fa17bc69ac282ef34062f0 Mon Sep 17 00:00:00 2001 From: Arjunlal B Date: Fri, 6 Nov 2020 17:38:17 +0530 Subject: [PATCH 2/3] fix: use enum instead of string --- .../toggle-button-group/toggle-button-group.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/components/src/toggle-button-group/toggle-button-group.component.ts b/projects/components/src/toggle-button-group/toggle-button-group.component.ts index 1a370848d..98cdf90fa 100644 --- a/projects/components/src/toggle-button-group/toggle-button-group.component.ts +++ b/projects/components/src/toggle-button-group/toggle-button-group.component.ts @@ -40,7 +40,7 @@ export class ToggleButtonGroupComponent implements OnChanges, AfterViewInit { public disableInitialSelection?: boolean; @Input() - public justifyContent?: string; + public justifyContent: ToggleButtonsJustifyMode = ToggleButtonsJustifyMode.Default; @Output() public readonly selectedLabelChange: EventEmitter = new EventEmitter(); @@ -121,3 +121,8 @@ export class ToggleButtonGroupComponent implements OnChanges, AfterViewInit { this.buttons.forEach(button => button.setState(state)); } } + +export enum ToggleButtonsJustifyMode { + SpaceBetween = 'space-between', + Default = 'initial' +} From ff6afa50360d00abe5225468bd8d78c9c389ba59 Mon Sep 17 00:00:00 2001 From: Arjunlal B Date: Fri, 6 Nov 2020 18:09:31 +0530 Subject: [PATCH 3/3] fix: update export --- projects/components/src/public-api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/components/src/public-api.ts b/projects/components/src/public-api.ts index fc63f1406..83055bbf9 100644 --- a/projects/components/src/public-api.ts +++ b/projects/components/src/public-api.ts @@ -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';