Skip to content
This repository was archived by the owner on Aug 7, 2020. It is now read-only.

feat(oui-checkbox): add error class when checkbox is in error #314

Merged
merged 2 commits into from
Nov 14, 2018
Merged

feat(oui-checkbox): add error class when checkbox is in error #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a39444
feat(oui-checkbox): add error class when checkbox is in error
Jisay Nov 12, 2018
d3358f7
fix(oui-checkbox): test and error display
Jisay Nov 13, 2018
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
3 changes: 3 additions & 0 deletions packages/oui-checkbox/src/checkbox.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import template from "./checkbox.html";
export default {
template,
controller,
require: {
form: "?^^form"
},
bindings: {
model: "=?",
id: "@?",
Expand Down
8 changes: 7 additions & 1 deletion packages/oui-checkbox/src/checkbox.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default class {
// So we use $timeout to force the $apply
this.$timeout(() =>
this.$element
.addClass("oui-checkbox")
.removeAttr("id")
.removeAttr("name")
);
Expand All @@ -38,6 +37,13 @@ export default class {
addDefaultParameter(this, "id", `ouiCheckbox${this.$scope.$id}`);
}

hasError () {
if (!this.form || !this.form[this.name]) {
return false;
}
return (!this.form[this.name].$dirty || this.form.$submitted) && !this.focused && this.form[this.name].$invalid;
}

_updateIndeterminateState (model) {
this.checkboxElement.prop("indeterminate", model === null);
}
Expand Down
59 changes: 32 additions & 27 deletions packages/oui-checkbox/src/checkbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
<input class="oui-checkbox__input"
type="checkbox"
id="{{:: $ctrl.id }}"
name="{{:: $ctrl.name }}"
ng-attr-aria-labelledby="{{:: $ctrl.id }}-text"
ng-attr-aria-describedby="{{:: $ctrl.description && $ctrl.id + '-description' || undefined }}"
ng-model="$ctrl.model"
ng-change="$ctrl.onChange({ modelValue: $ctrl.model })"
ng-disabled="$ctrl.disabled"
ng-required="$ctrl.required">
<label for="{{:: $ctrl.id }}"
class="oui-checkbox__label-container"
ng-attr-aria-labelledby="{{:: $ctrl.id }}-text"
ng-attr-aria-describedby="{{:: $ctrl.description && $ctrl.id + '-description' || undefined }}">
<span class="oui-checkbox__label">
<span id="{{:: $ctrl.id }}-text" ng-transclude>{{$ctrl.text}}</span>
<span class="oui-checkbox__icon">
<span class="oui-icon oui-icon-checkbox-unchecked"></span>
<span class="oui-icon oui-icon-checkbox-checked"></span>
<span class="oui-icon oui-icon-checkbox-checkmark"></span>
<span class="oui-icon oui-icon-checkbox-indeterminate"></span>
<div class="oui-checkbox"
ng-class="{ 'oui-checkbox_error': $ctrl.hasError() }">
<input class="oui-checkbox__input"
type="checkbox"
id="{{:: $ctrl.id }}"
name="{{:: $ctrl.name }}"
ng-attr-aria-labelledby="{{:: $ctrl.id }}-text"
ng-attr-aria-describedby="{{:: $ctrl.description && $ctrl.id + '-description' || undefined }}"
ng-model="$ctrl.model"
ng-change="$ctrl.onChange({ modelValue: $ctrl.model })"
ng-disabled="$ctrl.disabled"
ng-required="$ctrl.required"
ng-focus="$ctrl.focused = true"
ng-blur="$ctrl.focused = false">
<label for="{{:: $ctrl.id }}"
class="oui-checkbox__label-container"
ng-attr-aria-labelledby="{{:: $ctrl.id }}-text"
ng-attr-aria-describedby="{{:: $ctrl.description && $ctrl.id + '-description' || undefined }}">
<span class="oui-checkbox__label">
<span id="{{:: $ctrl.id }}-text" ng-transclude>{{$ctrl.text}}</span>
<span class="oui-checkbox__icon">
<span class="oui-icon oui-icon-checkbox-unchecked"></span>
<span class="oui-icon oui-icon-checkbox-checked"></span>
<span class="oui-icon oui-icon-checkbox-checkmark"></span>
<span class="oui-icon oui-icon-checkbox-indeterminate"></span>
</span>
</span>
</span>
<span id="{{:: $ctrl.id }}-description" class="oui-checkbox__description"
ng-bind="$ctrl.description"
ng-if="$ctrl.description">
</span>
</label>
<span id="{{:: $ctrl.id }}-description" class="oui-checkbox__description"
ng-bind="$ctrl.description"
ng-if="$ctrl.description">
</span>
</label>
</div>
4 changes: 2 additions & 2 deletions packages/oui-checkbox/src/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ describe("ouiCheckbox", () => {
}

describe("Component", () => {
it("should have a default classname", () => {
it("should have an element with default classname", () => {
const element = TestUtils.compileTemplate("<oui-checkbox></oui-checkbox>");

$timeout.flush();

expect(element.hasClass("oui-checkbox")).toBeTruthy();
expect(element.find("div").eq(0).hasClass("oui-checkbox")).toBe(true);
});

describe("id attribute", () => {
Expand Down