Skip to content

Commit

Permalink
Merge 5a2ec51 into 94950d5
Browse files Browse the repository at this point in the history
  • Loading branch information
helrac committed May 1, 2018
2 parents 94950d5 + 5a2ec51 commit c9f7186
Show file tree
Hide file tree
Showing 22 changed files with 423 additions and 45 deletions.
21 changes: 21 additions & 0 deletions addon/components/inputs/autocomplete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import SelectInput from './select'
import layout from 'ember-frost-bunsen/templates/components/frost-bunsen-input-autocomplete'

export default SelectInput.extend({
// == Component Properties ===================================================
classNames: [
'frost-bunsen-input-autocomplete',
'frost-field'
],

layout,

/**
* This should be overriden by inherited inputs to convert the value to the appropriate format
* @param {String} data - value to parse
* @returns {String} parsed value
*/
parseValue (data) {
return data
}
})
2 changes: 2 additions & 0 deletions addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export {default as Form} from './components/form'
export {default as InputWrapper} from './components/input-wrapper'
export {default as Section} from './components/section'
export {default as ValidationResult} from './components/validation-result'
import {default as Autocomplete} from './components/inputs/autocomplete'
import {default as Boolean} from './components/inputs/boolean'
import {default as ButtonGroup} from './components/inputs/button-group'
import {default as CheckboxArray} from './components/inputs/checkbox-array'
Expand All @@ -30,6 +31,7 @@ import {default as Url} from './components/inputs/url'
import {default as When} from './components/inputs/when'

export const Inputs = {
Autocomplete,
Boolean,
ButtonGroup,
CheckboxArray,
Expand Down
53 changes: 53 additions & 0 deletions addon/templates/components/frost-bunsen-input-autocomplete.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{{#if readOnly}}
{{frost-bunsen-input-static
bunsenId=bunsenId
bunsenModel=bunsenModel
bunsenView=bunsenView
cellConfig=cellConfig
errorMessage=errorMessage
formDisabled=formDisabled
getRootProps=getRootProps
hook=hook
onChange=onChange
onError=onError
readOnly=readOnly
registerForFormValueChanges=registerForFormValueChanges
renderers=renderers
required=required
showAllErrors=showAllErrors
unregisterForFormValueChanges=unregisterForFormValueChanges
value=selectedItemLabel
}}
{{else}}
{{#if (not cellConfig.hideLabel)}}
<label class={{labelWrapperClassName}}>
{{renderLabel}}
{{#if showRequiredLabel}}
<div class='frost-bunsen-required'>Required</div>
{{/if}}
</label>
{{/if}}
<div class={{inputWrapperClassName}}>
{{frost-autocomplete
class=valueClassName
data=options
disabled=disabled
error=(if renderErrorMessage true false)
hook=hook
onChange=(action 'handleChange')
onBlur=(action 'showErrorMessage')
options=selectSpreadProperties
placeholder=placeholder
width=width
selectedValue=value
}}
{{frost-bunsen-description-bubble
description=cellConfig.description
}}
</div>
{{#if renderErrorMessage}}
<div class='frost-bunsen-error'>
{{renderErrorMessage}}
</div>
{{/if}}
{{/if}}
1 change: 1 addition & 0 deletions addon/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const {keys} = Object
*/

export const builtInRenderers = {
autocomplete: 'frost-bunsen-input-autocomplete',
boolean: 'frost-bunsen-input-boolean',
'button-group': 'frost-bunsen-input-button-group',
'checkbox-array': 'frost-bunsen-input-checkbox-array',
Expand Down
1 change: 1 addition & 0 deletions app/components/frost-bunsen-input-autocomplete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {default} from 'ember-frost-bunsen/components/inputs/autocomplete'
94 changes: 53 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"ember-cli-svgstore": "github:ciena-blueplanet/ember-cli-svgstore#977df1cf58ae43b1d98a591573c3e06947744321",
"ember-computed-decorators": "0.3.0",
"ember-concurrency": "0.7.19",
"ember-frost-core": "^8.0.0",
"ember-frost-core": "^8.2.2",
"ember-frost-date-picker": "^11.0.0",
"ember-frost-fields": "^9.0.0",
"ember-frost-popover": "^10.0.0",
Expand All @@ -110,4 +110,4 @@
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}
2 changes: 0 additions & 2 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-env node */
const Reporter = require('ember-test-utils/reporter')

module.exports = {
disable_watching: true,
Expand All @@ -11,6 +10,5 @@ module.exports = {
launch_in_dev: [
'Chrome'
],
reporter: new Reporter(),
test_page: 'tests/index.html?hidepassed'
}
Loading

0 comments on commit c9f7186

Please sign in to comment.