Skip to content

Commit

Permalink
Merge pull request #1636 from sveltejs/gh-875
Browse files Browse the repository at this point in the history
use props when passing data to custom elements (#875)
  • Loading branch information
Rich-Harris committed Aug 8, 2018
2 parents 7b073bd + b26ee1c commit 2880428
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/compile/nodes/Attribute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,11 @@ export default class Attribute extends Node {
// xlink is a special case... we could maybe extend this to generic
// namespaced attributes but I'm not sure that's applicable in
// HTML5?
const method = name.slice(0, 6) === 'xlink:'
? '@setXlinkAttribute'
: '@setAttribute';
const method = /-/.test(node.name)
? '@setCustomElementData'
: name.slice(0, 6) === 'xlink:'
? '@setXlinkAttribute'
: '@setAttribute';

const isLegacyInputType = this.compiler.options.legacy && name === 'type' && this.parent.name === 'input';

Expand Down
10 changes: 10 additions & 0 deletions src/shared/dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ export function setAttributes(node, attributes) {
}
}

export function setCustomElementData(node, prop, value) {
if (prop in node) {
node[prop] = value;
} else if (value) {
setAttribute(node, prop, value);
} else {
removeAttribute(node, prop);
}
}

export function removeAttribute(node, attribute) {
node.removeAttribute(attribute);
}
Expand Down
15 changes: 15 additions & 0 deletions test/custom-elements/samples/props/main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<my-widget class="foo" {items}/>

<script>
import './my-widget.html';

export default {
tag: 'custom-element',

data() {
return {
items: ['a', 'b', 'c']
};
}
};
</script>
14 changes: 14 additions & 0 deletions test/custom-elements/samples/props/my-widget.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<p>{items.length} items</p>
<p>{items.join(', ')}</p>

<script>
export default {
tag: 'my-widget',

data() {
return {
items: []
};
}
};
</script>
23 changes: 23 additions & 0 deletions test/custom-elements/samples/props/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import * as assert from 'assert';
import CustomElement from './main.html';

export default function (target) {
new CustomElement({
target
});

assert.equal(target.innerHTML, '<custom-element></custom-element>');

const el = target.querySelector('custom-element');
const widget = el.shadowRoot.querySelector('my-widget');

const [p1, p2] = widget.shadowRoot.querySelectorAll('p');

assert.equal(p1.textContent, '3 items');
assert.equal(p2.textContent, 'a, b, c');

el.items = ['d', 'e', 'f', 'g', 'h'];

assert.equal(p1.textContent, '5 items');
assert.equal(p2.textContent, 'd, e, f, g, h');
}

0 comments on commit 2880428

Please sign in to comment.