Skip to content

[Patch] Fixed height and margin in toggle group #699

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
mawelCaballero merged 1 commit into from
Feb 22, 2022
Merged

[Patch] Fixed height and margin in toggle group #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
80 changes: 38 additions & 42 deletions projects/dxc-ngx-cdk/src/lib/dxc-toggleGroup/dxc-toggle/dxc-toggle.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,22 @@ import {
Output,
EventEmitter,
HostBinding,
ChangeDetectionStrategy
ChangeDetectionStrategy,
} from "@angular/core";
import { css } from "emotion";
import { OnInit } from '@angular/core';
import { OnInit } from "@angular/core";

@Component({
selector: "dxc-toggle",
templateUrl: "./dxc-toggle.component.html",
providers: [],
})
export class DxcToggleComponent implements OnInit {


@Input() label: string;
@Input() value;
@Output() public onClick: EventEmitter<any> = new EventEmitter<any>();
@Output() public onKeyPress: EventEmitter<any> = new EventEmitter<any>();
role:string;
role: string;
@HostBinding("class") style;

@HostBinding("class.selected") get valid() {
Expand All @@ -36,64 +34,62 @@ export class DxcToggleComponent implements OnInit {
}

onHandleKeyPressHandler(event) {
if ((event.code === "Enter" || event.code === "Space")){
if (event.code === "Enter" || event.code === "Space") {
this.onKeyPress.emit(this.value);
}
};
}

ngOnInit(): void {
this.style = `${this.getDynamicStyle()}`;
}

getDynamicStyle(){
getDynamicStyle() {
return css`

display: flex;
background: var(--toggleGroup-unselectedBackgroundColor);
margin: 4px;
color: var(--toggleGroup-unselectedFontColor);
border-radius: var(--toggleGroup-optionBorderRadius);
border-width: var(--toggleGroup-optionBorderThickness);
border-style: var(--toggleGroup-optionBorderStyle);

.toggleContent {

${this.label ? `padding-left: var(--toggleGroup-labelPaddingLeft);
padding-right: var(--toggleGroup-labelPaddingRight);` : `
.toggleContent {
${this.label
? `padding-left: var(--toggleGroup-labelPaddingLeft);
padding-right: var(--toggleGroup-labelPaddingRight);`
: `
padding-left: var(--toggleGroup-iconPaddingLeft);
padding-right: var(--toggleGroup-iconPaddingRight);
` }
`}

&:focus,
&:focus,
&:focus-within,
&:focus-visible {
outline: none;
}
height: 40px;
width: 100% !important;
outline: none;
}
height: 40px;
width: 100% !important;
display: flex;
align-items: center;
.label {
font-family: var(--toggleGroup-labelFontFamily);
font-size: var(--toggleGroup-labelFontSize);
font-style: var(--toggleGroup-labelFontStyle);
font-weight: var(--toggleGroup-labelFontWeight);
}
.icon {
${this.label
? `margin-right: var(--toggleGroup-iconMarginRight);`
: ``}
display: flex;
align-items: center;
.label {
font-family: var(--toggleGroup-labelFontFamily);
font-size: var(--toggleGroup-labelFontSize);
font-style: var(--toggleGroup-labelFontStyle);
font-weight: var(--toggleGroup-labelFontWeight);
}
.icon {
${this.label ? `margin-right: var(--toggleGroup-iconMarginRight);`: `` }
display: flex;
height: 24px;
overflow: hidden;
width: 24px;
svg {
fill: var(--toggleGroup-unselectedFontColor);
height: 100%;
width: 100%;
}
height: 24px;
overflow: hidden;
width: 24px;
svg {
fill: var(--toggleGroup-unselectedFontColor);
height: 100%;
width: 100%;
}
}

}
`;
};

}
}
84 changes: 46 additions & 38 deletions projects/dxc-ngx-cdk/src/lib/dxc-toggleGroup/dxc-toggleGroup.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
coerceNumberProperty,
} from "@angular/cdk/coercion";
import { DxcToggleComponent } from "./dxc-toggle/dxc-toggle.component";
import { ChangeDetectorRef } from '@angular/core';
import { ChangeDetectorRef } from "@angular/core";
import { v4 as uuidv4 } from "uuid";

@Component({
Expand Down Expand Up @@ -76,7 +76,7 @@ export class DxcToggleGroupComponent implements OnInit {
tabIndexValue: 0,
});
constructor(private utils: CssUtils, private ref: ChangeDetectorRef) {
this.toggleGroupId = `file-input${ uuidv4()}`;
this.toggleGroupId = `file-input${uuidv4()}`;
}

ngOnInit() {
Expand All @@ -91,7 +91,7 @@ export class DxcToggleGroupComponent implements OnInit {
ngAfterContentInit() {
// reference to the dxc-toggles and manipulating them depending on the given data
if (this.toggleGroup) {
this.toggleGroup.forEach((item:DxcToggleComponent, index: number) => {
this.toggleGroup.forEach((item: DxcToggleComponent, index: number) => {
item.onClick.subscribe((value) => {
if (!this.disabled) {
this.valueChanged(value);
Expand All @@ -105,11 +105,10 @@ export class DxcToggleGroupComponent implements OnInit {

setTimeout(() => {
item.tabIndexValue = this.disabled ? -1 : this.tabIndex;
item.role = this.multiple ? 'switch': 'radio';
item.role = this.multiple ? "switch" : "radio";
this.setToggleSelected(item);
});
});

}
}

Expand All @@ -127,8 +126,6 @@ export class DxcToggleGroupComponent implements OnInit {
}
}



private valueChanged(selectedOption: any): void {
let newSelectedOptions = [];
//handle When value is defined
Expand All @@ -143,7 +140,8 @@ export class DxcToggleGroupComponent implements OnInit {
}
this.selectedOptions = newSelectedOptions;
} else {
this.selectedOptions = selectedOption === this.selectedOptions ? null : selectedOption;
this.selectedOptions =
selectedOption === this.selectedOptions ? null : selectedOption;
}
} else if (this.multiple) {
newSelectedOptions = this.value.map((v) => v);
Expand All @@ -153,22 +151,26 @@ export class DxcToggleGroupComponent implements OnInit {
} else {
newSelectedOptions.push(selectedOption);
}
}else{
} else {
newSelectedOptions = selectedOption;
}
this.changeSelectedToggle(this.multiple ? selectedOption : null);
// Emit the new selected values
this.onChange.emit(this.isControlled ? newSelectedOptions: this.selectedOptions);
this.onChange.emit(
this.isControlled ? newSelectedOptions : this.selectedOptions
);
}

private changeSelectedToggle(selectedValue? :string) {
private changeSelectedToggle(selectedValue?: string) {
if (this.toggleGroup) {
if (selectedValue){
const filterToggles = this.toggleGroup.filter(item=> item.value === selectedValue);
if (selectedValue) {
const filterToggles = this.toggleGroup.filter(
(item) => item.value === selectedValue
);
filterToggles.forEach((item) => {
this.setToggleSelected(item);
});
}else {
} else {
this.toggleGroup.forEach((item) => {
this.setToggleSelected(item);
});
Expand All @@ -179,9 +181,13 @@ export class DxcToggleGroupComponent implements OnInit {

private setToggleSelected(item: DxcToggleComponent) {
if (this.multiple) {
this.isControlled ? item.selected = this.value.includes(item.value) : item.selected = this.selectedOptions.includes(item.value);
this.isControlled
? (item.selected = this.value.includes(item.value))
: (item.selected = this.selectedOptions.includes(item.value));
} else {
this.isControlled ? item.selected = item.value === this.value : item.selected = item.value === this.selectedOptions;
this.isControlled
? (item.selected = item.value === this.value)
: (item.selected = item.value === this.selectedOptions);
}
}

Expand All @@ -205,8 +211,7 @@ export class DxcToggleGroupComponent implements OnInit {
cursor: not-allowed;
}
&.selected {
background: var(
--toggleGroup-selectedDisabledBackgroundColor);
background: var(--toggleGroup-selectedDisabledBackgroundColor);
color: var(--toggleGroup-selectedDisabledFontColor);
.icon img,
.icon svg {
Expand Down Expand Up @@ -250,9 +255,7 @@ export class DxcToggleGroupComponent implements OnInit {
fill: var(--toggleGroup-selectedFontColor);
}
&:active {
background: var(
--toggleGroup-selectedActiveBackgroundColor
);
background: var(--toggleGroup-selectedActiveBackgroundColor);
color: #ffffff;
}
&:hover {
Expand All @@ -273,44 +276,49 @@ export class DxcToggleGroupComponent implements OnInit {
display: inline-flex;
flex-direction: column;
${this.utils.getMargins(inputs.margin)};
label{
color: ${this.disabled ? 'var(--toggleGroup-disabledLabelFontColor)' : 'var(--toggleGroup-labelFontColor)' };
label {
color: ${this.disabled
? "var(--toggleGroup-disabledLabelFontColor)"
: "var(--toggleGroup-labelFontColor)"};
font-family: var(--toggleGroup-labelFontFamily);
font-size: var(--toggleGroup-labelFontSize);
font-style: var(--toggleGroup-labelFontStyle);
font-weight: var(--toggleGroup-labelFontWeight);
line-height: var(--toggleGroup-labelLineHeight);

}


.helperText{
color: ${this.disabled ? 'var(--toggleGroup-disabledHelperTextFontColor)' : 'var(--toggleGroup-helperTextFontColor)' };
font-family: var(--toggleGroup-helperTextFontFamily);
font-size: var(--toggleGroup-helperTextFontSize);
font-style: var(--toggleGroup-helperTextFontStyle);
font-weight: var(--toggleGroup-helperTextFontWeight);
line-height: var(--toggleGroup-helperTextLineHeight);
}
.toggleContainer{
.helperText {
color: ${this.disabled
? "var(--toggleGroup-disabledHelperTextFontColor)"
: "var(--toggleGroup-helperTextFontColor)"};
font-family: var(--toggleGroup-helperTextFontFamily);
font-size: var(--toggleGroup-helperTextFontSize);
font-style: var(--toggleGroup-helperTextFontStyle);
font-weight: var(--toggleGroup-helperTextFontWeight);
line-height: var(--toggleGroup-helperTextLineHeight);
}
.toggleContainer {
display: inline-flex;
flex-direction: row;
opacity: 1px;
height: calc(48px - 4px - 4px);
opacity: 1;
height: 48px;
padding: 4px;
margin-top: var(--toggleGroup-containerMarginTop);
border-width: var(--toggleGroup-containerBorderThickness);
border-style: var(--toggleGroup-containerBorderStyle);
border-radius: var(--toggleGroup-containerBorderRadius);
border-color: var(--toggleGroup-containerBorderColor);
background-color: var(--toggleGroup-containerBackgroundColor);
padding: 4px;
margin-top: var(--toggleGroup-containerMarginTop);
align-items: center;
min-height: 40px;
box-sizing: border-box;
}

${this.disabledStyles()};

dxc-toggle:not(:last-of-type) {
margin-right: 4px;
}
`;
}
}