Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support number quality on Image Component #18224

Merged
merged 2 commits into from
Oct 27, 2020
Merged

Add support number quality on Image Component #18224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9984d8
Add support number quality on Image Component
ykzts Oct 25, 2020
be3c95a
Merge branch 'canary' of github.com:vercel/next.js into ykzts-quality…
timneutkens Oct 27, 2020
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
30 changes: 15 additions & 15 deletions packages/next/client/image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type ImageProps = Omit<
'src' | 'srcSet' | 'ref' | 'width' | 'height' | 'loading'
> & {
src: string
quality?: string
quality?: number | string
priority?: boolean
loading?: LoadingValue
unoptimized?: boolean
Expand Down Expand Up @@ -104,8 +104,8 @@ function getDeviceSizes(width: number | undefined): number[] {
function computeSrc(
src: string,
unoptimized: boolean,
width: number | undefined,
quality?: string
width?: number,
quality?: number
): string {
if (unoptimized) {
return src
Expand All @@ -118,7 +118,7 @@ function computeSrc(
type CallLoaderProps = {
src: string
width: number
quality?: string
quality?: number
}

function callLoader(loaderProps: CallLoaderProps) {
Expand All @@ -129,8 +129,8 @@ function callLoader(loaderProps: CallLoaderProps) {
type SrcSetData = {
src: string
unoptimized: boolean
width: number | undefined
quality: string | undefined
width?: number
quality?: number
}

function generateSrcSet({
Expand All @@ -155,7 +155,7 @@ type PreloadData = {
unoptimized: boolean
width: number | undefined
sizes?: string
quality?: string
quality?: number
}

function generatePreload({
Expand Down Expand Up @@ -251,8 +251,10 @@ export default function Image({
}
}, [thisEl, lazy])

let widthInt = getInt(width)
let heightInt = getInt(height)
const widthInt = getInt(width)
const heightInt = getInt(height)
const qualityInt = getInt(quality)

let divStyle: React.CSSProperties | undefined
let imgStyle: React.CSSProperties | undefined
let wrapperStyle: React.CSSProperties | undefined
Expand Down Expand Up @@ -305,12 +307,12 @@ export default function Image({
}

// Generate attribute values
const imgSrc = computeSrc(src, unoptimized, widthInt, quality)
const imgSrc = computeSrc(src, unoptimized, widthInt, qualityInt)
const imgSrcSet = generateSrcSet({
src,
width: widthInt,
unoptimized,
quality,
quality: qualityInt,
})

let imgAttributes:
Expand Down Expand Up @@ -352,7 +354,7 @@ export default function Image({
width: widthInt,
unoptimized,
sizes,
quality,
quality: qualityInt,
})
: ''}
<img
Expand Down Expand Up @@ -442,7 +444,5 @@ function defaultLoader({ root, src, width, quality }: LoaderProps): string {
}
}

return `${root}?url=${encodeURIComponent(src)}&w=${width}&q=${
quality || '75'
}`
return `${root}?url=${encodeURIComponent(src)}&w=${width}&q=${quality || 75}`
}
12 changes: 12 additions & 0 deletions test/integration/image-component/typescript/pages/valid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ const Page = () => {
src="https://via.placeholder.com/100"
unsized
></Image>
<Image
id="quality-num"
src="https://via.placeholder.com/500"
quality={80}
unsized
></Image>
<Image
id="quality-str"
src="https://via.placeholder.com/500"
quality="80"
unsized
></Image>
<p id="stubtext">This is valid usage of the Image component</p>
</div>
)
Expand Down