Merge pull request #1681 from sveltejs/gh-1666

correctly set select value on mount

src/compile/nodes/Attribute.ts

@@ -210,7 +210,7 @@ export default class Attribute extends Node {
 					}
 				`;
 
-				block.builders.hydrate.addBlock(deindent`
+				block.builders.mount.addBlock(deindent`
 					${last} = ${value};
 					${updater}
 				`);

test/js/samples/select-dynamic-value/expected-bundle.js

@@ -0,0 +1,224 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function append(target, node) {
+	target.appendChild(node);
+}
+
+function insert(target, node, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = noop;
+
+	this._fragment.d(detach !== false);
+	this._fragment = null;
+	this._state = {};
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		var handler = handlers[i];
+
+		if (!handler.__calling) {
+			try {
+				handler.__calling = true;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
+		}
+	}
+}
+
+function flush(component) {
+	component._lock = true;
+	callAll(component._beforecreate);
+	callAll(component._oncreate);
+	callAll(component._aftercreate);
+	component._lock = false;
+}
+
+function get() {
+	return this._state;
+}
+
+function init(component, options) {
+	component._handlers = blankObject();
+	component._slots = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = options.store || component.root.store;
+
+	if (!options.root) {
+		component._beforecreate = [];
+		component._oncreate = [];
+		component._aftercreate = [];
+	}
+}
+
+function on(eventName, handler) {
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	if (this.root._lock) return;
+	flush(this.root);
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		this.fire("state", { changed: changed, current: this._state, previous: oldState });
+		this._fragment.p(changed, this._state);
+		this.fire("update", { changed: changed, current: this._state, previous: oldState });
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+var proto = {
+	destroy,
+	get,
+	fire,
+	on,
+	set,
+	_recompute: noop,
+	_set,
+	_mount,
+	_differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, ctx) {
+	var select, option, text, option_1, text_1, select_value_value;
+
+	return {
+		c() {
+			select = createElement("select");
+			option = createElement("option");
+			text = createText("1");
+			option_1 = createElement("option");
+			text_1 = createText("2");
+			option.__value = "1";
+			option.value = option.__value;
+			option_1.__value = "2";
+			option_1.value = option_1.__value;
+		},
+
+		m(target, anchor) {
+			insert(target, select, anchor);
+			append(select, option);
+			append(option, text);
+			append(select, option_1);
+			append(option_1, text_1);
+
+			select_value_value = ctx.current;
+			for (var i = 0; i < select.options.length; i += 1) {
+				var option_2 = select.options[i];
+
+				if (option_2.__value === select_value_value) {
+					option_2.selected = true;
+					break;
+				}
+			}
+		},
+
+		p(changed, ctx) {
+			if ((changed.current) && select_value_value !== (select_value_value = ctx.current)) {
+				for (var i = 0; i < select.options.length; i += 1) {
+					var option_2 = select.options[i];
+
+					if (option_2.__value === select_value_value) {
+						option_2.selected = true;
+						break;
+					}
+				}
+			}
+		},
+
+		d(detach) {
+			if (detach) {
+				detachNode(select);
+			}
+		}
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+	this._intro = true;
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;

test/js/samples/select-dynamic-value/expected.js

@@ -0,0 +1,73 @@
+/* generated by Svelte vX.Y.Z */
+import { append, assign, createElement, createText, detachNode, init, insert, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, ctx) {
+	var select, option, text, option_1, text_1, select_value_value;
+
+	return {
+		c() {
+			select = createElement("select");
+			option = createElement("option");
+			text = createText("1");
+			option_1 = createElement("option");
+			text_1 = createText("2");
+			option.__value = "1";
+			option.value = option.__value;
+			option_1.__value = "2";
+			option_1.value = option_1.__value;
+		},
+
+		m(target, anchor) {
+			insert(target, select, anchor);
+			append(select, option);
+			append(option, text);
+			append(select, option_1);
+			append(option_1, text_1);
+
+			select_value_value = ctx.current;
+			for (var i = 0; i < select.options.length; i += 1) {
+				var option_2 = select.options[i];
+
+				if (option_2.__value === select_value_value) {
+					option_2.selected = true;
+					break;
+				}
+			}
+		},
+
+		p(changed, ctx) {
+			if ((changed.current) && select_value_value !== (select_value_value = ctx.current)) {
+				for (var i = 0; i < select.options.length; i += 1) {
+					var option_2 = select.options[i];
+
+					if (option_2.__value === select_value_value) {
+						option_2.selected = true;
+						break;
+					}
+				}
+			}
+		},
+
+		d(detach) {
+			if (detach) {
+				detachNode(select);
+			}
+		}
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+	this._intro = true;
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;

test/js/samples/select-dynamic-value/input.html

@@ -0,0 +1,4 @@
+<select value={current}>
+	<option value="1">1</option>
+	<option value="2">2</option>
+</select>