From 9a154e0d3b41dbdf56624537fd553023e6b13420 Mon Sep 17 00:00:00 2001
From: deviprsd <deviprsd21@gmail.com>
Date: Mon, 29 Jul 2019 00:07:55 -0500
Subject: [PATCH] fixes sequential order

---
 package-lock.json                             |  2 +-
 src/runtime/internal/scheduler.ts             | 21 +++++++++--------
 .../_config.js                                | 23 +++++++++++++++++++
 .../main.svelte                               | 15 ++++++++++++
 4 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 test/runtime/samples/binding-this-sequential-lifcycle-hooks/_config.js
 create mode 100644 test/runtime/samples/binding-this-sequential-lifcycle-hooks/main.svelte

diff --git a/package-lock.json b/package-lock.json
index bcde04de2034..66dd55ef883a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.6.7",
+  "version": "3.6.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/runtime/internal/scheduler.ts b/src/runtime/internal/scheduler.ts
index e3d7181fcbec..8d9002be1a3b 100644
--- a/src/runtime/internal/scheduler.ts
+++ b/src/runtime/internal/scheduler.ts
@@ -35,15 +35,18 @@ export function flush() {
 	const seen_callbacks = new Set();
 
 	do {
-		// first, call beforeUpdate functions
-		// and update components
-		while (dirty_components.length) {
-			const component = dirty_components.shift();
-			set_current_component(component);
-			update(component.$$);
-		}
-
-		while (binding_callbacks.length) binding_callbacks.pop()();
+		do {
+			// check dirty bindings first
+			while (binding_callbacks.length) binding_callbacks.pop()();
+
+			// then call beforeUpdate functions
+			// and update components
+			while (dirty_components.length) {
+				const component = dirty_components.shift();
+				set_current_component(component);
+				update(component.$$);
+			}
+		} while (binding_callbacks.length);
 
 		// then, once components are updated, call
 		// afterUpdate functions. This may cause
diff --git a/test/runtime/samples/binding-this-sequential-lifcycle-hooks/_config.js b/test/runtime/samples/binding-this-sequential-lifcycle-hooks/_config.js
new file mode 100644
index 000000000000..9fc60a87f714
--- /dev/null
+++ b/test/runtime/samples/binding-this-sequential-lifcycle-hooks/_config.js
@@ -0,0 +1,23 @@
+export default {
+	html: `<div>bind</div>`,
+
+	async test({ assert, component, target }) {
+		assert.equal(component.ref, target.querySelector('div'));
+		assert.equal(component.hooks[0], 'Before');
+		assert.equal(component.hooks.pop(), 'After');
+
+		while (component.hooks.length) component.hooks.pop();
+
+		component.bind = false;
+		assert.equal(component.ref, null);
+		assert.equal(component.hooks[0], 'Before');
+		assert.equal(component.hooks.pop(), 'After');
+
+		while (component.hooks.length) component.hooks.pop();
+
+		component.bind = true;
+		assert.equal(component.ref, target.querySelector('div'));
+		assert.equal(component.hooks[0], 'Before');
+		assert.equal(component.hooks.pop(), 'After');
+	}
+};
diff --git a/test/runtime/samples/binding-this-sequential-lifcycle-hooks/main.svelte b/test/runtime/samples/binding-this-sequential-lifcycle-hooks/main.svelte
new file mode 100644
index 000000000000..14d2f3cb36d6
--- /dev/null
+++ b/test/runtime/samples/binding-this-sequential-lifcycle-hooks/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	// adapted from https://svelte.dev/repl/8a96e6e545244bff9fd0125b152d6840?version=3.6.9
+	import { afterUpdate, beforeUpdate, onMount } from 'svelte';
+
+	export let ref = null, bind = true, hooks = [];
+
+	// using push to not make hooks reactive
+  beforeUpdate(() => hooks.push('Before'))
+  afterUpdate(() => hooks.push('After'))
+	onMount(() => hooks.push('Mount'))
+</script>
+
+{#if bind}
+	<div bind:this={ref}>bind</div>
+{/if}