Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: Switch on viewport-based srcSets for width-defined Images (#2415)
Ivan Starkov8b22708cc776
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex 322b045413..26e17b52d5 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -33,7 +33,6 @@ import {} from "./use-props-logic";import { Row, getLabel } from "../shared";import { serverSyncStore } from "~/shared/sync";-import { isFeatureEnabled } from "@webstudio-is/feature-flags";const itemToString = (item: NameAndLabel | null) =>item ? getLabel(item, item.name) : "";@@ -120,28 +119,18 @@ const renderProperty = ("width" in asset.meta &&"height" in asset.meta) {- if (isFeatureEnabled("image")) {- logic.handleChangeByPropName("width", {- value: asset.meta.width,- type: "number",- });- logic.handleChangeByPropName("height", {- value: asset.meta.height,- type: "number",- });-- setCssProperty("height")({- type: "keyword",- value: "fit-content",- });-- return;- }+ logic.handleChangeByPropName("width", {+ value: asset.meta.width,+ type: "number",+ });+ logic.handleChangeByPropName("height", {+ value: asset.meta.height,+ type: "number",+ });- setCssProperty("aspectRatio")({- type: "unit",- unit: "number",- value: asset.meta.width / asset.meta.height,+ setCssProperty("height")({+ type: "keyword",+ value: "fit-content",});}},diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex 097f54e3e0..593b62ed14 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -7,5 +7,3 @@ export const adminRole = false;// A general flag to enable/disable all the AI features.export const ai = process.env.NODE_ENV !== "production";export const aiCopy = ai && process.env.NODE_ENV !== "production";-// New image optimisations-export const image = false;diff --git a/packages/image/src/image-optimize.test.ts b/packages/image/src/image-optimize.test.tsindex 67b6dca3be..33dc6289f7 100644--- a/packages/image/src/image-optimize.test.ts+++ b/packages/image/src/image-optimize.test.ts@@ -16,9 +16,9 @@ describe("Image optimizations applied", () => {expect(imgAttr).toMatchInlineSnapshot(`{- "sizes": undefined,+ "sizes": "100vw","src": "/asset/image/logo.webp?width=256&quality=100&format=auto",- "srcSet": "/asset/image/logo.webp?width=128&quality=100&format=auto 1x, /asset/image/logo.webp?width=256&quality=100&format=auto 2x",+ "srcSet": "/asset/image/logo.webp?width=16&quality=100&format=auto 16w, /asset/image/logo.webp?width=32&quality=100&format=auto 32w, /asset/image/logo.webp?width=48&quality=100&format=auto 48w, /asset/image/logo.webp?width=64&quality=100&format=auto 64w, /asset/image/logo.webp?width=96&quality=100&format=auto 96w, /asset/image/logo.webp?width=128&quality=100&format=auto 128w, /asset/image/logo.webp?width=256&quality=100&format=auto 256w",}`);});diff --git a/packages/image/src/image-optimize.ts b/packages/image/src/image-optimize.tsindex 9137a99679..b6d25a6979 100644--- a/packages/image/src/image-optimize.ts+++ b/packages/image/src/image-optimize.ts@@ -21,7 +21,7 @@* source size value is 70vw equal to 800px * 0,7 = 560px** browser internal srcset will be (we divide `w` descriptor by source size value):- * photo-small.jpg 320/560x, photo-medium.jpg 640/560x, photo-huge.jpg 1280/560x =>+ * photo-small.jpg 320w/560px, photo-medium.jpg 640w/560px, photo-huge.jpg 1280w/560px =>* photo-small.jpg 0.57x, photo-medium.jpg 1.14x, photo-huge.jpg 2.28x** Finally same rules as for pixel density descriptor 'x' are applied.@@ -36,8 +36,7 @@* > if allSizes.length is too big, you will have many caches misses.** If img has a defined width property.- * 1. find the first value from allSizes which is greater or equal to the width property- * 2. use found value to generate srcset with pixel density descriptor 'x'+ * 1. filter allSizes to exclude loading images higher that maxDevicePixelRatio * img.width*** If img has no defined width property.@@ -120,7 +119,9 @@ const getWidths = (// we can exclude from srcSets all images which are smaller than the smallestRatio * smallesDeviceSizeconst smallestRatio = Math.min(...percentSizes) * 0.01;return {- widths: allSizes.filter((s) => s >= deviceSizes[0] * smallestRatio),+ widths: allSizes.filter(+ (size) => size >= deviceSizes[0] * smallestRatio+ ),kind: "w",};}@@ -131,6 +132,23 @@ const getWidths = (return { widths: deviceSizes, kind: "w" };}+ // Max device pixel ratio capped at 2; higher ratios offer negligible benefits+ // See Twitter Engineering's article on capping image fidelity: https://blog.twitter.com/engineering/en_us/topics/infrastructure/2019/capping-image-fidelity-on-ultra-high-resolution-devices.html+ const MAX_DEVICE_PIXEL_RATIO = 2;++ let index = allSizes.findIndex(+ (size) => size >= MAX_DEVICE_PIXEL_RATIO * width+ );+ index = index < 0 ? allSizes.length : index;++ return {+ widths: allSizes.slice(0, index + 1),+ kind: "w",+ };++ /*+ // Leave it here for future optimisations - icon like images+const widths = [...new Set([width, width * 2].map(@@ -139,6 +157,7 @@ const getWidths = (),];return { widths, kind: "x" };+ */};const generateImgAttrs = ({