Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set indeterminate prop directly, fixes #128 #129

Merged
merged 1 commit into from
Apr 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 1 deletion lib/babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const camelCase = require('camel-case')
const hyperx = require('hyperx')
const SVG_TAGS = require('./svg-tags')
const BOOL_PROPS = require('./bool-props')
const DIRECT_PROPS = require('./direct-props')

const SVGNS = 'http://www.w3.org/2000/svg'
const XLINKNS = 'http://www.w3.org/1999/xlink'
Expand Down Expand Up @@ -226,7 +227,7 @@ module.exports = (babel) => {
}

// abc.onclick = xyz
if (attrName.slice(0, 2) === 'on') {
if (attrName.slice(0, 2) === 'on' || DIRECT_PROPS.indexOf(attrName) > -1) {
const value = convertPlaceholders(props[propName]).filter(isNotEmptyString)
result.push(setDomProperty(id, attrName,
value.length === 1
Expand Down
4 changes: 3 additions & 1 deletion lib/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ var hyperx = require('hyperx')
var appendChild = require('./append-child')
var SVG_TAGS = require('./svg-tags')
var BOOL_PROPS = require('./bool-props')
// Props that need to be set directly rather than with el.setAttribute()
var DIRECT_PROPS = require('./direct-props')

var SVGNS = 'http://www.w3.org/2000/svg'
var XLINKNS = 'http://www.w3.org/1999/xlink'
Expand Down Expand Up @@ -52,7 +54,7 @@ function nanoHtmlCreateElement (tag, props, children) {
else if (val === 'false') continue
}
// If a property prefers being set directly vs setAttribute
if (key.slice(0, 2) === 'on') {
if (key.slice(0, 2) === 'on' || DIRECT_PROPS.indexOf(key) !== -1) {
el[p] = val
} else {
if (ns) {
Expand Down
10 changes: 9 additions & 1 deletion lib/browserify-transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ var BOOL_PROPS = require('./bool-props').reduce(function (o, key) {
o[key] = 1
return o
}, {})
// Props that need to be set directly rather than with el.setAttribute()
var DIRECT_PROPS = require('./direct-props').reduce(function (o, key) {
o[key] = 1
return o
}, {})

module.exports = function yoYoify (file, opts) {
if (/\.json$/.test(file)) return through()
Expand Down Expand Up @@ -140,6 +145,8 @@ function processNode (node, args) {
if (val.slice(0, 9) === 'arguments') {
if (namespace) {
res.push('if (' + val + ' && ' + key + ') ' + to + '.setAttributeNS(null, ' + key + ', ' + key + ')')
} else if (DIRECT_PROPS[key.slice(1, -1)]) {
res.push('if (' + val + ' && ' + key + ') ' + to + '[' + key + '] = true')
} else {
res.push('if (' + val + ' && ' + key + ') ' + to + '.setAttribute(' + key + ', ' + key + ')')
}
Expand All @@ -149,7 +156,8 @@ function processNode (node, args) {
else if (val === 'false') return
}
}
if (key.slice(1, 3) === 'on') {

if (key.slice(1, 3) === 'on' || DIRECT_PROPS[key.slice(1, -1)]) {
res.push(to + '[' + key + '] = ' + val)
} else {
if (key === '"xlink:href"') {
Expand Down
3 changes: 3 additions & 0 deletions lib/direct-props.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = [
'indeterminate'
]
8 changes: 6 additions & 2 deletions tests/browser/elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@ var test = require('tape')
var html = require('../../')

test('create inputs', function (t) {
t.plan(5)
t.plan(7)

var expected = 'testing'
var result = html`<input type="text" value="${expected}" />`
t.equal(result.tagName, 'INPUT', 'created an input')
t.equal(result.value, expected, 'set the value of an input')

result = html`<input type="checkbox" checked="${true}" disabled="${false}" />`
result = html`<input type="checkbox" checked="${true}" disabled="${false}" indeterminate="${true}" />`
t.equal(result.getAttribute('type'), 'checkbox', 'created a checkbox')
t.equal(result.getAttribute('checked'), 'checked', 'set the checked attribute')
t.equal(result.getAttribute('disabled'), null, 'should not have set the disabled attribute')
t.equal(result.indeterminate, true, 'should have set indeterminate property')

result = html`<input indeterminate />`
t.equal(result.indeterminate, true, 'should have set indeterminate property')

t.end()
})
Expand Down