From b45b264b723e66fbb01c3fc1b2e66345d4670212 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Sun, 6 May 2018 09:14:23 -0400
Subject: [PATCH] fix handling of shorthand event handler in dynamic components
---
src/compile/nodes/Component.ts | 2 +-
.../Widget.html | 1 +
.../_config.js | 18 ++++++++++++++++++
.../main.html | 9 +++++++++
4 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html
create mode 100644 test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js
create mode 100644 test/runtime/samples/event-handler-shorthand-dynamic-component/main.html
diff --git a/src/compile/nodes/Component.ts b/src/compile/nodes/Component.ts
index 71c5f8082b..e25703dd2e 100644
--- a/src/compile/nodes/Component.ts
+++ b/src/compile/nodes/Component.ts
@@ -364,7 +364,7 @@ export default class Component extends Node {
${this.handlers.map(handler => deindent`
function ${handler.var}(event) {
- ${handler.snippet}
+ ${handler.snippet || `#component.fire("${handler.name}", event);`}
}
if (${name}) ${name}.on("${handler.name}", ${handler.var});
diff --git a/test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html b/test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html
new file mode 100644
index 0000000000..47e1f95a2f
--- /dev/null
+++ b/test/runtime/samples/event-handler-shorthand-dynamic-component/Widget.html
@@ -0,0 +1 @@
+<button on:click='fire("foo", { answer: 42 })'>click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js b/test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js
new file mode 100644
index 0000000000..e0e21f1400
--- /dev/null
+++ b/test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js
@@ -0,0 +1,18 @@
+export default {
+ html: `
+ <button>click me</button>
+ `,
+
+ test (assert, component, target, window) {
+ const button = target.querySelector('button');
+ const event = new window.MouseEvent('click');
+
+ let answer;
+ component.on('foo', event => {
+ answer = event.answer;
+ });
+
+ button.dispatchEvent(event);
+ assert.equal(answer, 42);
+ }
+};
diff --git a/test/runtime/samples/event-handler-shorthand-dynamic-component/main.html b/test/runtime/samples/event-handler-shorthand-dynamic-component/main.html
new file mode 100644
index 0000000000..388a087608
--- /dev/null
+++ b/test/runtime/samples/event-handler-shorthand-dynamic-component/main.html
@@ -0,0 +1,9 @@
+<svelte:component this={Widget} on:foo/>
+
+<script>
+ import Widget from './Widget.html';
+
+ export default {
+ data: () => ({ Widget })
+ };
+</script>