Skip to content

fix indirect bindings on elements with spreads #4398

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

Merged
merged 3 commits into from
Feb 12, 2020
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Svelte changelog

## Unreleased

* Fix indirect bindings involving elements with spreads ([#3680](https://github.com/sveltejs/svelte/issues/3680))

## 3.18.2

* Fix binding to module-level variables ([#4086](https://github.com/sveltejs/svelte/issues/4086))
Expand Down
19 changes: 12 additions & 7 deletions src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,25 @@ export default class AttributeWrapper {
}
}

render(block: Block) {
is_indirectly_bound_value() {
const element = this.parent;
const name = fix_attribute_casing(this.node.name);

const metadata = this.get_metadata();

const is_indirectly_bound_value =
name === 'value' &&
return name === 'value' &&
(element.node.name === 'option' || // TODO check it's actually bound
(element.node.name === 'input' &&
element.node.bindings.find(
element.node.bindings.some(
(binding) =>
/checked|group/.test(binding.name)
)));
}

render(block: Block) {
const element = this.parent;
const name = fix_attribute_casing(this.node.name);

const metadata = this.get_metadata();

const is_indirectly_bound_value = this.is_indirectly_bound_value();

const property_name = is_indirectly_bound_value
? '__value'
Expand Down
8 changes: 4 additions & 4 deletions src/compiler/compile/render_dom/wrappers/Element/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -679,10 +679,10 @@ export default class ElementWrapper extends Wrapper {
updates.push(condition ? x`${condition} && ${snippet}` : snippet);
} else {
const metadata = attr.get_metadata();
const snippet = x`{ ${
(metadata && metadata.property_name) ||
fix_attribute_casing(attr.node.name)
}: ${attr.get_value(block)} }`;
const name = attr.is_indirectly_bound_value()
? '__value'
: (metadata && metadata.property_name) || fix_attribute_casing(attr.node.name);
const snippet = x`{ ${name}: ${attr.get_value(block)} }`;
initial_props.push(snippet);

updates.push(condition ? x`${condition} && ${snippet}` : snippet);
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/internal/dom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export function set_attributes(node: Element & ElementCSSInlineStyle, attributes
node.removeAttribute(key);
} else if (key === 'style') {
node.style.cssText = attributes[key];
} else if (descriptors[key] && descriptors[key].set) {
} else if (key === '__value' || descriptors[key] && descriptors[key].set) {
node[key] = attributes[key];
} else {
attr(node, key, attributes[key]);
Expand Down
44 changes: 44 additions & 0 deletions test/runtime/samples/binding-indirect-spread/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
export default {
skip_if_ssr: true,
async test({ assert, component, target, window }) {
const event = new window.MouseEvent('click');

const [radio1, radio2, radio3] = target.querySelectorAll('input[type=radio]');

assert.ok(!radio1.checked);
assert.ok(radio2.checked);
assert.ok(!radio3.checked);

component.radio = 'radio1';

assert.ok(radio1.checked);
assert.ok(!radio2.checked);
assert.ok(!radio3.checked);

await radio3.dispatchEvent(event);

assert.equal(component.radio, 'radio3');
assert.ok(!radio1.checked);
assert.ok(!radio2.checked);
assert.ok(radio3.checked);

const [check1, check2, check3] = target.querySelectorAll('input[type=checkbox]');

assert.ok(!check1.checked);
assert.ok(check2.checked);
assert.ok(!check3.checked);

component.check = ['check1', 'check2'];

assert.ok(check1.checked);
assert.ok(check2.checked);
assert.ok(!check3.checked);

await check3.dispatchEvent(event);

assert.deepEqual(component.check, ['check1', 'check2', 'check3']);
assert.ok(check1.checked);
assert.ok(check2.checked);
assert.ok(check3.checked);
}
};
12 changes: 12 additions & 0 deletions test/runtime/samples/binding-indirect-spread/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<script>
export let radio = 'radio2';
export let check = ['check2'];
</script>

<input type='radio' bind:group={radio} value='radio1' {...{}}>
<input type='radio' bind:group={radio} value='radio2' {...{}}>
<input type='radio' bind:group={radio} value='radio3' {...{}}>

<input type='checkbox' bind:group={check} value='check1' {...{}}>
<input type='checkbox' bind:group={check} value='check2' {...{}}>
<input type='checkbox' bind:group={check} value='check3' {...{}}>