chore(release): 1.3.4

fix: ios 15 font rendering crash (#2645 )
ci: add ios 15.0 testing (#2780 )
2023-08-10 21:13:10 +03:00 · 2021-12-29 14:11:55 +00:00 · 2021-12-29 22:09:32 +08:00 · 2021-12-29 21:02:16 +08:00
9 changed files with 48 additions and 5 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -113,6 +113,10 @@ jobs:
            name: iOS Simulator Safari 14
            targetBrowser: Safari_IOS_14
            xcode: /Applications/Xcode_12.4.app
+          - os: macos-11
+            name: iOS Simulator Safari 15.0
+            targetBrowser: Safari_IOS_15_0
+            xcode: /Applications/Xcode_13.0.app
          - os: macos-11
            name: iOS Simulator Safari 15
            targetBrowser: Safari_IOS_15
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,19 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+## [1.3.4](https://github.com/niklasvh/html2canvas/compare/v1.3.3...v1.3.4) (2021-12-29)
+
+
+### ci
+
+* add ios 15.0 testing (#2780) ([d922207](https://github.com/niklasvh/html2canvas/commit/d9222075daaed08884491b0563fc899ee0ced731)), closes [#2780](https://github.com/niklasvh/html2canvas/issues/2780)
+
+### fix
+
+* ios 15 font rendering crash (#2645) ([ba2b1cd](https://github.com/niklasvh/html2canvas/commit/ba2b1cd8e9a9d7932675d7abffce1526a609e769)), closes [#2645](https://github.com/niklasvh/html2canvas/issues/2645)
+
+
+
 ## [1.3.3](https://github.com/niklasvh/html2canvas/compare/v1.3.2...v1.3.3) (2021-11-23)


--- a/karma.conf.js
+++ b/karma.conf.js
@ -42,9 +42,15 @@ module.exports = function(config) {
            platform: 'iOS',
            sdk: '14.4'
        },
+        Safari_IOS_15_0: {
+            base: 'MobileSafari',
+            name: 'iPhone 13',
+            platform: 'iOS',
+            sdk: '15.0'
+        },
        Safari_IOS_15: {
            base: 'MobileSafari',
-            name: 'iPhone 8',
+            name: 'iPhone 13',
            platform: 'iOS',
            sdk: '15.2'
        },
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "html2canvas",
-  "version": "1.3.3",
+  "version": "1.3.4",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
--- a/package.json
+++ b/package.json
@ -6,7 +6,7 @@
  "module": "dist/html2canvas.esm.js",
  "typings": "dist/types/index.d.ts",
  "browser": "dist/html2canvas.js",
-  "version": "1.3.3",
+  "version": "1.3.4",
  "author": {
    "name": "Niklas von Hertzen",
    "email": "niklasvh@gmail.com",
--- a/src/render/canvas/canvas-renderer.ts
+++ b/src/render/canvas/canvas-renderer.ts
@ -162,7 +162,7 @@ export class CanvasRenderer extends Renderer {
        const fontVariant = styles.fontVariant
            .filter((variant) => variant === 'normal' || variant === 'small-caps')
            .join('');
-        const fontFamily = styles.fontFamily.join(', ');
+        const fontFamily = fixIOSSystemFonts(styles.fontFamily).join(', ');
        const fontSize = isDimensionToken(styles.fontSize)
            ? `${styles.fontSize.number}${styles.fontSize.unit}`
            : `${styles.fontSize.number}px`;
@ -947,3 +947,12 @@ const canvasTextAlign = (textAlign: TEXT_ALIGN): CanvasTextAlign => {
            return 'left';
    }
 };
+
+// see https://github.com/niklasvh/html2canvas/pull/2645
+const iOSBrokenFonts = ['-apple-system', 'system-ui'];
+
+const fixIOSSystemFonts = (fontFamilies: string[]): string[] => {
+    return /iPhone OS 15_(0|1)/.test(window.navigator.userAgent)
+        ? fontFamilies.filter((fontFamily) => iOSBrokenFonts.indexOf(fontFamily) === -1)
+        : fontFamilies;
+};
--- a/tests/reftests/text/lang/chinese.html
+++ b/tests/reftests/text/lang/chinese.html
@ -11,6 +11,13 @@
        float: left;
      }

+      .apple-system {
+          font-family: -apple-system, Arial;
+      }
+
+      .system-ui {
+          font-family: system-ui, Arial;
+      }
    </style>
  </head>
  <body>
@ -32,5 +39,7 @@
      </p><p>&nbsp;&nbsp;&nbsp;&nbsp;〔13〕 法捷耶夫（一九○一——一九五六），苏联名作家。他所作的小说《毁灭》于一九二七年出版，内容是描写苏联国内战争时期由苏联远东滨海边区工人、农民和革命知识分子所组成的一支游击队同国内反革命白卫军以及日本武装干涉军进行斗争的故事。这部小说曾由鲁迅译为汉文。
      </p><p>&nbsp;&nbsp;&nbsp;&nbsp;〔14〕 见鲁迅《集外集·自嘲》（《鲁迅全集》第7卷，人民文学出版社1981年版，第147页）。</p>
    </div>
+    <div class="apple-system">中文</div>
+    <div class="system-ui">中文</div>
  </body>
 </html>
--- a/tests/reftests/text/text.html
+++ b/tests/reftests/text/text.html
@ -149,6 +149,6 @@
    <span>[AB / CD]</span>
 </div>
 <div>Emojis 🤷🏾‍♂️👨‍👩‍👧‍👦 :)</div>
-<div style="letter-spacing: 2px">Emojis with letter-spacing 🤷🏾‍♂️👨‍👩‍👧‍👦 :)</div>
+<div style="letter-spacing: 2px">Emojis with letter-spacing 🤷🏾‍♂️👨‍👩‍👧‍👦 :) ❤️❤️❤️👨‍❤️‍💋‍👨👨‍❤️‍👨</div>
 </body>
 </html>
--- a/www/.gitignore
+++ b/www/.gitignore
@ -9,3 +9,5 @@ yarn-error.log
 src/results.json
 static/tests/preview.js
 src/preview.js
+.docusaurus
+build/
Author	SHA1	Message	Date
CI	04787ee88a	chore(release): 1.3.4	2021-12-29 14:11:55 +00:00
Niklas von Hertzen	ba2b1cd8e9	fix: ios 15 font rendering crash (#2645 )	2021-12-29 22:09:32 +08:00
Niklas von Hertzen	d9222075da	ci: add ios 15.0 testing (#2780 )	2021-12-29 21:02:16 +08:00