checkbox and radio

ionic/components/checkbox/checkbox.ts

@@ -17,8 +17,9 @@ import {Icon} from '../icon/icon';
 @IonicComponent({
   selector: 'ion-checkbox',
   host: {
-    'class': 'item',
+    '[class.item]': 'item',
-    '[attr.aria-checked]': 'checked'
+    '[attr.aria-checked]': 'input.checked',
+    '(^click)': 'onClick($event)'
   },
   defaultProperties: {
     'iconOff': 'ion-ios-circle-outline',
@@ -27,7 +28,7 @@ import {Icon} from '../icon/icon';
 })
 @IonicView({
   template:
-  '<div class="item-media media-checkbox" (click)="onClick($event)">' +
+  '<div class="item-media media-checkbox">' +
     '<icon [name]="iconOff" class="checkbox-off"></icon>' +
     '<icon [name]="iconOn" class="checkbox-on"></icon>' +
   '</div>' +
@@ -36,42 +37,31 @@ import {Icon} from '../icon/icon';
   '</div>'
 })
 export class Checkbox extends IonInputItem {
-
-  _checkbox: CheckboxInput;
-
   constructor(
     elementRef: ElementRef,
     config: IonicConfig
   ) {
     super(elementRef, config);
+    this.item = true;
   }
 
-  onAllChangesDone() {
+  onClick(ev) {
-    // Enforce that this directive actually contains a checkbox
+    // toggling with spacebar fires mouse event
-    if (this._checkbox == null) {
+    if (ev.target.tagName === "INPUT") return;
-      throw 'No <input type="checkbox"> found inside of <ion-checkbox>';
-    }
-  }
 
-  registerInput(checkboxDir) {
+    this.input.checked = !this.input.checked;
-    if (this._checkbox != null) {
-      throw 'Only one <input type="checkbox"> is allowed per <ion-checkbox>'
-    }
-    this._checkbox = checkboxDir.elementRef.nativeElement;
-    this._checkboxDir = checkboxDir;
-  }
 
-  onClick(e) {
+    //TODO trigger change/mouse event on the actual input to trigger
-    let val = !this._checkbox.checked;
-    this._checkbox.checked = val;
-    this.checked = val;
-
-    //TODO figure out a way to trigger change on the actual input to trigger
     // form updates
 
     // this._checkbox.dispatchEvent(e);
     //this._checkboxDir.control.valueAccessor.writeValue(val);
   }
+
+  onChangeEvent(input) {
+    //TODO can we just assume this will always be true?
+    this.input.checked = this.input.elementRef.nativeElement.checked;
+  }
 }
 
 

ionic/components/checkbox/test/basic/index.ts

@@ -1,7 +1,4 @@
-import {Component, View} from 'angular2/angular2';
+import {App} from 'ionic/ionic';
-
-import {Query, QueryList, NgFor} from 'angular2/angular2';
-// import {FormBuilder, Validators, NgFormControl, Control, NgControlName, NgControlGroup, ControlContainer} from 'angular2/forms';
 import {
   Control,
   ControlGroup,
@@ -14,8 +11,6 @@ import {
   NgFormModel,
   FormBuilder
 } from 'angular2/forms';
-import {App, Checkbox, Content, List} from 'ionic/ionic';
-//import {IONIC_DIRECTIVES} from 'ionic/ionic'
 
 @App({
   templateUrl: 'main.html'

ionic/components/form/tap-input.ts

@@ -9,12 +9,18 @@ import {RadioButton} from '../radio/radio';
 
 
 @Directive({
-  selector: 'input[type=checkbox],input[type=radio]'
+  selector: 'input[type=checkbox],input[type=radio]',
+  properties: [ 'checked', 'name' ],
+  host: {
+    '[checked]': 'checked',
+    '[attr.name]': 'name',
+    '(change)': 'onChangeEvent($event)'
+  }
 })
 export class TapInput extends IonInput {
   constructor(
-    @Optional() @Parent() checkboxContainer: Checkbox, //TODO have this be either Checkbox or Radio
+    @Optional() @Parent() checkboxContainer: Checkbox,
-    @Optional() @Parent() radioContainer : RadioButton,
+    @Optional() @Parent() radioContainer: RadioButton,
     @Optional() @Ancestor() scrollView: Content,
     @Attribute('type') type: string,
     elementRef: ElementRef,
@@ -35,4 +41,8 @@ export class TapInput extends IonInput {
     this.tabIndex = this.tabIndex || '';
   }
 
+  onChangeEvent(ev) {
+    this.container && this.container.onChangeEvent(this);
+  }
+
 }

ionic/components/radio/radio.ts

@@ -1,134 +1,105 @@
 import {ElementRef, Ancestor} from 'angular2/angular2';
 
 import {IonicDirective, IonicComponent, IonicView} from '../../config/annotations';
+import {IonicConfig} from '../../config/config';
+import {Ion} from '../ion';
+import {IonInputItem} from '../form/form';
 
+let groupName = -1;
 
 @IonicDirective({
-  selector: 'ion-radio-group'
+  selector: 'ion-radio-group',
+  host: {
+    '[class.list]': 'list'
+  }
 })
-export class RadioGroup {
+export class RadioGroup extends Ion {
+
+  _name: number = ++groupName;
+  buttons: Array<RadioButton> = [];
+
   constructor(
-    elementRef: ElementRef//,
+    elementRef: ElementRef,
-    //cd:ControlDirective
+    ionicConfig: IonicConfig
   ) {
-    this.ele = elementRef.nativeElement
+    super(elementRef, ionicConfig);
-    // this.config = RadioGroup.config.invoke(this)
+    this.list = true;
-    // this.controlDirective = cd;
-    // cd.valueAccessor = this; //ControlDirective should inject CheckboxControlDirective
-
-    this.ele.classList.add('list');
-
-    this.buttons = [];
   }
 
-  /**
-   * Much like ngModel, this is called from our valueAccessor for the attached
-   * ControlDirective to update the value internally.
-   */
-  writeValue(value) {
-    this.value = value;
-
-    setTimeout(() => {
-      this.selectFromValue(value);
-    })
-  }
-
-  /**
-   * Called by child SegmentButtons to bind themselves to
-   * the Segment.
-   */
   register(radioButton) {
     this.buttons.push(radioButton);
+    let inputEl = radioButton.input.elementRef.nativeElement;
+    if (!inputEl.hasAttribute('name')) {
+      radioButton.input.name = this._name;
+    }
+    // if (radioButton && !radioButton.hasAttribute('name')){
+    //   radioButton.setAttribute('name', this._name);
+    // }
+  }
 
-    // If we don't have a default value, and this is the
+  update(input) {
-    // first button added, select it
+    for (let button of this.buttons) {
-    if(!this.value && this.buttons.length === 1) {
+      button.input.checked = button.input.elementRef.nativeElement.checked;
-      setTimeout(() => {
-        // We need to defer so the control directive can initialize
-        this.selected(radioButton);
-      })
     }
   }
 
-  /**
-   * Select the button with the given value.
-   */
-  selectFromValue(value) {
-    for(let button of this.buttons) {
-      if(button.value === value) {
-        this.selected(button);
-      }
-    }
-  }
-
-
-  /**
-   * Indicate a button should be selected.
-   */
-  selected(radioButton) {
-    for(let button of this.buttons) {
-      button.setActive(false);
-    }
-    radioButton.setActive(true);
-
-    this.value = radioButton.value;
-    // TODO: Better way to do this?
-    this.controlDirective._control().updateValue(this.value);
-  }
 }
 
-
 @IonicComponent({
   selector: 'ion-radio',
-  properties: [
-    'value'
-  ],
   host: {
-    '(^click)': 'buttonClicked($event)'
+    '[class.item]': 'item',
+    '[class.active]': 'input.checked',
+    '[attr.aria-checked]': 'input.checked',
+    '(^click)': 'onClick($event)'
+  },
+  defaultProperties: {
+    'iconOff': 'ion-ios-circle-outline',
+    'iconOn': 'ion-ios-checkmark'
   }
 })
 @IonicView({
-  template: `
+  template:
-    <div class="item-content">
+  '<div class="item-media media-radio">' +
-      <div class="item-title">
+    '<icon [name]="iconOff" class="radio-off"></icon>' +
-        <content></content>
+    '<icon [name]="iconOn" class="radio-on"></icon>' +
-      </div>
+  '</div>' +
-      <div class="item-media media-radio">
+  '<div class="item-content">' +
-        <icon class="radio-off"></icon>
+    '<content></content>' +
-        <icon class="ion-ios-checkmark-empty radio-on"></icon>
+  '</div>'
-      </div>
-    </div>
-  `
 })
-export class RadioButton {
+export class RadioButton extends IonInputItem {
   constructor(
     @Ancestor() group: RadioGroup,
-    elementRef: ElementRef
+    elementRef: ElementRef,
+    config: IonicConfig
   ) {
-    this.ele = elementRef.ele;
+    super(elementRef, config);
-
+    this.item = true;
-    this.ele.classList.add('item')
-    this.ele.setAttribute('aria-checked', true)
-
     this.group = group;
-
-    group.register(this);
   }
 
-  setActive(isActive) {
+  registerInput(input) {
-    // TODO: No ele
+    this.input = input;
-    if(isActive) {
+    this.group.register(this);
-      this.ele.classList.add('active');
-      this.ele.setAttribute('aria-checked', true)
-    } else {
-      this.ele.classList.remove('active');
-      this.ele.setAttribute('aria-checked', false)
-    }
   }
 
-  buttonClicked(event) {
+  onClick(ev) {
-    this.group.selected(this, event);
+    // switching between radio buttons with arrow keys fires a MouseEvent
-    event.preventDefault();
+    if (ev.target.tagName === "INPUT") return;
+    this.input.checked = !this.input.checked;
+
+    //let bindings update first
+    setTimeout(() => this.group.update(this.input));
+
+    //TODO figure out a way to trigger change on the actual input to trigger
+    // form updates
+
+    // this._checkbox.dispatchEvent(e);
+    //this._checkboxDir.control.valueAccessor.writeValue(val);
   }
 
+  onChangeEvent(input) {
+    this.group.update(input);
+  }
 }

ionic/components/radio/test/basic/index.ts

@@ -1,4 +1,16 @@
 import {App} from 'ionic/ionic';
+import {
+  Control,
+  ControlGroup,
+  NgForm,
+  formDirectives,
+  Validators,
+  NgControl,
+  ControlValueAccessor,
+  NgControlName,
+  NgFormModel,
+  FormBuilder
+} from 'angular2/forms';
 
 
 @App({
@@ -6,9 +18,33 @@ import {App} from 'ionic/ionic';
 })
 class IonicApp {
   constructor() {
-    // var fb = new FormBuilder();
+    this.fruitsGroup1 = new ControlGroup({
-    // this.form = fb.group({
+      "appleCtrl": new Control("", isChecked),
-    //   preferredApple: ['mac', Validators.required],
+      "bananaCtrl": new Control("", isChecked)
-    // });
+    });
+    this.fruitsGroup2 = new ControlGroup({
+      "grapeCtrl": new Control("", isChecked),
+      "cherryCtrl": new Control("", isChecked)
+    });
+
+    this.fruitsForm = new ControlGroup({
+      "fruitGroup1": this.fruitsGroup1,
+      "fruitGroup2": this.fruitsGroup2
+    });
+
+    function isChecked(ctrl) {
+      if (ctrl.checked) {
+        return null;
+      } else {
+        return {
+          'notChecked': true
+        }
+      }
+    }
+  }
+
+  doSubmit(event) {
+    console.log('Submitting form', this.fruitsForm.value);
+    event.preventDefault();
   }
 }

ionic/components/radio/test/basic/main.html

@@ -3,33 +3,28 @@
 
   <ion-content>
 
-    <form (^submit)="doSubmit($event)" [control-group]="form">
+    <form (^submit)="doSubmit($event)" [ng-form-model]="fruitsForm">
       <div class="list-header">
-        Radio Group
+        Fruit Group 1
       </div>
 
-      <ion-radio-group control="preferredApple">
+      <ion-radio-group ng-control-group="fruitGroup1">
-
+        <ion-radio><label>APPLE</label><input #apple type="radio" ng-control="appleCtrl"></ion-radio>
-        <ion-radio value="mac">
+        <ion-radio><label>BANANA</label><input #banana type="radio" ng-control="bananaCtrl"></ion-radio>
-          McIntosh
-        </ion-radio>
-
-        <ion-radio value="granny">
-          Granny Smith
-        </ion-radio>
-
-        <ion-radio value="gala">
-          Gala
-        </ion-radio>
-
-        <ion-radio value="fuji">
-          Fuji
-        </ion-radio>
-
       </ion-radio-group>
 
+      appleCtrl.dirty: {{fruitsForm.controls.fruitGroup1.controls.appleCtrl.dirty}}<br>
+
+      <div class="list-header">
+        Fruit Group 2
+      </div>
+      <ion-radio-group ng-control-group="fruitGroup2">
+        <ion-radio><label>GRAPE</label><input #grape name="test" type="radio" ng-control="grapeCtrl"></ion-radio>
+        <ion-radio><label>CHERRY</label><input #cherry name="test" type="radio" ng-control="cherryCtrl"></ion-radio>
+      </ion-radio-group>
+
+
     </form>
 
-    Current apple: <b>{{form.controls.preferredApple.value}}</b>
   </ion-content>
 </ion-view>

ionic/config/annotations.ts

@@ -57,8 +57,10 @@ export const IonicDirectives = [
   forwardRef(() => SegmentButton),
   forwardRef(() => SegmentControlValueAccessor),
   forwardRef(() => Checkbox),
-  //Checkbox, Switch
+  forwardRef(() => RadioGroup),
-  //RadioGroup, RadioButton, SearchBar,
+  forwardRef(() => RadioButton),
+  //Switch
+  //SearchBar,
 
   // Input
   forwardRef(() => Input),