Review main Merged

64325[BUGFIX] Fix inline icon rendering of bitmap icons

Benjamin Franzke CR +2 V +2 Easy +6 −7 updated 04/28/20, 07:27

Commit message

The existing "inline" rendering for icons causes bitmaps to be
rendered for SVG-inline usage using the <image> tag. This tag
can not be rendered in HTML context.

The backend module menu uses inlined SVGs. Rendering bitmap icons with
SVG-syntax, without an SVG root element, does not work in this context.
(Note: It works in SVG trees because the optional svg container is
removed by SvgTree.js and the image-tag is wrapped into a new <g> element)

We do now wrap "inline" bitmap icons into an svg tag, which will fix
the bitmap module case while the bitmap icons will still
be embeddable into svg groups (<g>) for svg trees.

Review

  • Code review CR +2 Done
    • Benni Mack +2
    • Markus Klein +1
    • Frank Nägler +1
  • Verified V +2 Done
    • Benni Mack +2
    • Markus Klein +1
    • TYPO3com +1 CI

Issues 2

Files 2

Review log 1115

  1. Benjamin Franzke uploaded patch set 1 04/27/20, 19:14

  2. TYPO3com voted on patch set 1 V +1 04/27/20, 19:27 Completed build in 12m 41s on Mon, 27 Apr, 07:27 PM Test Summary: 73657 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-3063

  3. Benjamin Franzke uploaded patch set 2 04/27/20, 21:19

  4. Benjamin Franzke commented on patch set 1 04/27/20, 21:20

    > Note: It works in SVG trees because the optional svg container is removed by SvgTree.js and the image-tag is wrapped into a new <g> element It actually produces more sane markup for the SVG tree case as well and allows to remove one workaround in SvgTree.js: Given this example icon request (which contains the 'inline' parameter): route: /ajax/icons icon: ["test-icon","small",null,"default","inline"] When /ajax/icons is requested, with the inline parameter the following markup is usually returned: <span class="t3js-icon icon icon-size-small icon-state-default icon-test-icon" data-identifier="test-icon"> <span class="icon-markup"> <image width="16" height="16" xlink:href="/typo3conf/ext/myext/Resources/Public/Icons/test-icon.png"/> </span> </span> That markups makes no sense, as <image> is wrapped into a <span>. This code does only ever work because SvgTree.js parses the <image> line out of that invalid HTML. With this patch a sane HTML markup is generated instead which threfore fixes the module menu as well: <span class="t3js-icon icon icon-size-small icon-state-default icon-test-icon" data-identifier="test-icon"> <span class="icon-markup"> <svg version="1.1" xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 16 16" width="16" height="16"><image width="16" height="16" xlink:href="/typo3conf/ext/myext/Resources/Public/Icons/test-icon.png"/></svg> </span> </span>
  5. TYPO3com voted on patch set 2 V +1 04/27/20, 21:32 Completed build in 12m 56s on Mon, 27 Apr, 09:32 PM Test Summary: 73655 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-3067

  6. Markus Klein commented on patch set 2 V +1 CR +1 04/27/20, 21:58

    works. thanks.
  7. Markus Klein updated the commit message in patch set 3 04/27/20, 21:59

  8. Markus Klein voted on patch set 3 V +1 CR +1 04/27/20, 21:59

  9. TYPO3com voted on patch set 3 V -1 04/27/20, 22:12 Completed build in 11m 49s on Mon, 27 Apr, 10:11 PM Test Summary: 1 of 74142 failed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-3072

  10. TYPO3com voted on patch set 3 V +1 04/27/20, 23:08 Completed build in 12m 56s on Mon, 27 Apr, 11:08 PM Test Summary: 73657 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-3075

  11. Benni Mack voted on patch set 3 CR +1 04/28/20, 05:19

  12. Frank Nägler commented on patch set 3 CR +1 04/28/20, 06:50

    It looks ok for me, on reading. Is this patch tested with a Bitmap icon within the PageTree? If this is working as before, I see no problem.
  13. Benjamin Franzke commented on patch set 3 04/28/20, 07:01

    > Is this patch tested with a Bitmap icon within the PageTree? Yes, I added a PNG for a page type and tested that it works. I verified that the cache (also of the browser) has been cleared, and that the changed markup was actually used in the SVG tree (PageTree) for this PNG icon. Test extension is here: cd typo3conf/ext/ && git clone -b png-icons-test https://github.com/bnf/blog bin/typo3 extension:activate blog
  14. Benni Mack voted on patch set 3 V +2 CR +2 04/28/20, 07:27

  15. Benni Mack merged patch set 4 04/28/20, 07:27