refactor: simplify invalidate logic (#143)

ignatiusmb · web-flow · commit d4a5cc2ec8fd · 2023-10-02T14:08:53.000+07:00
diff --git a/src/lib/nodes/Node.svelte b/src/lib/nodes/Node.svelte
@@ -11,25 +11,14 @@
 	export let node: NonNullable<typeof $selected>;
 	export let depth = 1;
 
-	let _timeout: null | NodeJS.Timeout;
-	node.invalidate = () => {
-		if (_timeout) return;
-
-		_timeout = setTimeout(() => {
-			_timeout = null;
-			node = node;
-		}, 100);
-	};
+	node.invalidate = () => (node = node);
 
 	let lastLength = node.children.length;
 	let flash = false;
 	$: {
 		flash = flash || node.children.length !== lastLength;
 		lastLength = node.children.length;
 	}
-
-	// TODO: report, something really weird with the language server
-	const iterate = () => node.children;
 </script>
 
 {#if $visibility[node.type]}
@@ -125,8 +114,8 @@
 		{/if}
 	</li>
 {:else}
-	{#each iterate() as node (node.id)}
-		<svelte:self {node} {depth} />
+	{#each node.children as child (child.id)}
+		<svelte:self node={child} {depth} />
 	{/each}
 {/if}
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -39,8 +39,7 @@
 
 <svelte:window
 	on:keydown={({ target, key }) => {
-		if (target !== document.body) return;
-		if (!$selected?.invalidate) return;
+		if (target !== document.body || !$selected) return;
 
 		if (key === 'Enter') {
 			$selected.expanded = !$selected.expanded;
