| @@ -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,20 +333,9 @@ | ||
| 344 | 333 | "width" |
| 345 | 334 | ); |
| 346 | 335 | } |
| 347 | 336 | }; |
| 348 | - var objectFit = { | |
| 349 | - name: "objectFit", | |
| 350 | - generate: (style, options) => { | |
| 351 | - return generateRule( | |
| 352 | - style, | |
| 353 | - options, | |
| 354 | - ["dimensions", "objectFit"], | |
| 355 | - "objectFit" | |
| 356 | - ); | |
| 357 | - } | |
| 358 | - }; | |
| 359 | - var dimensions_default = [height, minHeight, minWidth, aspectRatio, width2, objectFit]; | |
| 337 | + var dimensions_default = [height, minHeight, aspectRatio, width2]; | |
| 360 | 338 | |
| 361 | 339 | // packages/style-engine/build-module/styles/background/index.mjs |
| 362 | 340 | var backgroundImage = { |
| 363 | 341 | name: "backgroundImage", |
| @@ -362,23 +340,26 @@ | ||
| 362 | 340 | var backgroundImage = { |
| 363 | 341 | name: "backgroundImage", |
| 364 | 342 | generate: (style, options) => { |
| 365 | 343 | const _backgroundImage = style?.background?.backgroundImage; |
| 366 | - const gradient2 = getCSSValueFromRawStyle(style?.background?.gradient) || ""; | |
| 367 | - if (!_backgroundImage && !gradient2) { | |
| 368 | - 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 | + ]; | |
| 369 | 355 | } |
| 370 | - const backgroundImageValue = typeof _backgroundImage === "object" && _backgroundImage?.url ? `url( '${encodeURI( | |
| 371 | - safeDecodeURI(_backgroundImage.url) | |
| 372 | - )}' )` : getCSSValueFromRawStyle(_backgroundImage); | |
| 373 | - const cssValue = [gradient2, backgroundImageValue].filter(Boolean).join(", "); | |
| 374 | - return !!cssValue ? [ | |
| 375 | - { | |
| 376 | - selector: options.selector, | |
| 377 | - key: "backgroundImage", | |
| 378 | - value: cssValue | |
| 379 | - } | |
| 380 | - ] : []; | |
| 356 | + return generateRule( | |
| 357 | + style, | |
| 358 | + options, | |
| 359 | + ["background", "backgroundImage"], | |
| 360 | + "backgroundImage" | |
| 361 | + ); | |
| 381 | 362 | } |
| 382 | 363 | }; |
| 383 | 364 | var backgroundPosition = { |
| 384 | 365 | name: "backgroundPosition", |
| @@ -616,19 +597,8 @@ | ||
| 616 | 597 | "writingMode" |
| 617 | 598 | ); |
| 618 | 599 | } |
| 619 | 600 | }; |
| 620 | - var textShadow = { | |
| 621 | - name: "textShadow", | |
| 622 | - generate: (style, options) => { | |
| 623 | - return generateRule( | |
| 624 | - style, | |
| 625 | - options, | |
| 626 | - ["typography", "textShadow"], | |
| 627 | - "textShadow" | |
| 628 | - ); | |
| 629 | - } | |
| 630 | - }; | |
| 631 | 601 | var typography_default = [ |
| 632 | 602 | fontFamily, |
| 633 | 603 | fontSize, |
| 634 | 604 | fontStyle, |
| @@ -637,9 +607,8 @@ | ||
| 637 | 607 | lineHeight, |
| 638 | 608 | textColumns, |
| 639 | 609 | textDecoration, |
| 640 | 610 | textIndent, |
| 641 | - textShadow, | |
| 642 | 611 | textTransform, |
| 643 | 612 | writingMode |
| 644 | 613 | ]; |
| 645 | 614 | |
