Unverified Commit 9ad1f321 authored by RTrace's avatar RTrace Committed by GitHub

Add interactive-widget optional property to Viewport type (#46506)



## Feature

- [x] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [x] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)
Co-authored-by: 's avatarJiachi Liu <4800338+huozhi@users.noreply.github.com>
parent aa614635
...@@ -169,4 +169,42 @@ describe('accumulateMetadata', () => { ...@@ -169,4 +169,42 @@ describe('accumulateMetadata', () => {
}) })
}) })
}) })
describe('viewport', () => {
it('should support string viewport', async () => {
const metadataItems: MetadataItems = [
[
{ viewport: 'width=device-width, initial-scale=1, shrink-to-fit=no' },
null,
],
]
const metadata = await accumulateMetadata(metadataItems)
expect(metadata).toMatchObject({
viewport: 'width=device-width, initial-scale=1, shrink-to-fit=no',
})
})
it('should support viewport descriptors', async () => {
const metadataItems: MetadataItems = [
[
{
viewport: {
width: 'device-width',
height: 'device-height',
initialScale: 1,
minimumScale: 1,
maximumScale: 1,
interactiveWidget: 'overlays-content',
},
},
null,
],
]
const metadata = await accumulateMetadata(metadataItems)
expect(metadata).toMatchObject({
viewport:
'width=device-width, height=device-height, initial-scale=1, minimum-scale=1, maximum-scale=1, interactive-widget=overlays-content',
})
})
})
}) })
...@@ -15,6 +15,7 @@ const viewPortKeys = { ...@@ -15,6 +15,7 @@ const viewPortKeys = {
initialScale: 'initial-scale', initialScale: 'initial-scale',
minimumScale: 'minimum-scale', minimumScale: 'minimum-scale',
maximumScale: 'maximum-scale', maximumScale: 'maximum-scale',
interactiveWidget: 'interactive-widget',
viewportFit: 'viewport-fit', viewportFit: 'viewport-fit',
} as const } as const
......
...@@ -59,6 +59,7 @@ export type Viewport = { ...@@ -59,6 +59,7 @@ export type Viewport = {
initialScale?: number initialScale?: number
minimumScale?: number minimumScale?: number
maximumScale?: number maximumScale?: number
interactiveWidget?: 'resizes-visual' | 'resizes-content' | 'overlays-content'
} }
// Apple Web App // Apple Web App
......
...@@ -24,7 +24,12 @@ export const metadata: Metadata = { ...@@ -24,7 +24,12 @@ export const metadata: Metadata = {
themeColor: { color: 'cyan', media: '(prefers-color-scheme: dark)' }, themeColor: { color: 'cyan', media: '(prefers-color-scheme: dark)' },
colorScheme: 'dark', colorScheme: 'dark',
manifest: 'https://github.com/manifest.json', manifest: 'https://github.com/manifest.json',
viewport: 'width=device-width, initial-scale=1, shrink-to-fit=no', viewport: {
width: 'device-width',
initialScale: 1,
maximumScale: 1,
interactiveWidget: 'resizes-visual',
},
creator: 'shu', creator: 'shu',
publisher: 'vercel', publisher: 'vercel',
robots: 'index, follow', robots: 'index, follow',
......
export default function Page() {
return 'viewport'
}
export const metadata = {
viewport: {
width: 'device-width',
initialScale: 1,
maximumScale: 1,
},
}
...@@ -141,7 +141,7 @@ createNextDescribe( ...@@ -141,7 +141,7 @@ createNextDescribe(
await checkMetaNameContentPair( await checkMetaNameContentPair(
browser, browser,
'viewport', 'viewport',
'width=device-width, initial-scale=1, shrink-to-fit=no' 'width=device-width, initial-scale=1, maximum-scale=1, interactive-widget=resizes-visual'
) )
await checkMetaNameContentPair(browser, 'creator', 'shu') await checkMetaNameContentPair(browser, 'creator', 'shu')
await checkMetaNameContentPair(browser, 'publisher', 'vercel') await checkMetaNameContentPair(browser, 'publisher', 'vercel')
...@@ -154,15 +154,6 @@ createNextDescribe( ...@@ -154,15 +154,6 @@ createNextDescribe(
) )
}) })
it('should support object viewport', async () => {
const browser = await next.browser('/viewport/object')
await checkMetaNameContentPair(
browser,
'viewport',
'width=device-width, initial-scale=1, maximum-scale=1'
)
})
it('should support apple related tags `itunes` and `appWebApp`', async () => { it('should support apple related tags `itunes` and `appWebApp`', async () => {
const browser = await next.browser('/apple') const browser = await next.browser('/apple')
await checkMetaNameContentPair( await checkMetaNameContentPair(
...@@ -365,20 +356,23 @@ createNextDescribe( ...@@ -365,20 +356,23 @@ createNextDescribe(
...parentMetadata, ...parentMetadata,
} }
}` }`
await next.patchFile(pagePath, content)
const browser = await next.browser('/mutate') try {
await check( await next.patchFile(pagePath, content)
async () => ((await hasRedbox(browser, true)) ? 'success' : 'fail'),
/success/
)
const error = await getRedboxDescription(browser)
await next.deleteFile(pagePath) const browser = await next.browser('/mutate')
await check(
async () =>
(await hasRedbox(browser, true)) ? 'success' : 'fail',
/success/
)
expect(error).toContain( expect(await getRedboxDescription(browser)).toContain(
'Cannot add property x, object is not extensible' 'Cannot add property x, object is not extensible'
) )
} finally {
await next.deleteFile(pagePath)
}
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment