Skip to content

fix binding to aliased props #3809

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

Closed
wants to merge 3 commits into from
Closed
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Also:
* Fix edge cases in matching selectors against elements ([#1710](https://github.com/sveltejs/svelte/issues/1710))
* Fix several bugs related to interaction of `{...spread}` attributes with other features ([#2721](https://github.com/sveltejs/svelte/issues/2721), [#2916](https://github.com/sveltejs/svelte/issues/2916), [#3421](https://github.com/sveltejs/svelte/issues/3421), [#3681](https://github.com/sveltejs/svelte/issues/3681), [#3764](https://github.com/sveltejs/svelte/issues/3764), [#3790](https://github.com/sveltejs/svelte/issues/3790))
* Allow exiting a reactive block early with `break $` ([#2828](https://github.com/sveltejs/svelte/issues/2828))
* Fix binding to props that have been renamed with `export { ... as ... }` ([#3508](https://github.com/sveltejs/svelte/issues/3508))
* Fix application of style scoping class in cases of ambiguity ([#3544](https://github.com/sveltejs/svelte/issues/3544))
* Check attributes have changed before setting them to avoid image flicker ([#3579](https://github.com/sveltejs/svelte/pull/3579))
* Fix generating malformed code for `{@debug}` tags with no dependencies ([#3588](https://github.com/sveltejs/svelte/issues/3588))
Expand Down
10 changes: 7 additions & 3 deletions src/compiler/compile/render_dom/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ export default function dom(

component.rewrite_props(({ name, reassigned, export_name }) => {
const value = `$${name}`;

const insert = (reassigned || export_name)
? b`${`$$subscribe_${name}`}()`
: b`@component_subscribe($$self, ${name}, #value => $$invalidate('${value}', ${value} = #value))`;
Expand Down Expand Up @@ -426,10 +426,14 @@ export default function dom(
}

const prop_names = x`[]`;
const renamed_prop_names = [];

// TODO find a more idiomatic way of doing this
props.forEach(v => {
(prop_names as any).elements.push({ type: 'Literal', value: v.export_name });
if (v.name !== v.export_name) {
renamed_prop_names.push(p`${v.export_name}: "${v.name}"`);
}
});

if (options.customElement) {
Expand All @@ -440,7 +444,7 @@ export default function dom(

${css.code && b`this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}

@init(this, { target: this.shadowRoot }, ${definition}, create_fragment, ${not_equal}, ${prop_names});
@init(this, { target: this.shadowRoot }, ${definition}, create_fragment, ${not_equal}, ${prop_names}, ${renamed_prop_names.length > 0 && x`{ ${renamed_prop_names} }`});

${dev_props_check}

Expand Down Expand Up @@ -492,7 +496,7 @@ export default function dom(
constructor(options) {
super(${options.dev && `options`});
${should_add_css && b`if (!@_document.getElementById("${component.stylesheet.id}-style")) ${add_css}();`}
@init(this, options, ${definition}, create_fragment, ${not_equal}, ${prop_names});
@init(this, options, ${definition}, create_fragment, ${not_equal}, ${prop_names}, ${renamed_prop_names.length > 0 && x`{ ${renamed_prop_names} }`});
${options.dev && b`@dispatch_dev("SvelteRegisterComponent", { component: this, tagName: "${name.name}", options, id: create_fragment.name });`}

${dev_props_check}
Expand Down
7 changes: 6 additions & 1 deletion src/runtime/internal/Component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ interface T$$ {
callbacks: any;
after_update: any[];
props: any;
renamed_props: any;
fragment: null|any;
not_equal: any;
before_update: any[];
Expand All @@ -23,6 +24,9 @@ interface T$$ {

export function bind(component, name, callback) {
if (component.$$.props.indexOf(name) === -1) return;
if (component.$$.renamed_props && name in component.$$.renamed_props) {
name = component.$$.renamed_props[name];
}
component.$$.bound[name] = callback;
callback(component.$$.ctx[name]);
}
Expand Down Expand Up @@ -70,7 +74,7 @@ function make_dirty(component, key) {
component.$$.dirty[key] = true;
}

export function init(component, options, instance, create_fragment, not_equal, prop_names) {
export function init(component, options, instance, create_fragment, not_equal, prop_names, renamed_props) {
const parent_component = current_component;
set_current_component(component);

Expand All @@ -82,6 +86,7 @@ export function init(component, options, instance, create_fragment, not_equal, p

// state
props: prop_names,
renamed_props,
update: noop,
not_equal,
bound: blank_object(),
Expand Down
4 changes: 4 additions & 0 deletions test/runtime/samples/component-binding-aliased/Widget.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<script>
let foo = 42;
export { foo as bar };
</script>
5 changes: 5 additions & 0 deletions test/runtime/samples/component-binding-aliased/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export default {
html: `
<div>42</div>
`
};
8 changes: 8 additions & 0 deletions test/runtime/samples/component-binding-aliased/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<script>
import Widget from './Widget.svelte';
let bar;
</script>

<Widget bind:bar/>

<div>{bar}</div>