Skip to content

Commit e229b75

Browse files
committed
fix(ScriptPreview): lastWords are not shown in Inspector when content.script contains only whitespace characters
1 parent ed98911 commit e229b75

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

packages/webui/src/client/ui/PreviewPopUp/PreviewPopUpContext.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useRef, useState } from 'react'
1+
import React, { useRef, useState } from 'react'
22
import { PreviewPopUp, PreviewPopUpHandle } from './PreviewPopUp.js'
33
import { Padding, Placement } from '@popperjs/core'
44
import { PreviewPopUpContent } from './PreviewPopUpContent.js'
@@ -178,7 +178,7 @@ export function convertSourceLayerItemToPreview(
178178

179179
return {
180180
contents: _.compact([
181-
item.content.previewRenderer
181+
item.content.previewRenderer && payload.template
182182
? {
183183
type: 'iframe',
184184
href: item.content.previewRenderer,
@@ -220,7 +220,7 @@ export function convertSourceLayerItemToPreview(
220220
options: { size: 'large' },
221221
}
222222
} catch (e) {
223-
console.error(`Failed to generate preview PopUp payload:`, e, item.content.previewPayload)
223+
console.error(`Failed to generate preview PopUp payload:`, e, item.content.previewPayload, item)
224224

225225
return {
226226
contents: _.compact([
@@ -449,10 +449,6 @@ export function PreviewPopUpContextProvider({ children }: React.PropsWithChildre
449449
},
450450
}
451451

452-
useEffect(() => {
453-
console.log(previewSession)
454-
}, [previewSession])
455-
456452
return (
457453
<PreviewPopUpContext.Provider value={context}>
458454
{children}

packages/webui/src/client/ui/PreviewPopUp/Previews/ScriptPreview.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { useMemo } from 'react'
12
import { getScriptPreview } from '../../../lib/ui/scriptPreview.js'
23
import { useTranslation } from 'react-i18next'
34
import Moment from 'react-moment'
@@ -16,17 +17,19 @@ export function ScriptPreview({ content }: ScriptPreviewProps): React.ReactEleme
1617
const { t } = useTranslation()
1718
const { startOfScript, endOfScript, breakScript } = getScriptPreview(content.script ?? '')
1819

20+
const fullScript = useMemo(() => content?.script?.trim(), [content?.script])
21+
1922
return (
2023
<div>
2124
<div className="preview-popUp__script">
22-
{content?.script ? (
25+
{fullScript ? (
2326
breakScript ? (
2427
<>
2528
<span className="mini-inspector__full-text text-broken">{startOfScript + '\u2026'}</span>
2629
<span className="mini-inspector__full-text text-broken text-end">{'\u2026' + endOfScript}</span>
2730
</>
2831
) : (
29-
<span className="mini-inspector__full-text">{content.script}</span>
32+
<span className="mini-inspector__full-text">{fullScript}</span>
3033
)
3134
) : content.lastWords ? (
3235
<span className="mini-inspector__full-text">{'\u2026' + content.lastWords}</span>

0 commit comments

Comments
 (0)