update select value bindings at the end of the cycle (fixes #476)

pull/478/head
Rich-Harris 8 years ago
parent ef630b1483
commit 02e55e8f7a

@ -63,7 +63,7 @@ export default function visitElement ( generator, block, state, node ) {
.forEach( attribute => {
// <select> value attributes are an annoying special case — it must be handled
// *after* its children have been updated
if ( attribute.type === 'Attribute' && attribute.name === 'value' && node.name === 'select' ) {
if ( ( attribute.type === 'Attribute' || attribute.type === 'Binding' ) && attribute.name === 'value' && node.name === 'select' ) {
selectValueAttribute = attribute;
return;
}
@ -74,12 +74,7 @@ export default function visitElement ( generator, block, state, node ) {
// special case bound <option> without a value attribute
if ( node.name === 'option' && !node.attributes.find( attribute => attribute.type === 'Attribute' && attribute.name === 'value' ) ) { // TODO check it's bound
const statement = `${name}.__value = ${name}.textContent;`;
block.builders.update.addLine( statement );
node.initialUpdate = statement;
}
if ( node.initialUpdate ) {
block.builders.create.addBlock( node.initialUpdate );
node.initialUpdate = node.lateUpdate = statement;
}
if ( childState.allUsedContexts.length || childState.usesComponent ) {
@ -117,8 +112,17 @@ export default function visitElement ( generator, block, state, node ) {
visit( generator, block, childState, child );
});
if ( node.initialUpdate ) {
block.builders.create.addBlock( node.initialUpdate );
}
if ( node.lateUpdate ) {
block.builders.update.addLine( node.lateUpdate );
}
if ( selectValueAttribute ) {
visitAttribute( generator, block, childState, node, selectValueAttribute );
const visitor = selectValueAttribute.type === 'Attribute' ? visitAttribute : visitBinding;
visitor( generator, block, childState, node, selectValueAttribute );
}
}

@ -0,0 +1,34 @@
export default {
data: {
items: [],
selected: null
},
html: `
<select></select>
<p>selected: nothing</p>
`,
test ( assert, component, target ) {
component.set({
items: [ 'one', 'two', 'three' ],
selected: 'two'
});
const options = target.querySelectorAll( 'option' );
assert.ok( !options[0].selected );
assert.ok( options[1].selected );
assert.ok( !options[2].selected );
assert.htmlEqual( target.innerHTML, `
<select>
<option>one</option>
<option>two</option>
<option>three</option>
</select>
<p>selected: two</p>
` );
component.destroy();
}
};

@ -0,0 +1,7 @@
<select bind:value='selected'>
{{#each items as item}}
<option>{{item}}</option>
{{/each}}
</select>
<p>selected: {{selected || 'nothing'}}</p>
Loading…
Cancel
Save