Fix scroll positions for CanvasRenderer (Fix #1259 )

Prevent generated iframe from getting re-rendered
Fix data-html2canvas-ignore attribute (Fix #1253 )
2023-08-10 21:13:10 +03:00 · 2017-12-07 16:36:09 +08:00 · 2017-12-07 16:16:22 +08:00 · 2017-12-07 16:12:39 +08:00 · 2017-12-07 15:47:53 +08:00 · 2017-12-07 15:47:42 +08:00
8 changed files with 79 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,11 @@
 ### Changelog ###
-#### v1.0.0-alpha1 - TBD ####
+#### v1.0.0-alpha2 - TBD ####
 * Fix scroll positions for CanvasRenderer (#1259)
 * Fix `data-html2canvas-ignore` attribute (#1253)
 * Fix decimal `letter-spacing` values (#1293)
 #### v1.0.0-alpha1 - 5.12.2017 ####
 * Complete rewrite of library
 ##### Breaking Changes #####
 * Remove deprecated onrendered callback, calling `html2canvas` returns a `Promise<HTMLCanvasElement>`
--- a/package.json
+++ b/package.json
@ -3,7 +3,7 @@
  "name": "html2canvas",
  "description": "Screenshots with JavaScript",
  "main": "dist/npm/index.js",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
  "author": {
    "name": "Niklas von Hertzen",
    "email": "niklasvh@gmail.com",
--- a/src/Clone.js
+++ b/src/Clone.js
@ -11,6 +11,8 @@ import {copyCSSStyles} from './Util';
 import {parseBackgroundImage} from './parsing/background';
 import CanvasRenderer from './renderer/CanvasRenderer';
 const IGNORE_ATTRIBUTE = 'data-html2canvas-ignore';
 export class DocumentCloner {
    scrolledElements: Array<[HTMLElement, number, number]>;
    referenceElement: HTMLElement;
@ -233,7 +235,11 @@ export class DocumentCloner {
        }
        for (let child = node.firstChild; child; child = child.nextSibling) {
-            if (child.nodeType !== Node.ELEMENT_NODE || child.nodeName !== 'SCRIPT') {
+            if (
                child.nodeType !== Node.ELEMENT_NODE ||
                // $FlowFixMe
                (child.nodeName !== 'SCRIPT' && !child.hasAttribute(IGNORE_ATTRIBUTE))
            ) {
                if (!this.copyStyles || child.nodeName !== 'STYLE') {
                    clone.appendChild(this.cloneNode(child));
                }
@ -247,7 +253,7 @@ export class DocumentCloner {
            }
            this.inlineAllImages(clone);
            if (node.scrollTop !== 0 || node.scrollLeft !== 0) {
-                this.scrolledElements.push([node, node.scrollLeft, node.scrollTop]);
+                this.scrolledElements.push([clone, node.scrollLeft, node.scrollTop]);
            }
            switch (node.nodeName) {
                case 'CANVAS':
@ -493,6 +499,7 @@ const createIframeContainer = (
    cloneIframeContainer.width = bounds.width.toString();
    cloneIframeContainer.height = bounds.height.toString();
    cloneIframeContainer.scrolling = 'no'; // ios won't scroll without it
    cloneIframeContainer.setAttribute(IGNORE_ATTRIBUTE, 'true');
    if (!ownerDocument.body) {
        return Promise.reject(
            __DEV__ ? `Body element not found in Document that is getting rendered` : ''
--- a/src/index.js
+++ b/src/index.js
@ -39,6 +39,12 @@ const html2canvas = (element: HTMLElement, conf: ?Options): Promise<*> => {
    const config = conf || {};
    const logger = new Logger();
    if (__DEV__ && typeof config.onrendered === 'function') {
        logger.error(
            `onrendered option is deprecated, html2canvas returns a Promise with the canvas as the value`
        );
    }
    const ownerDocument = element.ownerDocument;
    if (!ownerDocument) {
        return Promise.reject(`Provided element is not within a Document`);
--- a/src/parsing/letterSpacing.js
+++ b/src/parsing/letterSpacing.js
@ -5,6 +5,6 @@ export const parseLetterSpacing = (letterSpacing: string): number => {
    if (letterSpacing === 'normal') {
        return 0;
    }
-    const value = parseInt(letterSpacing, 10);
+    const value = parseFloat(letterSpacing);
    return isNaN(value) ? 0 : value;
 };
--- a/tests/reftests/options/ignore.html
+++ b/tests/reftests/options/ignore.html
@ -0,0 +1,41 @@
 <!DOCTYPE html>
 <html>
 <head>
    <title>element render test</title>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <script>
    </script>
    <script type="text/javascript" src="../../test.js"></script>
    <style>
        #div1 {
            width: 100px;
            height: 100px;
            background: green;
        }
        #ignored {
            background: red;
            width: 100px;
            height: 100px;
        }
        body, html {
            margin: 0;
            padding: 0;
        }
    </style>
 </head>
 <body>
 <div id="ignored" data-html2canvas-ignore>
    great failure
 </div>
 <div id="div1">
    great success
 </div>
 </body>
 </html>
--- a/tests/reftests/overflow/overflow.html
+++ b/tests/reftests/overflow/overflow.html
@ -65,6 +65,20 @@
            </div>
        </div>
        <div style="overflow:scroll; height: 100px;" id="scroll">
            Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s
            with the release of <div style="border-width:10px 0 5px 0;background:green;">a</div>Letraset sheets containing Lorem Ipsum passages, <img src="../../assets/image.jpg" /> and more recently with desktop publishing software like <b>Aldus PageMaker</b> including versions of Lorem Ipsum.
            <div style="overflow:visible;position:relative;"><u>position:relative within a overflow:hidden element</u><br /> <br />
                Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like <b>Aldus PageMaker</b> including versions of Lorem Ipsum.
            </div>
            <script>
                document.querySelector('#scroll').scrollTo(0, 200);
            </script>
        </div>
    </body>
 </html>
--- a/tests/reftests/text/text.html
+++ b/tests/reftests/text/text.html
@ -126,6 +126,7 @@
            <li style="word-spacing:5px;">word-spacing:5px; (as each letter is rendered individually, the bounds will always be correct)</li>
            <li style="line-height:35px;">line-height:35px; <br />(same goes for line-height)</li>
            <li style="letter-spacing:5px;">letter-spacing:5px;</li>
            <li style="letter-spacing:0.9px;">letter-spacing:0.9px;</li>
            <li style="text-align:right;width:300px;">text-align:right;width:300px;</li>
            <li style="font-variant:small-caps;">font-variant:small-caps; </li>
        </ul>
Author	SHA1	Message	Date
Niklas von Hertzen	ef5c59e26d	Fix scroll positions for CanvasRenderer (Fix #1259 )	2017-12-07 16:36:09 +08:00
Niklas von Hertzen	8b653f89bc	Prevent generated iframe from getting re-rendered	2017-12-07 16:16:22 +08:00
Niklas von Hertzen	9db8580b97	Fix data-html2canvas-ignore attribute (Fix #1253 )	2017-12-07 16:12:39 +08:00
Niklas von Hertzen	4a09264103	Update CHANGELOG	2017-12-07 15:47:53 +08:00
Niklas von Hertzen	b8178e92b4	Add deprecation warning for onrendered (Fix #1290 )	2017-12-07 15:47:42 +08:00
Niklas von Hertzen	166cbba7c2	Fix decimal letter spacing values (#1293 )	2017-12-07 15:20:24 +08:00