| @@ -177,9 +177,9 @@ | ||
| 177 | 177 | } |
| 178 | 178 | function safeDecodeURI(uri) { |
| 179 | 179 | try { |
| 180 | 180 | return decodeURI(uri); |
| 181 | - } catch { | |
| 181 | + } catch (uriError) { | |
| 182 | 182 | return uri; |
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | |
| @@ -311,19 +311,8 @@ | ||
| 311 | 311 | "minHeight" |
| 312 | 312 | ); |
| 313 | 313 | } |
| 314 | 314 | }; |
| 315 | - var minWidth = { | |
| 316 | - name: "minWidth", | |
| 317 | - generate: (style, options) => { | |
| 318 | - return generateRule( | |
| 319 | - style, | |
| 320 | - options, | |
| 321 | - ["dimensions", "minWidth"], | |
| 322 | - "minWidth" | |
| 323 | - ); | |
| 324 | - } | |
| 325 | - }; | |
| 326 | 315 | var aspectRatio = { |
| 327 | 316 | name: "aspectRatio", |
| 328 | 317 | generate: (style, options) => { |
| 329 | 318 | return generateRule( |
| @@ -344,9 +333,9 @@ | ||
| 344 | 333 | "width" |
| 345 | 334 | ); |
| 346 | 335 | } |
| 347 | 336 | }; |
| 348 | - var dimensions_default = [height, minHeight, minWidth, aspectRatio, width2]; | |
| 337 | + var dimensions_default = [height, minHeight, aspectRatio, width2]; | |
| 349 | 338 | |
| 350 | 339 | // packages/style-engine/build-module/styles/background/index.mjs |
| 351 | 340 | var backgroundImage = { |
| 352 | 341 | name: "backgroundImage", |
| @@ -351,23 +340,26 @@ | ||
| 351 | 340 | var backgroundImage = { |
| 352 | 341 | name: "backgroundImage", |
| 353 | 342 | generate: (style, options) => { |
| 354 | 343 | const _backgroundImage = style?.background?.backgroundImage; |
| 355 | - const gradient2 = getCSSValueFromRawStyle(style?.background?.gradient) || ""; | |
| 356 | - if (!_backgroundImage && !gradient2) { | |
| 357 | - return []; | |
| 344 | + if (typeof _backgroundImage === "object" && _backgroundImage?.url) { | |
| 345 | + return [ | |
| 346 | + { | |
| 347 | + selector: options.selector, | |
| 348 | + key: "backgroundImage", | |
| 349 | + // Passed `url` may already be encoded. To prevent double encoding, decodeURI is executed to revert to the original string. | |
| 350 | + value: `url( '${encodeURI( | |
| 351 | + safeDecodeURI(_backgroundImage.url) | |
| 352 | + )}' )` | |
| 353 | + } | |
| 354 | + ]; | |
| 358 | 355 | } |
| 359 | - const backgroundImageValue = typeof _backgroundImage === "object" && _backgroundImage?.url ? `url( '${encodeURI( | |
| 360 | - safeDecodeURI(_backgroundImage.url) | |
| 361 | - )}' )` : getCSSValueFromRawStyle(_backgroundImage); | |
| 362 | - const cssValue = [gradient2, backgroundImageValue].filter(Boolean).join(", "); | |
| 363 | - return !!cssValue ? [ | |
| 364 | - { | |
| 365 | - selector: options.selector, | |
| 366 | - key: "backgroundImage", | |
| 367 | - value: cssValue | |
| 368 | - } | |
| 369 | - ] : []; | |
| 356 | + return generateRule( | |
| 357 | + style, | |
| 358 | + options, | |
| 359 | + ["background", "backgroundImage"], | |
| 360 | + "backgroundImage" | |
| 361 | + ); | |
| 370 | 362 | } |
| 371 | 363 | }; |
| 372 | 364 | var backgroundPosition = { |
| 373 | 365 | name: "backgroundPosition", |
