fix actions having no access to parent nodes (sveltejs#4252)

taylorzane · Dec 17, 2020 · 35a9225 · 35a9225
1 parent ef4d1ac
commit 35a9225
Show file tree

Hide file tree

Showing 29 changed files with 88 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Prevent text input cursor jumping in Safari with one-way binding ([#3449](https://github.com/sveltejs/svelte/issues/3449))
 * Expose compiler version in dev events ([#4047](https://github.com/sveltejs/svelte/issues/4047))
+* Don't run actions before their element is in the document ([#4166](https://github.com/sveltejs/svelte/issues/4166))
 * Fix reactive assignments with destructuring and stores where the destructured value should be undefined ([#4170](https://github.com/sveltejs/svelte/issues/4170))
 * Do not automatically declare variables in reactive declarations when assigning to a member expression ([#4212](https://github.com/sveltejs/svelte/issues/4212))
 

diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
@@ -450,15 +450,15 @@ export default class Block {
 			this.add_variable(dispose);
 
 			if (this.event_listeners.length === 1) {
-				this.chunks.hydrate.push(
+				this.chunks.mount.push(
 					b`${dispose} = ${this.event_listeners[0]};`
 				);
 
 				this.chunks.destroy.push(
 					b`${dispose}();`
 				);
 			} else {
-				this.chunks.hydrate.push(b`
+				this.chunks.mount.push(b`
 					${dispose} = [
 						${this.event_listeners}
 					];

diff --git a/test/js/samples/action-custom-event-handler/expected.js b/test/js/samples/action-custom-event-handler/expected.js
@@ -20,10 +20,10 @@ function create_fragment(ctx) {
 		c() {
 			button = element("button");
 			button.textContent = "foo";
-			dispose = action_destroyer(foo_action = foo.call(null, button, /*foo_function*/ ctx[1]));
 		},
 		m(target, anchor) {
 			insert(target, button, anchor);
+			dispose = action_destroyer(foo_action = foo.call(null, button, /*foo_function*/ ctx[1]));
 		},
 		p(ctx, [dirty]) {
 			if (foo_action && is_function(foo_action.update) && dirty & /*bar*/ 1) foo_action.update.call(null, /*foo_function*/ ctx[1]);
@@ -42,7 +42,7 @@ function handleFoo(bar) {
 }
 
 function foo(node, callback) {
-
+	
 }
 
 function instance($$self, $$props, $$invalidate) {

diff --git a/test/js/samples/action/expected.js b/test/js/samples/action/expected.js
@@ -21,10 +21,10 @@ function create_fragment(ctx) {
 			a = element("a");
 			a.textContent = "Test";
 			attr(a, "href", "#");
-			dispose = action_destroyer(link_action = link.call(null, a));
 		},
 		m(target, anchor) {
 			insert(target, a, anchor);
+			dispose = action_destroyer(link_action = link.call(null, a));
 		},
 		p: noop,
 		i: noop,

diff --git a/test/js/samples/bind-online/expected.js b/test/js/samples/bind-online/expected.js
@@ -14,13 +14,13 @@ function create_fragment(ctx) {
 	add_render_callback(/*onlinestatuschanged*/ ctx[1]);
 
 	return {
-		c() {
+		c: noop,
+		m(target, anchor) {
 			dispose = [
 				listen(window, "online", /*onlinestatuschanged*/ ctx[1]),
 				listen(window, "offline", /*onlinestatuschanged*/ ctx[1])
 			];
 		},
-		m: noop,
 		p: noop,
 		i: noop,
 		o: noop,

diff --git a/test/js/samples/bind-open/expected.js b/test/js/samples/bind-open/expected.js
@@ -20,12 +20,11 @@ function create_fragment(ctx) {
 
 			details.innerHTML = `<summary>summary</summary>content
 `;
-
-			dispose = listen(details, "toggle", /*details_toggle_handler*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, details, anchor);
 			details.open = /*open*/ ctx[0];
+			dispose = listen(details, "toggle", /*details_toggle_handler*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*open*/ 1) {

diff --git a/test/js/samples/bindings-readonly-order/expected.js b/test/js/samples/bindings-readonly-order/expected.js
@@ -26,16 +26,16 @@ function create_fragment(ctx) {
 			input1 = element("input");
 			attr(input0, "type", "file");
 			attr(input1, "type", "file");
-
-			dispose = [
-				listen(input0, "change", /*input0_change_handler*/ ctx[1]),
-				listen(input1, "change", /*input1_change_handler*/ ctx[2])
-			];
 		},
 		m(target, anchor) {
 			insert(target, input0, anchor);
 			insert(target, t, anchor);
 			insert(target, input1, anchor);
+
+			dispose = [
+				listen(input0, "change", /*input0_change_handler*/ ctx[1]),
+				listen(input1, "change", /*input1_change_handler*/ ctx[2])
+			];
 		},
 		p: noop,
 		i: noop,

diff --git a/test/js/samples/capture-inject-dev-only/expected.js b/test/js/samples/capture-inject-dev-only/expected.js
@@ -28,14 +28,14 @@ function create_fragment(ctx) {
 			t0 = text(/*foo*/ ctx[0]);
 			t1 = space();
 			input = element("input");
-			dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, p, anchor);
 			append(p, t0);
 			insert(target, t1, anchor);
 			insert(target, input, anchor);
 			set_input_value(input, /*foo*/ ctx[0]);
+			dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*foo*/ 1) set_data(t0, /*foo*/ ctx[0]);

diff --git a/test/js/samples/component-static-var/expected.js b/test/js/samples/component-static-var/expected.js
@@ -35,7 +35,6 @@ function create_fragment(ctx) {
 			create_component(bar.$$.fragment);
 			t1 = space();
 			input = element("input");
-			dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
 		},
 		m(target, anchor) {
 			mount_component(foo, target, anchor);
@@ -45,6 +44,7 @@ function create_fragment(ctx) {
 			insert(target, input, anchor);
 			set_input_value(input, /*z*/ ctx[0]);
 			current = true;
+			dispose = listen(input, "input", /*input_input_handler*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			const bar_changes = {};

diff --git a/test/js/samples/component-store-reassign-invalidate/expected.js b/test/js/samples/component-store-reassign-invalidate/expected.js
@@ -31,13 +31,13 @@ function create_fragment(ctx) {
 			t1 = space();
 			button = element("button");
 			button.textContent = "reset";
-			dispose = listen(button, "click", /*click_handler*/ ctx[2]);
 		},
 		m(target, anchor) {
 			insert(target, h1, anchor);
 			append(h1, t0);
 			insert(target, t1, anchor);
 			insert(target, button, anchor);
+			dispose = listen(button, "click", /*click_handler*/ ctx[2]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*$foo*/ 2) set_data(t0, /*$foo*/ ctx[1]);

diff --git a/test/js/samples/dont-invalidate-this/expected.js b/test/js/samples/dont-invalidate-this/expected.js
@@ -17,10 +17,10 @@ function create_fragment(ctx) {
 	return {
 		c() {
 			input = element("input");
-			dispose = listen(input, "input", make_uppercase);
 		},
 		m(target, anchor) {
 			insert(target, input, anchor);
+			dispose = listen(input, "input", make_uppercase);
 		},
 		p: noop,
 		i: noop,

diff --git a/test/js/samples/event-handler-dynamic/expected.js b/test/js/samples/event-handler-dynamic/expected.js
@@ -42,14 +42,6 @@ function create_fragment(ctx) {
 			t5 = space();
 			button2 = element("button");
 			button2.textContent = "click";
-
-			dispose = [
-				listen(button0, "click", /*updateHandler1*/ ctx[2]),
-				listen(button1, "click", /*updateHandler2*/ ctx[3]),
-				listen(button2, "click", function () {
-					if (is_function(/*clickHandler*/ ctx[0])) /*clickHandler*/ ctx[0].apply(this, arguments);
-				})
-			];
 		},
 		m(target, anchor) {
 			insert(target, p0, anchor);
@@ -61,6 +53,14 @@ function create_fragment(ctx) {
 			append(p1, t4);
 			insert(target, t5, anchor);
 			insert(target, button2, anchor);
+
+			dispose = [
+				listen(button0, "click", /*updateHandler1*/ ctx[2]),
+				listen(button1, "click", /*updateHandler2*/ ctx[3]),
+				listen(button2, "click", function () {
+					if (is_function(/*clickHandler*/ ctx[0])) /*clickHandler*/ ctx[0].apply(this, arguments);
+				})
+			];
 		},
 		p(new_ctx, [dirty]) {
 			ctx = new_ctx;

diff --git a/test/js/samples/event-handler-no-passive/expected.js b/test/js/samples/event-handler-no-passive/expected.js
@@ -20,10 +20,10 @@ function create_fragment(ctx) {
 			a = element("a");
 			a.textContent = "this should not navigate to example.com";
 			attr(a, "href", "https://example.com");
-			dispose = listen(a, "touchstart", touchstart_handler);
 		},
 		m(target, anchor) {
 			insert(target, a, anchor);
+			dispose = listen(a, "touchstart", touchstart_handler);
 		},
 		p: noop,
 		i: noop,

diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js
@@ -35,13 +35,6 @@ function create_fragment(ctx) {
 			t3 = space();
 			button2 = element("button");
 			button2.textContent = "or me!";
-
-			dispose = [
-				listen(button0, "click", stop_propagation(prevent_default(handleClick))),
-				listen(button1, "click", handleClick, { once: true, capture: true }),
-				listen(button2, "click", handleClick, true),
-				listen(div, "touchstart", handleTouchstart, { passive: true })
-			];
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -50,6 +43,13 @@ function create_fragment(ctx) {
 			append(div, button1);
 			append(div, t3);
 			append(div, button2);
+
+			dispose = [
+				listen(button0, "click", stop_propagation(prevent_default(handleClick))),
+				listen(button1, "click", handleClick, { once: true, capture: true }),
+				listen(button2, "click", handleClick, true),
+				listen(div, "touchstart", handleTouchstart, { passive: true })
+			];
 		},
 		p: noop,
 		i: noop,

diff --git a/test/js/samples/input-files/expected.js b/test/js/samples/input-files/expected.js
@@ -20,10 +20,10 @@ function create_fragment(ctx) {
 			input = element("input");
 			attr(input, "type", "file");
 			input.multiple = true;
-			dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, input, anchor);
+			dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
 		},
 		p: noop,
 		i: noop,

diff --git a/test/js/samples/input-no-initial-value/expected.js b/test/js/samples/input-no-initial-value/expected.js
@@ -31,18 +31,18 @@ function create_fragment(ctx) {
 			button.textContent = "Store";
 			attr(input, "type", "text");
 			input.required = true;
-
-			dispose = [
-				listen(input, "input", /*input_input_handler*/ ctx[2]),
-				listen(form, "submit", /*handleSubmit*/ ctx[1])
-			];
 		},
 		m(target, anchor) {
 			insert(target, form, anchor);
 			append(form, input);
 			set_input_value(input, /*test*/ ctx[0]);
 			append(form, t0);
 			append(form, button);
+
+			dispose = [
+				listen(input, "input", /*input_input_handler*/ ctx[2]),
+				listen(form, "submit", /*handleSubmit*/ ctx[1])
+			];
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*test*/ 1 && input.value !== /*test*/ ctx[0]) {

diff --git a/test/js/samples/input-range/expected.js b/test/js/samples/input-range/expected.js
@@ -22,16 +22,16 @@ function create_fragment(ctx) {
 		c() {
 			input = element("input");
 			attr(input, "type", "range");
+		},
+		m(target, anchor) {
+			insert(target, input, anchor);
+			set_input_value(input, /*value*/ ctx[0]);
 
 			dispose = [
 				listen(input, "change", /*input_change_input_handler*/ ctx[1]),
 				listen(input, "input", /*input_change_input_handler*/ ctx[1])
 			];
 		},
-		m(target, anchor) {
-			insert(target, input, anchor);
-			set_input_value(input, /*value*/ ctx[0]);
-		},
 		p(ctx, [dirty]) {
 			if (dirty & /*value*/ 1) {
 				set_input_value(input, /*value*/ ctx[0]);

diff --git a/test/js/samples/input-value/expected.js b/test/js/samples/input-value/expected.js
@@ -30,14 +30,14 @@ function create_fragment(ctx) {
 			t1 = text(/*name*/ ctx[0]);
 			t2 = text("!");
 			input.value = /*name*/ ctx[0];
-			dispose = listen(input, "input", /*onInput*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, input, anchor);
 			insert(target, t0, anchor);
 			insert(target, h1, anchor);
 			append(h1, t1);
 			append(h1, t2);
+			dispose = listen(input, "input", /*onInput*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*name*/ 1 && input.value !== /*name*/ ctx[0]) {

diff --git a/test/js/samples/input-without-blowback-guard/expected.js b/test/js/samples/input-without-blowback-guard/expected.js
@@ -19,11 +19,11 @@ function create_fragment(ctx) {
 		c() {
 			input = element("input");
 			attr(input, "type", "checkbox");
-			dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, input, anchor);
 			input.checked = /*foo*/ ctx[0];
+			dispose = listen(input, "change", /*input_change_handler*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*foo*/ 1) {

diff --git a/test/js/samples/instrumentation-script-if-no-block/expected.js b/test/js/samples/instrumentation-script-if-no-block/expected.js
@@ -30,14 +30,14 @@ function create_fragment(ctx) {
 			p = element("p");
 			t2 = text("x: ");
 			t3 = text(/*x*/ ctx[0]);
-			dispose = listen(button, "click", /*foo*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, button, anchor);
 			insert(target, t1, anchor);
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
+			dispose = listen(button, "click", /*foo*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*x*/ 1) set_data(t3, /*x*/ ctx[0]);

diff --git a/test/js/samples/instrumentation-script-x-equals-x/expected.js b/test/js/samples/instrumentation-script-x-equals-x/expected.js
@@ -31,14 +31,14 @@ function create_fragment(ctx) {
 			p = element("p");
 			t2 = text("number of things: ");
 			t3 = text(t3_value);
-			dispose = listen(button, "click", /*foo*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, button, anchor);
 			insert(target, t1, anchor);
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
+			dispose = listen(button, "click", /*foo*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*things*/ 1 && t3_value !== (t3_value = /*things*/ ctx[0].length + "")) set_data(t3, t3_value);

diff --git a/test/js/samples/instrumentation-template-if-no-block/expected.js b/test/js/samples/instrumentation-template-if-no-block/expected.js
@@ -30,14 +30,14 @@ function create_fragment(ctx) {
 			p = element("p");
 			t2 = text("x: ");
 			t3 = text(/*x*/ ctx[0]);
-			dispose = listen(button, "click", /*click_handler*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, button, anchor);
 			insert(target, t1, anchor);
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
+			dispose = listen(button, "click", /*click_handler*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*x*/ 1) set_data(t3, /*x*/ ctx[0]);

diff --git a/test/js/samples/instrumentation-template-x-equals-x/expected.js b/test/js/samples/instrumentation-template-x-equals-x/expected.js
@@ -31,14 +31,14 @@ function create_fragment(ctx) {
 			p = element("p");
 			t2 = text("number of things: ");
 			t3 = text(t3_value);
-			dispose = listen(button, "click", /*click_handler*/ ctx[1]);
 		},
 		m(target, anchor) {
 			insert(target, button, anchor);
 			insert(target, t1, anchor);
 			insert(target, p, anchor);
 			append(p, t2);
 			append(p, t3);
+			dispose = listen(button, "click", /*click_handler*/ ctx[1]);
 		},
 		p(ctx, [dirty]) {
 			if (dirty & /*things*/ 1 && t3_value !== (t3_value = /*things*/ ctx[0].length + "")) set_data(t3, t3_value);