Keep line breaks for TreeViewItemContent

intuitem · Feb 13, 2024 · ed5fce3 · ed5fce3
1 parent 04f7138
commit ed5fce3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemContent.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemContent.svelte
@@ -102,7 +102,9 @@
 					</a>
 				</span>
 			{:else}
-				{content}
+				<p class="max-w-[65ch] whitespace-pre-line">
+					{content}
+				</p>
 			{/if}
 		</span>
 		{#if (threats && threats.length > 0) || (security_functions && security_functions.length > 0)}

diff --git a/frontend/src/routes/(app)/frameworks/[id=uuid]/TreeViewItemContent.svelte b/frontend/src/routes/(app)/frameworks/[id=uuid]/TreeViewItemContent.svelte
@@ -21,16 +21,26 @@
 </script>
 
 <div>
-	<span style="font-weight: {hasChildren ? 600 : 300};">
-		{content}
+	<span class="whitespace-pre-line" style="font-weight: {hasChildren ? 600 : 300};">
+		<p class="max-w-[65ch]">
+			{content}
+		</p>
 	</span>
 	{#if (threats && threats.length > 0) || (security_functions && security_functions.length > 0)}
 		<div
 			role="button"
 			tabindex="0"
 			class="underline text-sm hover:text-primary-400 {classesShowInfoText(showInfo)}"
-			on:click={(_) => (showInfo = !showInfo)}
-			on:keydown={(_) => (showInfo = !showInfo)}
+			on:click={(e) => {
+				e.preventDefault();
+				showInfo = !showInfo;
+			}}
+			on:keydown={(e) => {
+				if (e.key === 'Enter') {
+					e.preventDefault();
+					showInfo = !showInfo;
+				}
+			}}
 		>
 			<i class="text-xs fa-solid fa-info-circle" /> Learn more
 		</div>