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.

Sign up for GitHub

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

Jump to bottom

Fix separate bind:group with one array #4774

Closed
wants to merge 5 commits into from
Closed

Fix separate bind:group with one array #4774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c51aa7
Add force uncheck values for dublicate bind:group
Th0rN13 May 4, 2020
00b97b9
Add test for repeated bind:group case
Th0rN13 May 4, 2020
8f5c1b8
Fix: different group with identical values
Th0rN13 May 4, 2020
23e7f0b
Use const for groups
Th0rN13 May 4, 2020
ffa6da9
Move to Set, due duplicate values
Th0rN13 May 4, 2020
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
16 changes: 13 additions & 3 deletions src/runtime/internal/dom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,22 @@ export function xlink_attr(node, attribute, value) {
node.setAttributeNS('http://www.w3.org/1999/xlink', attribute, value);
}

// To force uncheck repeated group, need to store old value for each group
const groups = new Map();

export function get_binding_group_value(group) {
const value = [];
const value = new Set();
const force = new Set();
for (let i = 0; i < group.length; i += 1) {
if (group[i].checked) value.push(group[i].__value);
if (group[i].checked) {
value.add(group[i].__value);
} else if (groups.get(group) && groups.get(group).has(group[i].__value)) {
force.add(group[i].__value);
}
}
return value;
force.forEach((key) => value.delete(key));
groups.set(group, value);
return Array.from(value);
}

export function to_number(value) {
Expand Down
91 changes: 91 additions & 0 deletions test/runtime/samples/binding-input-checkbox-group-repeated-with-other/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
const values = [
"a",
"b",
];

export default {
props: {
values,
selected: [],
selected2: []
},

async test({ assert, target, window }) {
const inputs = target.querySelectorAll('input');
assert.equal(inputs[0].checked, false);
assert.equal(inputs[1].checked, false);
assert.equal(inputs[2].checked, false);
assert.equal(inputs[3].checked, false);
assert.equal(inputs[4].checked, false);
assert.equal(inputs[5].checked, false);

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

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

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

<label>
<input type="checkbox" value="b"> b
</label>

<label>
<input type="checkbox" value="a"> a
</label>

<label>
<input type="checkbox" value="b"> b
</label>

<p></p>

<label>
<input type="checkbox" value="a"> a
</label>

<label>
<input type="checkbox" value="b"> b
</label>

<p>b</p>
`);

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

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

<label>
<input type="checkbox" value="b"> b
</label>

<label>
<input type="checkbox" value="a"> a
</label>

<label>
<input type="checkbox" value="b"> b
</label>

<p>b</p>

<label>
<input type="checkbox" value="a"> a
</label>

<label>
<input type="checkbox" value="b"> b
</label>

<p>b</p>
`);

}
};
33 changes: 33 additions & 0 deletions test/runtime/samples/binding-input-checkbox-group-repeated-with-other/main.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<script>
export let selected;
export let selected2;
export let values;
</script>

<label>
<input type="checkbox" value="{values[0]}" bind:group={selected} /> {values[0]}
</label>

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

<label>
<input type="checkbox" value="{values[0]}" bind:group={selected} /> {values[0]}
</label>

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

<p>{selected.join(', ')}</p>

<label>
<input type="checkbox" value="{values[0]}" bind:group={selected2} /> {values[0]}
</label>

<label>
<input type="checkbox" value="{values[1]}" bind:group={selected2} /> {values[1]}
</label>

<p>{selected2.join( ', ' ) }</p>
112 changes: 112 additions & 0 deletions test/runtime/samples/binding-input-checkbox-group-repeated/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
const values = [
{ name: 'Alpha' },
{ name: 'Beta' }
];

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

html: `
<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

<p>Beta</p>`,

async 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);
assert.equal(inputs[3].checked, true);

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

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

assert.htmlEqual(target.innerHTML, `
<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

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

inputs[1].checked = false;
await inputs[1].dispatchEvent(event);

assert.htmlEqual(target.innerHTML, `
<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

<p>Alpha</p>
`);

component.selected = [values[0], values[1]];
assert.equal(inputs[0].checked, true);
assert.equal(inputs[1].checked, true);
assert.equal(inputs[0].checked, true);
assert.equal(inputs[1].checked, true);

assert.htmlEqual(target.innerHTML, `
<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

<label>
<input type="checkbox" value="[object Object]"> Alpha
</label>

<label>
<input type="checkbox" value="[object Object]"> Beta
</label>

<p>Alpha, Beta</p>
`);
}
};
22 changes: 22 additions & 0 deletions test/runtime/samples/binding-input-checkbox-group-repeated/main.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<script>
export let selected;
export let values;
</script>

<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[0]}" bind:group={selected} /> {values[0].name}
</label>

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

<p>{selected.map( function ( value ) { return value.name; }).join( ', ' ) }</p>