Merge pull request #2996 from sveltejs/init-contenteditable

Initialise html/text bindings from DOM

site/content/docs/02-template-syntax.md

@@ -510,6 +510,14 @@ When the value of an `<option>` matches its text content, the attribute can be o
 </select>
 ```
 
+---
+
+Elements with the `contenteditable` attribute support `innerHTML` and `textContent` bindings.
+
+```html
+<div contenteditable="true" bind:innerHTML={html}></div>
+```
+
 ##### Media element bindings
 
 ---

site/content/tutorial/06-bindings/08-contenteditable-bindings/app-a/App.svelte

@@ -0,0 +1,15 @@
+<script>
+	let html = '<p>Write some text!</p>';
+</script>
+
+<div contenteditable="true"></div>
+
+<pre>{html}</pre>
+
+<style>
+	[contenteditable] {
+		padding: 0.5em;
+		border: 1px solid #eee;
+		border-radius: 4px;
+	}
+</style>

site/content/tutorial/06-bindings/08-contenteditable-bindings/app-b/App.svelte

@@ -0,0 +1,18 @@
+<script>
+	let html = '<p>Write some text!</p>';
+</script>
+
+<div
+	contenteditable="true"
+	bind:innerHTML={html}
+></div>
+
+<pre>{html}</pre>
+
+<style>
+	[contenteditable] {
+		padding: 0.5em;
+		border: 1px solid #eee;
+		border-radius: 4px;
+	}
+</style>

site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md

@@ -0,0 +1,12 @@
+---
+title: Contenteditable bindings
+---
+
+Elements with a `contenteditable="true"` attribute support `textContent` and `innerHTML` bindings:
+
+```html
+<div
+	contenteditable="true"
+	bind:innerHTML={html}
+></div>
+```

src/compiler/compile/nodes/Element.ts

@@ -608,8 +608,8 @@ export default class Element extends Node {
 					});
 				}
 			} else if (
-				name === 'text' ||
-				name === 'html'
+				name === 'textContent' ||
+				name === 'innerHTML'
 			) {
 				const contenteditable = this.attributes.find(
 					(attribute: Attribute) => attribute.name === 'contenteditable'
@@ -618,7 +618,7 @@ export default class Element extends Node {
 				if (!contenteditable) {
 					component.error(binding, {
 						code: `missing-contenteditable-attribute`,
-						message: `'contenteditable' attribute is required for text and html two-way bindings`
+						message: `'contenteditable' attribute is required for textContent and innerHTML two-way bindings`
 					});
 				} else if (contenteditable && !contenteditable.is_static) {
 					component.error(contenteditable, {

src/compiler/compile/render-dom/wrappers/Element/Binding.ts

@@ -133,6 +133,14 @@ export default class BindingWrapper {
 				break;
 			}
 
+			case 'textContent':
+				update_conditions.push(`${this.snippet} !== ${parent.var}.textContent`);
+				break;
+
+			case 'innerHTML':
+				update_conditions.push(`${this.snippet} !== ${parent.var}.innerHTML`);
+				break;
+
 			case 'currentTime':
 			case 'playbackRate':
 			case 'volume':
@@ -162,7 +170,9 @@ export default class BindingWrapper {
 			);
 		}
 
-		if (!/(currentTime|paused)/.test(this.node.name)) {
+		if (this.node.name === 'innerHTML' || this.node.name === 'textContent') {
+			block.builders.mount.add_block(`if (${this.snippet} !== void 0) ${update_dom}`);
+		} else if (!/(currentTime|paused)/.test(this.node.name)) {
 			block.builders.mount.add_block(update_dom);
 		}
 	}
@@ -198,14 +208,6 @@ function get_dom_updater(
 		return `${element.var}.checked = ${condition};`;
 	}
 
-	if (binding.node.name === 'text') {
-		return `if (${binding.snippet} !== ${element.var}.textContent) ${element.var}.textContent = ${binding.snippet};`;
-	}
-
-	if (binding.node.name === 'html') {
-		return `if (${binding.snippet} !== ${element.var}.innerHTML) ${element.var}.innerHTML = ${binding.snippet};`;
-	}
-
 	return `${element.var}.${binding.node.name} = ${binding.snippet};`;
 }
 
@@ -318,14 +320,6 @@ function get_value_from_dom(
 		return `@time_ranges_to_array(this.${name})`;
 	}
 
-	if (name === 'text') {
-		return `this.textContent`;
-	}
-
-	if (name === 'html') {
-		return `this.innerHTML`;
-	}
-
 	// everything else
 	return `this.${name}`;
 }

src/compiler/compile/render-dom/wrappers/Element/index.ts

@@ -30,7 +30,7 @@ const events = [
 	{
 		event_names: ['input'],
 		filter: (node: Element, name: string) =>
-			(name === 'text' || name === 'html') &&
+			(name === 'textContent' || name === 'innerHTML') &&
 			node.attributes.some(attribute => attribute.name === 'contenteditable')
 	},
 	{
@@ -510,7 +510,19 @@ export default class ElementWrapper extends Wrapper {
 				.map(binding => `${binding.snippet} === void 0`)
 				.join(' || ');
 
-			if (this.node.name === 'select' || group.bindings.find(binding => binding.node.name === 'indeterminate' || binding.is_readonly_media_attribute())) {
+			const should_initialise = (
+				this.node.name === 'select' ||
+				group.bindings.find(binding => {
+					return (
+						binding.node.name === 'indeterminate' ||
+						binding.node.name === 'textContent' ||
+						binding.node.name === 'innerHTML' ||
+						binding.is_readonly_media_attribute()
+					);
+				})
+			);
+
+			if (should_initialise) {
 				const callback = has_local_function ? handler : `() => ${callee}.call(${this.var})`;
 				block.builders.hydrate.add_line(
 					`if (${some_initial_state_is_undefined}) @add_render_callback(${callback});`

src/compiler/compile/render-ssr/handlers/Element.ts

@@ -53,7 +53,11 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 	slot_scopes: Map<any, any>;
 }) {
 	let opening_tag = `<${node.name}`;
-	let node_contents; // awkward special case
+
+	// awkward special case
+	let node_contents;
+	let value;
+
 	const contenteditable = (
 		node.name !== 'textarea' &&
 		node.name !== 'input' &&
@@ -150,33 +154,34 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 
 		if (name === 'group') {
 			// TODO server-render group bindings
-		} else if (contenteditable && (name === 'text' || name === 'html')) {
-			const snippet = snip(expression);
-			if (name == 'text') {
-				node_contents = '${@escape(' + snippet + ')}';
-			} else {
-				// Do not escape HTML content
-				node_contents = '${' + snippet + '}';
-			}
+		} else if (contenteditable && (name === 'textContent' || name === 'innerHTML')) {
+			node_contents = snip(expression);
+			value = name === 'textContent' ? '@escape($$value)' : '$$value';
 		} else if (binding.name === 'value' && node.name === 'textarea') {
 			const snippet = snip(expression);
-			node_contents='${(' + snippet + ') || ""}';
+			node_contents = '${(' + snippet + ') || ""}';
 		} else {
 			const snippet = snip(expression);
-			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + JSON.stringify(v))) : "")(' + snippet + ')}';
+			opening_tag += '${@add_attribute("' + name + '", ' + snippet + ')}';
 		}
 	});
 
 	if (add_class_attribute) {
-		opening_tag += `\${((v) => v ? ' class="' + v + '"' : '')([${class_expression}].join(' ').trim())}`;
+		opening_tag += `\${@add_classes([${class_expression}].join(' ').trim())}`;
 	}
 
 	opening_tag += '>';
 
 	renderer.append(opening_tag);
 
-	if ((node.name === 'textarea' || contenteditable) && node_contents !== undefined) {
-		renderer.append(node_contents);
+	if (node_contents !== undefined) {
+		if (contenteditable) {
+			renderer.append('${($$value => $$value === void 0 ? `');
+			renderer.render(node.children, options);
+			renderer.append('` : ' + value + ')(' + node_contents + ')}');
+		} else {
+			renderer.append(node_contents);
+		}
 	} else {
 		renderer.render(node.children, options);
 	}

