Conditionally add bubble to fragment

Author: Timothy Johnson

src/compiler/compile/render_dom/Block.ts

@@ -1,6 +1,6 @@
 import Renderer from './Renderer';
 import Wrapper from './wrappers/shared/Wrapper';
-import { b, x } from 'code-red';
+import { b, x, p } from 'code-red';
 import { Node, Identifier, ArrayPattern } from 'estree';
 import { is_head } from './wrappers/shared/is_head';
 
@@ -294,9 +294,7 @@ export default class Block {
 			}`;
 		}
 
-		if (this.chunks.bubble.length === 0) {
-			properties.bubble = noop;
-		} else {
+		if (this.chunks.bubble.length > 0) {
 			const mounted: Identifier = {
 				type: 'Identifier',
 				name: '#mounted'
@@ -410,7 +408,6 @@ export default class Block {
 			l: ${properties.claim},
 			h: ${properties.hydrate},
 			m: ${properties.mount},
-			b: ${properties.bubble},
 			p: ${properties.update},
 			r: ${properties.measure},
 			f: ${properties.fix},
@@ -420,6 +417,10 @@ export default class Block {
 			d: ${properties.destroy}
 		}`;
 
+		if (properties.bubble) {
+			return_value.properties.push(p`b: ${properties.bubble}`);
+		}
+
 		const block = dev && this.get_unique_name('block');
 
 		const body = b`

src/runtime/internal/Component.ts

@@ -216,7 +216,10 @@ export class SvelteComponent {
 	}
 
 	$on(type, callback) {
-		const dispose = this.$$.fragment && this.$$.fragment.b(type, callback) || noop;
+		const dispose = this.$$.fragment
+			&& this.$$.fragment.b
+			&& this.$$.fragment.b(type, callback)
+			|| noop;
 		const callbacks = (this.$$.callbacks[type] || (this.$$.callbacks[type] = []));
 		callbacks.push(callback);
 

test/js/samples/action-custom-event-handler/expected.js

@@ -26,7 +26,6 @@ function create_fragment(ctx) {
 			if (remount) dispose();
 			dispose = action_destroyer(foo_action = foo.call(null, button, /*foo_function*/ ctx[1]));
 		},
-		b: noop,
 		p(ctx, [dirty]) {
 			if (foo_action && is_function(foo_action.update) && dirty & /*bar*/ 1) foo_action.update.call(null, /*foo_function*/ ctx[1]);
 		},

test/js/samples/action/expected.js

@@ -27,7 +27,6 @@ function create_fragment(ctx) {
 			if (remount) dispose();
 			dispose = action_destroyer(link_action = link.call(null, a));
 		},
-		b: noop,
 		p: noop,
 		i: noop,
 		o: noop,

test/js/samples/bind-online/expected.js

@@ -23,7 +23,6 @@ function create_fragment(ctx) {
 				listen(window, "offline", /*onlinestatuschanged*/ ctx[1])
 			];
 		},
-		b: noop,
 		p: noop,
 		i: noop,
 		o: noop,

test/js/samples/bind-open/expected.js

@@ -27,7 +27,6 @@ function create_fragment(ctx) {
 			if (remount) dispose();
 			dispose = listen(details, "toggle", /*details_toggle_handler*/ ctx[1]);
 		},
-		b: noop,
 		p(ctx, [dirty]) {
 			if (dirty & /*open*/ 1) {
 				details.open = /*open*/ ctx[0];

test/js/samples/bind-width-height/expected.js

@@ -25,7 +25,6 @@ function create_fragment(ctx) {
 			insert(target, div, anchor);
 			div_resize_listener = add_resize_listener(div, /*div_elementresize_handler*/ ctx[2].bind(div));
 		},
-		b: noop,
 		p: noop,
 		i: noop,
 		o: noop,

test/js/samples/bindings-readonly-order/expected.js

@@ -38,7 +38,6 @@ function create_fragment(ctx) {
 				listen(input1, "change", /*input1_change_handler*/ ctx[2])
 			];
 		},
-		b: noop,
 		p: noop,
 		i: noop,
 		o: noop,

test/js/samples/capture-inject-dev-only/expected.js

@@ -38,7 +38,6 @@ function create_fragment(ctx) {
 			if (remount) dispose();
 			dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
 		},
-		b: noop,
 		p(ctx, [dirty]) {
 			if (dirty & /*foo*/ 1) set_data(t0, /*foo*/ ctx[0]);
 

test/js/samples/capture-inject-state/expected.js

@@ -67,7 +67,6 @@ function create_fragment(ctx) {
 			append_dev(p, t9);
 			append_dev(p, t10);
 		},
-		b: noop,
 		p: function update(ctx, [dirty]) {
 			if (dirty & /*prop*/ 1) set_data_dev(t0, /*prop*/ ctx[0]);
 			if (dirty & /*realName*/ 2) set_data_dev(t2, /*realName*/ ctx[1]);