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

allow dynamic each-block to have static else-block #501

Merged
merged 4 commits into from
Apr 19, 2017
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
32 changes: 22 additions & 10 deletions src/generators/dom/visitors/EachBlock.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,28 @@ export default function visitEachBlock ( generator, block, state, node ) {
}
` );

block.builders.update.addBlock( deindent`
if ( !${each_block_value}.length && ${each_block_else} ) {
${each_block_else}.update( changed, ${params} );
} else if ( !${each_block_value}.length ) {
${each_block_else} = ${node.else._block.name}( ${params}, ${block.component} );
${each_block_else}.mount( ${anchor}.parentNode, ${anchor} );
} else if ( ${each_block_else} ) {
${each_block_else}.destroy( true );
}
` );
if ( node.else._block.hasUpdateMethod ) {
block.builders.update.addBlock( deindent`
if ( !${each_block_value}.length && ${each_block_else} ) {
${each_block_else}.update( changed, ${params} );
} else if ( !${each_block_value}.length ) {
${each_block_else} = ${node.else._block.name}( ${params}, ${block.component} );
${each_block_else}.mount( ${anchor}.parentNode, ${anchor} );
} else if ( ${each_block_else} ) {
${each_block_else}.destroy( true );
}
` );
} else {
block.builders.update.addBlock( deindent`
if ( ${each_block_value}.length ) {
if ( ${each_block_else} ) ${each_block_else}.destroy( true );
} else if ( !${each_block_else} ) {
${each_block_else} = ${node.else._block.name}( ${params}, ${block.component} );
${each_block_else}.mount( ${anchor}.parentNode, ${anchor} );
}
` );
}


block.builders.destroy.addBlock( deindent`
if ( ${each_block_else} ) {
Expand Down
4 changes: 2 additions & 2 deletions src/generators/dom/visitors/Element/Binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import getSetter from '../shared/binding/getSetter.js';
import getStaticAttributeValue from './getStaticAttributeValue.js';

export default function visitBinding ( generator, block, state, node, attribute ) {
const { name, keypath } = flattenReference( attribute.value );
const { name, keypath, parts } = flattenReference( attribute.value );
const { snippet, contexts, dependencies } = block.contextualise( attribute.value );

if ( dependencies.length > 1 ) throw new Error( 'An unexpected situation arose. Please raise an issue at https://github.com/sveltejs/svelte/issues — thanks!' );
Expand All @@ -17,7 +17,7 @@ export default function visitBinding ( generator, block, state, node, attribute
const handler = block.getUniqueName( `${state.parentNode}_${eventName}_handler` );
const isMultipleSelect = node.name === 'select' && node.attributes.find( attr => attr.name.toLowerCase() === 'multiple' ); // TODO use getStaticAttributeValue
const type = getStaticAttributeValue( node, 'type' );
const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, keypath ) : null;
const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, parts.join( '.' ) ) : null;
const value = getBindingValue( generator, block, state, node, attribute, isMultipleSelect, bindingGroup, type );

let setter = getSetter({ block, name, keypath, context: '_svelte', attribute, dependencies, value });
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
const values = [
{ name: 'Alpha' },
{ name: 'Beta' },
{ name: 'Gamma' }
];

export default {
data: {
values,
selected: [ values[1] ]
},

'skip-ssr': true, // values are rendered as [object Object]

html: `
<label>
<input type="checkbox"> Alpha
</label>

<label>
<input type="checkbox"> Beta
</label>

<label>
<input type="checkbox"> Gamma
</label>

<p>Beta</p>`,

test ( assert, component, target, window ) {
const inputs = target.querySelectorAll( 'input' );
assert.equal( inputs[0].checked, false );
assert.equal( inputs[1].checked, true );
assert.equal( inputs[2].checked, false );

const event = new window.Event( 'change' );

inputs[0].checked = true;
inputs[0].dispatchEvent( event );

assert.htmlEqual( target.innerHTML, `
<label>
<input type="checkbox"> Alpha
</label>

<label>
<input type="checkbox"> Beta
</label>

<label>
<input type="checkbox"> Gamma
</label>

<p>Alpha, Beta</p>
` );

component.set({ selected: [ values[1], values[2] ] });
assert.equal( inputs[0].checked, false );
assert.equal( inputs[1].checked, true );
assert.equal( inputs[2].checked, true );

assert.htmlEqual( target.innerHTML, `
<label>
<input type="checkbox"> Alpha
</label>

<label>
<input type="checkbox"> Beta
</label>

<label>
<input type="checkbox"> Gamma
</label>

<p>Beta, Gamma</p>
` );
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<label>
<input type="checkbox" value="{{values[0]}}" bind:group='selected' /> {{values[0].name}}
</label>

<label>
<input type="checkbox" value="{{values[1]}}" bind:group='selected' /> {{values[1].name}}
</label>

<label>
<input type="checkbox" value="{{values[2]}}" bind:group='selected' /> {{values[2].name}}
</label>

<p>{{selected.map( function ( value ) { return value.name; }).join( ', ' ) }}</p>
27 changes: 27 additions & 0 deletions test/runtime/samples/each-block-dynamic-else-static/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
export default {
data: {
animals: [ 'alpaca', 'baboon', 'capybara' ]
},

html: `
<p>alpaca</p>
<p>baboon</p>
<p>capybara</p>
`,

test ( assert, component, target ) {
component.set({ animals: [] });
assert.htmlEqual( target.innerHTML, `
<p>no animals</p>
` );

// trigger an 'update' of the else block, to ensure that
// non-existent update method is not called
component.set({ animals: [] });

component.set({ animals: ['wombat'] });
assert.htmlEqual( target.innerHTML, `
<p>wombat</p>
` );
}
};
5 changes: 5 additions & 0 deletions test/runtime/samples/each-block-dynamic-else-static/main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{{#each animals as animal}}
<p>{{animal}}</p>
{{else}}
<p>no animals</p>
{{/each}}