Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions playwright/rendering-modes.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@

await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered')

await expect(getPreviewFrame(page).locator('body > knighted-preview-root')).toHaveCount(

Check failure on line 225 in playwright/rendering-modes.spec.ts

View workflow job for this annotation

GitHub Actions / E2E (Playwright, chromium)

[chromium] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed

1) [chromium] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: expect(locator).toHaveCount(expected) failed Locator: locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') Expected: 1 Received: 0 Timeout: 90000ms Call log: - Expect "toHaveCount" with timeout 90000ms - waiting for locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') 93 × locator resolved to 0 elements - unexpected value "0" 223 | await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered') 224 | > 225 | await expect(getPreviewFrame(page).locator('body > knighted-preview-root')).toHaveCount( | ^ 226 | 1, 227 | ) 228 | }) at /home/runner/work/develop/develop/playwright/rendering-modes.spec.ts:225:79

Check failure on line 225 in playwright/rendering-modes.spec.ts

View workflow job for this annotation

GitHub Actions / E2E (Playwright, chromium)

[chromium] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed

1) [chromium] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed Error: expect(locator).toHaveCount(expected) failed Locator: locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') Expected: 1 Received: 0 Timeout: 90000ms Call log: - Expect "toHaveCount" with timeout 90000ms - waiting for locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') 93 × locator resolved to 0 elements - unexpected value "0" 223 | await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered') 224 | > 225 | await expect(getPreviewFrame(page).locator('body > knighted-preview-root')).toHaveCount( | ^ 226 | 1, 227 | ) 228 | }) at /home/runner/work/develop/develop/playwright/rendering-modes.spec.ts:225:79

Check failure on line 225 in playwright/rendering-modes.spec.ts

View workflow job for this annotation

GitHub Actions / E2E (Playwright, webkit, shard 2/3)

[webkit] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed

1) [webkit] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: expect(locator).toHaveCount(expected) failed Locator: locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') Expected: 1 Received: 0 Timeout: 90000ms Call log: - Expect "toHaveCount" with timeout 90000ms - waiting for locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') 92 × locator resolved to 0 elements - unexpected value "0" 223 | await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered') 224 | > 225 | await expect(getPreviewFrame(page).locator('body > knighted-preview-root')).toHaveCount( | ^ 226 | 1, 227 | ) 228 | }) at /home/runner/work/develop/develop/playwright/rendering-modes.spec.ts:225:79

Check failure on line 225 in playwright/rendering-modes.spec.ts

View workflow job for this annotation

GitHub Actions / E2E (Playwright, webkit, shard 2/3)

[webkit] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed

1) [webkit] › playwright/rendering-modes.spec.ts:194:1 › react mode mounts into internal non-div host to avoid div selector bleed Error: expect(locator).toHaveCount(expected) failed Locator: locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') Expected: 1 Received: 0 Timeout: 90000ms Call log: - Expect "toHaveCount" with timeout 90000ms - waiting for locator('#preview-host iframe').contentFrame().locator('body > knighted-preview-root') 92 × locator resolved to 0 elements - unexpected value "0" 223 | await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered') 224 | > 225 | await expect(getPreviewFrame(page).locator('body > knighted-preview-root')).toHaveCount( | ^ 226 | 1, 227 | ) 228 | }) at /home/runner/work/develop/develop/playwright/rendering-modes.spec.ts:225:79
1,
)
})
Expand Down Expand Up @@ -326,6 +326,38 @@
await expect(page.getByRole('status', { name: 'App status' })).not.toHaveText('Error')
})

test('preview iframe sandbox isolates parent origin access', async ({ page }) => {
await waitForInitialRender(page)

const iframe = page.locator('#preview-host iframe')
const sandbox = await iframe.getAttribute('sandbox')

expect(typeof sandbox).toBe('string')
expect(sandbox?.includes('allow-same-origin')).toBeFalsy()

await setComponentEditorSource(
page,
[
'const canReadParentStorage = (() => {',
' try {',
' return Boolean(window.parent.localStorage)',
' } catch {',
' return false',
' }',
'})()',
'',
'export const App = () => (',
" <button type='button'>",
" {canReadParentStorage ? 'parent-readable' : 'parent-blocked'}",
' </button>',
')',
].join('\n'),
)

await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered')
await expect(getPreviewFrame(page).getByRole('button')).toContainText('parent-blocked')
})

test('post-render runtime exceptions from iframe are reported in preview panel', async ({
page,
}) => {
Expand Down
8 changes: 8 additions & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,14 @@ const showAppToast = message => {
const previewBackground = createPreviewBackgroundController({
previewBgColorInput,
getPreviewHost: () => previewHost,
onBackgroundColorChange: color => {
if (
renderRuntime &&
typeof renderRuntime.updatePreviewBackgroundColor === 'function'
) {
renderRuntime.updatePreviewBackgroundColor(color)
}
},
getDefaultPreviewBackgroundColor: () => {
if (document.documentElement.dataset.theme === 'light') {
return '#ffffff'
Expand Down
14 changes: 5 additions & 9 deletions src/modules/preview-background.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const createPreviewBackgroundController = ({
previewBgColorInput,
getPreviewHost,
getDefaultPreviewBackgroundColor,
onBackgroundColorChange,
}) => {
let previewBackgroundColor = null
let previewBackgroundCustomized = false
Expand Down Expand Up @@ -66,26 +67,21 @@ export const createPreviewBackgroundController = ({
return
}

const iframe = previewHost.querySelector('iframe')
const iframeDocument = iframe?.contentDocument ?? null

if (typeof color === 'string' && color.length > 0) {
previewHost.style.backgroundColor = color
previewHost.style.setProperty('--preview-iframe-background-color', color)

if (iframeDocument) {
iframeDocument.documentElement.style.backgroundColor = color
iframeDocument.body.style.backgroundColor = color
if (typeof onBackgroundColorChange === 'function') {
onBackgroundColorChange(color)
}
return
}

previewHost.style.removeProperty('background-color')
previewHost.style.removeProperty('--preview-iframe-background-color')

if (iframeDocument) {
iframeDocument.documentElement.style.removeProperty('background-color')
iframeDocument.body.style.removeProperty('background-color')
if (typeof onBackgroundColorChange === 'function') {
onBackgroundColorChange('')
}
}

Expand Down
Loading
Loading