Skip to content

Commit 38db671

Browse files
author
Jicheng Lu
committed
refine mark down style
1 parent 7880091 commit 38db671

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

src/lib/common/Markdown.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
export let containerClasses = "";
1010
1111
/** @type {boolean} */
12-
export let replaceText = false;
12+
export let rawText = false;
1313
1414
let displayText = '';
1515
$: {
16-
const markedText = replaceNewLine(marked(replaceText ? replaceMarkdown(text || '') : text || '')?.toString());
16+
const markedText = !rawText ? replaceNewLine(marked(replaceMarkdown(text || ''))?.toString()) : marked(text || '')?.toString();
1717
if (!!markedText && markedText.endsWith('<br>')) {
1818
const idx = markedText.lastIndexOf('<br>');
1919
displayText = markedText.substring(0, idx);

src/lib/scss/custom/common/_common.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ button:focus {
183183
}
184184

185185
p {
186-
margin-top: 0 !important;
187-
margin-bottom: 0 !important;
186+
margin-top: 1em !important;
187+
margin-bottom: 1em !important;
188188
}
189189

190190
a {

src/lib/scss/custom/pages/_chat.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@
218218
}
219219

220220
span p {
221-
margin-top: 0px !important;
222-
margin-bottom: 0px !important;
221+
margin-top: 1em !important;
222+
margin-bottom: 1em !important;
223223
}
224224

225225
.chat-indication {

src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@
1313
let logTextStyle = '';
1414
let is_collapsed = true;
1515
const unknownAgent = "Uknown";
16-
const includedSources = [
16+
const collapsedSources = [
1717
ContentLogSource.Prompt,
1818
ContentLogSource.AgentResponse,
1919
ContentLogSource.FunctionCall,
2020
ContentLogSource.Notification
2121
];
2222
23+
const rawTextSources = [
24+
ContentLogSource.AgentResponse,
25+
ContentLogSource.FunctionCall,
26+
];
27+
2328
$: {
2429
if (data.source === ContentLogSource.AgentResponse || data.source === ContentLogSource.Notification) {
2530
logDisplayStyle = 'border border-secondary';
@@ -63,11 +68,11 @@
6368
class={`rounded log-content ${logDisplayStyle}`}
6469
style="padding: 5px 8px;"
6570
>
66-
<div class:log-collapse={includedSources.includes(data.source) && !!is_collapsed}>
67-
<Markdown containerClasses={logTextStyle} text={data?.content} replaceText />
71+
<div class:log-collapse={collapsedSources.includes(data.source) && !!is_collapsed}>
72+
<Markdown containerClasses={logTextStyle} text={data?.content} rawText={rawTextSources.includes(data.source)} />
6873
</div>
6974

70-
{#if includedSources.includes(data.source)}
75+
{#if collapsedSources.includes(data.source)}
7176
<Button class='toggle-btn btn-sm' color="link" on:click={(e) => toggleText(e)}>
7277
{`${is_collapsed ? 'More +' : 'Less -'}`}
7378
</Button>

src/routes/chat/[agentId]/[conversationId]/rich-content/rc-message.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77

88
<div class="ctext-wrap bg-primary">
99
<div class="flex-shrink-0 align-self-center">
10-
<Markdown text={message?.rich_content?.message?.text || message?.text} />
10+
<Markdown text={message?.rich_content?.message?.text || message?.text} rawText />
1111
</div>
1212
</div>

src/routes/page/conversation/[conversationId]/conv-dialog-element.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Markdown
2222
containerClasses={'dialog-item-text'}
2323
text={dialog?.rich_content?.message?.text || dialog?.text}
24-
replaceText
24+
rawText
2525
/>
2626
</div>
2727

0 commit comments

Comments
 (0)