src/runtime/internal/ssr.ts

@@ -119,3 +119,12 @@ export function get_store_value<T>(store: Readable<T>): T | undefined {
 	store.subscribe(_ => value = _)();
 	return value;
 }
+
+export function add_attribute(name, value) {
+	if (!value) return '';
+	return ` ${name}${value === true ? '' : `=${JSON.stringify(value)}`}`;
+}
+
+export function add_classes(classes) {
+	return classes ? ` class="${classes}"` : ``;
+}

test/runtime/samples/binding-contenteditable-html-initial/_config.js

@@ -0,0 +1,40 @@
+export default {
+	html: `
+		<editor contenteditable="true"><b>world</b></editor>
+		<p>hello <b>world</b></p>
+	`,
+
+	ssrHtml: `
+		<editor contenteditable="true"><b>world</b></editor>
+		<p>hello undefined</p>
+	`,
+
+	async test({ assert, component, target, window }) {
+		assert.equal(component.name, '<b>world</b>');
+
+		const el = target.querySelector('editor');
+
+		el.innerHTML = 'every<span>body</span>';
+
+		// No updates to data yet
+		assert.htmlEqual(target.innerHTML, `
+			<editor contenteditable="true">every<span>body</span></editor>
+			<p>hello <b>world</b></p>
+		`);
+
+		// Handle user input
+		const event = new window.Event('input');
+		await el.dispatchEvent(event);
+		assert.htmlEqual(target.innerHTML, `
+			<editor contenteditable="true">every<span>body</span></editor>
+			<p>hello every<span>body</span></p>
+		`);
+
+		component.name = 'good<span>bye</span>';
+		assert.equal(el.innerHTML, 'good<span>bye</span>');
+		assert.htmlEqual(target.innerHTML, `
+			<editor contenteditable="true">good<span>bye</span></editor>
+			<p>hello good<span>bye</span></p>
+		`);
+	},
+};

