Skip to content

Commit 8912c6a

Browse files
committed
Merge branch 'refactor-global-header-height' of github.com:hypertrace/hypertrace-ui into refactor-global-header-height
2 parents 216b7a9 + 32a8600 commit 8912c6a

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

package-lock.json

Lines changed: 15 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@
107107
"jest-junit": "^13.0.0",
108108
"jest-preset-angular": "^8.4.0",
109109
"lodash": "^4.17.21",
110-
"ng-mocks": "^13.3.0",
110+
"ng-mocks": "^13.4.0",
111111
"ng-packagr": "^12.2.5",
112112
"prettier": "^2.2.1",
113113
"pretty-quick": "^3.1.3",
114114
"ts-node": "~10.7.0",
115115
"tslint": "~6.1.3",
116116
"tslint-config-prettier": "^1.18.0",
117117
"typescript": "~4.3.5",
118-
"typescript-tslint-plugin": "^1.0.1"
118+
"typescript-tslint-plugin": "^1.0.2"
119119
},
120120
"config": {
121121
"commitizen": {

projects/components/src/radio/radio-group.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ export class RadioGroupComponent implements ControlValueAccessor, OnInit {
8585
this.setSelection(value);
8686
}
8787

88+
public setDisabledState(isDisabled?: boolean): void {
89+
this.disabled = isDisabled ?? false;
90+
}
91+
8892
public registerOnChange(onChange: (value?: string) => void): void {
8993
this.propagateControlValueChange = onChange;
9094
}

0 commit comments

Comments
 (0)