Commit 51a9f36

author

jonatansalas

committed

#35 Added Number component

#43 Added Number component #51 Fix issues with bootstrap demo

1 parent 9a11422 commit 51a9f36Copy full SHA for 51a9f36

File tree

+36

-6

lines changed

+36

-6

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,18 @@ class Input extends Component {`
`19`	`19`
`20`	`20`	`static defaultProps = {`
`21`	`21`	`inputType: "text"`
`22`		`- }`
	`22`	`+ };`
`23`	`23`
`24`	`24`	`render() {`
`25`	`25`	`let {`
`26`	`26`	`error, touched, displayName, name, help, fieldLayout, innerSize, children, inputType,`
`27`		`- value, placeholder, addonBefore, addonAfter, onChange, onBlur, componentClass, rows`
	`27`	`+ value, placeholder, addonBefore, addonAfter, onChange, onBlur, componentClass, rows,`
	`28`	`+ min, max`
`28`	`29`	`} = this.props;`
`29`	`30`
	`31`	`+ console.info("This is the min -> " + min);`
	`32`	`+ console.info("This is the max -> " + max);`
	`33`	`+`
`30`	`34`	`let formGroupProps = {`
`31`	`35`	`error,`
`32`	`36`	`touched,`
`@@ -49,12 +53,12 @@ class Input extends Component {`
`49`	`53`	`onChange,`
`50`	`54`	`onBlur,`
`51`	`55`	`componentClass,`
`52`		`- rows`
	`56`	`+ rows,`
`53`	`57`	`};`
`54`	`58`
`55`	`59`	`return (`
`56`	`60`	`<FormGroup {...formGroupProps}>`
`57`		`- <FormControl {...formControlProps}>`
	`61`	`+ <FormControl {...formControlProps}min={min}max={max}>`
`58`	`62`	`{ children }`
`59`	`63`	`</FormControl>`
`60`	`64`	`</FormGroup>`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@ import React, { Component, PropTypes } from 'react';`
`2`	`2`	`import {DateTimePicker as ReactWidgetsDateTimePicker} from 'react-widgets';`
`3`	`3`	`import { getDateLocalizer } from 'redux-autoform-utils';`
`4`	`4`	`import FormGroup from '../common/FormGroup';`
	`5`	`+import Moment from 'moment';`
	`6`	`+import momentLocalizer from 'react-widgets/lib/localizers/moment';`
	`7`	`+`
	`8`	`+momentLocalizer(Moment);`
`5`	`9`
`6`	`10`	`class DateTimePicker extends Component {`
`7`	`11`	`static propTypes = {`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,22 @@`
	`1`	`+import React, { Component, PropTypes } from 'react';`
	`2`	`+import Input from '../common/Input';`
	`3`	`+`
	`4`	`+class Number extends Component {`
	`5`	`+ static propTypes = {`
	`6`	`+ value: PropTypes.any,`
	`7`	`+ onChange: PropTypes.func.isRequired,`
	`8`	`+ placeholder: PropTypes.string,`
	`9`	`+ displayName: PropTypes.string,`
	`10`	`+ name: PropTypes.string.isRequired,`
	`11`	`+ error: PropTypes.string,`
	`12`	`+ addonBefore: PropTypes.string,`
	`13`	`+ addonAfter: PropTypes.string,`
	`14`	`+ fieldLayout: PropTypes.string`
	`15`	`+ };`
	`16`	`+`
	`17`	`+ render() {`
	`18`	`+ return <Input componentClass="input" inputType="number" {...this.props}/>;`
	`19`	`+ }`
	`20`	`+}`
	`21`	`+`
	`22`	`+export default Number;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import Checkbox from '../components/field/CheckBox';`
`13`	`13`	`import Radio from '../components/field/Radio';`
`14`	`14`	`import FileUpload from '../components/field/FileUpload';`
`15`	`15`	`import EntityContainer from '../components/field/EntityContainer';`
	`16`	`+import Number from '../components/field/Number';`
`16`	`17`
`17`	`18`	`import Group from '../components/group/Group';`
`18`	`19`	`import TabGroup from '../components/group/TabGroup';`
`@@ -24,11 +25,9 @@ import Root from '../components/common/Root';`
`24`	`25`	`class BootstrapFactory extends ComponentFactory {`
`25`	`26`	`constructor(config) {`
`26`	`27`	`super();`
`27`		`-`
`28`	`28`	`this.setBaseComponents();`
`29`	`29`	`this.setDefaultConfiguration(config);`
`30`	`30`	`}`
`31`		`-`
`32`	`31`
`33`	`32`	`setBaseComponents = () => {`
`34`	`33`	`this.registerFieldComponent('TextBox', ['string', 'int', 'float', 'datetime', 'date', 'time'], TextBox);`
`@@ -45,6 +44,7 @@ class BootstrapFactory extends ComponentFactory {`
`45`	`44`	`this.registerFieldComponent('FieldGroup', ['group'], FieldGroup);`
`46`	`45`	`this.registerFieldComponent('FileUpload', ['string'], FileUpload);`
`47`	`46`	`this.registerFieldComponent('EntityContainer', ['entity'], EntityContainer);`
	`47`	`+ this.registerFieldComponent('Number', ['int'], Number);`
`48`	`48`
`49`	`49`	`this.registerGroupComponent('Group', Group);`
`50`	`50`	`this.registerGroupComponent('TabGroup', TabGroup);`

Comments

(0)