test/runtime/samples/binding-contenteditable-html-initial/main.svelte

@@ -0,0 +1,8 @@
+<script>
+	export let name;
+</script>
+
+<editor contenteditable="true" bind:innerHTML={name}>
+	<b>world</b>
+</editor>
+<p>hello {@html name}</p>

test/runtime/samples/binding-contenteditable-html/_config.js

@@ -8,11 +8,6 @@ export default {
 		<p>hello <b>world</b></p>
 	`,
 
-	ssrHtml: `
-		<editor contenteditable="true"><b>world</b></editor>
-		<p>hello <b>world</b></p>
-	`,
-
 	async test({ assert, component, target, window }) {
 		const el = target.querySelector('editor');
 		assert.equal(el.innerHTML, '<b>world</b>');

test/runtime/samples/binding-contenteditable-html/main.svelte

@@ -0,0 +1,6 @@
+<script>
+	export let name;
+</script>
+
+<editor contenteditable="true" bind:innerHTML={name}></editor>
+<p>hello {@html name}</p>

test/runtime/samples/binding-contenteditable-text-initial/_config.js

@@ -0,0 +1,34 @@
+export default {
+	html: `
+		<editor contenteditable="true"><b>world</b></editor>
+		<p>hello world</p>
+	`,
+
+	ssrHtml: `
+		<editor contenteditable="true"><b>world</b></editor>
+		<p>hello undefined</p>
+	`,
+
+	async test({ assert, component, target, window }) {
+		assert.equal(component.name, 'world');
+
+		const el = target.querySelector('editor');
+
+		const event = new window.Event('input');
+
+		el.textContent = 'everybody';
+		await el.dispatchEvent(event);
+
+		assert.htmlEqual(target.innerHTML, `
+			<editor contenteditable="true">everybody</editor>
+			<p>hello everybody</p>
+		`);
+
+		component.name = 'goodbye';
+		assert.equal(el.textContent, 'goodbye');
+		assert.htmlEqual(target.innerHTML, `
+			<editor contenteditable="true">goodbye</editor>
+			<p>hello goodbye</p>
+		`);
+	},
+};

test/runtime/samples/binding-contenteditable-text-initial/main.svelte

@@ -0,0 +1,8 @@
+<script>
+	export let name;
+</script>
+
+<editor contenteditable="true" bind:textContent={name}>
+	<b>world</b>
+</editor>
+<p>hello {name}</p>

test/runtime/samples/binding-contenteditable-text/_config.js

@@ -8,11 +8,6 @@ export default {
 		<p>hello world</p>
 	`,
 
-	ssrHtml: `
-		<editor contenteditable="true">world</editor>
-		<p>hello world</p>
-	`,
-
 	async test({ assert, component, target, window }) {
 		const el = target.querySelector('editor');
 		assert.equal(el.textContent, 'world');

test/runtime/samples/binding-contenteditable-text/main.svelte

@@ -0,0 +1,6 @@
+<script>
+	export let name;
+</script>
+
+<editor contenteditable="true" bind:textContent={name}></editor>
+<p>hello {name}</p>

test/runtime/samples/contenteditable-html/main.svelte

@@ -1,6 +0,0 @@
-<script>
-    export let name;
-</script>
-
-<editor contenteditable="true" bind:html={name}></editor>
-<p>hello {@html name}</p>

test/runtime/samples/contenteditable-text/main.svelte

@@ -1,6 +0,0 @@
-<script>
-    export let name;
-</script>
-
-<editor contenteditable="true" bind:text={name}></editor>
-<p>hello {name}</p>

test/validator/samples/contenteditable-dynamic/input.svelte

@@ -3,4 +3,4 @@
 
     let toggle = false;
 </script>
-<editor contenteditable={toggle} bind:html={name}></editor>
+<editor contenteditable={toggle} bind:innerHTML={name}></editor>

test/validator/samples/contenteditable-missing/errors.json

@@ -1,6 +1,6 @@
 [{
 	"code": "missing-contenteditable-attribute",
-	"message": "'contenteditable' attribute is required for text and html two-way bindings",
+	"message": "'contenteditable' attribute is required for textContent and innerHTML two-way bindings",
 	"start": {
 		"line": 4,
 		"column": 8,
@@ -8,8 +8,8 @@
 	},
 	"end": {
 		"line": 4,
-		"column": 24,
-		"character": 64
+		"column": 31,
+		"character": 71
 	},
 	"pos": 48
 }]

test/validator/samples/contenteditable-missing/input.svelte

@@ -1,4 +1,4 @@
 <script>
     export let name;
 </script>
-<editor bind:text={name}></editor>
+<editor bind:textContent={name}></editor>