From bf7703f5915c6154937f3febf812aad6483bff45 Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Sun, 11 Nov 2018 17:37:06 +0100 Subject: make window and document exchangeable in case they are not globals alreay, make sure that init functions are chaninable --- dist/svg.js | 98 +++++++++++++++++++++++++++++++------------- package-lock.json | 6 +++ package.json | 1 + src/animation/Animator.js | 3 ++ src/animation/Timeline.js | 2 + src/elements/Bare.js | 3 ++ src/elements/Doc.js | 3 ++ src/elements/Dom.js | 4 +- src/elements/Element.js | 1 - src/elements/Image.js | 3 ++ src/elements/Shape.js | 1 - src/elements/Style.js | 1 - src/elements/Text.js | 3 ++ src/main.js | 1 + src/modules/core/event.js | 3 ++ src/modules/core/parser.js | 3 ++ src/modules/core/selector.js | 3 ++ src/modules/core/textable.js | 4 ++ src/types/Box.js | 5 +++ src/types/Color.js | 2 + src/types/Matrix.js | 2 + src/types/Morphable.js | 3 ++ src/types/Point.js | 2 + src/types/SVGArray.js | 1 + src/types/SVGNumber.js | 2 + src/utils/adopter.js | 3 ++ src/utils/window.js | 10 +++++ 27 files changed, 140 insertions(+), 33 deletions(-) create mode 100644 src/utils/window.js diff --git a/dist/svg.js b/dist/svg.js index bcaef61..2243698 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Thu Nov 08 2018 19:44:36 GMT+0100 (GMT+01:00) +* BUILT: Sun Nov 11 2018 17:18:46 GMT+0100 (GMT+01:00) */; var SVG = (function () { 'use strict'; @@ -320,16 +320,27 @@ var SVG = (function () { var xlink = 'http://www.w3.org/1999/xlink'; var svgjs = 'http://svgjs.com/svgjs'; + var globals = { + window: window, + document: document + }; + function registerWindow(w) { + globals.window = w; + globals.document = w.document; + } + var Base = function Base() { _classCallCheck(this, Base); }; + var window$1 = globals.window, + document$1 = globals.document; var elements = {}; var root = Symbol('root'); // Method for element creation function makeNode(name) { // create element - return document.createElementNS(ns, name); + return document$1.createElementNS(ns, name); } function makeInstance(element) { if (element instanceof Base) return element; @@ -343,7 +354,7 @@ var SVG = (function () { } if (typeof element === 'string' && element.charAt(0) !== '<') { - return adopt(document.querySelector(element)); + return adopt(document$1.querySelector(element)); } var node = makeNode('svg'); @@ -354,7 +365,7 @@ var SVG = (function () { return element; } function nodeOrNew(name, node) { - return node instanceof window.Node ? node : makeNode(name); + return node instanceof window$1.Node ? node : makeNode(name); } // Adopt existing svg elements function adopt(node) { @@ -363,7 +374,7 @@ var SVG = (function () { if (node.instance instanceof Base) return node.instance; - if (!(node instanceof window.SVGElement)) { + if (!(node instanceof window$1.SVGElement)) { return new elements.HtmlNode(node); } // initialize variables @@ -836,6 +847,7 @@ var SVG = (function () { memory: memory }); + var window$2 = globals.window; var listenerId = 0; function getEvents(node) { @@ -941,10 +953,10 @@ var SVG = (function () { function dispatch(node, event, data) { var n = getEventTarget(node); // Dispatch event - if (event instanceof window.Event) { + if (event instanceof window$2.Event) { n.dispatchEvent(event); } else { - event = new window.CustomEvent(event, { + event = new window$2.CustomEvent(event, { detail: data, cancelable: true }); @@ -1445,6 +1457,9 @@ var SVG = (function () { return this; } + var window$3 = globals.window, + document$2 = globals.document; + var Dom = /*#__PURE__*/ function (_EventTarget) { @@ -1609,7 +1624,8 @@ var SVG = (function () { parent = adopt(parent.node.parentNode); if (!type) return parent; // loop trough ancestors if type is given - while (parent && parent.node instanceof window.SVGElement) { + while (parent && parent.node instanceof window$3.SVGElement) { + // FIXME: That shouldnt be neccessary if (typeof type === 'string' ? parent.matches(type) : parent instanceof type) return parent; parent = adopt(parent.node.parentNode); } @@ -1730,8 +1746,8 @@ var SVG = (function () { outerHTML = outerHTML == null ? false : outerHTML; // Create temporary holder - well = document.createElementNS(ns, 'svg'); - fragment = document.createDocumentFragment(); // Dump raw svg + well = document$2.createElementNS(ns, 'svg'); + fragment = document$2.createDocumentFragment(); // Dump raw svg well.innerHTML = svgOrFn; // Transplant nodes into the fragment @@ -1759,6 +1775,7 @@ var SVG = (function () { extend(Dom, { attr: attr }); + register(Dom); var Doc = getClass(root); @@ -1914,6 +1931,7 @@ var SVG = (function () { return Element; }(Dom); + register(Element); var Container = /*#__PURE__*/ @@ -1951,6 +1969,7 @@ var SVG = (function () { return Container; }(Element); + register(Container); var Defs = /*#__PURE__*/ @@ -1979,6 +1998,8 @@ var SVG = (function () { }(Container); register(Defs); + var window$4 = globals.window; + var Doc$1 = /*#__PURE__*/ function (_Container) { @@ -1999,7 +2020,7 @@ var SVG = (function () { _createClass(Doc, [{ key: "isRoot", value: function isRoot() { - return !this.node.parentNode || !(this.node.parentNode instanceof window.SVGElement) || this.node.parentNode.nodeName === '#document'; + return !this.node.parentNode || !(this.node.parentNode instanceof window$4.SVGElement) || this.node.parentNode.nodeName === '#document'; } // Check if this is a root svg // If not, call docs from this element @@ -2060,6 +2081,7 @@ var SVG = (function () { }); register(Doc$1, 'Doc', true); + var document$3 = globals.document; function parser() { // Reuse cached element if possible if (!parser.nodes) { @@ -2073,7 +2095,7 @@ var SVG = (function () { } if (!parser.nodes.svg.node.parentNode) { - var b = document.body || document.documentElement; + var b = document$3.body || document$3.documentElement; parser.nodes.svg.addTo(b); } @@ -3129,11 +3151,12 @@ var SVG = (function () { return Queue; }(); + var window$5 = globals.window; var Animator = { nextDraw: null, frames: new Queue(), timeouts: new Queue(), - timer: window.performance || window.Date, + timer: window$5.performance || window$5.Date, transforms: [], frame: function frame(fn) { // Store the node @@ -3142,7 +3165,7 @@ var SVG = (function () { }); // Request an animation frame if we don't have one if (Animator.nextDraw === null) { - Animator.nextDraw = window.requestAnimationFrame(Animator._draw); + Animator.nextDraw = window$5.requestAnimationFrame(Animator._draw); } // Return the node so we can remove it easily @@ -3162,7 +3185,7 @@ var SVG = (function () { }); // Request another animation frame if we need one if (Animator.nextDraw === null) { - Animator.nextDraw = window.requestAnimationFrame(Animator._draw); + Animator.nextDraw = window$5.requestAnimationFrame(Animator._draw); } return node; @@ -3203,23 +3226,26 @@ var SVG = (function () { el(); }); // If we have remaining timeouts or frames, draw until we don't anymore - Animator.nextDraw = Animator.timeouts.first() || Animator.frames.first() ? window.requestAnimationFrame(Animator._draw) : null; + Animator.nextDraw = Animator.timeouts.first() || Animator.frames.first() ? window$5.requestAnimationFrame(Animator._draw) : null; } }; + var window$6 = globals.window, + document$4 = globals.document; + function isNulledBox(box) { return !box.w && !box.h && !box.x && !box.y; } function domContains(node) { - return (document.documentElement.contains || function (node) { + return (document$4.documentElement.contains || function (node) { // This is IE - it does not support contains() for top-level SVGs while (node.parentNode) { node = node.parentNode; } - return node === document; - }).call(document.documentElement, node); + return node === document$4; + }).call(document$4.documentElement, node); } var Box = @@ -3245,6 +3271,7 @@ var SVG = (function () { this.y2 = this.y + this.h; this.cx = this.x + this.w / 2; this.cy = this.y + this.h / 2; + return this; } // Merge rect box with another, return a new instance }, { @@ -3277,8 +3304,8 @@ var SVG = (function () { key: "addOffset", value: function addOffset() { // offset by window scroll position, because getBoundingClientRect changes when window is scrolled - this.x += window.pageXOffset; - this.y += window.pageYOffset; + this.x += window$6.pageXOffset; + this.y += window$6.pageYOffset; return this; } }, { @@ -3908,7 +3935,9 @@ var SVG = (function () { }); } - var time = window.performance || Date; + var window$7 = globals.window, + document$5 = globals.document; + var time = window$7.performance || Date; var makeSchedule = function makeSchedule(runnerInfo) { var start = runnerInfo.start; @@ -3933,7 +3962,7 @@ var SVG = (function () { return time.now(); }; - this._dispatcher = document.createElement('div'); // Store the timing variables + this._dispatcher = document$5.createElement('div'); // Store the timing variables this._startTime = 0; this._speed = 1.0; // Play control variables control how the animation proceeds @@ -5356,6 +5385,7 @@ var SVG = (function () { return Shape; }(Element); + register(Shape); var Circle = /*#__PURE__*/ @@ -5477,8 +5507,9 @@ var SVG = (function () { }(Element); register(Stop); + var document$6 = globals.document; function baseFind(query, parent) { - return map((parent || document).querySelectorAll(query), function (node) { + return map((parent || document$6).querySelectorAll(query), function (node) { return adopt(node); }); } // Scoped find method @@ -5651,6 +5682,8 @@ var SVG = (function () { }); register(Pattern); + var window$8 = globals.window; + var Image = /*#__PURE__*/ function (_Shape) { @@ -5667,7 +5700,7 @@ var SVG = (function () { key: "load", value: function load(url, callback) { if (!url) return this; - var img = new window.Image(); + var img = new window$8.Image(); on(img, 'load', function (e) { var p = this.parent(Pattern); // ensure image size @@ -6217,7 +6250,8 @@ var SVG = (function () { }); register(Rect); - // Create plain text node + var document$7 = globals.document; // Create plain text node + function plain(text) { // clear if build mode is disabled if (this._build === false) { @@ -6225,7 +6259,7 @@ var SVG = (function () { } // create text node - this.node.appendChild(document.createTextNode(text)); + this.node.appendChild(document$7.createTextNode(text)); return this; } // Get length of text element @@ -6238,6 +6272,8 @@ var SVG = (function () { length: length }); + var window$9 = globals.window; + var Text = /*#__PURE__*/ function (_Shape) { @@ -6373,7 +6409,7 @@ var SVG = (function () { var blankLineOffset = 0; var leading = this.dom.leading; this.each(function () { - var fontSize = window.getComputedStyle(this.node).getPropertyValue('font-size'); + var fontSize = window$9.getComputedStyle(this.node).getPropertyValue('font-size'); var dy = leading * new SVGNumber(fontSize); if (this.dom.newLined) { @@ -6491,6 +6527,8 @@ var SVG = (function () { }); register(Tspan); + var document$8 = globals.document; + var Bare = /*#__PURE__*/ function (_Container) { @@ -6511,7 +6549,7 @@ var SVG = (function () { } // create text node - this.node.appendChild(document.createTextNode(text)); + this.node.appendChild(document$8.createTextNode(text)); return this; } }]); @@ -6785,6 +6823,7 @@ var SVG = (function () { return this.put(new Style()).font(name, src, params); }) }); + register(Style); var _Symbol = /*#__PURE__*/ @@ -6954,6 +6993,7 @@ var SVG = (function () { defaults: defaults, parser: parser, find: baseFind, + registerWindow: registerWindow, Animator: Animator, Controller: Controller, Ease: Ease, diff --git a/package-lock.json b/package-lock.json index 1a0ddf4..3ba3ab7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2919,6 +2919,12 @@ "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", "dev": true }, + "esm": { + "version": "3.0.84", + "resolved": "https://registry.npmjs.org/esm/-/esm-3.0.84.tgz", + "integrity": "sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==", + "dev": true + }, "espree": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz", diff --git a/package.json b/package.json index 7adbde8..619b1f2 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "eslint-plugin-node": "^8.0.0", "eslint-plugin-promise": "^4.0.1", "eslint-plugin-standard": "^4.0.0", + "esm": "^3.0.84", "http-server": "^0.11.1", "jasmine-core": "^3.3.0", "karma": "^3.1.1", diff --git a/src/animation/Animator.js b/src/animation/Animator.js index fdb2326..4e0b112 100644 --- a/src/animation/Animator.js +++ b/src/animation/Animator.js @@ -1,5 +1,8 @@ +import globals from '../utils/window.js' import Queue from './Queue.js' +const { window } = globals + const Animator = { nextDraw: null, frames: new Queue(), diff --git a/src/animation/Timeline.js b/src/animation/Timeline.js index 790033a..ff30a0d 100644 --- a/src/animation/Timeline.js +++ b/src/animation/Timeline.js @@ -1,6 +1,8 @@ import { registerMethods } from '../utils/methods.js' import Animator from './Animator.js' +import globals from '../utils/window.js' +const { window, document } = globals var time = window.performance || Date var makeSchedule = function (runnerInfo) { diff --git a/src/elements/Bare.js b/src/elements/Bare.js index 9415cd4..7162f3a 100644 --- a/src/elements/Bare.js +++ b/src/elements/Bare.js @@ -1,6 +1,9 @@ import { nodeOrNew, register, wrapWithAttrCheck } from '../utils/adopter.js' import { registerMethods } from '../utils/methods.js' import Container from './Container.js' +import globals from '../utils/window.js' + +const { document } = globals export default class Bare extends Container { constructor (node, attrs) { diff --git a/src/elements/Doc.js b/src/elements/Doc.js index 0d862ba..952f1d3 100644 --- a/src/elements/Doc.js +++ b/src/elements/Doc.js @@ -8,6 +8,9 @@ import { ns, svgjs, xlink, xmlns } from '../modules/core/namespaces.js' import { registerMethods } from '../utils/methods.js' import Container from './Container.js' import Defs from './Defs.js' +import globals from '../utils/window.js' + +const { window } = globals export default class Doc extends Container { constructor (node) { diff --git a/src/elements/Dom.js b/src/elements/Dom.js index 87d0f5e..8fa053c 100644 --- a/src/elements/Dom.js +++ b/src/elements/Dom.js @@ -8,9 +8,11 @@ import { } from '../utils/adopter.js' import { map } from '../utils/utils.js' import { ns } from '../modules/core/namespaces.js' +import globals from '../utils/window.js' import EventTarget from '../types/EventTarget.js' import attr from '../modules/core/attr.js' +const { window, document } = globals export default class Dom extends EventTarget { constructor (node, attrs) { @@ -154,7 +156,7 @@ export default class Dom extends EventTarget { if (!type) return parent // loop trough ancestors if type is given - while (parent && parent.node instanceof window.SVGElement) { + while (parent && parent.node instanceof window.SVGElement) { // FIXME: That shouldnt be neccessary if (typeof type === 'string' ? parent.matches(type) : parent instanceof type) return parent parent = adopt(parent.node.parentNode) } diff --git a/src/elements/Element.js b/src/elements/Element.js index 7d491f9..03b5f07 100644 --- a/src/elements/Element.js +++ b/src/elements/Element.js @@ -4,7 +4,6 @@ import { reference } from '../modules/core/regex.js' import Dom from './Dom.js' import SVGNumber from '../types/SVGNumber.js' - const Doc = getClass(root) export default class Element extends Dom { diff --git a/src/elements/Image.js b/src/elements/Image.js index c529439..6a01b8f 100644 --- a/src/elements/Image.js +++ b/src/elements/Image.js @@ -6,6 +6,9 @@ import { registerMethods } from '../utils/methods.js' import { xlink } from '../modules/core/namespaces.js' import Pattern from './Pattern.js' import Shape from './Shape.js' +import globals from '../utils/window.js' + +const { window } = globals export default class Image extends Shape { constructor (node) { diff --git a/src/elements/Shape.js b/src/elements/Shape.js index e2821fe..cdddc60 100644 --- a/src/elements/Shape.js +++ b/src/elements/Shape.js @@ -1,7 +1,6 @@ import { register } from '../utils/adopter.js' import Element from './Element.js' - export default class Shape extends Element {} register(Shape) diff --git a/src/elements/Style.js b/src/elements/Style.js index 1883184..50ec50e 100644 --- a/src/elements/Style.js +++ b/src/elements/Style.js @@ -3,7 +3,6 @@ import { registerMethods } from '../utils/methods.js' import { unCamelCase } from '../utils/utils.js' import Element from './Element.js' - function cssRule (selector, rule) { if (!selector) return '' if (!rule) return selector diff --git a/src/elements/Text.js b/src/elements/Text.js index b4ba0ad..41be916 100644 --- a/src/elements/Text.js +++ b/src/elements/Text.js @@ -9,8 +9,11 @@ import { attrs } from '../modules/core/defaults.js' import { registerMethods } from '../utils/methods.js' import SVGNumber from '../types/SVGNumber.js' import Shape from './Shape.js' +import globals from '../utils/window.js' import * as textable from '../modules/core/textable.js' +const { window } = globals + export default class Text extends Shape { // Initialize node constructor (node) { diff --git a/src/main.js b/src/main.js index 8a7fd96..1961604 100644 --- a/src/main.js +++ b/src/main.js @@ -61,6 +61,7 @@ export { default as parser } from './modules/core/parser.js' export { default as find } from './modules/core/selector.js' export * from './modules/core/event.js' export * from './utils/adopter.js' +export { registerWindow } from './utils/window.js' /* Animation Modules */ export { default as Animator } from './animation/Animator.js' diff --git a/src/modules/core/event.js b/src/modules/core/event.js index 2fcaf58..351fe3f 100644 --- a/src/modules/core/event.js +++ b/src/modules/core/event.js @@ -1,5 +1,8 @@ import { delimiter } from './regex.js' import { makeInstance } from '../../utils/adopter.js' +import globals from '../../utils/window.js' + +const { window } = globals let listenerId = 0 diff --git a/src/modules/core/parser.js b/src/modules/core/parser.js index 7a656ef..a490576 100644 --- a/src/modules/core/parser.js +++ b/src/modules/core/parser.js @@ -1,4 +1,7 @@ import Doc from '../../elements/Doc.js' +import globals from '../../utils/window.js' + +const { document } = globals export default function parser () { // Reuse cached element if possible diff --git a/src/modules/core/selector.js b/src/modules/core/selector.js index 1e0b55e..52a7ad1 100644 --- a/src/modules/core/selector.js +++ b/src/modules/core/selector.js @@ -1,6 +1,9 @@ import { adopt } from '../../utils/adopter.js' import { map } from '../../utils/utils.js' import { registerMethods } from '../../utils/methods.js' +import globals from '../../utils/window.js' + +const { document } = globals export default function baseFind (query, parent) { return map((parent || document).querySelectorAll(query), function (node) { diff --git a/src/modules/core/textable.js b/src/modules/core/textable.js index 139d056..cf452c6 100644 --- a/src/modules/core/textable.js +++ b/src/modules/core/textable.js @@ -1,3 +1,7 @@ +import globals from '../../utils/window.js' + +const { document } = globals + // Create plain text node export function plain (text) { // clear if build mode is disabled diff --git a/src/types/Box.js b/src/types/Box.js index 21672b1..97ba699 100644 --- a/src/types/Box.js +++ b/src/types/Box.js @@ -1,8 +1,11 @@ import { delimiter } from '../modules/core/regex.js' import { registerMethods } from '../utils/methods.js' +import globals from '../utils/window.js' import Point from './Point.js' import parser from '../modules/core/parser.js' +const { window, document } = globals + function isNulledBox (box) { return !box.w && !box.h && !box.x && !box.y } @@ -41,6 +44,8 @@ export default class Box { this.y2 = this.y + this.h this.cx = this.x + this.w / 2 this.cy = this.y + this.h / 2 + + return this } // Merge rect box with another, return a new instance diff --git a/src/types/Color.js b/src/types/Color.js index 6bbfd82..a96958b 100644 --- a/src/types/Color.js +++ b/src/types/Color.js @@ -93,6 +93,8 @@ export default class Color { this.g = g this.b = b } + + return this } // Default to hex conversion diff --git a/src/types/Matrix.js b/src/types/Matrix.js index 963fd1a..ee12488 100644 --- a/src/types/Matrix.js +++ b/src/types/Matrix.js @@ -37,6 +37,8 @@ export default class Matrix { this.d = source.d != null ? source.d : base.d this.e = source.e != null ? source.e : base.e this.f = source.f != null ? source.f : base.f + + return this } // Clones this matrix diff --git a/src/types/Morphable.js b/src/types/Morphable.js index 021c5f4..703cc00 100644 --- a/src/types/Morphable.js +++ b/src/types/Morphable.js @@ -121,6 +121,7 @@ export class NonMorphable { init (val) { val = Array.isArray(val) ? val[0] : val this.value = val + return this } valueOf () { @@ -152,6 +153,7 @@ export class TransformBag { } Object.assign(this, TransformBag.defaults, obj) + return this } toArray () { @@ -199,6 +201,7 @@ export class ObjectBag { }) this.values = entries.reduce((last, curr) => last.concat(curr), []) + return this } valueOf () { diff --git a/src/types/Point.js b/src/types/Point.js index 685240b..6a2b968 100644 --- a/src/types/Point.js +++ b/src/types/Point.js @@ -19,6 +19,8 @@ export default class Point { // merge source this.x = source.x == null ? base.x : source.x this.y = source.y == null ? base.y : source.y + + return this } // Clone point diff --git a/src/types/SVGArray.js b/src/types/SVGArray.js index 3894b22..4fcb500 100644 --- a/src/types/SVGArray.js +++ b/src/types/SVGArray.js @@ -12,6 +12,7 @@ extend(SVGArray, { init (arr) { this.length = 0 this.push(...this.parse(arr)) + return this }, toArray () { diff --git a/src/types/SVGNumber.js b/src/types/SVGNumber.js index bba9741..ea21cbd 100644 --- a/src/types/SVGNumber.js +++ b/src/types/SVGNumber.js @@ -40,6 +40,8 @@ export default class SVGNumber { this.unit = value.unit } } + + return this } toString () { diff --git a/src/utils/adopter.js b/src/utils/adopter.js index 88cd383..5d5d1f0 100644 --- a/src/utils/adopter.js +++ b/src/utils/adopter.js @@ -1,7 +1,10 @@ import { capitalize } from './utils.js' import { ns } from '../modules/core/namespaces.js' +import globals from '../utils/window.js' import Base from '../types/Base.js' +const { window, document } = globals + const elements = {} export const root = Symbol('root') diff --git a/src/utils/window.js b/src/utils/window.js new file mode 100644 index 0000000..f44ebb9 --- /dev/null +++ b/src/utils/window.js @@ -0,0 +1,10 @@ +const globals = { + window, document +} + +export default globals + +export function registerWindow (w) { + globals.window = w + globals.document = w.document +} -- cgit v1.2.3 From d3f8d83551799db061a558537bc89dcbfd522c21 Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Mon, 12 Nov 2018 09:35:37 +0100 Subject: evaluate window and document on access and not on import --- .config/karma.conf.js | 2 +- .config/karma.quick.js | 2 +- dist/svg.js | 104 +++++++++++++++++++------------------------ src/animation/Animator.js | 12 +++-- src/animation/Timeline.js | 7 ++- src/elements/Bare.js | 6 +-- src/elements/Doc.js | 6 +-- src/elements/Dom.js | 10 ++--- src/elements/Image.js | 6 +-- src/elements/Text.js | 6 +-- src/elemnts-svg.js | 68 ---------------------------- src/modules/core/event.js | 8 ++-- src/modules/core/parser.js | 6 +-- src/modules/core/selector.js | 6 +-- src/modules/core/textable.js | 6 +-- src/types/Box.js | 14 +++--- src/utils/adopter.js | 12 +++-- src/utils/window.js | 13 +++--- 18 files changed, 94 insertions(+), 200 deletions(-) delete mode 100644 src/elemnts-svg.js diff --git a/.config/karma.conf.js b/.config/karma.conf.js index 7421808..61fe206 100644 --- a/.config/karma.conf.js +++ b/.config/karma.conf.js @@ -32,7 +32,7 @@ module.exports = function(config) { served: true }, 'dist/svg.js', - 'spec/spec/**/*.js' + 'spec/spec/*.js' ], proxies: { diff --git a/.config/karma.quick.js b/.config/karma.quick.js index 4574707..8d6dc2e 100644 --- a/.config/karma.quick.js +++ b/.config/karma.quick.js @@ -27,7 +27,7 @@ module.exports = function(config) { served: true }, 'dist/svg.js', - 'spec/spec/**/*.js' + 'spec/spec/*.js' ], diff --git a/dist/svg.js b/dist/svg.js index 2243698..8cd3575 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Sun Nov 11 2018 17:18:46 GMT+0100 (GMT+01:00) +* BUILT: Mon Nov 12 2018 09:31:46 GMT+0100 (GMT+01:00) */; var SVG = (function () { 'use strict'; @@ -321,26 +321,26 @@ var SVG = (function () { var svgjs = 'http://svgjs.com/svgjs'; var globals = { - window: window, - document: document + window: typeof window === 'undefined' ? null : window, + document: typeof document === 'undefined' ? null : document }; - function registerWindow(w) { - globals.window = w; - globals.document = w.document; + function registerWindow() { + var win = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null; + var doc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; + globals.window = win; + globals.document = doc; } var Base = function Base() { _classCallCheck(this, Base); }; - var window$1 = globals.window, - document$1 = globals.document; var elements = {}; var root = Symbol('root'); // Method for element creation function makeNode(name) { // create element - return document$1.createElementNS(ns, name); + return globals.document.createElementNS(ns, name); } function makeInstance(element) { if (element instanceof Base) return element; @@ -354,7 +354,7 @@ var SVG = (function () { } if (typeof element === 'string' && element.charAt(0) !== '<') { - return adopt(document$1.querySelector(element)); + return adopt(globals.document.querySelector(element)); } var node = makeNode('svg'); @@ -365,7 +365,7 @@ var SVG = (function () { return element; } function nodeOrNew(name, node) { - return node instanceof window$1.Node ? node : makeNode(name); + return node instanceof globals.window.Node ? node : makeNode(name); } // Adopt existing svg elements function adopt(node) { @@ -374,7 +374,7 @@ var SVG = (function () { if (node.instance instanceof Base) return node.instance; - if (!(node instanceof window$1.SVGElement)) { + if (!(node instanceof globals.window.SVGElement)) { return new elements.HtmlNode(node); } // initialize variables @@ -847,7 +847,6 @@ var SVG = (function () { memory: memory }); - var window$2 = globals.window; var listenerId = 0; function getEvents(node) { @@ -953,10 +952,10 @@ var SVG = (function () { function dispatch(node, event, data) { var n = getEventTarget(node); // Dispatch event - if (event instanceof window$2.Event) { + if (event instanceof globals.window.Event) { n.dispatchEvent(event); } else { - event = new window$2.CustomEvent(event, { + event = new globals.window.CustomEvent(event, { detail: data, cancelable: true }); @@ -1024,6 +1023,8 @@ var SVG = (function () { this.g = g; this.b = b; } + + return this; } // Default to hex conversion }, { @@ -1239,6 +1240,7 @@ var SVG = (function () { init: function init(arr) { this.length = 0; this.push.apply(this, _toConsumableArray(this.parse(arr))); + return this; }, toArray: function toArray() { return Array.prototype.concat.apply([], this); @@ -1311,6 +1313,8 @@ var SVG = (function () { this.unit = value.unit; } } + + return this; } }, { key: "toString", @@ -1457,9 +1461,6 @@ var SVG = (function () { return this; } - var window$3 = globals.window, - document$2 = globals.document; - var Dom = /*#__PURE__*/ function (_EventTarget) { @@ -1624,7 +1625,7 @@ var SVG = (function () { parent = adopt(parent.node.parentNode); if (!type) return parent; // loop trough ancestors if type is given - while (parent && parent.node instanceof window$3.SVGElement) { + while (parent && parent.node instanceof globals.window.SVGElement) { // FIXME: That shouldnt be neccessary if (typeof type === 'string' ? parent.matches(type) : parent instanceof type) return parent; parent = adopt(parent.node.parentNode); @@ -1746,8 +1747,8 @@ var SVG = (function () { outerHTML = outerHTML == null ? false : outerHTML; // Create temporary holder - well = document$2.createElementNS(ns, 'svg'); - fragment = document$2.createDocumentFragment(); // Dump raw svg + well = globals.document.createElementNS(ns, 'svg'); + fragment = globals.document.createDocumentFragment(); // Dump raw svg well.innerHTML = svgOrFn; // Transplant nodes into the fragment @@ -1998,8 +1999,6 @@ var SVG = (function () { }(Container); register(Defs); - var window$4 = globals.window; - var Doc$1 = /*#__PURE__*/ function (_Container) { @@ -2020,7 +2019,7 @@ var SVG = (function () { _createClass(Doc, [{ key: "isRoot", value: function isRoot() { - return !this.node.parentNode || !(this.node.parentNode instanceof window$4.SVGElement) || this.node.parentNode.nodeName === '#document'; + return !this.node.parentNode || !(this.node.parentNode instanceof globals.window.SVGElement) || this.node.parentNode.nodeName === '#document'; } // Check if this is a root svg // If not, call docs from this element @@ -2081,7 +2080,6 @@ var SVG = (function () { }); register(Doc$1, 'Doc', true); - var document$3 = globals.document; function parser() { // Reuse cached element if possible if (!parser.nodes) { @@ -2095,7 +2093,7 @@ var SVG = (function () { } if (!parser.nodes.svg.node.parentNode) { - var b = document$3.body || document$3.documentElement; + var b = globals.document.body || globals.document.documentElement; parser.nodes.svg.addTo(b); } @@ -2134,6 +2132,7 @@ var SVG = (function () { }; this.x = source.x == null ? base.x : source.x; this.y = source.y == null ? base.y : source.y; + return this; } // Clone point }, { @@ -2209,6 +2208,7 @@ var SVG = (function () { this.d = source.d != null ? source.d : base.d; this.e = source.e != null ? source.e : base.e; this.f = source.f != null ? source.f : base.f; + return this; } // Clones this matrix }, { @@ -3151,12 +3151,11 @@ var SVG = (function () { return Queue; }(); - var window$5 = globals.window; var Animator = { nextDraw: null, frames: new Queue(), timeouts: new Queue(), - timer: window$5.performance || window$5.Date, + timer: globals.window.performance || globals.window.Date, transforms: [], frame: function frame(fn) { // Store the node @@ -3165,7 +3164,7 @@ var SVG = (function () { }); // Request an animation frame if we don't have one if (Animator.nextDraw === null) { - Animator.nextDraw = window$5.requestAnimationFrame(Animator._draw); + Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw); } // Return the node so we can remove it easily @@ -3185,7 +3184,7 @@ var SVG = (function () { }); // Request another animation frame if we need one if (Animator.nextDraw === null) { - Animator.nextDraw = window$5.requestAnimationFrame(Animator._draw); + Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw); } return node; @@ -3226,26 +3225,23 @@ var SVG = (function () { el(); }); // If we have remaining timeouts or frames, draw until we don't anymore - Animator.nextDraw = Animator.timeouts.first() || Animator.frames.first() ? window$5.requestAnimationFrame(Animator._draw) : null; + Animator.nextDraw = Animator.timeouts.first() || Animator.frames.first() ? globals.window.requestAnimationFrame(Animator._draw) : null; } }; - var window$6 = globals.window, - document$4 = globals.document; - function isNulledBox(box) { return !box.w && !box.h && !box.x && !box.y; } function domContains(node) { - return (document$4.documentElement.contains || function (node) { + return (globals.document.documentElement.contains || function (node) { // This is IE - it does not support contains() for top-level SVGs while (node.parentNode) { node = node.parentNode; } - return node === document$4; - }).call(document$4.documentElement, node); + return node === document; + }).call(globals.document.documentElement, node); } var Box = @@ -3304,8 +3300,8 @@ var SVG = (function () { key: "addOffset", value: function addOffset() { // offset by window scroll position, because getBoundingClientRect changes when window is scrolled - this.x += window$6.pageXOffset; - this.y += window$6.pageYOffset; + this.x += globals.window.pageXOffset; + this.y += globals.window.pageYOffset; return this; } }, { @@ -3343,7 +3339,7 @@ var SVG = (function () { box = cb(clone.node); clone.remove(); } catch (e) { - console.warn('Getting a bounding box of this element is not possible'); + throw new Error('Getting a bounding box of element "' + this.node.nodeName + '" is not possible'); } } @@ -3809,6 +3805,7 @@ var SVG = (function () { value: function init(val) { val = Array.isArray(val) ? val[0] : val; this.value = val; + return this; } }, { key: "valueOf", @@ -3850,6 +3847,7 @@ var SVG = (function () { } Object.assign(this, TransformBag.defaults, obj); + return this; } }, { key: "toArray", @@ -3896,6 +3894,7 @@ var SVG = (function () { this.values = entries.reduce(function (last, curr) { return last.concat(curr); }, []); + return this; } }, { key: "valueOf", @@ -3935,9 +3934,7 @@ var SVG = (function () { }); } - var window$7 = globals.window, - document$5 = globals.document; - var time = window$7.performance || Date; + var time = globals.window.performance || Date; var makeSchedule = function makeSchedule(runnerInfo) { var start = runnerInfo.start; @@ -3962,7 +3959,7 @@ var SVG = (function () { return time.now(); }; - this._dispatcher = document$5.createElement('div'); // Store the timing variables + this._dispatcher = globals.document.createElement('div'); // Store the timing variables this._startTime = 0; this._speed = 1.0; // Play control variables control how the animation proceeds @@ -5507,9 +5504,8 @@ var SVG = (function () { }(Element); register(Stop); - var document$6 = globals.document; function baseFind(query, parent) { - return map((parent || document$6).querySelectorAll(query), function (node) { + return map((parent || globals.document).querySelectorAll(query), function (node) { return adopt(node); }); } // Scoped find method @@ -5682,8 +5678,6 @@ var SVG = (function () { }); register(Pattern); - var window$8 = globals.window; - var Image = /*#__PURE__*/ function (_Shape) { @@ -5700,7 +5694,7 @@ var SVG = (function () { key: "load", value: function load(url, callback) { if (!url) return this; - var img = new window$8.Image(); + var img = new globals.window.Image(); on(img, 'load', function (e) { var p = this.parent(Pattern); // ensure image size @@ -6250,8 +6244,6 @@ var SVG = (function () { }); register(Rect); - var document$7 = globals.document; // Create plain text node - function plain(text) { // clear if build mode is disabled if (this._build === false) { @@ -6259,7 +6251,7 @@ var SVG = (function () { } // create text node - this.node.appendChild(document$7.createTextNode(text)); + this.node.appendChild(globals.document.createTextNode(text)); return this; } // Get length of text element @@ -6272,8 +6264,6 @@ var SVG = (function () { length: length }); - var window$9 = globals.window; - var Text = /*#__PURE__*/ function (_Shape) { @@ -6409,7 +6399,7 @@ var SVG = (function () { var blankLineOffset = 0; var leading = this.dom.leading; this.each(function () { - var fontSize = window$9.getComputedStyle(this.node).getPropertyValue('font-size'); + var fontSize = globals.window.getComputedStyle(this.node).getPropertyValue('font-size'); var dy = leading * new SVGNumber(fontSize); if (this.dom.newLined) { @@ -6527,8 +6517,6 @@ var SVG = (function () { }); register(Tspan); - var document$8 = globals.document; - var Bare = /*#__PURE__*/ function (_Container) { @@ -6549,7 +6537,7 @@ var SVG = (function () { } // create text node - this.node.appendChild(document$8.createTextNode(text)); + this.node.appendChild(globals.document.createTextNode(text)); return this; } }]); diff --git a/src/animation/Animator.js b/src/animation/Animator.js index 4e0b112..9b460f5 100644 --- a/src/animation/Animator.js +++ b/src/animation/Animator.js @@ -1,13 +1,11 @@ -import globals from '../utils/window.js' +import { globals } from '../utils/window.js' import Queue from './Queue.js' -const { window } = globals - const Animator = { nextDraw: null, frames: new Queue(), timeouts: new Queue(), - timer: window.performance || window.Date, + timer: globals.window.performance || globals.window.Date, transforms: [], frame (fn) { @@ -16,7 +14,7 @@ const Animator = { // Request an animation frame if we don't have one if (Animator.nextDraw === null) { - Animator.nextDraw = window.requestAnimationFrame(Animator._draw) + Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw) } // Return the node so we can remove it easily @@ -38,7 +36,7 @@ const Animator = { // Request another animation frame if we need one if (Animator.nextDraw === null) { - Animator.nextDraw = window.requestAnimationFrame(Animator._draw) + Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw) } return node @@ -80,7 +78,7 @@ const Animator = { // If we have remaining timeouts or frames, draw until we don't anymore Animator.nextDraw = Animator.timeouts.first() || Animator.frames.first() - ? window.requestAnimationFrame(Animator._draw) + ? globals.window.requestAnimationFrame(Animator._draw) : null } } diff --git a/src/animation/Timeline.js b/src/animation/Timeline.js index ff30a0d..f1d540a 100644 --- a/src/animation/Timeline.js +++ b/src/animation/Timeline.js @@ -1,9 +1,8 @@ import { registerMethods } from '../utils/methods.js' import Animator from './Animator.js' -import globals from '../utils/window.js' +import { globals } from '../utils/window.js' -const { window, document } = globals -var time = window.performance || Date +var time = globals.window.performance || Date var makeSchedule = function (runnerInfo) { var start = runnerInfo.start @@ -19,7 +18,7 @@ export default class Timeline { return time.now() } - this._dispatcher = document.createElement('div') + this._dispatcher = globals.document.createElement('div') // Store the timing variables this._startTime = 0 diff --git a/src/elements/Bare.js b/src/elements/Bare.js index 7162f3a..a057634 100644 --- a/src/elements/Bare.js +++ b/src/elements/Bare.js @@ -1,9 +1,7 @@ import { nodeOrNew, register, wrapWithAttrCheck } from '../utils/adopter.js' import { registerMethods } from '../utils/methods.js' import Container from './Container.js' -import globals from '../utils/window.js' - -const { document } = globals +import { globals } from '../utils/window.js' export default class Bare extends Container { constructor (node, attrs) { @@ -17,7 +15,7 @@ export default class Bare extends Container { } // create text node - this.node.appendChild(document.createTextNode(text)) + this.node.appendChild(globals.document.createTextNode(text)) return this } diff --git a/src/elements/Doc.js b/src/elements/Doc.js index 952f1d3..d56fae3 100644 --- a/src/elements/Doc.js +++ b/src/elements/Doc.js @@ -8,9 +8,7 @@ import { ns, svgjs, xlink, xmlns } from '../modules/core/namespaces.js' import { registerMethods } from '../utils/methods.js' import Container from './Container.js' import Defs from './Defs.js' -import globals from '../utils/window.js' - -const { window } = globals +import { globals } from '../utils/window.js' export default class Doc extends Container { constructor (node) { @@ -20,7 +18,7 @@ export default class Doc extends Container { isRoot () { return !this.node.parentNode || - !(this.node.parentNode instanceof window.SVGElement) || + !(this.node.parentNode instanceof globals.window.SVGElement) || this.node.parentNode.nodeName === '#document' } diff --git a/src/elements/Dom.js b/src/elements/Dom.js index 8fa053c..192b9bd 100644 --- a/src/elements/Dom.js +++ b/src/elements/Dom.js @@ -8,12 +8,10 @@ import { } from '../utils/adopter.js' import { map } from '../utils/utils.js' import { ns } from '../modules/core/namespaces.js' -import globals from '../utils/window.js' +import { globals } from '../utils/window.js' import EventTarget from '../types/EventTarget.js' import attr from '../modules/core/attr.js' -const { window, document } = globals - export default class Dom extends EventTarget { constructor (node, attrs) { super(node) @@ -156,7 +154,7 @@ export default class Dom extends EventTarget { if (!type) return parent // loop trough ancestors if type is given - while (parent && parent.node instanceof window.SVGElement) { // FIXME: That shouldnt be neccessary + while (parent && parent.node instanceof globals.window.SVGElement) { // FIXME: That shouldnt be neccessary if (typeof type === 'string' ? parent.matches(type) : parent instanceof type) return parent parent = adopt(parent.node.parentNode) } @@ -279,8 +277,8 @@ export default class Dom extends EventTarget { outerHTML = outerHTML == null ? false : outerHTML // Create temporary holder - well = document.createElementNS(ns, 'svg') - fragment = document.createDocumentFragment() + well = globals.document.createElementNS(ns, 'svg') + fragment = globals.document.createDocumentFragment() // Dump raw svg well.innerHTML = svgOrFn diff --git a/src/elements/Image.js b/src/elements/Image.js index 6a01b8f..7f00980 100644 --- a/src/elements/Image.js +++ b/src/elements/Image.js @@ -6,9 +6,7 @@ import { registerMethods } from '../utils/methods.js' import { xlink } from '../modules/core/namespaces.js' import Pattern from './Pattern.js' import Shape from './Shape.js' -import globals from '../utils/window.js' - -const { window } = globals +import { globals } from '../utils/window.js' export default class Image extends Shape { constructor (node) { @@ -19,7 +17,7 @@ export default class Image extends Shape { load (url, callback) { if (!url) return this - var img = new window.Image() + var img = new globals.window.Image() on(img, 'load', function (e) { var p = this.parent(Pattern) diff --git a/src/elements/Text.js b/src/elements/Text.js index 41be916..db9c2ee 100644 --- a/src/elements/Text.js +++ b/src/elements/Text.js @@ -9,11 +9,9 @@ import { attrs } from '../modules/core/defaults.js' import { registerMethods } from '../utils/methods.js' import SVGNumber from '../types/SVGNumber.js' import Shape from './Shape.js' -import globals from '../utils/window.js' +import { globals } from '../utils/window.js' import * as textable from '../modules/core/textable.js' -const { window } = globals - export default class Text extends Shape { // Initialize node constructor (node) { @@ -134,7 +132,7 @@ export default class Text extends Shape { var leading = this.dom.leading this.each(function () { - var fontSize = window.getComputedStyle(this.node) + var fontSize = globals.window.getComputedStyle(this.node) .getPropertyValue('font-size') var dy = leading * new SVGNumber(fontSize) diff --git a/src/elemnts-svg.js b/src/elemnts-svg.js deleted file mode 100644 index b5b2542..0000000 --- a/src/elemnts-svg.js +++ /dev/null @@ -1,68 +0,0 @@ -import { ns } from './namespaces.js' - -/* eslint no-unused-vars: "off" */ -var a = { - // Import raw svg - svg (svg, fn = false) { - var well, len, fragment - - // act as getter if no svg string is given - if (svg == null || svg === true || typeof svg === 'function') { - // write svgjs data to the dom - this.writeDataToDom() - let current = this - - // An export modifier was passed - if (typeof svg === 'function') { - // Juggle arguments - [fn, svg] = [svg, fn] - - // If the user wants outerHTML we need to process this node, too - if (!svg) { - current = fn(current) - - // The user does not want this node? Well, then he gets nothing - if (current === false) return '' - } - - // Deep loop through all children and apply modifier - current.each(function () { - let result = fn(this) - - // If modifier returns false, discard node - if (result === false) { - this.remove() - - // If modifier returns new node, use it - } else if (result !== this) { - this.replace(result) - } - }, true) - } - - // Return outer or inner content - return svg - ? current.node.innerHTML - : current.node.outerHTML - } - - // Act as setter if we got a string - - // Create temporary holder - well = document.createElementNS(ns, 'svg') - fragment = document.createDocumentFragment() - - // Dump raw svg - well.innerHTML = svg - - // Transplant nodes into the fragment - for (len = well.children.length; len--;) { - fragment.appendChild(well.firstElementChild) - } - - // Add the whole fragment at once - this.node.appendChild(fragment) - - return this - } -} diff --git a/src/modules/core/event.js b/src/modules/core/event.js index 351fe3f..a52a744 100644 --- a/src/modules/core/event.js +++ b/src/modules/core/event.js @@ -1,8 +1,6 @@ import { delimiter } from './regex.js' import { makeInstance } from '../../utils/adopter.js' -import globals from '../../utils/window.js' - -const { window } = globals +import { globals } from '../../utils/window.js' let listenerId = 0 @@ -112,10 +110,10 @@ export function dispatch (node, event, data) { var n = getEventTarget(node) // Dispatch event - if (event instanceof window.Event) { + if (event instanceof globals.window.Event) { n.dispatchEvent(event) } else { - event = new window.CustomEvent(event, { detail: data, cancelable: true }) + event = new globals.window.CustomEvent(event, { detail: data, cancelable: true }) n.dispatchEvent(event) } return event diff --git a/src/modules/core/parser.js b/src/modules/core/parser.js index a490576..ccbbc54 100644 --- a/src/modules/core/parser.js +++ b/src/modules/core/parser.js @@ -1,7 +1,5 @@ import Doc from '../../elements/Doc.js' -import globals from '../../utils/window.js' - -const { document } = globals +import { globals } from '../../utils/window.js' export default function parser () { // Reuse cached element if possible @@ -21,7 +19,7 @@ export default function parser () { } if (!parser.nodes.svg.node.parentNode) { - let b = document.body || document.documentElement + let b = globals.document.body || globals.document.documentElement parser.nodes.svg.addTo(b) } diff --git a/src/modules/core/selector.js b/src/modules/core/selector.js index 52a7ad1..f2a7c58 100644 --- a/src/modules/core/selector.js +++ b/src/modules/core/selector.js @@ -1,12 +1,10 @@ import { adopt } from '../../utils/adopter.js' import { map } from '../../utils/utils.js' import { registerMethods } from '../../utils/methods.js' -import globals from '../../utils/window.js' - -const { document } = globals +import { globals } from '../../utils/window.js' export default function baseFind (query, parent) { - return map((parent || document).querySelectorAll(query), function (node) { + return map((parent || globals.document).querySelectorAll(query), function (node) { return adopt(node) }) } diff --git a/src/modules/core/textable.js b/src/modules/core/textable.js index cf452c6..55df7c6 100644 --- a/src/modules/core/textable.js +++ b/src/modules/core/textable.js @@ -1,6 +1,4 @@ -import globals from '../../utils/window.js' - -const { document } = globals +import { globals } from '../../utils/window.js' // Create plain text node export function plain (text) { @@ -10,7 +8,7 @@ export function plain (text) { } // create text node - this.node.appendChild(document.createTextNode(text)) + this.node.appendChild(globals.document.createTextNode(text)) return this } diff --git a/src/types/Box.js b/src/types/Box.js index 97ba699..8c1c4ca 100644 --- a/src/types/Box.js +++ b/src/types/Box.js @@ -1,23 +1,21 @@ import { delimiter } from '../modules/core/regex.js' import { registerMethods } from '../utils/methods.js' -import globals from '../utils/window.js' +import { globals } from '../utils/window.js' import Point from './Point.js' import parser from '../modules/core/parser.js' -const { window, document } = globals - function isNulledBox (box) { return !box.w && !box.h && !box.x && !box.y } function domContains (node) { - return (document.documentElement.contains || function (node) { + return (globals.document.documentElement.contains || function (node) { // This is IE - it does not support contains() for top-level SVGs while (node.parentNode) { node = node.parentNode } return node === document - }).call(document.documentElement, node) + }).call(globals.document.documentElement, node) } export default class Box { @@ -88,8 +86,8 @@ export default class Box { addOffset () { // offset by window scroll position, because getBoundingClientRect changes when window is scrolled - this.x += window.pageXOffset - this.y += window.pageYOffset + this.x += globals.window.pageXOffset + this.y += globals.window.pageYOffset return this } @@ -121,7 +119,7 @@ function getBox (cb) { box = cb(clone.node) clone.remove() } catch (e) { - console.warn('Getting a bounding box of this element is not possible') + throw new Error('Getting a bounding box of element "' + this.node.nodeName + '" is not possible') } } return box diff --git a/src/utils/adopter.js b/src/utils/adopter.js index 5d5d1f0..5de4038 100644 --- a/src/utils/adopter.js +++ b/src/utils/adopter.js @@ -1,17 +1,15 @@ import { capitalize } from './utils.js' import { ns } from '../modules/core/namespaces.js' -import globals from '../utils/window.js' +import { globals } from '../utils/window.js' import Base from '../types/Base.js' -const { window, document } = globals - const elements = {} export const root = Symbol('root') // Method for element creation export function makeNode (name) { // create element - return document.createElementNS(ns, name) + return globals.document.createElementNS(ns, name) } export function makeInstance (element) { @@ -26,7 +24,7 @@ export function makeInstance (element) { } if (typeof element === 'string' && element.charAt(0) !== '<') { - return adopt(document.querySelector(element)) + return adopt(globals.document.querySelector(element)) } var node = makeNode('svg') @@ -40,7 +38,7 @@ export function makeInstance (element) { } export function nodeOrNew (name, node) { - return node instanceof window.Node ? node : makeNode(name) + return node instanceof globals.window.Node ? node : makeNode(name) } // Adopt existing svg elements @@ -51,7 +49,7 @@ export function adopt (node) { // make sure a node isn't already adopted if (node.instance instanceof Base) return node.instance - if (!(node instanceof window.SVGElement)) { + if (!(node instanceof globals.window.SVGElement)) { return new elements.HtmlNode(node) } diff --git a/src/utils/window.js b/src/utils/window.js index f44ebb9..9e51339 100644 --- a/src/utils/window.js +++ b/src/utils/window.js @@ -1,10 +1,9 @@ -const globals = { - window, document +export const globals = { + window: typeof window === 'undefined' ? null : window, + document: typeof document === 'undefined' ? null : document } -export default globals - -export function registerWindow (w) { - globals.window = w - globals.document = w.document +export function registerWindow (win = null, doc = null) { + globals.window = win + globals.document = doc } -- cgit v1.2.3 From 7a5ae8b897548eef9efbf900b42936f24f911cea Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Fri, 9 Nov 2018 11:17:18 +0100 Subject: adds `List` which does bring back `SVG.Set` in an elegant way (#645) --- dist/svg.js | 155 ++++++++++++++++++++++++++++++++++----------------- src/main.js | 20 ++++--- src/types/List.js | 38 +++++++++++++ src/types/set.js | 18 ------ src/utils/adopter.js | 4 ++ src/utils/methods.js | 10 ++++ 6 files changed, 168 insertions(+), 77 deletions(-) create mode 100644 src/types/List.js delete mode 100644 src/types/set.js diff --git a/dist/svg.js b/dist/svg.js index 8cd3575..670b1fd 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Mon Nov 12 2018 09:31:46 GMT+0100 (GMT+01:00) +* BUILT: Mon Nov 12 2018 12:58:46 GMT+0100 (GMT+01:00) */; var SVG = (function () { 'use strict'; @@ -216,6 +216,64 @@ var SVG = (function () { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } + var methods = {}; + var names = []; + function registerMethods(name, m) { + if (Array.isArray(name)) { + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; + + try { + for (var _iterator = name[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var _name = _step.value; + registerMethods(_name, m); + } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return != null) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } + } + + return; + } + + if (_typeof(name) === 'object') { + var _arr = Object.entries(name); + + for (var _i = 0; _i < _arr.length; _i++) { + var _arr$_i = _slicedToArray(_arr[_i], 2), + _name2 = _arr$_i[0], + _m = _arr$_i[1]; + + registerMethods(_name2, _m); + } + + return; + } + + addMethodNames(Object.keys(m)); + methods[name] = Object.assign(methods[name] || {}, m); + } + function getMethodsFor(name) { + return methods[name] || {}; + } + function getMethodNames() { + return _toConsumableArray(new Set(names)); + } + function addMethodNames(_names) { + names.push.apply(names, _toConsumableArray(_names)); + } + // Map function function map(array, block) { var i; @@ -398,6 +456,7 @@ var SVG = (function () { var asRoot = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; elements[name] = element; if (asRoot) elements[root] = element; + addMethodNames(Object.keys(element.prototype)); return element; } function getClass(name) { @@ -462,56 +521,6 @@ var SVG = (function () { }; } - var methods = {}; - function registerMethods(name, m) { - if (Array.isArray(name)) { - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; - - try { - for (var _iterator = name[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { - var _name = _step.value; - registerMethods(_name, m); - } - } catch (err) { - _didIteratorError = true; - _iteratorError = err; - } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } - } - - return; - } - - if (_typeof(name) === 'object') { - var _arr = Object.entries(name); - - for (var _i = 0; _i < _arr.length; _i++) { - var _arr$_i = _slicedToArray(_arr[_i], 2), - _name2 = _arr$_i[0], - _m = _arr$_i[1]; - - registerMethods(_name2, _m); - } - - return; - } - - methods[name] = Object.assign(methods[name] || {}, m); - } - function getMethodsFor(name) { - return methods[name] || {}; - } - function siblings() { return this.parent().children(); } // Get the curent position siblings @@ -5369,6 +5378,48 @@ var SVG = (function () { transform: transform }); + var List = subClassArray('List', Array, function (arr) { + this.length = 0; + this.push.apply(this, _toConsumableArray(arr)); + }); + extend(List, { + each: function each(cbOrName) { + for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + args[_key - 1] = arguments[_key]; + } + + if (typeof cbOrName === 'function') { + this.forEach(function (el) { + cbOrName.call(el, el); + }); + } else { + this.forEach(function (el) { + el[cbOrName].apply(el, args); + }); + } + + return this; + }, + toArray: function toArray() { + return Array.prototype.concat.apply([], this); + } + }); + + List.extend = function (methods) { + methods = methods.reduce(function (obj, name) { + obj[name] = function () { + for (var _len2 = arguments.length, attrs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + attrs[_key2] = arguments[_key2]; + } + + return this.each.apply(this, [name].concat(attrs)); + }; + + return obj; + }, {}); + extend(List, methods); + }; + var Shape = /*#__PURE__*/ function (_Element) { @@ -6968,6 +7019,7 @@ var SVG = (function () { extend(Shape, getMethodsFor('Shape')); // extend(Element, getConstructor('Memory')) extend(Container, getMethodsFor('Container')); + List.extend(getMethodNames()); registerMorphableType([SVGNumber, Color, Box, Matrix, SVGArray, PointArray, PathArray]); makeMorphable(); @@ -7000,6 +7052,7 @@ var SVG = (function () { PathArray: PathArray, Point: Point, PointArray: PointArray, + List: List, Bare: Bare, Circle: Circle, ClipPath: ClipPath, diff --git a/src/main.js b/src/main.js index 1961604..a7deaaa 100644 --- a/src/main.js +++ b/src/main.js @@ -7,15 +7,9 @@ import './modules/optional/memory.js' import './modules/optional/sugar.js' import './modules/optional/transform.js' -import Morphable, { - NonMorphable, - ObjectBag, - TransformBag, - makeMorphable, - registerMorphableType -} from './types/Morphable.js' +import List from './types/List.js' import { extend } from './utils/adopter.js' -import { getMethodsFor } from './utils/methods.js' +import { getMethodNames, getMethodsFor } from './utils/methods.js' import Box from './types/Box.js' import Circle from './elements/Circle.js' import Color from './types/Color.js' @@ -31,6 +25,13 @@ import Image from './elements/Image.js' import Line from './elements/Line.js' import Marker from './elements/Marker.js' import Matrix from './types/Matrix.js' +import Morphable, { + NonMorphable, + ObjectBag, + TransformBag, + makeMorphable, + registerMorphableType +} from './types/Morphable.js' import Path from './elements/Path.js' import PathArray from './types/PathArray.js' import Pattern from './elements/Pattern.js' @@ -80,6 +81,7 @@ export { default as SVGNumber } from './types/SVGNumber.js' export { default as PathArray } from './types/PathArray.js' export { default as Point } from './types/Point.js' export { default as PointArray } from './types/PointArray.js' +export { default as List } from './types/List.js' /* Elements */ export { default as Bare } from './elements/Bare.js' @@ -152,6 +154,8 @@ extend(Shape, getMethodsFor('Shape')) // extend(Element, getConstructor('Memory')) extend(Container, getMethodsFor('Container')) +List.extend(getMethodNames()) + registerMorphableType([ SVGNumber, Color, diff --git a/src/types/List.js b/src/types/List.js new file mode 100644 index 0000000..f3c0e1e --- /dev/null +++ b/src/types/List.js @@ -0,0 +1,38 @@ +import { extend } from '../utils/adopter.js' +import { subClassArray } from './ArrayPolyfill.js' + +const List = subClassArray('List', Array, function (arr) { + this.length = 0 + this.push(...arr) +}) + +export default List + +extend(List, { + each (cbOrName, ...args) { + if (typeof cbOrName === 'function') { + this.forEach((el) => { cbOrName.call(el, el) }) + } else { + this.forEach((el) => { + el[cbOrName](...args) + }) + } + + return this + }, + + toArray () { + return Array.prototype.concat.apply([], this) + } +}) + +List.extend = function (methods) { + methods = methods.reduce((obj, name) => { + obj[name] = function (...attrs) { + return this.each(name, ...attrs) + } + return obj + }, {}) + + extend(List, methods) +} diff --git a/src/types/set.js b/src/types/set.js deleted file mode 100644 index c755c2c..0000000 --- a/src/types/set.js +++ /dev/null @@ -1,18 +0,0 @@ -/* eslint no-unused-vars: "off" */ -class SVGSet extends Set { - // constructor (arr) { - // super(arr) - // } - - each (cbOrName, ...args) { - if (typeof cbOrName === 'function') { - this.forEach((el) => { cbOrName.call(el, el) }) - } else { - this.forEach((el) => { - el[cbOrName](...args) - }) - } - - return this - } -} diff --git a/src/utils/adopter.js b/src/utils/adopter.js index 5de4038..80bfd8a 100644 --- a/src/utils/adopter.js +++ b/src/utils/adopter.js @@ -1,3 +1,4 @@ +import { addMethodNames } from './methods.js' import { capitalize } from './utils.js' import { ns } from '../modules/core/namespaces.js' import { globals } from '../utils/window.js' @@ -73,6 +74,9 @@ export function adopt (node) { export function register (element, name = element.name, asRoot = false) { elements[name] = element if (asRoot) elements[root] = element + + addMethodNames(Object.keys(element.prototype)) + return element } diff --git a/src/utils/methods.js b/src/utils/methods.js index 2373445..70f9329 100644 --- a/src/utils/methods.js +++ b/src/utils/methods.js @@ -1,5 +1,6 @@ const methods = {} const constructors = {} +const names = [] export function registerMethods (name, m) { if (Array.isArray(name)) { @@ -16,6 +17,7 @@ export function registerMethods (name, m) { return } + addMethodNames(Object.keys(m)) methods[name] = Object.assign(methods[name] || {}, m) } @@ -23,6 +25,14 @@ export function getMethodsFor (name) { return methods[name] || {} } +export function getMethodNames () { + return [...new Set(names)] +} + +export function addMethodNames (_names) { + names.push(..._names) +} + export function registerConstructor (name, setup) { constructors[name] = setup } -- cgit v1.2.3 From c108c060152add00cac72a4911f6e998ffb4eb83 Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Sat, 10 Nov 2018 20:24:57 +0100 Subject: change method name, make strings more pleasing to read --- src/types/ArrayPolyfill.js | 12 ++++++------ src/types/List.js | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/types/ArrayPolyfill.js b/src/types/ArrayPolyfill.js index cf95d54..839a970 100644 --- a/src/types/ArrayPolyfill.js +++ b/src/types/ArrayPolyfill.js @@ -5,12 +5,12 @@ export const subClassArray = (function () { return Function('name', 'baseClass', '_constructor', [ 'baseClass = baseClass || Array', 'return {', - '[name]: class extends baseClass {', - 'constructor (...args) {', - 'super(...args)', - '_constructor && _constructor.apply(this, args)', - '}', - '}', + ' [name]: class extends baseClass {', + ' constructor (...args) {', + ' super(...args)', + ' _constructor && _constructor.apply(this, args)', + ' }', + ' }', '}[name]' ].join('\n')) } catch (e) { diff --git a/src/types/List.js b/src/types/List.js index f3c0e1e..193ed05 100644 --- a/src/types/List.js +++ b/src/types/List.js @@ -9,12 +9,12 @@ const List = subClassArray('List', Array, function (arr) { export default List extend(List, { - each (cbOrName, ...args) { - if (typeof cbOrName === 'function') { - this.forEach((el) => { cbOrName.call(el, el) }) + each (fnOrMethodName, ...args) { + if (typeof fnOrMethodName === 'function') { + this.forEach((el) => { fnOrMethodName.call(el, el) }) } else { this.forEach((el) => { - el[cbOrName](...args) + el[fnOrMethodName](...args) }) } -- cgit v1.2.3 From 6ea72cae2c761848b7db2c9457fd41c62d0336d6 Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Mon, 12 Nov 2018 12:00:03 +0100 Subject: make List return new lists on method calls, add map to array polyfill so that this works, fix runner --- dist/svg.js | 5942 +++++++++++++++++++++-------------------- spec/spec/sugar.js | 12 +- src/animation/Runner.js | 32 +- src/main.js | 5 +- src/modules/optional/sugar.js | 17 +- src/types/ArrayPolyfill.js | 6 + src/types/List.js | 11 +- src/types/SVGArray.js | 2 + 8 files changed, 3051 insertions(+), 2976 deletions(-) diff --git a/dist/svg.js b/dist/svg.js index 670b1fd..d7dfcd1 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Mon Nov 12 2018 12:58:46 GMT+0100 (GMT+01:00) +* BUILT: Mon Nov 12 2018 13:00:40 GMT+0100 (GMT+01:00) */; var SVG = (function () { 'use strict'; @@ -1222,7 +1222,7 @@ var SVG = (function () { var subClassArray = function () { try { // try es6 subclassing - return Function('name', 'baseClass', '_constructor', ['baseClass = baseClass || Array', 'return {', '[name]: class extends baseClass {', 'constructor (...args) {', 'super(...args)', '_constructor && _constructor.apply(this, args)', '}', '}', '}[name]'].join('\n')); + return Function('name', 'baseClass', '_constructor', ['baseClass = baseClass || Array', 'return {', ' [name]: class extends baseClass {', ' constructor (...args) {', ' super(...args)', ' _constructor && _constructor.apply(this, args)', ' }', ' }', '}[name]'].join('\n')); } catch (e) { // Use es5 approach return function (name) { @@ -1237,6 +1237,13 @@ var SVG = (function () { Arr.prototype = Object.create(baseClass.prototype); Arr.prototype.constructor = Arr; + + Arr.prototype.map = function (fn) { + var arr = new Arr(); + arr.push.apply(arr, Array.prototype.map.call(this, fn)); + return arr; + }; + return Arr; }; } @@ -1247,6 +1254,8 @@ var SVG = (function () { }); extend(SVGArray, { init: function init(arr) { + // This catches the case, that native map tries to create an array with new Array(1) + if (typeof arr === 'number') return this; this.length = 0; this.push.apply(this, _toConsumableArray(this.parse(arr))); return this; @@ -2729,293 +2738,581 @@ var SVG = (function () { } }); - /*** - Base Class - ========== - The base stepper class that will be - ***/ + var sugar = { + stroke: ['color', 'width', 'opacity', 'linecap', 'linejoin', 'miterlimit', 'dasharray', 'dashoffset'], + fill: ['color', 'opacity', 'rule'], + prefix: function prefix(t, a) { + return a === 'color' ? t : t + '-' + a; + } // Add sugar for fill and stroke + + }; + ['fill', 'stroke'].forEach(function (m) { + var extension = {}; + var i; + + extension[m] = function (o) { + if (typeof o === 'undefined') { + return this.attr(m); + } + + if (typeof o === 'string' || Color.isRgb(o) || o instanceof Element) { + this.attr(m, o); + } else { + // set all attributes from sugar.fill and sugar.stroke list + for (i = sugar[m].length - 1; i >= 0; i--) { + if (o[sugar[m][i]] != null) { + this.attr(sugar.prefix(m, sugar[m][i]), o[sugar[m][i]]); + } + } + } - function makeSetterGetter(k, f) { - return function (v) { - if (v == null) return this[v]; - this[k] = v; - if (f) f.call(this); return this; }; - } - var easing = { - '-': function _(pos) { - return pos; + registerMethods(['Shape', 'Runner'], extension); + }); + registerMethods(['Element', 'Runner'], { + // Let the user set the matrix directly + matrix: function matrix(mat, b, c, d, e, f) { + // Act as a getter + if (mat == null) { + return new Matrix(this); + } // Act as a setter, the user can pass a matrix or a set of numbers + + + return this.attr('transform', new Matrix(mat, b, c, d, e, f)); }, - '<>': function _(pos) { - return -Math.cos(pos * Math.PI) / 2 + 0.5; + // Map rotation to transform + rotate: function rotate(angle, cx, cy) { + return this.transform({ + rotate: angle, + ox: cx, + oy: cy + }, true); }, - '>': function _(pos) { - return Math.sin(pos * Math.PI / 2); + // Map skew to transform + skew: function skew(x, y, cx, cy) { + return arguments.length === 1 || arguments.length === 3 ? this.transform({ + skew: x, + ox: y, + oy: cx + }, true) : this.transform({ + skew: [x, y], + ox: cx, + oy: cy + }, true); }, - '<': function _(pos) { - return -Math.cos(pos * Math.PI / 2) + 1; + shear: function shear(lam, cx, cy) { + return this.transform({ + shear: lam, + ox: cx, + oy: cy + }, true); }, - bezier: function bezier(x1, y1, x2, y2) { - // see https://www.w3.org/TR/css-easing-1/#cubic-bezier-algo - return function (t) { - if (t < 0) { - if (x1 > 0) { - return y1 / x1 * t; - } else if (x2 > 0) { - return y2 / x2 * t; - } else { - return 0; - } - } else if (t > 1) { - if (x2 < 1) { - return (1 - y2) / (1 - x2) * t + (y2 - x2) / (1 - x2); - } else if (x1 < 1) { - return (1 - y1) / (1 - x1) * t + (y1 - x1) / (1 - x1); - } else { - return 1; - } - } else { - return 3 * t * Math.pow(1 - t, 2) * y1 + 3 * Math.pow(t, 2) * (1 - t) * y2 + Math.pow(t, 3); - } - }; + // Map scale to transform + scale: function scale(x, y, cx, cy) { + return arguments.length === 1 || arguments.length === 3 ? this.transform({ + scale: x, + ox: y, + oy: cx + }, true) : this.transform({ + scale: [x, y], + ox: cx, + oy: cy + }, true); }, - // https://www.w3.org/TR/css-easing-1/#step-timing-function-algo - steps: function steps(_steps) { - var stepPosition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'end'; - // deal with "jump-" prefix - stepPosition = stepPosition.split('-').reverse()[0]; - var jumps = _steps; - - if (stepPosition === 'none') { - --jumps; - } else if (stepPosition === 'both') { - ++jumps; - } // The beforeFlag is essentially useless - - - return function (t) { - var beforeFlag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false; - // Step is called currentStep in referenced url - var step = Math.floor(t * _steps); - var jumping = t * step % 1 === 0; - - if (stepPosition === 'start' || stepPosition === 'both') { - ++step; - } - - if (beforeFlag && jumping) { - --step; - } - - if (t >= 0 && step < 0) { - step = 0; - } - - if (t <= 1 && step > jumps) { - step = jumps; + // Map translate to transform + translate: function translate(x, y) { + return this.transform({ + translate: [x, y] + }, true); + }, + // Map relative translations to transform + relative: function relative(x, y) { + return this.transform({ + relative: [x, y] + }, true); + }, + // Map flip to transform + flip: function flip(direction, around) { + var directionString = typeof direction === 'string' ? direction : isFinite(direction) ? 'both' : 'both'; + var origin = direction === 'both' && isFinite(around) ? [around, around] : direction === 'x' ? [around, 0] : direction === 'y' ? [0, around] : isFinite(direction) ? [direction, direction] : [0, 0]; + this.transform({ + flip: directionString, + origin: origin + }, true); + }, + // Opacity + opacity: function opacity(value) { + return this.attr('opacity', value); + }, + // Relative move over x and y axes + dmove: function dmove(x, y) { + return this.dx(x).dy(y); + } + }); + registerMethods('Element', { + // Relative move over x axis + dx: function dx(x) { + return this.x(new SVGNumber(x).plus(this.x())); + }, + // Relative move over y axis + dy: function dy(y) { + return this.y(new SVGNumber(y).plus(this.y())); + } + }); + registerMethods('radius', { + // Add x and y radius + radius: function radius(x, y) { + var type = (this._element || this).type; + return type === 'radialGradient' || type === 'radialGradient' ? this.attr('r', new SVGNumber(x)) : this.rx(x).ry(y == null ? x : y); + } + }); + registerMethods('Path', { + // Get path length + length: function length() { + return this.node.getTotalLength(); + }, + // Get point at length + pointAt: function pointAt(length) { + return new Point(this.node.getPointAtLength(length)); + } + }); + registerMethods(['Element', 'Runner'], { + // Set font + font: function font(a, v) { + if (_typeof(a) === 'object') { + for (v in a) { + this.font(v, a[v]); } + } - return step / jumps; - }; + return a === 'leading' ? this.leading(v) : a === 'anchor' ? this.attr('text-anchor', v) : a === 'size' || a === 'family' || a === 'weight' || a === 'stretch' || a === 'variant' || a === 'style' ? this.attr('font-' + a, v) : this.attr(a, v); } - }; - var Stepper = - /*#__PURE__*/ - function () { - function Stepper() { - _classCallCheck(this, Stepper); + }); + registerMethods('Text', { + ax: function ax(x) { + return this.attr('x', x); + }, + ay: function ay(y) { + return this.attr('y', y); + }, + amove: function amove(x, y) { + return this.ax(x).ay(y); } + }); // Add events to elements - _createClass(Stepper, [{ - key: "done", - value: function done() { - return false; + var methods$1 = ['click', 'dblclick', 'mousedown', 'mouseup', 'mouseover', 'mouseout', 'mousemove', 'mouseenter', 'mouseleave', 'touchstart', 'touchmove', 'touchleave', 'touchend', 'touchcancel'].reduce(function (last, event) { + // add event to Element + var fn = function fn(f) { + if (f === null) { + off(this, event); + } else { + on(this, event, f); } - }]); - return Stepper; - }(); - /*** - Easing Functions - ================ - ***/ + return this; + }; - var Ease = - /*#__PURE__*/ - function (_Stepper) { - _inherits(Ease, _Stepper); + last[event] = fn; + return last; + }, {}); + registerMethods('Element', methods$1); - function Ease(fn) { - var _this; + function untransform() { + return this.attr('transform', null); + } // merge the whole transformation chain into one matrix and returns it - _classCallCheck(this, Ease); + function matrixify() { + var matrix = (this.attr('transform') || ''). // split transformations + split(transforms).slice(0, -1).map(function (str) { + // generate key => value pairs + var kv = str.trim().split('('); + return [kv[0], kv[1].split(delimiter).map(function (str) { + return parseFloat(str); + })]; + }).reverse() // merge every transformation into one matrix + .reduce(function (matrix, transform) { + if (transform[0] === 'matrix') { + return matrix.lmultiply(Matrix.fromArray(transform[1])); + } - _this = _possibleConstructorReturn(this, _getPrototypeOf(Ease).call(this)); - _this.ease = easing[fn || timeline.ease] || fn; - return _this; + return matrix[transform[0]].apply(matrix, transform[1]); + }, new Matrix()); + return matrix; + } // add an element to another parent without changing the visual representation on the screen + + function toParent(parent) { + if (this === parent) return this; + var ctm = this.screenCTM(); + var pCtm = parent.screenCTM().inverse(); + this.addTo(parent).untransform().transform(pCtm.multiply(ctm)); + return this; + } // same as above with parent equals root-svg + + function toDoc() { + return this.toParent(this.doc()); + } // Add transformations + + function transform(o, relative) { + // Act as a getter if no object was passed + if (o == null || typeof o === 'string') { + var decomposed = new Matrix(this).decompose(); + return decomposed[o] || decomposed; } - _createClass(Ease, [{ - key: "step", - value: function step(from, to, pos) { - if (typeof from !== 'number') { - return pos < 1 ? from : to; - } + if (!Matrix.isMatrixLike(o)) { + // Set the origin according to the defined transform + o = _objectSpread({}, o, { + origin: getOrigin(o, this) + }); + } // The user can pass a boolean, an Element or an Matrix or nothing - return from + (to - from) * this.ease(pos); + + var cleanRelative = relative === true ? this : relative || false; + var result = new Matrix(cleanRelative).transform(o); + return this.attr('transform', result); + } + registerMethods('Element', { + untransform: untransform, + matrixify: matrixify, + toParent: toParent, + toDoc: toDoc, + transform: transform + }); + + function isNulledBox(box) { + return !box.w && !box.h && !box.x && !box.y; + } + + function domContains(node) { + return (globals.document.documentElement.contains || function (node) { + // This is IE - it does not support contains() for top-level SVGs + while (node.parentNode) { + node = node.parentNode; } - }]); - return Ease; - }(Stepper); - /*** - Controller Types - ================ - ***/ + return node === document; + }).call(globals.document.documentElement, node); + } - var Controller = + var Box = /*#__PURE__*/ - function (_Stepper2) { - _inherits(Controller, _Stepper2); + function () { + function Box() { + _classCallCheck(this, Box); - function Controller(fn) { - var _this2; + this.init.apply(this, arguments); + } - _classCallCheck(this, Controller); + _createClass(Box, [{ + key: "init", + value: function init(source) { + var base = [0, 0, 0, 0]; + source = typeof source === 'string' ? source.split(delimiter).map(parseFloat) : Array.isArray(source) ? source : _typeof(source) === 'object' ? [source.left != null ? source.left : source.x, source.top != null ? source.top : source.y, source.width, source.height] : arguments.length === 4 ? [].slice.call(arguments) : base; + this.x = source[0] || 0; + this.y = source[1] || 0; + this.width = this.w = source[2] || 0; + this.height = this.h = source[3] || 0; // Add more bounding box properties - _this2 = _possibleConstructorReturn(this, _getPrototypeOf(Controller).call(this)); - _this2.stepper = fn; - return _this2; - } + this.x2 = this.x + this.w; + this.y2 = this.y + this.h; + this.cx = this.x + this.w / 2; + this.cy = this.y + this.h / 2; + return this; + } // Merge rect box with another, return a new instance - _createClass(Controller, [{ - key: "step", - value: function step(current, target, dt, c) { - return this.stepper(current, target, dt, c); + }, { + key: "merge", + value: function merge(box) { + var x = Math.min(this.x, box.x); + var y = Math.min(this.y, box.y); + var width = Math.max(this.x + this.width, box.x + box.width) - x; + var height = Math.max(this.y + this.height, box.y + box.height) - y; + return new Box(x, y, width, height); } }, { - key: "done", - value: function done(c) { - return c.done; + key: "transform", + value: function transform(m) { + var xMin = Infinity; + var xMax = -Infinity; + var yMin = Infinity; + var yMax = -Infinity; + var pts = [new Point(this.x, this.y), new Point(this.x2, this.y), new Point(this.x, this.y2), new Point(this.x2, this.y2)]; + pts.forEach(function (p) { + p = p.transform(m); + xMin = Math.min(xMin, p.x); + xMax = Math.max(xMax, p.x); + yMin = Math.min(yMin, p.y); + yMax = Math.max(yMax, p.y); + }); + return new Box(xMin, yMin, xMax - xMin, yMax - yMin); + } + }, { + key: "addOffset", + value: function addOffset() { + // offset by window scroll position, because getBoundingClientRect changes when window is scrolled + this.x += globals.window.pageXOffset; + this.y += globals.window.pageYOffset; + return this; + } + }, { + key: "toString", + value: function toString() { + return this.x + ' ' + this.y + ' ' + this.width + ' ' + this.height; + } + }, { + key: "toArray", + value: function toArray() { + return [this.x, this.y, this.width, this.height]; + } + }, { + key: "isNulled", + value: function isNulled() { + return isNulledBox(this); } }]); - return Controller; - }(Stepper); + return Box; + }(); - function recalculate() { - // Apply the default parameters - var duration = (this._duration || 500) / 1000; - var overshoot = this._overshoot || 0; // Calculate the PID natural response + function getBox(cb) { + var box; - var eps = 1e-10; - var pi = Math.PI; - var os = Math.log(overshoot / 100 + eps); - var zeta = -os / Math.sqrt(pi * pi + os * os); - var wn = 3.9 / (zeta * duration); // Calculate the Spring values + try { + box = cb(this.node); - this.d = 2 * zeta * wn; - this.k = wn * wn; + if (isNulledBox(box) && !domContains(this.node)) { + throw new Error('Element not in the dom'); + } + } catch (e) { + try { + var clone = this.clone().addTo(parser().svg).show(); + box = cb(clone.node); + clone.remove(); + } catch (e) { + throw new Error('Getting a bounding box of element "' + this.node.nodeName + '" is not possible'); + } + } + + return box; } - var Spring = - /*#__PURE__*/ - function (_Controller) { - _inherits(Spring, _Controller); + registerMethods({ + Element: { + // Get bounding box + bbox: function bbox() { + return new Box(getBox.call(this, function (node) { + return node.getBBox(); + })); + }, + rbox: function rbox(el) { + var box = new Box(getBox.call(this, function (node) { + return node.getBoundingClientRect(); + })); + if (el) return box.transform(el.screenCTM().inverse()); + return box.addOffset(); + } + }, + viewbox: { + viewbox: function viewbox(x, y, width, height) { + // act as getter + if (x == null) return new Box(this.attr('viewBox')); // act as setter - function Spring(duration, overshoot) { - var _this3; + return this.attr('viewBox', new Box(x, y, width, height)); + } + } + }); - _classCallCheck(this, Spring); + function rx(rx) { + return this.attr('rx', rx); + } // Radius y value - _this3 = _possibleConstructorReturn(this, _getPrototypeOf(Spring).call(this)); + function ry(ry) { + return this.attr('ry', ry); + } // Move over x-axis - _this3.duration(duration || 500).overshoot(overshoot || 0); + function x(x) { + return x == null ? this.cx() - this.rx() : this.cx(x + this.rx()); + } // Move over y-axis - return _this3; + function y(y) { + return y == null ? this.cy() - this.ry() : this.cy(y + this.ry()); + } // Move by center over x-axis + + function cx(x) { + return x == null ? this.attr('cx') : this.attr('cx', x); + } // Move by center over y-axis + + function cy(y) { + return y == null ? this.attr('cy') : this.attr('cy', y); + } // Set width of element + + function width(width) { + return width == null ? this.rx() * 2 : this.rx(new SVGNumber(width).divide(2)); + } // Set height of element + + function height(height) { + return height == null ? this.ry() * 2 : this.ry(new SVGNumber(height).divide(2)); + } + + var circled = /*#__PURE__*/Object.freeze({ + rx: rx, + ry: ry, + x: x, + y: y, + cx: cx, + cy: cy, + width: width, + height: height + }); + + var Shape = + /*#__PURE__*/ + function (_Element) { + _inherits(Shape, _Element); + + function Shape() { + _classCallCheck(this, Shape); + + return _possibleConstructorReturn(this, _getPrototypeOf(Shape).apply(this, arguments)); } - _createClass(Spring, [{ - key: "step", - value: function step(current, target, dt, c) { - if (typeof current === 'string') return current; - c.done = dt === Infinity; - if (dt === Infinity) return target; - if (dt === 0) return current; - if (dt > 100) dt = 16; - dt /= 1000; // Get the previous velocity + return Shape; + }(Element); + register(Shape); - var velocity = c.velocity || 0; // Apply the control to get the new position and store it + var Circle = + /*#__PURE__*/ + function (_Shape) { + _inherits(Circle, _Shape); - var acceleration = -this.d * velocity - this.k * (current - target); - var newPosition = current + velocity * dt + acceleration * dt * dt / 2; // Store the velocity + function Circle(node) { + _classCallCheck(this, Circle); - c.velocity = velocity + acceleration * dt; // Figure out if we have converged, and if so, pass the value + return _possibleConstructorReturn(this, _getPrototypeOf(Circle).call(this, nodeOrNew('circle', node), node)); + } - c.done = Math.abs(target - newPosition) + Math.abs(velocity) < 0.002; - return c.done ? target : newPosition; + _createClass(Circle, [{ + key: "radius", + value: function radius(r) { + return this.attr('r', r); + } // Radius x value + + }, { + key: "rx", + value: function rx$$1(_rx) { + return this.attr('r', _rx); + } // Alias radius x value + + }, { + key: "ry", + value: function ry$$1(_ry) { + return this.rx(_ry); + } + }, { + key: "size", + value: function size(_size) { + return this.radius(new SVGNumber(_size).divide(2)); } }]); - return Spring; - }(Controller); - extend(Spring, { - duration: makeSetterGetter('_duration', recalculate), - overshoot: makeSetterGetter('_overshoot', recalculate) + return Circle; + }(Shape); + extend(Circle, { + x: x, + y: y, + cx: cx, + cy: cy, + width: width, + height: height }); - var PID = + registerMethods({ + Element: { + // Create circle element + circle: wrapWithAttrCheck(function (size) { + return this.put(new Circle()).size(size).move(0, 0); + }) + } + }); + register(Circle); + + var Ellipse = /*#__PURE__*/ - function (_Controller2) { - _inherits(PID, _Controller2); + function (_Shape) { + _inherits(Ellipse, _Shape); - function PID(p, i, d, windup) { - var _this4; + function Ellipse(node) { + _classCallCheck(this, Ellipse); - _classCallCheck(this, PID); + return _possibleConstructorReturn(this, _getPrototypeOf(Ellipse).call(this, nodeOrNew('ellipse', node), node)); + } - _this4 = _possibleConstructorReturn(this, _getPrototypeOf(PID).call(this)); - p = p == null ? 0.1 : p; - i = i == null ? 0.01 : i; - d = d == null ? 0 : d; - windup = windup == null ? 1000 : windup; + _createClass(Ellipse, [{ + key: "size", + value: function size(width$$1, height$$1) { + var p = proportionalSize(this, width$$1, height$$1); + return this.rx(new SVGNumber(p.width).divide(2)).ry(new SVGNumber(p.height).divide(2)); + } + }]); - _this4.p(p).i(i).d(d).windup(windup); + return Ellipse; + }(Shape); + extend(Ellipse, circled); + registerMethods('Container', { + // Create an ellipse + ellipse: wrapWithAttrCheck(function (width$$1, height$$1) { + return this.put(new Ellipse()).size(width$$1, height$$1).move(0, 0); + }) + }); + register(Ellipse); - return _this4; - } + var Stop = + /*#__PURE__*/ + function (_Element) { + _inherits(Stop, _Element); - _createClass(PID, [{ - key: "step", - value: function step(current, target, dt, c) { - if (typeof current === 'string') return current; - c.done = dt === Infinity; - if (dt === Infinity) return target; - if (dt === 0) return current; - var p = target - current; - var i = (c.integral || 0) + p * dt; - var d = (p - (c.error || 0)) / dt; - var windup = this.windup; // antiwindup + function Stop(node) { + _classCallCheck(this, Stop); - if (windup !== false) { - i = Math.max(-windup, Math.min(i, windup)); - } + return _possibleConstructorReturn(this, _getPrototypeOf(Stop).call(this, nodeOrNew('stop', node), node)); + } // add color stops - c.error = p; - c.integral = i; - c.done = Math.abs(p) < 0.001; - return c.done ? target : current + (this.P * p + this.I * i + this.D * d); + + _createClass(Stop, [{ + key: "update", + value: function update(o) { + if (typeof o === 'number' || o instanceof SVGNumber) { + o = { + offset: arguments[0], + color: arguments[1], + opacity: arguments[2] + }; + } // set attributes + + + if (o.opacity != null) this.attr('stop-opacity', o.opacity); + if (o.color != null) this.attr('stop-color', o.color); + if (o.offset != null) this.attr('offset', new SVGNumber(o.offset)); + return this; } }]); - return PID; - }(Controller); - extend(PID, { - windup: makeSetterGetter('windup'), - p: makeSetterGetter('P'), - i: makeSetterGetter('I'), - d: makeSetterGetter('D') + return Stop; + }(Element); + register(Stop); + + function baseFind(query, parent) { + return map((parent || globals.document).querySelectorAll(query), function (node) { + return adopt(node); + }); + } // Scoped find method + + function find(query) { + return baseFind(query, this.node); + } + registerMethods('Dom', { + find: find }); function from(x, y) { @@ -3042,3258 +3339,3004 @@ var SVG = (function () { to: to }); - function rx(rx) { - return this.attr('rx', rx); - } // Radius y value - - function ry(ry) { - return this.attr('ry', ry); - } // Move over x-axis + var Gradient = + /*#__PURE__*/ + function (_Container) { + _inherits(Gradient, _Container); - function x(x) { - return x == null ? this.cx() - this.rx() : this.cx(x + this.rx()); - } // Move over y-axis + function Gradient(type, attrs) { + _classCallCheck(this, Gradient); - function y(y) { - return y == null ? this.cy() - this.ry() : this.cy(y + this.ry()); - } // Move by center over x-axis + return _possibleConstructorReturn(this, _getPrototypeOf(Gradient).call(this, nodeOrNew(type + 'Gradient', typeof type === 'string' ? null : type), attrs)); + } // Add a color stop - function cx(x) { - return x == null ? this.attr('cx') : this.attr('cx', x); - } // Move by center over y-axis - function cy(y) { - return y == null ? this.attr('cy') : this.attr('cy', y); - } // Set width of element + _createClass(Gradient, [{ + key: "stop", + value: function stop(offset, color, opacity) { + return this.put(new Stop()).update(offset, color, opacity); + } // Update gradient - function width(width) { - return width == null ? this.rx() * 2 : this.rx(new SVGNumber(width).divide(2)); - } // Set height of element + }, { + key: "update", + value: function update(block) { + // remove all stops + this.clear(); // invoke passed block - function height(height) { - return height == null ? this.ry() * 2 : this.ry(new SVGNumber(height).divide(2)); - } + if (typeof block === 'function') { + block.call(this, this); + } - var circled = /*#__PURE__*/Object.freeze({ - rx: rx, - ry: ry, - x: x, - y: y, - cx: cx, - cy: cy, - width: width, - height: height - }); + return this; + } // Return the fill id - var Queue = - /*#__PURE__*/ - function () { - function Queue() { - _classCallCheck(this, Queue); + }, { + key: "url", + value: function url() { + return 'url(#' + this.id() + ')'; + } // Alias string convertion to fill - this._first = null; - this._last = null; + }, { + key: "toString", + value: function toString() { + return this.url(); + } // custom attr to handle transform + + }, { + key: "attr", + value: function attr(a, b, c) { + if (a === 'transform') a = 'gradientTransform'; + return _get(_getPrototypeOf(Gradient.prototype), "attr", this).call(this, a, b, c); + } + }, { + key: "targets", + value: function targets() { + return baseFind('svg [fill*="' + this.id() + '"]'); + } + }, { + key: "bbox", + value: function bbox() { + return new Box(); + } + }]); + + return Gradient; + }(Container); + extend(Gradient, gradiented); + registerMethods({ + Container: { + // Create gradient element in defs + gradient: wrapWithAttrCheck(function (type, block) { + return this.defs().gradient(type, block); + }) + }, + // define gradient + Defs: { + gradient: wrapWithAttrCheck(function (type, block) { + return this.put(new Gradient(type)).update(block); + }) } + }); + register(Gradient); - _createClass(Queue, [{ - key: "push", - value: function push(value) { - // An item stores an id and the provided value - var item = value.next ? value : { - value: value, - next: null, - prev: null // Deal with the queue being empty or populated + var Pattern = + /*#__PURE__*/ + function (_Container) { + _inherits(Pattern, _Container); - }; + // Initialize node + function Pattern(node) { + _classCallCheck(this, Pattern); - if (this._last) { - item.prev = this._last; - this._last.next = item; - this._last = item; - } else { - this._last = item; - this._first = item; - } // Update the length and return the current item + return _possibleConstructorReturn(this, _getPrototypeOf(Pattern).call(this, nodeOrNew('pattern', node), node)); + } // Return the fill id - return item; - } + _createClass(Pattern, [{ + key: "url", + value: function url() { + return 'url(#' + this.id() + ')'; + } // Update pattern by rebuilding + }, { - key: "shift", - value: function shift() { - // Check if we have a value - var remove = this._first; - if (!remove) return null; // If we do, remove it and relink things + key: "update", + value: function update(block) { + // remove content + this.clear(); // invoke passed block - this._first = remove.next; - if (this._first) this._first.prev = null; - this._last = this._first ? this._last : null; - return remove.value; - } // Shows us the first item in the list + if (typeof block === 'function') { + block.call(this, this); + } - }, { - key: "first", - value: function first() { - return this._first && this._first.value; - } // Shows us the last item in the list + return this; + } // Alias string convertion to fill }, { - key: "last", - value: function last() { - return this._last && this._last.value; - } // Removes the item that was returned from the push + key: "toString", + value: function toString() { + return this.url(); + } // custom attr to handle transform }, { - key: "remove", - value: function remove(item) { - // Relink the previous item - if (item.prev) item.prev.next = item.next; - if (item.next) item.next.prev = item.prev; - if (item === this._last) this._last = item.prev; - if (item === this._first) this._first = item.next; // Invalidate item - - item.prev = null; - item.next = null; + key: "attr", + value: function attr(a, b, c) { + if (a === 'transform') a = 'patternTransform'; + return _get(_getPrototypeOf(Pattern.prototype), "attr", this).call(this, a, b, c); + } + }, { + key: "targets", + value: function targets() { + return baseFind('svg [fill*="' + this.id() + '"]'); + } + }, { + key: "bbox", + value: function bbox() { + return new Box(); } }]); - return Queue; - }(); - - var Animator = { - nextDraw: null, - frames: new Queue(), - timeouts: new Queue(), - timer: globals.window.performance || globals.window.Date, - transforms: [], - frame: function frame(fn) { - // Store the node - var node = Animator.frames.push({ - run: fn - }); // Request an animation frame if we don't have one - - if (Animator.nextDraw === null) { - Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw); - } // Return the node so we can remove it easily - - - return node; - }, - transform_frame: function transform_frame(fn, id) { - Animator.transforms[id] = fn; - }, - timeout: function timeout(fn, delay) { - delay = delay || 0; // Work out when the event should fire - - var time = Animator.timer.now() + delay; // Add the timeout to the end of the queue - - var node = Animator.timeouts.push({ - run: fn, - time: time - }); // Request another animation frame if we need one + return Pattern; + }(Container); + registerMethods({ + Container: { + // Create pattern element in defs + pattern: function pattern() { + var _this$defs; - if (Animator.nextDraw === null) { - Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw); + return (_this$defs = this.defs()).pattern.apply(_this$defs, arguments); } - - return node; - }, - cancelFrame: function cancelFrame(node) { - Animator.frames.remove(node); - }, - clearTimeout: function clearTimeout(node) { - Animator.timeouts.remove(node); }, - _draw: function _draw(now) { - // Run all the timeouts we can run, if they are not ready yet, add them - // to the end of the queue immediately! (bad timeouts!!! [sarcasm]) - var nextTimeout = null; - var lastTimeout = Animator.timeouts.last(); + Defs: { + pattern: wrapWithAttrCheck(function (width, height, block) { + return this.put(new Pattern()).update(block).attr({ + x: 0, + y: 0, + width: width, + height: height, + patternUnits: 'userSpaceOnUse' + }); + }) + } + }); + register(Pattern); - while (nextTimeout = Animator.timeouts.shift()) { - // Run the timeout if its time, or push it to the end - if (now >= nextTimeout.time) { - nextTimeout.run(); - } else { - Animator.timeouts.push(nextTimeout); - } // If we hit the last item, we should stop shifting out more items + var Image = + /*#__PURE__*/ + function (_Shape) { + _inherits(Image, _Shape); + function Image(node) { + _classCallCheck(this, Image); - if (nextTimeout === lastTimeout) break; - } // Run all of the animation frames + return _possibleConstructorReturn(this, _getPrototypeOf(Image).call(this, nodeOrNew('image', node), node)); + } // (re)load image - var nextFrame = null; - var lastFrame = Animator.frames.last(); + _createClass(Image, [{ + key: "load", + value: function load(url, callback) { + if (!url) return this; + var img = new globals.window.Image(); + on(img, 'load', function (e) { + var p = this.parent(Pattern); // ensure image size - while (nextFrame !== lastFrame && (nextFrame = Animator.frames.shift())) { - nextFrame.run(); - } - - Animator.transforms.forEach(function (el) { - el(); - }); // If we have remaining timeouts or frames, draw until we don't anymore - - Animator.nextDraw = Animator.timeouts.first() || Animator.frames.first() ? globals.window.requestAnimationFrame(Animator._draw) : null; - } - }; + if (this.width() === 0 && this.height() === 0) { + this.size(img.width, img.height); + } - function isNulledBox(box) { - return !box.w && !box.h && !box.x && !box.y; - } + if (p instanceof Pattern) { + // ensure pattern size if not set + if (p.width() === 0 && p.height() === 0) { + p.size(this.width(), this.height()); + } + } - function domContains(node) { - return (globals.document.documentElement.contains || function (node) { - // This is IE - it does not support contains() for top-level SVGs - while (node.parentNode) { - node = node.parentNode; + if (typeof callback === 'function') { + callback.call(this, { + width: img.width, + height: img.height, + ratio: img.width / img.height, + url: url + }); + } + }, this); + on(img, 'load error', function () { + // dont forget to unbind memory leaking events + off(img); + }); + return this.attr('href', img.src = url, xlink); } + }]); - return node === document; - }).call(globals.document.documentElement, node); - } + return Image; + }(Shape); + registerAttrHook(function (attr$$1, val, _this) { + // convert image fill and stroke to patterns + if (attr$$1 === 'fill' || attr$$1 === 'stroke') { + if (isImage.test(val)) { + val = _this.doc().defs().image(val); + } + } - var Box = - /*#__PURE__*/ - function () { - function Box() { - _classCallCheck(this, Box); + if (val instanceof Image) { + val = _this.doc().defs().pattern(0, 0, function (pattern) { + pattern.add(val); + }); + } - this.init.apply(this, arguments); + return val; + }); + registerMethods({ + Container: { + // create image element, load image and set its size + image: wrapWithAttrCheck(function (source, callback) { + return this.put(new Image()).size(0, 0).load(source, callback); + }) } + }); + register(Image); - _createClass(Box, [{ - key: "init", - value: function init(source) { - var base = [0, 0, 0, 0]; - source = typeof source === 'string' ? source.split(delimiter).map(parseFloat) : Array.isArray(source) ? source : _typeof(source) === 'object' ? [source.left != null ? source.left : source.x, source.top != null ? source.top : source.y, source.width, source.height] : arguments.length === 4 ? [].slice.call(arguments) : base; - this.x = source[0] || 0; - this.y = source[1] || 0; - this.width = this.w = source[2] || 0; - this.height = this.h = source[3] || 0; // Add more bounding box properties + var PointArray = subClassArray('PointArray', SVGArray); + extend(PointArray, { + // Convert array to string + toString: function toString() { + // convert to a poly point string + for (var i = 0, il = this.length, array = []; i < il; i++) { + array.push(this[i].join(',')); + } - this.x2 = this.x + this.w; - this.y2 = this.y + this.h; - this.cx = this.x + this.w / 2; - this.cy = this.y + this.h / 2; - return this; - } // Merge rect box with another, return a new instance + return array.join(' '); + }, + // Convert array to line object + toLine: function toLine() { + return { + x1: this[0][0], + y1: this[0][1], + x2: this[1][0], + y2: this[1][1] + }; + }, + // Get morphed array at given position + at: function at(pos) { + // make sure a destination is defined + if (!this.destination) return this; // generate morphed point string - }, { - key: "merge", - value: function merge(box) { - var x = Math.min(this.x, box.x); - var y = Math.min(this.y, box.y); - var width = Math.max(this.x + this.width, box.x + box.width) - x; - var height = Math.max(this.y + this.height, box.y + box.height) - y; - return new Box(x, y, width, height); - } - }, { - key: "transform", - value: function transform(m) { - var xMin = Infinity; - var xMax = -Infinity; - var yMin = Infinity; - var yMax = -Infinity; - var pts = [new Point(this.x, this.y), new Point(this.x2, this.y), new Point(this.x, this.y2), new Point(this.x2, this.y2)]; - pts.forEach(function (p) { - p = p.transform(m); - xMin = Math.min(xMin, p.x); - xMax = Math.max(xMax, p.x); - yMin = Math.min(yMin, p.y); - yMax = Math.max(yMax, p.y); - }); - return new Box(xMin, yMin, xMax - xMin, yMax - yMin); - } - }, { - key: "addOffset", - value: function addOffset() { - // offset by window scroll position, because getBoundingClientRect changes when window is scrolled - this.x += globals.window.pageXOffset; - this.y += globals.window.pageYOffset; - return this; - } - }, { - key: "toString", - value: function toString() { - return this.x + ' ' + this.y + ' ' + this.width + ' ' + this.height; - } - }, { - key: "toArray", - value: function toArray() { - return [this.x, this.y, this.width, this.height]; - } - }, { - key: "isNulled", - value: function isNulled() { - return isNulledBox(this); + for (var i = 0, il = this.length, array = []; i < il; i++) { + array.push([this[i][0] + (this.destination[i][0] - this[i][0]) * pos, this[i][1] + (this.destination[i][1] - this[i][1]) * pos]); } - }]); - - return Box; - }(); - function getBox(cb) { - var box; + return new PointArray(array); + }, + // Parse point string and flat array + parse: function parse() { + var array = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [[0, 0]]; + var points = []; // if it is an array - try { - box = cb(this.node); + if (array instanceof Array) { + // and it is not flat, there is no need to parse it + if (array[0] instanceof Array) { + return array; + } + } else { + // Else, it is considered as a string + // parse points + array = array.trim().split(delimiter).map(parseFloat); + } // validate points - https://svgwg.org/svg2-draft/shapes.html#DataTypePoints + // Odd number of coordinates is an error. In such cases, drop the last odd coordinate. - if (isNulledBox(box) && !domContains(this.node)) { - throw new Error('Element not in the dom'); - } - } catch (e) { - try { - var clone = this.clone().addTo(parser().svg).show(); - box = cb(clone.node); - clone.remove(); - } catch (e) { - throw new Error('Getting a bounding box of element "' + this.node.nodeName + '" is not possible'); - } - } - return box; - } + if (array.length % 2 !== 0) array.pop(); // wrap points in two-tuples and parse points as floats - registerMethods({ - Element: { - // Get bounding box - bbox: function bbox() { - return new Box(getBox.call(this, function (node) { - return node.getBBox(); - })); - }, - rbox: function rbox(el) { - var box = new Box(getBox.call(this, function (node) { - return node.getBoundingClientRect(); - })); - if (el) return box.transform(el.screenCTM().inverse()); - return box.addOffset(); + for (var i = 0, len = array.length; i < len; i = i + 2) { + points.push([array[i], array[i + 1]]); } + + return points; }, - viewbox: { - viewbox: function viewbox(x, y, width, height) { - // act as getter - if (x == null) return new Box(this.attr('viewBox')); // act as setter + // Move point string + move: function move(x, y) { + var box = this.bbox(); // get relative offset - return this.attr('viewBox', new Box(x, y, width, height)); + x -= box.x; + y -= box.y; // move every point + + if (!isNaN(x) && !isNaN(y)) { + for (var i = this.length - 1; i >= 0; i--) { + this[i] = [this[i][0] + x, this[i][1] + y]; + } } - } - }); - var PathArray = subClassArray('PathArray', SVGArray); - function pathRegReplace(a, b, c, d) { - return c + d.replace(dots, ' .'); - } + return this; + }, + // Resize poly string + size: function size(width, height) { + var i; + var box = this.bbox(); // recalculate position of all points according to new size - function arrayToString(a) { - for (var i = 0, il = a.length, s = ''; i < il; i++) { - s += a[i][0]; + for (i = this.length - 1; i >= 0; i--) { + if (box.width) this[i][0] = (this[i][0] - box.x) * width / box.width + box.x; + if (box.height) this[i][1] = (this[i][1] - box.y) * height / box.height + box.y; + } - if (a[i][1] != null) { - s += a[i][1]; + return this; + }, + // Get bounding box of points + bbox: function bbox() { + var maxX = -Infinity; + var maxY = -Infinity; + var minX = Infinity; + var minY = Infinity; + this.forEach(function (el) { + maxX = Math.max(el[0], maxX); + maxY = Math.max(el[1], maxY); + minX = Math.min(el[0], minX); + minY = Math.min(el[1], minY); + }); + return { + x: minX, + y: minY, + width: maxX - minX, + height: maxY - minY + }; + } + }); - if (a[i][2] != null) { - s += ' '; - s += a[i][2]; + var MorphArray = PointArray; // Move by left top corner over x-axis - if (a[i][3] != null) { - s += ' '; - s += a[i][3]; - s += ' '; - s += a[i][4]; + function x$1(x) { + return x == null ? this.bbox().x : this.move(x, this.bbox().y); + } // Move by left top corner over y-axis - if (a[i][5] != null) { - s += ' '; - s += a[i][5]; - s += ' '; - s += a[i][6]; + function y$1(y) { + return y == null ? this.bbox().y : this.move(this.bbox().x, y); + } // Set width of element - if (a[i][7] != null) { - s += ' '; - s += a[i][7]; - } - } - } - } - } - } + function width$1(width) { + var b = this.bbox(); + return width == null ? b.width : this.size(width, b.height); + } // Set height of element - return s + ' '; + function height$1(height) { + var b = this.bbox(); + return height == null ? b.height : this.size(b.width, height); } - var pathHandlers = { - M: function M(c, p, p0) { - p.x = p0.x = c[0]; - p.y = p0.y = c[1]; - return ['M', p.x, p.y]; - }, - L: function L(c, p) { - p.x = c[0]; - p.y = c[1]; - return ['L', c[0], c[1]]; - }, - H: function H(c, p) { - p.x = c[0]; - return ['H', c[0]]; - }, - V: function V(c, p) { - p.y = c[0]; - return ['V', c[0]]; - }, - C: function C(c, p) { - p.x = c[4]; - p.y = c[5]; - return ['C', c[0], c[1], c[2], c[3], c[4], c[5]]; - }, - S: function S(c, p) { - p.x = c[2]; - p.y = c[3]; - return ['S', c[0], c[1], c[2], c[3]]; - }, - Q: function Q(c, p) { - p.x = c[2]; - p.y = c[3]; - return ['Q', c[0], c[1], c[2], c[3]]; - }, - T: function T(c, p) { - p.x = c[0]; - p.y = c[1]; - return ['T', c[0], c[1]]; - }, - Z: function Z(c, p, p0) { - p.x = p0.x; - p.y = p0.y; - return ['Z']; - }, - A: function A(c, p) { - p.x = c[5]; - p.y = c[6]; - return ['A', c[0], c[1], c[2], c[3], c[4], c[5], c[6]]; - } - }; - var mlhvqtcsaz = 'mlhvqtcsaz'.split(''); + var pointed = /*#__PURE__*/Object.freeze({ + MorphArray: MorphArray, + x: x$1, + y: y$1, + width: width$1, + height: height$1 + }); - for (var i = 0, il = mlhvqtcsaz.length; i < il; ++i) { - pathHandlers[mlhvqtcsaz[i]] = function (i) { - return function (c, p, p0) { - if (i === 'H') c[0] = c[0] + p.x;else if (i === 'V') c[0] = c[0] + p.y;else if (i === 'A') { - c[5] = c[5] + p.x; - c[6] = c[6] + p.y; - } else { - for (var j = 0, jl = c.length; j < jl; ++j) { - c[j] = c[j] + (j % 2 ? p.y : p.x); - } - } - return pathHandlers[i](c, p, p0); - }; - }(mlhvqtcsaz[i].toUpperCase()); - } + var Line = + /*#__PURE__*/ + function (_Shape) { + _inherits(Line, _Shape); - extend(PathArray, { - // Convert array to string - toString: function toString() { - return arrayToString(this); - }, - // Move path string - move: function move(x, y) { - // get bounding box of current situation - var box = this.bbox(); // get relative offset + // Initialize node + function Line(node) { + _classCallCheck(this, Line); - x -= box.x; - y -= box.y; + return _possibleConstructorReturn(this, _getPrototypeOf(Line).call(this, nodeOrNew('line', node), node)); + } // Get array - if (!isNaN(x) && !isNaN(y)) { - // move every point - for (var l, i = this.length - 1; i >= 0; i--) { - l = this[i][0]; - if (l === 'M' || l === 'L' || l === 'T') { - this[i][1] += x; - this[i][2] += y; - } else if (l === 'H') { - this[i][1] += x; - } else if (l === 'V') { - this[i][1] += y; - } else if (l === 'C' || l === 'S' || l === 'Q') { - this[i][1] += x; - this[i][2] += y; - this[i][3] += x; - this[i][4] += y; + _createClass(Line, [{ + key: "array", + value: function array() { + return new PointArray([[this.attr('x1'), this.attr('y1')], [this.attr('x2'), this.attr('y2')]]); + } // Overwrite native plot() method - if (l === 'C') { - this[i][5] += x; - this[i][6] += y; - } - } else if (l === 'A') { - this[i][6] += x; - this[i][7] += y; - } + }, { + key: "plot", + value: function plot(x1, y1, x2, y2) { + if (x1 == null) { + return this.array(); + } else if (typeof y1 !== 'undefined') { + x1 = { + x1: x1, + y1: y1, + x2: x2, + y2: y2 + }; + } else { + x1 = new PointArray(x1).toLine(); } - } - - return this; - }, - // Resize path string - size: function size(width, height) { - // get bounding box of current situation - var box = this.bbox(); - var i, l; // recalculate position of all points according to new size - for (i = this.length - 1; i >= 0; i--) { - l = this[i][0]; + return this.attr(x1); + } // Move by left top corner - if (l === 'M' || l === 'L' || l === 'T') { - this[i][1] = (this[i][1] - box.x) * width / box.width + box.x; - this[i][2] = (this[i][2] - box.y) * height / box.height + box.y; - } else if (l === 'H') { - this[i][1] = (this[i][1] - box.x) * width / box.width + box.x; - } else if (l === 'V') { - this[i][1] = (this[i][1] - box.y) * height / box.height + box.y; - } else if (l === 'C' || l === 'S' || l === 'Q') { - this[i][1] = (this[i][1] - box.x) * width / box.width + box.x; - this[i][2] = (this[i][2] - box.y) * height / box.height + box.y; - this[i][3] = (this[i][3] - box.x) * width / box.width + box.x; - this[i][4] = (this[i][4] - box.y) * height / box.height + box.y; + }, { + key: "move", + value: function move(x, y) { + return this.attr(this.array().move(x, y).toLine()); + } // Set element size to given width and height - if (l === 'C') { - this[i][5] = (this[i][5] - box.x) * width / box.width + box.x; - this[i][6] = (this[i][6] - box.y) * height / box.height + box.y; - } - } else if (l === 'A') { - // resize radii - this[i][1] = this[i][1] * width / box.width; - this[i][2] = this[i][2] * height / box.height; // move position values + }, { + key: "size", + value: function size(width, height) { + var p = proportionalSize(this, width, height); + return this.attr(this.array().size(p.width, p.height).toLine()); + } + }]); - this[i][6] = (this[i][6] - box.x) * width / box.width + box.x; - this[i][7] = (this[i][7] - box.y) * height / box.height + box.y; + return Line; + }(Shape); + extend(Line, pointed); + registerMethods({ + Container: { + // Create a line element + line: wrapWithAttrCheck(function () { + for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; } - } - return this; - }, - // Test if the passed path array use the same path data commands as this path array - equalCommands: function equalCommands(pathArray) { - var i, il, equalCommands; - pathArray = new PathArray(pathArray); - equalCommands = this.length === pathArray.length; + // make sure plot is called as a setter + // x1 is not necessarily a number, it can also be an array, a string and a PointArray + return Line.prototype.plot.apply(this.put(new Line()), args[0] != null ? args : [0, 0, 0, 0]); + }) + } + }); + register(Line); - for (i = 0, il = this.length; equalCommands && i < il; i++) { - equalCommands = this[i][0] === pathArray[i][0]; + var List = subClassArray('List', Array, function () { + var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + // This catches the case, that native map tries to create an array with new Array(1) + if (typeof arr === 'number') return this; + this.length = 0; + this.push.apply(this, _toConsumableArray(arr)); + }); + extend(List, { + each: function each(fnOrMethodName) { + for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + args[_key - 1] = arguments[_key]; } - return equalCommands; - }, - // Make path array morphable - morph: function morph(pathArray) { - pathArray = new PathArray(pathArray); - - if (this.equalCommands(pathArray)) { - this.destination = pathArray; + if (typeof fnOrMethodName === 'function') { + this.forEach(function (el) { + fnOrMethodName.call(el, el); + }); } else { - this.destination = null; + return this.map(function (el) { + return el[fnOrMethodName].apply(el, args); + }); // this.forEach((el) => { + // el[fnOrMethodName](...args) + // }) } return this; }, - // Get morphed path array at given position - at: function at(pos) { - // make sure a destination is defined - if (!this.destination) return this; - var sourceArray = this; - var destinationArray = this.destination.value; - var array = []; - var pathArray = new PathArray(); - var i, il, j, jl; // Animate has specified in the SVG spec - // See: https://www.w3.org/TR/SVG11/paths.html#PathElement - - for (i = 0, il = sourceArray.length; i < il; i++) { - array[i] = [sourceArray[i][0]]; - - for (j = 1, jl = sourceArray[i].length; j < jl; j++) { - array[i][j] = sourceArray[i][j] + (destinationArray[i][j] - sourceArray[i][j]) * pos; - } // For the two flags of the elliptical arc command, the SVG spec say: - // Flags and booleans are interpolated as fractions between zero and one, with any non-zero value considered to be a value of one/true - // Elliptical arc command as an array followed by corresponding indexes: - // ['A', rx, ry, x-axis-rotation, large-arc-flag, sweep-flag, x, y] - // 0 1 2 3 4 5 6 7 - + toArray: function toArray() { + return Array.prototype.concat.apply([], this); + } + }); - if (array[i][0] === 'A') { - array[i][4] = +(array[i][4] !== 0); - array[i][5] = +(array[i][5] !== 0); + List.extend = function (methods) { + methods = methods.reduce(function (obj, name) { + obj[name] = function () { + for (var _len2 = arguments.length, attrs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + attrs[_key2] = arguments[_key2]; } - } // Directly modify the value of a path array, this is done this way for performance - - - pathArray.value = array; - return pathArray; - }, - // Absolutize and parse path to array - parse: function parse() { - var array = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [['M', 0, 0]]; - // if it's already a patharray, no need to parse it - if (array instanceof PathArray) return array; // prepare for parsing - var s; - var paramCnt = { - 'M': 2, - 'L': 2, - 'H': 1, - 'V': 1, - 'C': 6, - 'S': 4, - 'Q': 4, - 'T': 2, - 'A': 7, - 'Z': 0 + return this.each.apply(this, [name].concat(attrs)); }; - if (typeof array === 'string') { - array = array.replace(numbersWithDots, pathRegReplace) // convert 45.123.123 to 45.123 .123 - .replace(pathLetters, ' $& ') // put some room between letters and numbers - .replace(hyphen, '$1 -') // add space before hyphen - .trim() // trim - .split(delimiter); // split into array - } else { - array = array.reduce(function (prev, curr) { - return [].concat.call(prev, curr); - }, []); - } // array now is an array containing all parts of a path e.g. ['M', '0', '0', 'L', '30', '30' ...] - - - var result = []; - var p = new Point(); - var p0 = new Point(); - var index = 0; - var len = array.length; - - do { - // Test if we have a path letter - if (isPathLetter.test(array[index])) { - s = array[index]; - ++index; // If last letter was a move command and we got no new, it defaults to [L]ine - } else if (s === 'M') { - s = 'L'; - } else if (s === 'm') { - s = 'l'; - } + return obj; + }, {}); + extend(List, methods); + }; - result.push(pathHandlers[s].call(null, array.slice(index, index = index + paramCnt[s.toUpperCase()]).map(parseFloat), p, p0)); - } while (len > index); + var Marker = + /*#__PURE__*/ + function (_Container) { + _inherits(Marker, _Container); - return result; - }, - // Get bounding box of path - bbox: function bbox() { - parser().path.setAttribute('d', this.toString()); - return parser.nodes.path.getBBox(); - } - }); + // Initialize node + function Marker(node) { + _classCallCheck(this, Marker); - var Morphable = - /*#__PURE__*/ - function () { - function Morphable(stepper) { - _classCallCheck(this, Morphable); + return _possibleConstructorReturn(this, _getPrototypeOf(Marker).call(this, nodeOrNew('marker', node), node)); + } // Set width of element - this._stepper = stepper || new Ease('-'); - this._from = null; - this._to = null; - this._type = null; - this._context = null; - this._morphObj = null; - } - _createClass(Morphable, [{ - key: "from", - value: function from(val) { - if (val == null) { - return this._from; - } + _createClass(Marker, [{ + key: "width", + value: function width(_width) { + return this.attr('markerWidth', _width); + } // Set height of element - this._from = this._set(val); - return this; - } }, { - key: "to", - value: function to(val) { - if (val == null) { - return this._to; - } + key: "height", + value: function height(_height) { + return this.attr('markerHeight', _height); + } // Set marker refX and refY - this._to = this._set(val); - return this; - } }, { - key: "type", - value: function type(_type) { - // getter - if (_type == null) { - return this._type; - } // setter - + key: "ref", + value: function ref(x, y) { + return this.attr('refX', x).attr('refY', y); + } // Update marker - this._type = _type; - return this; - } }, { - key: "_set", - value: function _set$$1(value) { - if (!this._type) { - var type = _typeof(value); + key: "update", + value: function update(block) { + // remove all content + this.clear(); // invoke passed block - if (type === 'number') { - this.type(SVGNumber); - } else if (type === 'string') { - if (Color.isColor(value)) { - this.type(Color); - } else if (delimiter.test(value)) { - this.type(pathLetters.test(value) ? PathArray : SVGArray); - } else if (numberAndUnit.test(value)) { - this.type(SVGNumber); - } else { - this.type(NonMorphable); - } - } else if (morphableTypes.indexOf(value.constructor) > -1) { - this.type(value.constructor); - } else if (Array.isArray(value)) { - this.type(SVGArray); - } else if (type === 'object') { - this.type(ObjectBag); - } else { - this.type(NonMorphable); - } + if (typeof block === 'function') { + block.call(this, this); } - var result = new this._type(value).toArray(); - this._morphObj = this._morphObj || new this._type(); - this._context = this._context || Array.apply(null, Array(result.length)).map(Object); - return result; - } - }, { - key: "stepper", - value: function stepper(_stepper) { - if (_stepper == null) return this._stepper; - this._stepper = _stepper; return this; - } - }, { - key: "done", - value: function done() { - var complete = this._context.map(this._stepper.done).reduce(function (last, curr) { - return last && curr; - }, true); + } // Return the fill id - return complete; - } }, { - key: "at", - value: function at(pos) { - var _this = this; - - return this._morphObj.fromArray(this._from.map(function (i, index) { - return _this._stepper.step(i, _this._to[index], pos, _this._context[index], _this._context); - })); + key: "toString", + value: function toString() { + return 'url(#' + this.id() + ')'; } }]); - return Morphable; - }(); - var NonMorphable = - /*#__PURE__*/ - function () { - function NonMorphable() { - _classCallCheck(this, NonMorphable); - - this.init.apply(this, arguments); - } + return Marker; + }(Container); + registerMethods({ + Container: { + marker: function marker() { + var _this$defs; - _createClass(NonMorphable, [{ - key: "init", - value: function init(val) { - val = Array.isArray(val) ? val[0] : val; - this.value = val; - return this; - } - }, { - key: "valueOf", - value: function valueOf() { - return this.value; - } - }, { - key: "toArray", - value: function toArray() { - return [this.value]; + // Create marker element in defs + return (_this$defs = this.defs()).marker.apply(_this$defs, arguments); } - }]); + }, + Defs: { + // Create marker + marker: wrapWithAttrCheck(function (width, height, block) { + // Set default viewbox to match the width and height, set ref to cx and cy and set orient to auto + return this.put(new Marker()).size(width, height).ref(width / 2, height / 2).viewbox(0, 0, width, height).attr('orient', 'auto').update(block); + }) + }, + marker: { + // Create and attach markers + marker: function marker(_marker, width, height, block) { + var attr = ['marker']; // Build attribute name - return NonMorphable; - }(); - var TransformBag = - /*#__PURE__*/ - function () { - function TransformBag() { - _classCallCheck(this, TransformBag); + if (_marker !== 'all') attr.push(_marker); + attr = attr.join('-'); // Set marker attribute - this.init.apply(this, arguments); + _marker = arguments[1] instanceof Marker ? arguments[1] : this.defs().marker(width, height, block); + return this.attr(attr, _marker); + } } + }); + register(Marker); - _createClass(TransformBag, [{ - key: "init", - value: function init(obj) { - if (Array.isArray(obj)) { - obj = { - scaleX: obj[0], - scaleY: obj[1], - shear: obj[2], - rotate: obj[3], - translateX: obj[4], - translateY: obj[5], - originX: obj[6], - originY: obj[7] - }; + /*** + Base Class + ========== + The base stepper class that will be + ***/ + + function makeSetterGetter(k, f) { + return function (v) { + if (v == null) return this[v]; + this[k] = v; + if (f) f.call(this); + return this; + }; + } + + var easing = { + '-': function _(pos) { + return pos; + }, + '<>': function _(pos) { + return -Math.cos(pos * Math.PI) / 2 + 0.5; + }, + '>': function _(pos) { + return Math.sin(pos * Math.PI / 2); + }, + '<': function _(pos) { + return -Math.cos(pos * Math.PI / 2) + 1; + }, + bezier: function bezier(x1, y1, x2, y2) { + // see https://www.w3.org/TR/css-easing-1/#cubic-bezier-algo + return function (t) { + if (t < 0) { + if (x1 > 0) { + return y1 / x1 * t; + } else if (x2 > 0) { + return y2 / x2 * t; + } else { + return 0; + } + } else if (t > 1) { + if (x2 < 1) { + return (1 - y2) / (1 - x2) * t + (y2 - x2) / (1 - x2); + } else if (x1 < 1) { + return (1 - y1) / (1 - x1) * t + (y1 - x1) / (1 - x1); + } else { + return 1; + } + } else { + return 3 * t * Math.pow(1 - t, 2) * y1 + 3 * Math.pow(t, 2) * (1 - t) * y2 + Math.pow(t, 3); } + }; + }, + // https://www.w3.org/TR/css-easing-1/#step-timing-function-algo + steps: function steps(_steps) { + var stepPosition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'end'; + // deal with "jump-" prefix + stepPosition = stepPosition.split('-').reverse()[0]; + var jumps = _steps; - Object.assign(this, TransformBag.defaults, obj); - return this; - } - }, { - key: "toArray", - value: function toArray() { - var v = this; - return [v.scaleX, v.scaleY, v.shear, v.rotate, v.translateX, v.translateY, v.originX, v.originY]; - } - }]); + if (stepPosition === 'none') { + --jumps; + } else if (stepPosition === 'both') { + ++jumps; + } // The beforeFlag is essentially useless - return TransformBag; - }(); - TransformBag.defaults = { - scaleX: 1, - scaleY: 1, - shear: 0, - rotate: 0, - translateX: 0, - translateY: 0, - originX: 0, - originY: 0 - }; - var ObjectBag = - /*#__PURE__*/ - function () { - function ObjectBag() { - _classCallCheck(this, ObjectBag); - this.init.apply(this, arguments); - } + return function (t) { + var beforeFlag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false; + // Step is called currentStep in referenced url + var step = Math.floor(t * _steps); + var jumping = t * step % 1 === 0; - _createClass(ObjectBag, [{ - key: "init", - value: function init(objOrArr) { - this.values = []; + if (stepPosition === 'start' || stepPosition === 'both') { + ++step; + } - if (Array.isArray(objOrArr)) { - this.values = objOrArr; - return; + if (beforeFlag && jumping) { + --step; } - var entries = Object.entries(objOrArr || {}).sort(function (a, b) { - return a[0] - b[0]; - }); - this.values = entries.reduce(function (last, curr) { - return last.concat(curr); - }, []); - return this; - } - }, { - key: "valueOf", - value: function valueOf() { - var obj = {}; - var arr = this.values; + if (t >= 0 && step < 0) { + step = 0; + } - for (var i = 0, len = arr.length; i < len; i += 2) { - obj[arr[i]] = arr[i + 1]; + if (t <= 1 && step > jumps) { + step = jumps; } - return obj; - } - }, { - key: "toArray", - value: function toArray() { - return this.values; + return step / jumps; + }; + } + }; + var Stepper = + /*#__PURE__*/ + function () { + function Stepper() { + _classCallCheck(this, Stepper); + } + + _createClass(Stepper, [{ + key: "done", + value: function done() { + return false; } }]); - return ObjectBag; + return Stepper; }(); - var morphableTypes = [NonMorphable, TransformBag, ObjectBag]; - function registerMorphableType() { - var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - morphableTypes.push.apply(morphableTypes, _toConsumableArray([].concat(type))); - } - function makeMorphable() { - extend(morphableTypes, { - to: function to(val) { - return new Morphable().type(this.constructor).from(this.valueOf()).to(val); - }, - fromArray: function fromArray(arr) { - this.init(arr); - return this; - } - }); - } + /*** + Easing Functions + ================ + ***/ - var time = globals.window.performance || Date; + var Ease = + /*#__PURE__*/ + function (_Stepper) { + _inherits(Ease, _Stepper); - var makeSchedule = function makeSchedule(runnerInfo) { - var start = runnerInfo.start; - var duration = runnerInfo.runner.duration(); - var end = start + duration; - return { - start: start, - duration: duration, - end: end, - runner: runnerInfo.runner - }; - }; + function Ease(fn) { + var _this; - var Timeline = - /*#__PURE__*/ - function () { - // Construct a new timeline on the given element - function Timeline() { - _classCallCheck(this, Timeline); + _classCallCheck(this, Ease); - this._timeSource = function () { - return time.now(); - }; + _this = _possibleConstructorReturn(this, _getPrototypeOf(Ease).call(this)); + _this.ease = easing[fn || timeline.ease] || fn; + return _this; + } - this._dispatcher = globals.document.createElement('div'); // Store the timing variables + _createClass(Ease, [{ + key: "step", + value: function step(from, to, pos) { + if (typeof from !== 'number') { + return pos < 1 ? from : to; + } - this._startTime = 0; - this._speed = 1.0; // Play control variables control how the animation proceeds + return from + (to - from) * this.ease(pos); + } + }]); - this._reverse = false; - this._persist = 0; // Keep track of the running animations and their starting parameters + return Ease; + }(Stepper); + /*** + Controller Types + ================ + ***/ - this._nextFrame = null; - this._paused = false; - this._runners = []; - this._order = []; - this._time = 0; - this._lastSourceTime = 0; - this._lastStepTime = 0; + var Controller = + /*#__PURE__*/ + function (_Stepper2) { + _inherits(Controller, _Stepper2); + + function Controller(fn) { + var _this2; + + _classCallCheck(this, Controller); + + _this2 = _possibleConstructorReturn(this, _getPrototypeOf(Controller).call(this)); + _this2.stepper = fn; + return _this2; } - _createClass(Timeline, [{ - key: "getEventTarget", - value: function getEventTarget() { - return this._dispatcher; + _createClass(Controller, [{ + key: "step", + value: function step(current, target, dt, c) { + return this.stepper(current, target, dt, c); } - /** - * - */ - // schedules a runner on the timeline - }, { - key: "schedule", - value: function schedule(runner, delay, when) { - if (runner == null) { - return this._runners.map(makeSchedule).sort(function (a, b) { - return a.start - b.start || a.duration - b.duration; - }); - } + key: "done", + value: function done(c) { + return c.done; + } + }]); - if (!this.active()) { - this._step(); + return Controller; + }(Stepper); - if (when == null) { - when = 'now'; - } - } // The start time for the next animation can either be given explicitly, - // derived from the current timeline time or it can be relative to the - // last start time to chain animations direclty + function recalculate() { + // Apply the default parameters + var duration = (this._duration || 500) / 1000; + var overshoot = this._overshoot || 0; // Calculate the PID natural response + var eps = 1e-10; + var pi = Math.PI; + var os = Math.log(overshoot / 100 + eps); + var zeta = -os / Math.sqrt(pi * pi + os * os); + var wn = 3.9 / (zeta * duration); // Calculate the Spring values - var absoluteStartTime = 0; - delay = delay || 0; // Work out when to start the animation + this.d = 2 * zeta * wn; + this.k = wn * wn; + } - if (when == null || when === 'last' || when === 'after') { - // Take the last time and increment - absoluteStartTime = this._startTime; - } else if (when === 'absolute' || when === 'start') { - absoluteStartTime = delay; - delay = 0; - } else if (when === 'now') { - absoluteStartTime = this._time; - } else if (when === 'relative') { - var runnerInfo = this._runners[runner.id]; + var Spring = + /*#__PURE__*/ + function (_Controller) { + _inherits(Spring, _Controller); - if (runnerInfo) { - absoluteStartTime = runnerInfo.start + delay; - delay = 0; - } - } else { - throw new Error('Invalid value for the "when" parameter'); - } // Manage runner + function Spring(duration, overshoot) { + var _this3; + _classCallCheck(this, Spring); - runner.unschedule(); - runner.timeline(this); - runner.time(-delay); // Save startTime for next runner + _this3 = _possibleConstructorReturn(this, _getPrototypeOf(Spring).call(this)); - this._startTime = absoluteStartTime + runner.duration() + delay; // Save runnerInfo + _this3.duration(duration || 500).overshoot(overshoot || 0); - this._runners[runner.id] = { - persist: this.persist(), - runner: runner, - start: absoluteStartTime // Save order and continue + return _this3; + } - }; + _createClass(Spring, [{ + key: "step", + value: function step(current, target, dt, c) { + if (typeof current === 'string') return current; + c.done = dt === Infinity; + if (dt === Infinity) return target; + if (dt === 0) return current; + if (dt > 100) dt = 16; + dt /= 1000; // Get the previous velocity - this._order.push(runner.id); + var velocity = c.velocity || 0; // Apply the control to get the new position and store it - this._continue(); + var acceleration = -this.d * velocity - this.k * (current - target); + var newPosition = current + velocity * dt + acceleration * dt * dt / 2; // Store the velocity - return this; - } // Remove the runner from this timeline + c.velocity = velocity + acceleration * dt; // Figure out if we have converged, and if so, pass the value - }, { - key: "unschedule", - value: function unschedule(runner) { - var index = this._order.indexOf(runner.id); + c.done = Math.abs(target - newPosition) + Math.abs(velocity) < 0.002; + return c.done ? target : newPosition; + } + }]); - if (index < 0) return this; - delete this._runners[runner.id]; + return Spring; + }(Controller); + extend(Spring, { + duration: makeSetterGetter('_duration', recalculate), + overshoot: makeSetterGetter('_overshoot', recalculate) + }); + var PID = + /*#__PURE__*/ + function (_Controller2) { + _inherits(PID, _Controller2); - this._order.splice(index, 1); + function PID(p, i, d, windup) { + var _this4; - runner.timeline(null); - return this; - } - }, { - key: "play", - value: function play() { - // Now make sure we are not paused and continue the animation - this._paused = false; - return this._continue(); - } - }, { - key: "pause", - value: function pause() { - // Cancel the next animation frame and pause - this._nextFrame = null; - this._paused = true; - return this; - } - }, { - key: "stop", - value: function stop() { - // Cancel the next animation frame and go to start - this.seek(-this._time); - return this.pause(); - } - }, { - key: "finish", - value: function finish() { - this.seek(Infinity); - return this.pause(); + _classCallCheck(this, PID); + + _this4 = _possibleConstructorReturn(this, _getPrototypeOf(PID).call(this)); + p = p == null ? 0.1 : p; + i = i == null ? 0.01 : i; + d = d == null ? 0 : d; + windup = windup == null ? 1000 : windup; + + _this4.p(p).i(i).d(d).windup(windup); + + return _this4; + } + + _createClass(PID, [{ + key: "step", + value: function step(current, target, dt, c) { + if (typeof current === 'string') return current; + c.done = dt === Infinity; + if (dt === Infinity) return target; + if (dt === 0) return current; + var p = target - current; + var i = (c.integral || 0) + p * dt; + var d = (p - (c.error || 0)) / dt; + var windup = this.windup; // antiwindup + + if (windup !== false) { + i = Math.max(-windup, Math.min(i, windup)); + } + + c.error = p; + c.integral = i; + c.done = Math.abs(p) < 0.001; + return c.done ? target : current + (this.P * p + this.I * i + this.D * d); } - }, { - key: "speed", - value: function speed(_speed) { - if (_speed == null) return this._speed; - this._speed = _speed; - return this; - } - }, { - key: "reverse", - value: function reverse(yes) { - var currentSpeed = this.speed(); - if (yes == null) return this.speed(-currentSpeed); - var positive = Math.abs(currentSpeed); - return this.speed(yes ? positive : -positive); - } - }, { - key: "seek", - value: function seek(dt) { - this._time += dt; - return this._continue(); - } - }, { - key: "time", - value: function time(_time) { - if (_time == null) return this._time; - this._time = _time; - return this; - } - }, { - key: "persist", - value: function persist(dtOrForever) { - if (dtOrForever == null) return this._persist; - this._persist = dtOrForever; - return this; - } - }, { - key: "source", - value: function source(fn) { - if (fn == null) return this._timeSource; - this._timeSource = fn; - return this; - } - }, { - key: "_step", - value: function _step() { - // If the timeline is paused, just do nothing - if (this._paused) return; // Get the time delta from the last time and update the time - - var time = this._timeSource(); - - var dtSource = time - this._lastSourceTime; - var dtTime = this._speed * dtSource + (this._time - this._lastStepTime); - this._lastSourceTime = time; // Update the time - - this._time += dtTime; - this._lastStepTime = this._time; // this.fire('time', this._time) - // Run all of the runners directly + }]); - var runnersLeft = false; + return PID; + }(Controller); + extend(PID, { + windup: makeSetterGetter('windup'), + p: makeSetterGetter('P'), + i: makeSetterGetter('I'), + d: makeSetterGetter('D') + }); - for (var i = 0, len = this._order.length; i < len; i++) { - // Get and run the current runner and ignore it if its inactive - var runnerInfo = this._runners[this._order[i]]; - var runner = runnerInfo.runner; - var dt = dtTime; // Make sure that we give the actual difference - // between runner start time and now + var PathArray = subClassArray('PathArray', SVGArray); + function pathRegReplace(a, b, c, d) { + return c + d.replace(dots, ' .'); + } - var dtToStart = this._time - runnerInfo.start; // Dont run runner if not started yet + function arrayToString(a) { + for (var i = 0, il = a.length, s = ''; i < il; i++) { + s += a[i][0]; - if (dtToStart < 0) { - runnersLeft = true; - continue; - } else if (dtToStart < dt) { - // Adjust dt to make sure that animation is on point - dt = dtToStart; - } + if (a[i][1] != null) { + s += a[i][1]; - if (!runner.active()) continue; // If this runner is still going, signal that we need another animation - // frame, otherwise, remove the completed runner + if (a[i][2] != null) { + s += ' '; + s += a[i][2]; - var finished = runner.step(dt).done; + if (a[i][3] != null) { + s += ' '; + s += a[i][3]; + s += ' '; + s += a[i][4]; - if (!finished) { - runnersLeft = true; // continue - } else if (runnerInfo.persist !== true) { - // runner is finished. And runner might get removed - var endTime = runner.duration() - runner.time() + this._time; + if (a[i][5] != null) { + s += ' '; + s += a[i][5]; + s += ' '; + s += a[i][6]; - if (endTime + this._persist < this._time) { - // Delete runner and correct index - delete this._runners[this._order[i]]; - this._order.splice(i--, 1) && --len; - runner.timeline(null); + if (a[i][7] != null) { + s += ' '; + s += a[i][7]; + } } } - } // Get the next animation frame to keep the simulation going + } + } + } + return s + ' '; + } - if (runnersLeft) { - this._nextFrame = Animator.frame(this._step.bind(this)); + var pathHandlers = { + M: function M(c, p, p0) { + p.x = p0.x = c[0]; + p.y = p0.y = c[1]; + return ['M', p.x, p.y]; + }, + L: function L(c, p) { + p.x = c[0]; + p.y = c[1]; + return ['L', c[0], c[1]]; + }, + H: function H(c, p) { + p.x = c[0]; + return ['H', c[0]]; + }, + V: function V(c, p) { + p.y = c[0]; + return ['V', c[0]]; + }, + C: function C(c, p) { + p.x = c[4]; + p.y = c[5]; + return ['C', c[0], c[1], c[2], c[3], c[4], c[5]]; + }, + S: function S(c, p) { + p.x = c[2]; + p.y = c[3]; + return ['S', c[0], c[1], c[2], c[3]]; + }, + Q: function Q(c, p) { + p.x = c[2]; + p.y = c[3]; + return ['Q', c[0], c[1], c[2], c[3]]; + }, + T: function T(c, p) { + p.x = c[0]; + p.y = c[1]; + return ['T', c[0], c[1]]; + }, + Z: function Z(c, p, p0) { + p.x = p0.x; + p.y = p0.y; + return ['Z']; + }, + A: function A(c, p) { + p.x = c[5]; + p.y = c[6]; + return ['A', c[0], c[1], c[2], c[3], c[4], c[5], c[6]]; + } + }; + var mlhvqtcsaz = 'mlhvqtcsaz'.split(''); + + for (var i = 0, il = mlhvqtcsaz.length; i < il; ++i) { + pathHandlers[mlhvqtcsaz[i]] = function (i) { + return function (c, p, p0) { + if (i === 'H') c[0] = c[0] + p.x;else if (i === 'V') c[0] = c[0] + p.y;else if (i === 'A') { + c[5] = c[5] + p.x; + c[6] = c[6] + p.y; } else { - this._nextFrame = null; + for (var j = 0, jl = c.length; j < jl; ++j) { + c[j] = c[j] + (j % 2 ? p.y : p.x); + } } + return pathHandlers[i](c, p, p0); + }; + }(mlhvqtcsaz[i].toUpperCase()); + } - return this; - } // Checks if we are running and continues the animation + extend(PathArray, { + // Convert array to string + toString: function toString() { + return arrayToString(this); + }, + // Move path string + move: function move(x, y) { + // get bounding box of current situation + var box = this.bbox(); // get relative offset - }, { - key: "_continue", - value: function _continue() { - if (this._paused) return this; + x -= box.x; + y -= box.y; - if (!this._nextFrame) { - this._nextFrame = Animator.frame(this._step.bind(this)); - } + if (!isNaN(x) && !isNaN(y)) { + // move every point + for (var l, i = this.length - 1; i >= 0; i--) { + l = this[i][0]; - return this; - } - }, { - key: "active", - value: function active() { - return !!this._nextFrame; - } - }]); + if (l === 'M' || l === 'L' || l === 'T') { + this[i][1] += x; + this[i][2] += y; + } else if (l === 'H') { + this[i][1] += x; + } else if (l === 'V') { + this[i][1] += y; + } else if (l === 'C' || l === 'S' || l === 'Q') { + this[i][1] += x; + this[i][2] += y; + this[i][3] += x; + this[i][4] += y; - return Timeline; - }(); - registerMethods({ - Element: { - timeline: function timeline() { - this._timeline = this._timeline || new Timeline(); - return this._timeline; + if (l === 'C') { + this[i][5] += x; + this[i][6] += y; + } + } else if (l === 'A') { + this[i][6] += x; + this[i][7] += y; + } + } } - } - }); - - var Runner = - /*#__PURE__*/ - function (_EventTarget) { - _inherits(Runner, _EventTarget); - function Runner(options) { - var _this; + return this; + }, + // Resize path string + size: function size(width, height) { + // get bounding box of current situation + var box = this.bbox(); + var i, l; // recalculate position of all points according to new size - _classCallCheck(this, Runner); + for (i = this.length - 1; i >= 0; i--) { + l = this[i][0]; - _this = _possibleConstructorReturn(this, _getPrototypeOf(Runner).call(this)); // Store a unique id on the runner, so that we can identify it later + if (l === 'M' || l === 'L' || l === 'T') { + this[i][1] = (this[i][1] - box.x) * width / box.width + box.x; + this[i][2] = (this[i][2] - box.y) * height / box.height + box.y; + } else if (l === 'H') { + this[i][1] = (this[i][1] - box.x) * width / box.width + box.x; + } else if (l === 'V') { + this[i][1] = (this[i][1] - box.y) * height / box.height + box.y; + } else if (l === 'C' || l === 'S' || l === 'Q') { + this[i][1] = (this[i][1] - box.x) * width / box.width + box.x; + this[i][2] = (this[i][2] - box.y) * height / box.height + box.y; + this[i][3] = (this[i][3] - box.x) * width / box.width + box.x; + this[i][4] = (this[i][4] - box.y) * height / box.height + box.y; - _this.id = Runner.id++; // Ensure a default value + if (l === 'C') { + this[i][5] = (this[i][5] - box.x) * width / box.width + box.x; + this[i][6] = (this[i][6] - box.y) * height / box.height + box.y; + } + } else if (l === 'A') { + // resize radii + this[i][1] = this[i][1] * width / box.width; + this[i][2] = this[i][2] * height / box.height; // move position values - options = options == null ? timeline.duration : options; // Ensure that we get a controller + this[i][6] = (this[i][6] - box.x) * width / box.width + box.x; + this[i][7] = (this[i][7] - box.y) * height / box.height + box.y; + } + } - options = typeof options === 'function' ? new Controller(options) : options; // Declare all of the variables + return this; + }, + // Test if the passed path array use the same path data commands as this path array + equalCommands: function equalCommands(pathArray) { + var i, il, equalCommands; + pathArray = new PathArray(pathArray); + equalCommands = this.length === pathArray.length; - _this._element = null; - _this._timeline = null; - _this.done = false; - _this._queue = []; // Work out the stepper and the duration + for (i = 0, il = this.length; equalCommands && i < il; i++) { + equalCommands = this[i][0] === pathArray[i][0]; + } - _this._duration = typeof options === 'number' && options; - _this._isDeclarative = options instanceof Controller; - _this._stepper = _this._isDeclarative ? options : new Ease(); // We copy the current values from the timeline because they can change + return equalCommands; + }, + // Make path array morphable + morph: function morph(pathArray) { + pathArray = new PathArray(pathArray); - _this._history = {}; // Store the state of the runner + if (this.equalCommands(pathArray)) { + this.destination = pathArray; + } else { + this.destination = null; + } - _this.enabled = true; - _this._time = 0; - _this._last = 0; // Save transforms applied to this runner + return this; + }, + // Get morphed path array at given position + at: function at(pos) { + // make sure a destination is defined + if (!this.destination) return this; + var sourceArray = this; + var destinationArray = this.destination.value; + var array = []; + var pathArray = new PathArray(); + var i, il, j, jl; // Animate has specified in the SVG spec + // See: https://www.w3.org/TR/SVG11/paths.html#PathElement - _this.transforms = new Matrix(); - _this.transformId = 1; // Looping variables + for (i = 0, il = sourceArray.length; i < il; i++) { + array[i] = [sourceArray[i][0]]; - _this._haveReversed = false; - _this._reverse = false; - _this._loopsDone = 0; - _this._swing = false; - _this._wait = 0; - _this._times = 1; - return _this; + for (j = 1, jl = sourceArray[i].length; j < jl; j++) { + array[i][j] = sourceArray[i][j] + (destinationArray[i][j] - sourceArray[i][j]) * pos; + } // For the two flags of the elliptical arc command, the SVG spec say: + // Flags and booleans are interpolated as fractions between zero and one, with any non-zero value considered to be a value of one/true + // Elliptical arc command as an array followed by corresponding indexes: + // ['A', rx, ry, x-axis-rotation, large-arc-flag, sweep-flag, x, y] + // 0 1 2 3 4 5 6 7 + + + if (array[i][0] === 'A') { + array[i][4] = +(array[i][4] !== 0); + array[i][5] = +(array[i][5] !== 0); + } + } // Directly modify the value of a path array, this is done this way for performance + + + pathArray.value = array; + return pathArray; + }, + // Absolutize and parse path to array + parse: function parse() { + var array = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [['M', 0, 0]]; + // if it's already a patharray, no need to parse it + if (array instanceof PathArray) return array; // prepare for parsing + + var s; + var paramCnt = { + 'M': 2, + 'L': 2, + 'H': 1, + 'V': 1, + 'C': 6, + 'S': 4, + 'Q': 4, + 'T': 2, + 'A': 7, + 'Z': 0 + }; + + if (typeof array === 'string') { + array = array.replace(numbersWithDots, pathRegReplace) // convert 45.123.123 to 45.123 .123 + .replace(pathLetters, ' $& ') // put some room between letters and numbers + .replace(hyphen, '$1 -') // add space before hyphen + .trim() // trim + .split(delimiter); // split into array + } else { + array = array.reduce(function (prev, curr) { + return [].concat.call(prev, curr); + }, []); + } // array now is an array containing all parts of a path e.g. ['M', '0', '0', 'L', '30', '30' ...] + + + var result = []; + var p = new Point(); + var p0 = new Point(); + var index = 0; + var len = array.length; + + do { + // Test if we have a path letter + if (isPathLetter.test(array[index])) { + s = array[index]; + ++index; // If last letter was a move command and we got no new, it defaults to [L]ine + } else if (s === 'M') { + s = 'L'; + } else if (s === 'm') { + s = 'l'; + } + + result.push(pathHandlers[s].call(null, array.slice(index, index = index + paramCnt[s.toUpperCase()]).map(parseFloat), p, p0)); + } while (len > index); + + return result; + }, + // Get bounding box of path + bbox: function bbox() { + parser().path.setAttribute('d', this.toString()); + return parser.nodes.path.getBBox(); } - /* - Runner Definitions - ================== - These methods help us define the runtime behaviour of the Runner or they - help us make new runners from the current runner - */ + }); + var Morphable = + /*#__PURE__*/ + function () { + function Morphable(stepper) { + _classCallCheck(this, Morphable); - _createClass(Runner, [{ - key: "element", - value: function element(_element) { - if (_element == null) return this._element; - this._element = _element; + this._stepper = stepper || new Ease('-'); + this._from = null; + this._to = null; + this._type = null; + this._context = null; + this._morphObj = null; + } - _element._prepareRunner(); + _createClass(Morphable, [{ + key: "from", + value: function from(val) { + if (val == null) { + return this._from; + } + this._from = this._set(val); return this; } }, { - key: "timeline", - value: function timeline$$1(_timeline) { - // check explicitly for undefined so we can set the timeline to null - if (typeof _timeline === 'undefined') return this._timeline; - this._timeline = _timeline; + key: "to", + value: function to(val) { + if (val == null) { + return this._to; + } + + this._to = this._set(val); return this; } }, { - key: "animate", - value: function animate(duration, delay, when) { - var o = Runner.sanitise(duration, delay, when); - var runner = new Runner(o.duration); - if (this._timeline) runner.timeline(this._timeline); - if (this._element) runner.element(this._element); - return runner.loop(o).schedule(delay, when); - } - }, { - key: "schedule", - value: function schedule(timeline$$1, delay, when) { - // The user doesn't need to pass a timeline if we already have one - if (!(timeline$$1 instanceof Timeline)) { - when = delay; - delay = timeline$$1; - timeline$$1 = this.timeline(); - } // If there is no timeline, yell at the user... - - - if (!timeline$$1) { - throw Error('Runner cannot be scheduled without timeline'); - } // Schedule the runner on the timeline provided + key: "type", + value: function type(_type) { + // getter + if (_type == null) { + return this._type; + } // setter - timeline$$1.schedule(this, delay, when); - return this; - } - }, { - key: "unschedule", - value: function unschedule() { - var timeline$$1 = this.timeline(); - timeline$$1 && timeline$$1.unschedule(this); + this._type = _type; return this; } }, { - key: "loop", - value: function loop(times, swing, wait) { - // Deal with the user passing in an object - if (_typeof(times) === 'object') { - swing = times.swing; - wait = times.wait; - times = times.times; - } // Sanitise the values and store them + key: "_set", + value: function _set$$1(value) { + if (!this._type) { + var type = _typeof(value); + if (type === 'number') { + this.type(SVGNumber); + } else if (type === 'string') { + if (Color.isColor(value)) { + this.type(Color); + } else if (delimiter.test(value)) { + this.type(pathLetters.test(value) ? PathArray : SVGArray); + } else if (numberAndUnit.test(value)) { + this.type(SVGNumber); + } else { + this.type(NonMorphable); + } + } else if (morphableTypes.indexOf(value.constructor) > -1) { + this.type(value.constructor); + } else if (Array.isArray(value)) { + this.type(SVGArray); + } else if (type === 'object') { + this.type(ObjectBag); + } else { + this.type(NonMorphable); + } + } - this._times = times || Infinity; - this._swing = swing || false; - this._wait = wait || 0; - return this; - } - }, { - key: "delay", - value: function delay(_delay) { - return this.animate(0, _delay); + var result = new this._type(value).toArray(); + this._morphObj = this._morphObj || new this._type(); + this._context = this._context || Array.apply(null, Array(result.length)).map(Object); + return result; } - /* - Basic Functionality - =================== - These methods allow us to attach basic functions to the runner directly - */ - }, { - key: "queue", - value: function queue(initFn, runFn, isTransform) { - this._queue.push({ - initialiser: initFn || noop, - runner: runFn || noop, - isTransform: isTransform, - initialised: false, - finished: false - }); - - var timeline$$1 = this.timeline(); - timeline$$1 && this.timeline()._continue(); + key: "stepper", + value: function stepper(_stepper) { + if (_stepper == null) return this._stepper; + this._stepper = _stepper; return this; } }, { - key: "during", - value: function during(fn) { - return this.queue(null, fn); + key: "done", + value: function done() { + var complete = this._context.map(this._stepper.done).reduce(function (last, curr) { + return last && curr; + }, true); + + return complete; } }, { - key: "after", - value: function after(fn) { - return this.on('finish', fn); + key: "at", + value: function at(pos) { + var _this = this; + + return this._morphObj.fromArray(this._from.map(function (i, index) { + return _this._stepper.step(i, _this._to[index], pos, _this._context[index], _this._context); + })); } - /* - Runner animation methods - ======================== - Control how the animation plays - */ + }]); - }, { - key: "time", - value: function time(_time) { - if (_time == null) { - return this._time; - } + return Morphable; + }(); + var NonMorphable = + /*#__PURE__*/ + function () { + function NonMorphable() { + _classCallCheck(this, NonMorphable); - var dt = _time - this._time; - this.step(dt); + this.init.apply(this, arguments); + } + + _createClass(NonMorphable, [{ + key: "init", + value: function init(val) { + val = Array.isArray(val) ? val[0] : val; + this.value = val; return this; } }, { - key: "duration", - value: function duration() { - return this._times * (this._wait + this._duration) - this._wait; + key: "valueOf", + value: function valueOf() { + return this.value; } }, { - key: "loops", - value: function loops(p) { - var loopDuration = this._duration + this._wait; + key: "toArray", + value: function toArray() { + return [this.value]; + } + }]); - if (p == null) { - var loopsDone = Math.floor(this._time / loopDuration); - var relativeTime = this._time - loopsDone * loopDuration; - var position = relativeTime / this._duration; - return Math.min(loopsDone + position, this._times); + return NonMorphable; + }(); + var TransformBag = + /*#__PURE__*/ + function () { + function TransformBag() { + _classCallCheck(this, TransformBag); + + this.init.apply(this, arguments); + } + + _createClass(TransformBag, [{ + key: "init", + value: function init(obj) { + if (Array.isArray(obj)) { + obj = { + scaleX: obj[0], + scaleY: obj[1], + shear: obj[2], + rotate: obj[3], + translateX: obj[4], + translateY: obj[5], + originX: obj[6], + originY: obj[7] + }; } - var whole = Math.floor(p); - var partial = p % 1; - var time = loopDuration * whole + this._duration * partial; - return this.time(time); + Object.assign(this, TransformBag.defaults, obj); + return this; } }, { - key: "position", - value: function position(p) { - // Get all of the variables we need - var x$$1 = this._time; - var d = this._duration; - var w = this._wait; - var t = this._times; - var s = this._swing; - var r = this._reverse; - var position; + key: "toArray", + value: function toArray() { + var v = this; + return [v.scaleX, v.scaleY, v.shear, v.rotate, v.translateX, v.translateY, v.originX, v.originY]; + } + }]); - if (p == null) { - /* - This function converts a time to a position in the range [0, 1] - The full explanation can be found in this desmos demonstration - https://www.desmos.com/calculator/u4fbavgche - The logic is slightly simplified here because we can use booleans - */ - // Figure out the value without thinking about the start or end time - var f = function f(x$$1) { - var swinging = s * Math.floor(x$$1 % (2 * (w + d)) / (w + d)); - var backwards = swinging && !r || !swinging && r; - var uncliped = Math.pow(-1, backwards) * (x$$1 % (w + d)) / d + backwards; - var clipped = Math.max(Math.min(uncliped, 1), 0); - return clipped; - }; // Figure out the value by incorporating the start time + return TransformBag; + }(); + TransformBag.defaults = { + scaleX: 1, + scaleY: 1, + shear: 0, + rotate: 0, + translateX: 0, + translateY: 0, + originX: 0, + originY: 0 + }; + var ObjectBag = + /*#__PURE__*/ + function () { + function ObjectBag() { + _classCallCheck(this, ObjectBag); + this.init.apply(this, arguments); + } - var endTime = t * (w + d) - w; - position = x$$1 <= 0 ? Math.round(f(1e-5)) : x$$1 < endTime ? f(x$$1) : Math.round(f(endTime - 1e-5)); - return position; - } // Work out the loops done and add the position to the loops done + _createClass(ObjectBag, [{ + key: "init", + value: function init(objOrArr) { + this.values = []; + if (Array.isArray(objOrArr)) { + this.values = objOrArr; + return; + } - var loopsDone = Math.floor(this.loops()); - var swingForward = s && loopsDone % 2 === 0; - var forwards = swingForward && !r || r && swingForward; - position = loopsDone + (forwards ? p : 1 - p); - return this.loops(position); + var entries = Object.entries(objOrArr || {}).sort(function (a, b) { + return a[0] - b[0]; + }); + this.values = entries.reduce(function (last, curr) { + return last.concat(curr); + }, []); + return this; } }, { - key: "progress", - value: function progress(p) { - if (p == null) { - return Math.min(1, this._time / this.duration()); + key: "valueOf", + value: function valueOf() { + var obj = {}; + var arr = this.values; + + for (var i = 0, len = arr.length; i < len; i += 2) { + obj[arr[i]] = arr[i + 1]; } - return this.time(p * this.duration()); + return obj; } }, { - key: "step", - value: function step(dt) { - // If we are inactive, this stepper just gets skipped - if (!this.enabled) return this; // Update the time and get the new position - - dt = dt == null ? 16 : dt; - this._time += dt; - var position = this.position(); // Figure out if we need to run the stepper in this frame - - var running = this._lastPosition !== position && this._time >= 0; - this._lastPosition = position; // Figure out if we just started - - var duration = this.duration(); - var justStarted = this._lastTime < 0 && this._time > 0; - var justFinished = this._lastTime < this._time && this.time > duration; - this._lastTime = this._time; + key: "toArray", + value: function toArray() { + return this.values; + } + }]); - if (justStarted) { - this.fire('start', this); - } // Work out if the runner is finished set the done flag here so animations - // know, that they are running in the last step (this is good for - // transformations which can be merged) + return ObjectBag; + }(); + var morphableTypes = [NonMorphable, TransformBag, ObjectBag]; + function registerMorphableType() { + var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + morphableTypes.push.apply(morphableTypes, _toConsumableArray([].concat(type))); + } + function makeMorphable() { + extend(morphableTypes, { + to: function to(val) { + return new Morphable().type(this.constructor).from(this.valueOf()).to(val); + }, + fromArray: function fromArray(arr) { + this.init(arr); + return this; + } + }); + } + var Path = + /*#__PURE__*/ + function (_Shape) { + _inherits(Path, _Shape); - var declarative = this._isDeclarative; - this.done = !declarative && !justFinished && this._time >= duration; // Call initialise and the run function + // Initialize node + function Path(node) { + _classCallCheck(this, Path); - if (running || declarative) { - this._initialise(running); // clear the transforms on this runner so they dont get added again and again + return _possibleConstructorReturn(this, _getPrototypeOf(Path).call(this, nodeOrNew('path', node), node)); + } // Get array - this.transforms = new Matrix(); + _createClass(Path, [{ + key: "array", + value: function array() { + return this._array || (this._array = new PathArray(this.attr('d'))); + } // Plot new path - var converged = this._run(declarative ? dt : position); + }, { + key: "plot", + value: function plot(d) { + return d == null ? this.array() : this.clear().attr('d', typeof d === 'string' ? d : this._array = new PathArray(d)); + } // Clear array cache - this.fire('step', this); - } // correct the done flag here - // declaritive animations itself know when they converged + }, { + key: "clear", + value: function clear() { + delete this._array; + return this; + } // Move by left top corner + }, { + key: "move", + value: function move(x, y) { + return this.attr('d', this.array().move(x, y)); + } // Move by left top corner over x-axis - this.done = this.done || converged && declarative; + }, { + key: "x", + value: function x(_x) { + return _x == null ? this.bbox().x : this.move(_x, this.bbox().y); + } // Move by left top corner over y-axis - if (this.done) { - this.fire('finish', this); - } + }, { + key: "y", + value: function y(_y) { + return _y == null ? this.bbox().y : this.move(this.bbox().x, _y); + } // Set element size to given width and height - return this; - } }, { - key: "finish", - value: function finish() { - return this.step(Infinity); - } + key: "size", + value: function size(width, height) { + var p = proportionalSize(this, width, height); + return this.attr('d', this.array().size(p.width, p.height)); + } // Set width of element + }, { - key: "reverse", - value: function reverse(_reverse) { - this._reverse = _reverse == null ? !this._reverse : _reverse; - return this; - } + key: "width", + value: function width(_width) { + return _width == null ? this.bbox().width : this.size(_width, this.bbox().height); + } // Set height of element + }, { - key: "ease", - value: function ease(fn) { - this._stepper = new Ease(fn); - return this; + key: "height", + value: function height(_height) { + return _height == null ? this.bbox().height : this.size(this.bbox().width, _height); } }, { - key: "active", - value: function active(enabled) { - if (enabled == null) return this.enabled; - this.enabled = enabled; - return this; + key: "targets", + value: function targets() { + return baseFind('svg textpath [href*="' + this.id() + '"]'); } - /* - Private Methods - =============== - Methods that shouldn't be used externally - */ - // Save a morpher to the morpher list so that we can retarget it later + }]); - }, { - key: "_rememberMorpher", - value: function _rememberMorpher(method, morpher) { - this._history[method] = { - morpher: morpher, - caller: this._queue[this._queue.length - 1] - }; - } // Try to set the target for a morpher if the morpher exists, otherwise - // do nothing and return false + return Path; + }(Shape); // Define morphable array + Path.prototype.MorphArray = PathArray; // Add parent method - }, { - key: "_tryRetarget", - value: function _tryRetarget(method, target) { - if (this._history[method]) { - // if the last method wasnt even initialised, throw it away - if (!this._history[method].caller.initialised) { - var index = this._queue.indexOf(this._history[method].caller); + registerMethods({ + Container: { + // Create a wrapped path element + path: wrapWithAttrCheck(function (d) { + // make sure plot is called as a setter + return this.put(new Path()).plot(d || new PathArray()); + }) + } + }); + register(Path); - this._queue.splice(index, 1); + function array() { + return this._array || (this._array = new PointArray(this.attr('points'))); + } // Plot new path - return false; - } // for the case of transformations, we use the special retarget function - // which has access to the outer scope + function plot(p) { + return p == null ? this.array() : this.clear().attr('points', typeof p === 'string' ? p : this._array = new PointArray(p)); + } // Clear array cache + function clear() { + delete this._array; + return this; + } // Move by left top corner - if (this._history[method].caller.isTransform) { - this._history[method].caller.isTransform(target); // for everything else a simple morpher change is sufficient + function move(x, y) { + return this.attr('points', this.array().move(x, y)); + } // Set element size to given width and height - } else { - this._history[method].morpher.to(target); - } + function size(width, height) { + var p = proportionalSize(this, width, height); + return this.attr('points', this.array().size(p.width, p.height)); + } - this._history[method].caller.finished = false; - var timeline$$1 = this.timeline(); - timeline$$1 && timeline$$1._continue(); - return true; - } + var poly = /*#__PURE__*/Object.freeze({ + array: array, + plot: plot, + clear: clear, + move: move, + size: size + }); - return false; - } // Run each initialise function in the runner if required + var Polygon = + /*#__PURE__*/ + function (_Shape) { + _inherits(Polygon, _Shape); - }, { - key: "_initialise", - value: function _initialise(running) { - // If we aren't running, we shouldn't initialise when not declarative - if (!running && !this._isDeclarative) return; // Loop through all of the initialisers + // Initialize node + function Polygon(node) { + _classCallCheck(this, Polygon); - for (var i = 0, len = this._queue.length; i < len; ++i) { - // Get the current initialiser - var current = this._queue[i]; // Determine whether we need to initialise + return _possibleConstructorReturn(this, _getPrototypeOf(Polygon).call(this, nodeOrNew('polygon', node), node)); + } - var needsIt = this._isDeclarative || !current.initialised && running; - running = !current.finished; // Call the initialiser if we need to + return Polygon; + }(Shape); + registerMethods({ + Container: { + // Create a wrapped polygon element + polygon: wrapWithAttrCheck(function (p) { + // make sure plot is called as a setter + return this.put(new Polygon()).plot(p || new PointArray()); + }) + } + }); + extend(Polygon, pointed); + extend(Polygon, poly); + register(Polygon); - if (needsIt && running) { - current.initialiser.call(this); - current.initialised = true; - } - } - } // Run each run function for the position or dt given + var Polyline = + /*#__PURE__*/ + function (_Shape) { + _inherits(Polyline, _Shape); - }, { - key: "_run", - value: function _run(positionOrDt) { - // Run all of the _queue directly - var allfinished = true; + // Initialize node + function Polyline(node) { + _classCallCheck(this, Polyline); - for (var i = 0, len = this._queue.length; i < len; ++i) { - // Get the current function to run - var current = this._queue[i]; // Run the function if its not finished, we keep track of the finished - // flag for the sake of declarative _queue - - var converged = current.runner.call(this, positionOrDt); - current.finished = current.finished || converged === true; - allfinished = allfinished && current.finished; - } // We report when all of the constructors are finished - - - return allfinished; - } - }, { - key: "addTransform", - value: function addTransform(transform, index) { - this.transforms.lmultiplyO(transform); - return this; - } - }, { - key: "clearTransform", - value: function clearTransform() { - this.transforms = new Matrix(); - return this; - } - }], [{ - key: "sanitise", - value: function sanitise(duration, delay, when) { - // Initialise the default parameters - var times = 1; - var swing = false; - var wait = 0; - duration = duration || timeline.duration; - delay = delay || timeline.delay; - when = when || 'last'; // If we have an object, unpack the values - - if (_typeof(duration) === 'object' && !(duration instanceof Stepper)) { - delay = duration.delay || delay; - when = duration.when || when; - swing = duration.swing || swing; - times = duration.times || times; - wait = duration.wait || wait; - duration = duration.duration || timeline.duration; - } - - return { - duration: duration, - delay: delay, - swing: swing, - times: times, - wait: wait, - when: when - }; - } - }]); - - return Runner; - }(EventTarget); - Runner.id = 0; - - var FakeRunner = function FakeRunner() { - var transforms = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Matrix(); - var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1; - var done = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; - - _classCallCheck(this, FakeRunner); - - this.transforms = transforms; - this.id = id; - this.done = done; - }; - - extend([Runner, FakeRunner], { - mergeWith: function mergeWith(runner) { - return new FakeRunner(runner.transforms.lmultiply(this.transforms), runner.id); + return _possibleConstructorReturn(this, _getPrototypeOf(Polyline).call(this, nodeOrNew('polyline', node), node)); } - }); // FakeRunner.emptyRunner = new FakeRunner() - var lmultiply = function lmultiply(last, curr) { - return last.lmultiplyO(curr); - }; + return Polyline; + }(Shape); + registerMethods({ + Container: { + // Create a wrapped polygon element + polyline: wrapWithAttrCheck(function (p) { + // make sure plot is called as a setter + return this.put(new Polyline()).plot(p || new PointArray()); + }) + } + }); + extend(Polyline, pointed); + extend(Polyline, poly); + register(Polyline); - var getRunnerTransform = function getRunnerTransform(runner) { - return runner.transforms; - }; + var Rect = + /*#__PURE__*/ + function (_Shape) { + _inherits(Rect, _Shape); - function mergeTransforms() { - // Find the matrix to apply to the element and apply it - var runners = this._transformationRunners.runners; - var netTransform = runners.map(getRunnerTransform).reduce(lmultiply, new Matrix()); - this.transform(netTransform); + // Initialize node + function Rect(node) { + _classCallCheck(this, Rect); - this._transformationRunners.merge(); + return _possibleConstructorReturn(this, _getPrototypeOf(Rect).call(this, nodeOrNew('rect', node), node)); + } - if (this._transformationRunners.length() === 1) { - this._frameId = null; + return Rect; + }(Shape); + extend(Rect, { + rx: rx, + ry: ry + }); + registerMethods({ + Container: { + // Create a rect element + rect: wrapWithAttrCheck(function (width$$1, height$$1) { + return this.put(new Rect()).size(width$$1, height$$1); + }) } - } + }); + register(Rect); - var RunnerArray = + var Queue = /*#__PURE__*/ function () { - function RunnerArray() { - _classCallCheck(this, RunnerArray); + function Queue() { + _classCallCheck(this, Queue); - this.runners = []; - this.ids = []; + this._first = null; + this._last = null; } - _createClass(RunnerArray, [{ - key: "add", - value: function add(runner) { - if (this.runners.includes(runner)) return; - var id = runner.id + 1; - var leftSibling = this.ids.reduce(function (last, curr) { - if (curr > last && curr < id) return curr; - return last; - }, 0); - var index = this.ids.indexOf(leftSibling) + 1; - this.ids.splice(index, 0, id); - this.runners.splice(index, 0, runner); - return this; - } - }, { - key: "getByID", - value: function getByID(id) { - return this.runners[this.ids.indexOf(id + 1)]; - } - }, { - key: "remove", - value: function remove(id) { - var index = this.ids.indexOf(id + 1); - this.ids.splice(index, 1); - this.runners.splice(index, 1); - return this; - } - }, { - key: "merge", - value: function merge() { - var _this2 = this; + _createClass(Queue, [{ + key: "push", + value: function push(value) { + // An item stores an id and the provided value + var item = value.next ? value : { + value: value, + next: null, + prev: null // Deal with the queue being empty or populated - var lastRunner = null; - this.runners.forEach(function (runner, i) { - if (lastRunner && runner.done && lastRunner.done) { - _this2.remove(runner.id); + }; - _this2.edit(lastRunner.id, runner.mergeWith(lastRunner)); - } + if (this._last) { + item.prev = this._last; + this._last.next = item; + this._last = item; + } else { + this._last = item; + this._first = item; + } // Update the length and return the current item - lastRunner = runner; - }); - return this; + + return item; } }, { - key: "edit", - value: function edit(id, newRunner) { - var index = this.ids.indexOf(id + 1); - this.ids.splice(index, 1, id); - this.runners.splice(index, 1, newRunner); - return this; - } + key: "shift", + value: function shift() { + // Check if we have a value + var remove = this._first; + if (!remove) return null; // If we do, remove it and relink things + + this._first = remove.next; + if (this._first) this._first.prev = null; + this._last = this._first ? this._last : null; + return remove.value; + } // Shows us the first item in the list + }, { - key: "length", - value: function length() { - return this.ids.length; - } + key: "first", + value: function first() { + return this._first && this._first.value; + } // Shows us the last item in the list + }, { - key: "clearBefore", - value: function clearBefore(id) { - var deleteCnt = this.ids.indexOf(id + 1) || 1; - this.ids.splice(0, deleteCnt, 0); - this.runners.splice(0, deleteCnt, new FakeRunner()); - return this; + key: "last", + value: function last() { + return this._last && this._last.value; + } // Removes the item that was returned from the push + + }, { + key: "remove", + value: function remove(item) { + // Relink the previous item + if (item.prev) item.prev.next = item.next; + if (item.next) item.next.prev = item.prev; + if (item === this._last) this._last = item.prev; + if (item === this._first) this._first = item.next; // Invalidate item + + item.prev = null; + item.next = null; } }]); - return RunnerArray; + return Queue; }(); - var frameId = 0; - registerMethods({ - Element: { - animate: function animate(duration, delay, when) { - var o = Runner.sanitise(duration, delay, when); - var timeline$$1 = this.timeline(); - return new Runner(o.duration).loop(o).element(this).timeline(timeline$$1).schedule(delay, when); - }, - delay: function delay(by, when) { - return this.animate(0, by, when); - }, - // this function searches for all runners on the element and deletes the ones - // which run before the current one. This is because absolute transformations - // overwfrite anything anyway so there is no need to waste time computing - // other runners - _clearTransformRunnersBefore: function _clearTransformRunnersBefore(currentRunner) { - this._transformationRunners.clearBefore(currentRunner.id); - }, - _currentTransform: function _currentTransform(current) { - return this._transformationRunners.runners // we need the equal sign here to make sure, that also transformations - // on the same runner which execute before the current transformation are - // taken into account - .filter(function (runner) { - return runner.id <= current.id; - }).map(getRunnerTransform).reduce(lmultiply, new Matrix()); - }, - addRunner: function addRunner(runner) { - this._transformationRunners.add(runner); + var Animator = { + nextDraw: null, + frames: new Queue(), + timeouts: new Queue(), + timer: globals.window.performance || globals.window.Date, + transforms: [], + frame: function frame(fn) { + // Store the node + var node = Animator.frames.push({ + run: fn + }); // Request an animation frame if we don't have one - Animator.transform_frame(mergeTransforms.bind(this), this._frameId); - }, - _prepareRunner: function _prepareRunner() { - if (this._frameId == null) { - this._transformationRunners = new RunnerArray().add(new FakeRunner(new Matrix(this))); - this._frameId = frameId++; - } - } - } - }); - extend(Runner, { - attr: function attr(a, v) { - return this.styleAttr('attr', a, v); + if (Animator.nextDraw === null) { + Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw); + } // Return the node so we can remove it easily + + + return node; }, - // Add animatable styles - css: function css(s, v) { - return this.styleAttr('css', s, v); + transform_frame: function transform_frame(fn, id) { + Animator.transforms[id] = fn; }, - styleAttr: function styleAttr(type, name, val) { - // apply attributes individually - if (_typeof(name) === 'object') { - for (var key in val) { - this.styleAttr(type, key, val[key]); - } + timeout: function timeout(fn, delay) { + delay = delay || 0; // Work out when the event should fire + + var time = Animator.timer.now() + delay; // Add the timeout to the end of the queue + + var node = Animator.timeouts.push({ + run: fn, + time: time + }); // Request another animation frame if we need one + + if (Animator.nextDraw === null) { + Animator.nextDraw = globals.window.requestAnimationFrame(Animator._draw); } - var morpher = new Morphable(this._stepper).to(val); - this.queue(function () { - morpher = morpher.from(this.element()[type](name)); - }, function (pos) { - this.element()[type](name, morpher.at(pos)); - return morpher.done(); - }); - return this; + return node; }, - zoom: function zoom(level, point) { - var morpher = new Morphable(this._stepper).to(new SVGNumber(level)); - this.queue(function () { - morpher = morpher.from(this.zoom()); - }, function (pos) { - this.element().zoom(morpher.at(pos), point); - return morpher.done(); - }); - return this; + cancelFrame: function cancelFrame(node) { + Animator.frames.remove(node); + }, + clearTimeout: function clearTimeout(node) { + Animator.timeouts.remove(node); }, + _draw: function _draw(now) { + // Run all the timeouts we can run, if they are not ready yet, add them + // to the end of the queue immediately! (bad timeouts!!! [sarcasm]) + var nextTimeout = null; + var lastTimeout = Animator.timeouts.last(); - /** - ** absolute transformations - **/ - // - // M v -----|-----(D M v = F v)------|-----> T v - // - // 1. define the final state (T) and decompose it (once) - // t = [tx, ty, the, lam, sy, sx] - // 2. on every frame: pull the current state of all previous transforms - // (M - m can change) - // and then write this as m = [tx0, ty0, the0, lam0, sy0, sx0] - // 3. Find the interpolated matrix F(pos) = m + pos * (t - m) - // - Note F(0) = M - // - Note F(1) = T - // 4. Now you get the delta matrix as a result: D = F * inv(M) - transform: function transform(transforms, relative, affine) { - // If we have a declarative function, we should retarget it if possible - relative = transforms.relative || relative; + while (nextTimeout = Animator.timeouts.shift()) { + // Run the timeout if its time, or push it to the end + if (now >= nextTimeout.time) { + nextTimeout.run(); + } else { + Animator.timeouts.push(nextTimeout); + } // If we hit the last item, we should stop shifting out more items - if (this._isDeclarative && !relative && this._tryRetarget('transform', transforms)) { - return this; - } // Parse the parameters + if (nextTimeout === lastTimeout) break; + } // Run all of the animation frames - var isMatrix = Matrix.isMatrixLike(transforms); - affine = transforms.affine != null ? transforms.affine : affine != null ? affine : !isMatrix; // Create a morepher and set its type - var morpher = new Morphable(this._stepper).type(affine ? TransformBag : Matrix); - var origin; - var element; - var current; - var currentAngle; - var startTransform; + var nextFrame = null; + var lastFrame = Animator.frames.last(); - function setup() { - // make sure element and origin is defined - element = element || this.element(); - origin = origin || getOrigin(transforms, element); - startTransform = new Matrix(relative ? undefined : element); // add the runner to the element so it can merge transformations + while (nextFrame !== lastFrame && (nextFrame = Animator.frames.shift())) { + nextFrame.run(); + } - element.addRunner(this); // Deactivate all transforms that have run so far if we are absolute + Animator.transforms.forEach(function (el) { + el(); + }); // If we have remaining timeouts or frames, draw until we don't anymore - if (!relative) { - element._clearTransformRunnersBefore(this); - } - } + Animator.nextDraw = Animator.timeouts.first() || Animator.frames.first() ? globals.window.requestAnimationFrame(Animator._draw) : null; + } + }; - function run(pos) { - // clear all other transforms before this in case something is saved - // on this runner. We are absolute. We dont need these! - if (!relative) this.clearTransform(); + var time = globals.window.performance || Date; - var _transform = new Point(origin).transform(element._currentTransform(this)), - x$$1 = _transform.x, - y$$1 = _transform.y; + var makeSchedule = function makeSchedule(runnerInfo) { + var start = runnerInfo.start; + var duration = runnerInfo.runner.duration(); + var end = start + duration; + return { + start: start, + duration: duration, + end: end, + runner: runnerInfo.runner + }; + }; - var target = new Matrix(_objectSpread({}, transforms, { - origin: [x$$1, y$$1] - })); - var start = this._isDeclarative && current ? current : startTransform; + var Timeline = + /*#__PURE__*/ + function () { + // Construct a new timeline on the given element + function Timeline() { + _classCallCheck(this, Timeline); - if (affine) { - target = target.decompose(x$$1, y$$1); - start = start.decompose(x$$1, y$$1); // Get the current and target angle as it was set + this._timeSource = function () { + return time.now(); + }; - var rTarget = target.rotate; - var rCurrent = start.rotate; // Figure out the shortest path to rotate directly + this._dispatcher = globals.document.createElement('div'); // Store the timing variables - var possibilities = [rTarget - 360, rTarget, rTarget + 360]; - var distances = possibilities.map(function (a) { - return Math.abs(a - rCurrent); + this._startTime = 0; + this._speed = 1.0; // Play control variables control how the animation proceeds + + this._reverse = false; + this._persist = 0; // Keep track of the running animations and their starting parameters + + this._nextFrame = null; + this._paused = false; + this._runners = []; + this._order = []; + this._time = 0; + this._lastSourceTime = 0; + this._lastStepTime = 0; + } + + _createClass(Timeline, [{ + key: "getEventTarget", + value: function getEventTarget() { + return this._dispatcher; + } + /** + * + */ + // schedules a runner on the timeline + + }, { + key: "schedule", + value: function schedule(runner, delay, when) { + if (runner == null) { + return this._runners.map(makeSchedule).sort(function (a, b) { + return a.start - b.start || a.duration - b.duration; }); - var shortest = Math.min.apply(Math, _toConsumableArray(distances)); - var index = distances.indexOf(shortest); - target.rotate = possibilities[index]; } - if (relative) { - // we have to be careful here not to overwrite the rotation - // with the rotate method of Matrix - if (!isMatrix) { - target.rotate = transforms.rotate || 0; - } + if (!this.active()) { + this._step(); - if (this._isDeclarative && currentAngle) { - start.rotate = currentAngle; + if (when == null) { + when = 'now'; } - } + } // The start time for the next animation can either be given explicitly, + // derived from the current timeline time or it can be relative to the + // last start time to chain animations direclty - morpher.from(start); - morpher.to(target); - var affineParameters = morpher.at(pos); - currentAngle = affineParameters.rotate; - current = new Matrix(affineParameters); - this.addTransform(current); - return morpher.done(); - } - function retarget(newTransforms) { - // only get a new origin if it changed since the last call - if ((newTransforms.origin || 'center').toString() !== (transforms.origin || 'center').toString()) { - origin = getOrigin(transforms, element); - } // overwrite the old transformations with the new ones + var absoluteStartTime = 0; + delay = delay || 0; // Work out when to start the animation + if (when == null || when === 'last' || when === 'after') { + // Take the last time and increment + absoluteStartTime = this._startTime; + } else if (when === 'absolute' || when === 'start') { + absoluteStartTime = delay; + delay = 0; + } else if (when === 'now') { + absoluteStartTime = this._time; + } else if (when === 'relative') { + var runnerInfo = this._runners[runner.id]; - transforms = _objectSpread({}, newTransforms, { - origin: origin - }); - } + if (runnerInfo) { + absoluteStartTime = runnerInfo.start + delay; + delay = 0; + } + } else { + throw new Error('Invalid value for the "when" parameter'); + } // Manage runner - this.queue(setup, run, retarget); - this._isDeclarative && this._rememberMorpher('transform', morpher); - return this; - }, - // Animatable x-axis - x: function x$$1(_x, relative) { - return this._queueNumber('x', _x); - }, - // Animatable y-axis - y: function y$$1(_y) { - return this._queueNumber('y', _y); - }, - dx: function dx(x$$1) { - return this._queueNumberDelta('dx', x$$1); - }, - dy: function dy(y$$1) { - return this._queueNumberDelta('dy', y$$1); - }, - _queueNumberDelta: function _queueNumberDelta(method, to$$1) { - to$$1 = new SVGNumber(to$$1); // Try to change the target if we have this method already registerd - if (this._tryRetargetDelta(method, to$$1)) return this; // Make a morpher and queue the animation + runner.unschedule(); + runner.timeline(this); + runner.time(-delay); // Save startTime for next runner - var morpher = new Morphable(this._stepper).to(to$$1); - this.queue(function () { - var from$$1 = this.element()[method](); - morpher.from(from$$1); - morpher.to(from$$1 + to$$1); - }, function (pos) { - this.element()[method](morpher.at(pos)); - return morpher.done(); - }); // Register the morpher so that if it is changed again, we can retarget it + this._startTime = absoluteStartTime + runner.duration() + delay; // Save runnerInfo - this._rememberMorpher(method, morpher); + this._runners[runner.id] = { + persist: this.persist(), + runner: runner, + start: absoluteStartTime // Save order and continue - return this; - }, - _queueObject: function _queueObject(method, to$$1) { - // Try to change the target if we have this method already registerd - if (this._tryRetarget(method, to$$1)) return this; // Make a morpher and queue the animation + }; - var morpher = new Morphable(this._stepper).to(to$$1); - this.queue(function () { - morpher.from(this.element()[method]()); - }, function (pos) { - this.element()[method](morpher.at(pos)); - return morpher.done(); - }); // Register the morpher so that if it is changed again, we can retarget it + this._order.push(runner.id); - this._rememberMorpher(method, morpher); + this._continue(); - return this; - }, - _queueNumber: function _queueNumber(method, value) { - return this._queueObject(method, new SVGNumber(value)); - }, - // Animatable center x-axis - cx: function cx$$1(x$$1) { - return this._queueNumber('cx', x$$1); - }, - // Animatable center y-axis - cy: function cy$$1(y$$1) { - return this._queueNumber('cy', y$$1); - }, - // Add animatable move - move: function move(x$$1, y$$1) { - return this.x(x$$1).y(y$$1); - }, - // Add animatable center - center: function center(x$$1, y$$1) { - return this.cx(x$$1).cy(y$$1); - }, - // Add animatable size - size: function size(width$$1, height$$1) { - // animate bbox based size for all other elements - var box; + return this; + } // Remove the runner from this timeline - if (!width$$1 || !height$$1) { - box = this._element.bbox(); - } + }, { + key: "unschedule", + value: function unschedule(runner) { + var index = this._order.indexOf(runner.id); - if (!width$$1) { - width$$1 = box.width / box.height * height$$1; - } + if (index < 0) return this; + delete this._runners[runner.id]; - if (!height$$1) { - height$$1 = box.height / box.width * width$$1; - } + this._order.splice(index, 1); - return this.width(width$$1).height(height$$1); - }, - // Add animatable width - width: function width$$1(_width) { - return this._queueNumber('width', _width); - }, - // Add animatable height - height: function height$$1(_height) { - return this._queueNumber('height', _height); - }, - // Add animatable plot - plot: function plot(a, b, c, d) { - // Lines can be plotted with 4 arguments - if (arguments.length === 4) { - return this.plot([a, b, c, d]); + runner.timeline(null); + return this; } - - var morpher = this._element.MorphArray().to(a); - - this.queue(function () { - morpher.from(this._element.array()); - }, function (pos) { - this._element.plot(morpher.at(pos)); - }); - return this; - }, - // Add leading method - leading: function leading(value) { - return this._queueNumber('leading', value); - }, - // Add animatable viewbox - viewbox: function viewbox(x$$1, y$$1, width$$1, height$$1) { - return this._queueObject('viewbox', new Box(x$$1, y$$1, width$$1, height$$1)); - }, - update: function update(o) { - if (_typeof(o) !== 'object') { - return this.update({ - offset: arguments[0], - color: arguments[1], - opacity: arguments[2] - }); + }, { + key: "play", + value: function play() { + // Now make sure we are not paused and continue the animation + this._paused = false; + return this._continue(); } - - if (o.opacity != null) this.attr('stop-opacity', o.opacity); - if (o.color != null) this.attr('stop-color', o.color); - if (o.offset != null) this.attr('offset', o.offset); - return this; - } - }); - extend(Runner, { - rx: rx, - ry: ry, - from: from, - to: to - }); - - var sugar = { - stroke: ['color', 'width', 'opacity', 'linecap', 'linejoin', 'miterlimit', 'dasharray', 'dashoffset'], - fill: ['color', 'opacity', 'rule'], - prefix: function prefix(t, a) { - return a === 'color' ? t : t + '-' + a; - } // Add sugar for fill and stroke - - }; - ['fill', 'stroke'].forEach(function (m) { - var extension = {}; - var i; - - extension[m] = function (o) { - if (typeof o === 'undefined') { - return this.attr(m); + }, { + key: "pause", + value: function pause() { + // Cancel the next animation frame and pause + this._nextFrame = null; + this._paused = true; + return this; } - - if (typeof o === 'string' || Color.isRgb(o) || o instanceof Element) { - this.attr(m, o); - } else { - // set all attributes from sugar.fill and sugar.stroke list - for (i = sugar[m].length - 1; i >= 0; i--) { - if (o[sugar[m][i]] != null) { - this.attr(sugar.prefix(m, sugar[m][i]), o[sugar[m][i]]); - } - } + }, { + key: "stop", + value: function stop() { + // Cancel the next animation frame and go to start + this.seek(-this._time); + return this.pause(); } - - return this; - }; - - registerMethods(['Shape', 'Runner'], extension); - }); - registerMethods(['Element', 'Runner'], { - // Let the user set the matrix directly - matrix: function matrix(mat, b, c, d, e, f) { - // Act as a getter - if (mat == null) { - return new Matrix(this); - } // Act as a setter, the user can pass a matrix or a set of numbers - - - return this.attr('transform', new Matrix(mat, b, c, d, e, f)); - }, - // Map rotation to transform - rotate: function rotate(angle, cx, cy) { - return this.transform({ - rotate: angle, - ox: cx, - oy: cy - }, true); - }, - // Map skew to transform - skew: function skew(x, y, cx, cy) { - return arguments.length === 1 || arguments.length === 3 ? this.transform({ - skew: x, - ox: y, - oy: cx - }, true) : this.transform({ - skew: [x, y], - ox: cx, - oy: cy - }, true); - }, - shear: function shear(lam, cx, cy) { - return this.transform({ - shear: lam, - ox: cx, - oy: cy - }, true); - }, - // Map scale to transform - scale: function scale(x, y, cx, cy) { - return arguments.length === 1 || arguments.length === 3 ? this.transform({ - scale: x, - ox: y, - oy: cx - }, true) : this.transform({ - scale: [x, y], - ox: cx, - oy: cy - }, true); - }, - // Map translate to transform - translate: function translate(x, y) { - return this.transform({ - translate: [x, y] - }, true); - }, - // Map relative translations to transform - relative: function relative(x, y) { - return this.transform({ - relative: [x, y] - }, true); - }, - // Map flip to transform - flip: function flip(direction, around) { - var directionString = typeof direction === 'string' ? direction : isFinite(direction) ? 'both' : 'both'; - var origin = direction === 'both' && isFinite(around) ? [around, around] : direction === 'x' ? [around, 0] : direction === 'y' ? [0, around] : isFinite(direction) ? [direction, direction] : [0, 0]; - this.transform({ - flip: directionString, - origin: origin - }, true); - }, - // Opacity - opacity: function opacity(value) { - return this.attr('opacity', value); - }, - // Relative move over x axis - dx: function dx(x) { - return this.x(new SVGNumber(x).plus(this instanceof Runner ? 0 : this.x()), true); - }, - // Relative move over y axis - dy: function dy(y) { - return this.y(new SVGNumber(y).plus(this instanceof Runner ? 0 : this.y()), true); - }, - // Relative move over x and y axes - dmove: function dmove(x, y) { - return this.dx(x).dy(y); - } - }); - registerMethods('radius', { - // Add x and y radius - radius: function radius(x, y) { - var type = (this._element || this).type; - return type === 'radialGradient' || type === 'radialGradient' ? this.attr('r', new SVGNumber(x)) : this.rx(x).ry(y == null ? x : y); - } - }); - registerMethods('Path', { - // Get path length - length: function length() { - return this.node.getTotalLength(); - }, - // Get point at length - pointAt: function pointAt(length) { - return new Point(this.node.getPointAtLength(length)); - } - }); - registerMethods(['Element', 'Runner'], { - // Set font - font: function font(a, v) { - if (_typeof(a) === 'object') { - for (v in a) { - this.font(v, a[v]); - } + }, { + key: "finish", + value: function finish() { + this.seek(Infinity); + return this.pause(); } - - return a === 'leading' ? this.leading(v) : a === 'anchor' ? this.attr('text-anchor', v) : a === 'size' || a === 'family' || a === 'weight' || a === 'stretch' || a === 'variant' || a === 'style' ? this.attr('font-' + a, v) : this.attr(a, v); - } - }); - registerMethods('Text', { - ax: function ax(x) { - return this.attr('x', x); - }, - ay: function ay(y) { - return this.attr('y', y); - }, - amove: function amove(x, y) { - return this.ax(x).ay(y); - } - }); // Add events to elements - - var methods$1 = ['click', 'dblclick', 'mousedown', 'mouseup', 'mouseover', 'mouseout', 'mousemove', 'mouseenter', 'mouseleave', 'touchstart', 'touchmove', 'touchleave', 'touchend', 'touchcancel'].reduce(function (last, event) { - // add event to Element - var fn = function fn(f) { - if (f === null) { - off(this, event); - } else { - on(this, event, f); + }, { + key: "speed", + value: function speed(_speed) { + if (_speed == null) return this._speed; + this._speed = _speed; + return this; } - - return this; - }; - - last[event] = fn; - return last; - }, {}); - registerMethods('Element', methods$1); - - function untransform() { - return this.attr('transform', null); - } // merge the whole transformation chain into one matrix and returns it - - function matrixify() { - var matrix = (this.attr('transform') || ''). // split transformations - split(transforms).slice(0, -1).map(function (str) { - // generate key => value pairs - var kv = str.trim().split('('); - return [kv[0], kv[1].split(delimiter).map(function (str) { - return parseFloat(str); - })]; - }).reverse() // merge every transformation into one matrix - .reduce(function (matrix, transform) { - if (transform[0] === 'matrix') { - return matrix.lmultiply(Matrix.fromArray(transform[1])); + }, { + key: "reverse", + value: function reverse(yes) { + var currentSpeed = this.speed(); + if (yes == null) return this.speed(-currentSpeed); + var positive = Math.abs(currentSpeed); + return this.speed(yes ? positive : -positive); } - - return matrix[transform[0]].apply(matrix, transform[1]); - }, new Matrix()); - return matrix; - } // add an element to another parent without changing the visual representation on the screen - - function toParent(parent) { - if (this === parent) return this; - var ctm = this.screenCTM(); - var pCtm = parent.screenCTM().inverse(); - this.addTo(parent).untransform().transform(pCtm.multiply(ctm)); - return this; - } // same as above with parent equals root-svg - - function toDoc() { - return this.toParent(this.doc()); - } // Add transformations - - function transform(o, relative) { - // Act as a getter if no object was passed - if (o == null || typeof o === 'string') { - var decomposed = new Matrix(this).decompose(); - return decomposed[o] || decomposed; - } - - if (!Matrix.isMatrixLike(o)) { - // Set the origin according to the defined transform - o = _objectSpread({}, o, { - origin: getOrigin(o, this) - }); - } // The user can pass a boolean, an Element or an Matrix or nothing - - - var cleanRelative = relative === true ? this : relative || false; - var result = new Matrix(cleanRelative).transform(o); - return this.attr('transform', result); - } - registerMethods('Element', { - untransform: untransform, - matrixify: matrixify, - toParent: toParent, - toDoc: toDoc, - transform: transform - }); - - var List = subClassArray('List', Array, function (arr) { - this.length = 0; - this.push.apply(this, _toConsumableArray(arr)); - }); - extend(List, { - each: function each(cbOrName) { - for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { - args[_key - 1] = arguments[_key]; + }, { + key: "seek", + value: function seek(dt) { + this._time += dt; + return this._continue(); } - - if (typeof cbOrName === 'function') { - this.forEach(function (el) { - cbOrName.call(el, el); - }); - } else { - this.forEach(function (el) { - el[cbOrName].apply(el, args); - }); + }, { + key: "time", + value: function time(_time) { + if (_time == null) return this._time; + this._time = _time; + return this; + } + }, { + key: "persist", + value: function persist(dtOrForever) { + if (dtOrForever == null) return this._persist; + this._persist = dtOrForever; + return this; + } + }, { + key: "source", + value: function source(fn) { + if (fn == null) return this._timeSource; + this._timeSource = fn; + return this; } + }, { + key: "_step", + value: function _step() { + // If the timeline is paused, just do nothing + if (this._paused) return; // Get the time delta from the last time and update the time + + var time = this._timeSource(); - return this; - }, - toArray: function toArray() { - return Array.prototype.concat.apply([], this); - } - }); + var dtSource = time - this._lastSourceTime; + var dtTime = this._speed * dtSource + (this._time - this._lastStepTime); + this._lastSourceTime = time; // Update the time - List.extend = function (methods) { - methods = methods.reduce(function (obj, name) { - obj[name] = function () { - for (var _len2 = arguments.length, attrs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { - attrs[_key2] = arguments[_key2]; - } + this._time += dtTime; + this._lastStepTime = this._time; // this.fire('time', this._time) + // Run all of the runners directly - return this.each.apply(this, [name].concat(attrs)); - }; + var runnersLeft = false; - return obj; - }, {}); - extend(List, methods); - }; + for (var i = 0, len = this._order.length; i < len; i++) { + // Get and run the current runner and ignore it if its inactive + var runnerInfo = this._runners[this._order[i]]; + var runner = runnerInfo.runner; + var dt = dtTime; // Make sure that we give the actual difference + // between runner start time and now - var Shape = - /*#__PURE__*/ - function (_Element) { - _inherits(Shape, _Element); + var dtToStart = this._time - runnerInfo.start; // Dont run runner if not started yet - function Shape() { - _classCallCheck(this, Shape); + if (dtToStart < 0) { + runnersLeft = true; + continue; + } else if (dtToStart < dt) { + // Adjust dt to make sure that animation is on point + dt = dtToStart; + } - return _possibleConstructorReturn(this, _getPrototypeOf(Shape).apply(this, arguments)); - } + if (!runner.active()) continue; // If this runner is still going, signal that we need another animation + // frame, otherwise, remove the completed runner - return Shape; - }(Element); - register(Shape); + var finished = runner.step(dt).done; - var Circle = - /*#__PURE__*/ - function (_Shape) { - _inherits(Circle, _Shape); + if (!finished) { + runnersLeft = true; // continue + } else if (runnerInfo.persist !== true) { + // runner is finished. And runner might get removed + var endTime = runner.duration() - runner.time() + this._time; - function Circle(node) { - _classCallCheck(this, Circle); + if (endTime + this._persist < this._time) { + // Delete runner and correct index + delete this._runners[this._order[i]]; + this._order.splice(i--, 1) && --len; + runner.timeline(null); + } + } + } // Get the next animation frame to keep the simulation going - return _possibleConstructorReturn(this, _getPrototypeOf(Circle).call(this, nodeOrNew('circle', node), node)); - } - _createClass(Circle, [{ - key: "radius", - value: function radius(r) { - return this.attr('r', r); - } // Radius x value + if (runnersLeft) { + this._nextFrame = Animator.frame(this._step.bind(this)); + } else { + this._nextFrame = null; + } - }, { - key: "rx", - value: function rx$$1(_rx) { - return this.attr('r', _rx); - } // Alias radius x value + return this; + } // Checks if we are running and continues the animation }, { - key: "ry", - value: function ry$$1(_ry) { - return this.rx(_ry); + key: "_continue", + value: function _continue() { + if (this._paused) return this; + + if (!this._nextFrame) { + this._nextFrame = Animator.frame(this._step.bind(this)); + } + + return this; } }, { - key: "size", - value: function size(_size) { - return this.radius(new SVGNumber(_size).divide(2)); + key: "active", + value: function active() { + return !!this._nextFrame; } }]); - return Circle; - }(Shape); - extend(Circle, { - x: x, - y: y, - cx: cx, - cy: cy, - width: width, - height: height - }); + return Timeline; + }(); registerMethods({ Element: { - // Create circle element - circle: wrapWithAttrCheck(function (size) { - return this.put(new Circle()).size(size).move(0, 0); - }) - } - }); - register(Circle); - - var Ellipse = - /*#__PURE__*/ - function (_Shape) { - _inherits(Ellipse, _Shape); - - function Ellipse(node) { - _classCallCheck(this, Ellipse); - - return _possibleConstructorReturn(this, _getPrototypeOf(Ellipse).call(this, nodeOrNew('ellipse', node), node)); - } - - _createClass(Ellipse, [{ - key: "size", - value: function size(width$$1, height$$1) { - var p = proportionalSize(this, width$$1, height$$1); - return this.rx(new SVGNumber(p.width).divide(2)).ry(new SVGNumber(p.height).divide(2)); + timeline: function timeline() { + this._timeline = this._timeline || new Timeline(); + return this._timeline; } - }]); - - return Ellipse; - }(Shape); - extend(Ellipse, circled); - registerMethods('Container', { - // Create an ellipse - ellipse: wrapWithAttrCheck(function (width$$1, height$$1) { - return this.put(new Ellipse()).size(width$$1, height$$1).move(0, 0); - }) + } }); - register(Ellipse); - var Stop = + var Runner = /*#__PURE__*/ - function (_Element) { - _inherits(Stop, _Element); - - function Stop(node) { - _classCallCheck(this, Stop); - - return _possibleConstructorReturn(this, _getPrototypeOf(Stop).call(this, nodeOrNew('stop', node), node)); - } // add color stops - - - _createClass(Stop, [{ - key: "update", - value: function update(o) { - if (typeof o === 'number' || o instanceof SVGNumber) { - o = { - offset: arguments[0], - color: arguments[1], - opacity: arguments[2] - }; - } // set attributes + function (_EventTarget) { + _inherits(Runner, _EventTarget); + function Runner(options) { + var _this; - if (o.opacity != null) this.attr('stop-opacity', o.opacity); - if (o.color != null) this.attr('stop-color', o.color); - if (o.offset != null) this.attr('offset', new SVGNumber(o.offset)); - return this; - } - }]); + _classCallCheck(this, Runner); - return Stop; - }(Element); - register(Stop); + _this = _possibleConstructorReturn(this, _getPrototypeOf(Runner).call(this)); // Store a unique id on the runner, so that we can identify it later - function baseFind(query, parent) { - return map((parent || globals.document).querySelectorAll(query), function (node) { - return adopt(node); - }); - } // Scoped find method + _this.id = Runner.id++; // Ensure a default value - function find(query) { - return baseFind(query, this.node); - } - registerMethods('Dom', { - find: find - }); + options = options == null ? timeline.duration : options; // Ensure that we get a controller - var Gradient = - /*#__PURE__*/ - function (_Container) { - _inherits(Gradient, _Container); + options = typeof options === 'function' ? new Controller(options) : options; // Declare all of the variables - function Gradient(type, attrs) { - _classCallCheck(this, Gradient); + _this._element = null; + _this._timeline = null; + _this.done = false; + _this._queue = []; // Work out the stepper and the duration - return _possibleConstructorReturn(this, _getPrototypeOf(Gradient).call(this, nodeOrNew(type + 'Gradient', typeof type === 'string' ? null : type), attrs)); - } // Add a color stop + _this._duration = typeof options === 'number' && options; + _this._isDeclarative = options instanceof Controller; + _this._stepper = _this._isDeclarative ? options : new Ease(); // We copy the current values from the timeline because they can change + _this._history = {}; // Store the state of the runner - _createClass(Gradient, [{ - key: "stop", - value: function stop(offset, color, opacity) { - return this.put(new Stop()).update(offset, color, opacity); - } // Update gradient + _this.enabled = true; + _this._time = 0; + _this._last = 0; // Save transforms applied to this runner - }, { - key: "update", - value: function update(block) { - // remove all stops - this.clear(); // invoke passed block + _this.transforms = new Matrix(); + _this.transformId = 1; // Looping variables - if (typeof block === 'function') { - block.call(this, this); - } + _this._haveReversed = false; + _this._reverse = false; + _this._loopsDone = 0; + _this._swing = false; + _this._wait = 0; + _this._times = 1; + return _this; + } + /* + Runner Definitions + ================== + These methods help us define the runtime behaviour of the Runner or they + help us make new runners from the current runner + */ - return this; - } // Return the fill id - }, { - key: "url", - value: function url() { - return 'url(#' + this.id() + ')'; - } // Alias string convertion to fill + _createClass(Runner, [{ + key: "element", + value: function element(_element) { + if (_element == null) return this._element; + this._element = _element; - }, { - key: "toString", - value: function toString() { - return this.url(); - } // custom attr to handle transform + _element._prepareRunner(); - }, { - key: "attr", - value: function attr(a, b, c) { - if (a === 'transform') a = 'gradientTransform'; - return _get(_getPrototypeOf(Gradient.prototype), "attr", this).call(this, a, b, c); + return this; } }, { - key: "targets", - value: function targets() { - return baseFind('svg [fill*="' + this.id() + '"]'); + key: "timeline", + value: function timeline$$1(_timeline) { + // check explicitly for undefined so we can set the timeline to null + if (typeof _timeline === 'undefined') return this._timeline; + this._timeline = _timeline; + return this; } }, { - key: "bbox", - value: function bbox() { - return new Box(); + key: "animate", + value: function animate(duration, delay, when) { + var o = Runner.sanitise(duration, delay, when); + var runner = new Runner(o.duration); + if (this._timeline) runner.timeline(this._timeline); + if (this._element) runner.element(this._element); + return runner.loop(o).schedule(delay, when); } - }]); - - return Gradient; - }(Container); - extend(Gradient, gradiented); - registerMethods({ - Container: { - // Create gradient element in defs - gradient: wrapWithAttrCheck(function (type, block) { - return this.defs().gradient(type, block); - }) - }, - // define gradient - Defs: { - gradient: wrapWithAttrCheck(function (type, block) { - return this.put(new Gradient(type)).update(block); - }) - } - }); - register(Gradient); - - var Pattern = - /*#__PURE__*/ - function (_Container) { - _inherits(Pattern, _Container); - - // Initialize node - function Pattern(node) { - _classCallCheck(this, Pattern); + }, { + key: "schedule", + value: function schedule(timeline$$1, delay, when) { + // The user doesn't need to pass a timeline if we already have one + if (!(timeline$$1 instanceof Timeline)) { + when = delay; + delay = timeline$$1; + timeline$$1 = this.timeline(); + } // If there is no timeline, yell at the user... - return _possibleConstructorReturn(this, _getPrototypeOf(Pattern).call(this, nodeOrNew('pattern', node), node)); - } // Return the fill id + if (!timeline$$1) { + throw Error('Runner cannot be scheduled without timeline'); + } // Schedule the runner on the timeline provided - _createClass(Pattern, [{ - key: "url", - value: function url() { - return 'url(#' + this.id() + ')'; - } // Update pattern by rebuilding + timeline$$1.schedule(this, delay, when); + return this; + } }, { - key: "update", - value: function update(block) { - // remove content - this.clear(); // invoke passed block + key: "unschedule", + value: function unschedule() { + var timeline$$1 = this.timeline(); + timeline$$1 && timeline$$1.unschedule(this); + return this; + } + }, { + key: "loop", + value: function loop(times, swing, wait) { + // Deal with the user passing in an object + if (_typeof(times) === 'object') { + swing = times.swing; + wait = times.wait; + times = times.times; + } // Sanitise the values and store them - if (typeof block === 'function') { - block.call(this, this); - } + this._times = times || Infinity; + this._swing = swing || false; + this._wait = wait || 0; return this; - } // Alias string convertion to fill - + } }, { - key: "toString", - value: function toString() { - return this.url(); - } // custom attr to handle transform + key: "delay", + value: function delay(_delay) { + return this.animate(0, _delay); + } + /* + Basic Functionality + =================== + These methods allow us to attach basic functions to the runner directly + */ }, { - key: "attr", - value: function attr(a, b, c) { - if (a === 'transform') a = 'patternTransform'; - return _get(_getPrototypeOf(Pattern.prototype), "attr", this).call(this, a, b, c); + key: "queue", + value: function queue(initFn, runFn, retargetFn, isTransform) { + this._queue.push({ + initialiser: initFn || noop, + runner: runFn || noop, + retarget: retargetFn, + isTransform: isTransform, + initialised: false, + finished: false + }); + + var timeline$$1 = this.timeline(); + timeline$$1 && this.timeline()._continue(); + return this; } }, { - key: "targets", - value: function targets() { - return baseFind('svg [fill*="' + this.id() + '"]'); + key: "during", + value: function during(fn) { + return this.queue(null, fn); } }, { - key: "bbox", - value: function bbox() { - return new Box(); + key: "after", + value: function after(fn) { + return this.on('finish', fn); } - }]); + /* + Runner animation methods + ======================== + Control how the animation plays + */ - return Pattern; - }(Container); - registerMethods({ - Container: { - // Create pattern element in defs - pattern: function pattern() { - var _this$defs; + }, { + key: "time", + value: function time(_time) { + if (_time == null) { + return this._time; + } - return (_this$defs = this.defs()).pattern.apply(_this$defs, arguments); + var dt = _time - this._time; + this.step(dt); + return this; } - }, - Defs: { - pattern: wrapWithAttrCheck(function (width, height, block) { - return this.put(new Pattern()).update(block).attr({ - x: 0, - y: 0, - width: width, - height: height, - patternUnits: 'userSpaceOnUse' - }); - }) - } - }); - register(Pattern); - - var Image = - /*#__PURE__*/ - function (_Shape) { - _inherits(Image, _Shape); + }, { + key: "duration", + value: function duration() { + return this._times * (this._wait + this._duration) - this._wait; + } + }, { + key: "loops", + value: function loops(p) { + var loopDuration = this._duration + this._wait; - function Image(node) { - _classCallCheck(this, Image); + if (p == null) { + var loopsDone = Math.floor(this._time / loopDuration); + var relativeTime = this._time - loopsDone * loopDuration; + var position = relativeTime / this._duration; + return Math.min(loopsDone + position, this._times); + } - return _possibleConstructorReturn(this, _getPrototypeOf(Image).call(this, nodeOrNew('image', node), node)); - } // (re)load image + var whole = Math.floor(p); + var partial = p % 1; + var time = loopDuration * whole + this._duration * partial; + return this.time(time); + } + }, { + key: "position", + value: function position(p) { + // Get all of the variables we need + var x$$1 = this._time; + var d = this._duration; + var w = this._wait; + var t = this._times; + var s = this._swing; + var r = this._reverse; + var position; + if (p == null) { + /* + This function converts a time to a position in the range [0, 1] + The full explanation can be found in this desmos demonstration + https://www.desmos.com/calculator/u4fbavgche + The logic is slightly simplified here because we can use booleans + */ + // Figure out the value without thinking about the start or end time + var f = function f(x$$1) { + var swinging = s * Math.floor(x$$1 % (2 * (w + d)) / (w + d)); + var backwards = swinging && !r || !swinging && r; + var uncliped = Math.pow(-1, backwards) * (x$$1 % (w + d)) / d + backwards; + var clipped = Math.max(Math.min(uncliped, 1), 0); + return clipped; + }; // Figure out the value by incorporating the start time - _createClass(Image, [{ - key: "load", - value: function load(url, callback) { - if (!url) return this; - var img = new globals.window.Image(); - on(img, 'load', function (e) { - var p = this.parent(Pattern); // ensure image size - if (this.width() === 0 && this.height() === 0) { - this.size(img.width, img.height); - } + var endTime = t * (w + d) - w; + position = x$$1 <= 0 ? Math.round(f(1e-5)) : x$$1 < endTime ? f(x$$1) : Math.round(f(endTime - 1e-5)); + return position; + } // Work out the loops done and add the position to the loops done - if (p instanceof Pattern) { - // ensure pattern size if not set - if (p.width() === 0 && p.height() === 0) { - p.size(this.width(), this.height()); - } - } - if (typeof callback === 'function') { - callback.call(this, { - width: img.width, - height: img.height, - ratio: img.width / img.height, - url: url - }); - } - }, this); - on(img, 'load error', function () { - // dont forget to unbind memory leaking events - off(img); - }); - return this.attr('href', img.src = url, xlink); + var loopsDone = Math.floor(this.loops()); + var swingForward = s && loopsDone % 2 === 0; + var forwards = swingForward && !r || r && swingForward; + position = loopsDone + (forwards ? p : 1 - p); + return this.loops(position); } - }]); + }, { + key: "progress", + value: function progress(p) { + if (p == null) { + return Math.min(1, this._time / this.duration()); + } - return Image; - }(Shape); - registerAttrHook(function (attr$$1, val, _this) { - // convert image fill and stroke to patterns - if (attr$$1 === 'fill' || attr$$1 === 'stroke') { - if (isImage.test(val)) { - val = _this.doc().defs().image(val); + return this.time(p * this.duration()); } - } + }, { + key: "step", + value: function step(dt) { + // If we are inactive, this stepper just gets skipped + if (!this.enabled) return this; // Update the time and get the new position - if (val instanceof Image) { - val = _this.doc().defs().pattern(0, 0, function (pattern) { - pattern.add(val); - }); - } + dt = dt == null ? 16 : dt; + this._time += dt; + var position = this.position(); // Figure out if we need to run the stepper in this frame - return val; - }); - registerMethods({ - Container: { - // create image element, load image and set its size - image: wrapWithAttrCheck(function (source, callback) { - return this.put(new Image()).size(0, 0).load(source, callback); - }) - } - }); - register(Image); + var running = this._lastPosition !== position && this._time >= 0; + this._lastPosition = position; // Figure out if we just started - var PointArray = subClassArray('PointArray', SVGArray); - extend(PointArray, { - // Convert array to string - toString: function toString() { - // convert to a poly point string - for (var i = 0, il = this.length, array = []; i < il; i++) { - array.push(this[i].join(',')); - } + var duration = this.duration(); + var justStarted = this._lastTime < 0 && this._time > 0; + var justFinished = this._lastTime < this._time && this.time > duration; + this._lastTime = this._time; - return array.join(' '); - }, - // Convert array to line object - toLine: function toLine() { - return { - x1: this[0][0], - y1: this[0][1], - x2: this[1][0], - y2: this[1][1] - }; - }, - // Get morphed array at given position - at: function at(pos) { - // make sure a destination is defined - if (!this.destination) return this; // generate morphed point string + if (justStarted) { + this.fire('start', this); + } // Work out if the runner is finished set the done flag here so animations + // know, that they are running in the last step (this is good for + // transformations which can be merged) - for (var i = 0, il = this.length, array = []; i < il; i++) { - array.push([this[i][0] + (this.destination[i][0] - this[i][0]) * pos, this[i][1] + (this.destination[i][1] - this[i][1]) * pos]); - } - return new PointArray(array); - }, - // Parse point string and flat array - parse: function parse() { - var array = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [[0, 0]]; - var points = []; // if it is an array + var declarative = this._isDeclarative; + this.done = !declarative && !justFinished && this._time >= duration; // Call initialise and the run function - if (array instanceof Array) { - // and it is not flat, there is no need to parse it - if (array[0] instanceof Array) { - return array; - } - } else { - // Else, it is considered as a string - // parse points - array = array.trim().split(delimiter).map(parseFloat); - } // validate points - https://svgwg.org/svg2-draft/shapes.html#DataTypePoints - // Odd number of coordinates is an error. In such cases, drop the last odd coordinate. + if (running || declarative) { + this._initialise(running); // clear the transforms on this runner so they dont get added again and again - if (array.length % 2 !== 0) array.pop(); // wrap points in two-tuples and parse points as floats + this.transforms = new Matrix(); - for (var i = 0, len = array.length; i < len; i = i + 2) { - points.push([array[i], array[i + 1]]); - } + var converged = this._run(declarative ? dt : position); - return points; - }, - // Move point string - move: function move(x, y) { - var box = this.bbox(); // get relative offset + this.fire('step', this); + } // correct the done flag here + // declaritive animations itself know when they converged - x -= box.x; - y -= box.y; // move every point - if (!isNaN(x) && !isNaN(y)) { - for (var i = this.length - 1; i >= 0; i--) { - this[i] = [this[i][0] + x, this[i][1] + y]; - } - } + this.done = this.done || converged && declarative; - return this; - }, - // Resize poly string - size: function size(width, height) { - var i; - var box = this.bbox(); // recalculate position of all points according to new size + if (this.done) { + this.fire('finish', this); + } - for (i = this.length - 1; i >= 0; i--) { - if (box.width) this[i][0] = (this[i][0] - box.x) * width / box.width + box.x; - if (box.height) this[i][1] = (this[i][1] - box.y) * height / box.height + box.y; + return this; } + }, { + key: "finish", + value: function finish() { + return this.step(Infinity); + } + }, { + key: "reverse", + value: function reverse(_reverse) { + this._reverse = _reverse == null ? !this._reverse : _reverse; + return this; + } + }, { + key: "ease", + value: function ease(fn) { + this._stepper = new Ease(fn); + return this; + } + }, { + key: "active", + value: function active(enabled) { + if (enabled == null) return this.enabled; + this.enabled = enabled; + return this; + } + /* + Private Methods + =============== + Methods that shouldn't be used externally + */ + // Save a morpher to the morpher list so that we can retarget it later - return this; - }, - // Get bounding box of points - bbox: function bbox() { - var maxX = -Infinity; - var maxY = -Infinity; - var minX = Infinity; - var minY = Infinity; - this.forEach(function (el) { - maxX = Math.max(el[0], maxX); - maxY = Math.max(el[1], maxY); - minX = Math.min(el[0], minX); - minY = Math.min(el[1], minY); - }); - return { - x: minX, - y: minY, - width: maxX - minX, - height: maxY - minY - }; - } - }); - - var MorphArray = PointArray; // Move by left top corner over x-axis - - function x$1(x) { - return x == null ? this.bbox().x : this.move(x, this.bbox().y); - } // Move by left top corner over y-axis - - function y$1(y) { - return y == null ? this.bbox().y : this.move(this.bbox().x, y); - } // Set width of element + }, { + key: "_rememberMorpher", + value: function _rememberMorpher(method, morpher) { + this._history[method] = { + morpher: morpher, + caller: this._queue[this._queue.length - 1] + }; + } // Try to set the target for a morpher if the morpher exists, otherwise + // do nothing and return false - function width$1(width) { - var b = this.bbox(); - return width == null ? b.width : this.size(width, b.height); - } // Set height of element + }, { + key: "_tryRetarget", + value: function _tryRetarget(method, target) { + if (this._history[method]) { + // if the last method wasnt even initialised, throw it away + if (!this._history[method].caller.initialised) { + var index = this._queue.indexOf(this._history[method].caller); - function height$1(height) { - var b = this.bbox(); - return height == null ? b.height : this.size(b.width, height); - } + this._queue.splice(index, 1); - var pointed = /*#__PURE__*/Object.freeze({ - MorphArray: MorphArray, - x: x$1, - y: y$1, - width: width$1, - height: height$1 - }); + return false; + } // for the case of transformations, we use the special retarget function + // which has access to the outer scope - var Line = - /*#__PURE__*/ - function (_Shape) { - _inherits(Line, _Shape); - // Initialize node - function Line(node) { - _classCallCheck(this, Line); + if (this._history[method].caller.retarget) { + this._history[method].caller.retarget(target); // for everything else a simple morpher change is sufficient - return _possibleConstructorReturn(this, _getPrototypeOf(Line).call(this, nodeOrNew('line', node), node)); - } // Get array + } else { + this._history[method].morpher.to(target); + } + this._history[method].caller.finished = false; + var timeline$$1 = this.timeline(); + timeline$$1 && timeline$$1._continue(); + return true; + } - _createClass(Line, [{ - key: "array", - value: function array() { - return new PointArray([[this.attr('x1'), this.attr('y1')], [this.attr('x2'), this.attr('y2')]]); - } // Overwrite native plot() method + return false; + } // Run each initialise function in the runner if required }, { - key: "plot", - value: function plot(x1, y1, x2, y2) { - if (x1 == null) { - return this.array(); - } else if (typeof y1 !== 'undefined') { - x1 = { - x1: x1, - y1: y1, - x2: x2, - y2: y2 - }; - } else { - x1 = new PointArray(x1).toLine(); + key: "_initialise", + value: function _initialise(running) { + // If we aren't running, we shouldn't initialise when not declarative + if (!running && !this._isDeclarative) return; // Loop through all of the initialisers + + for (var i = 0, len = this._queue.length; i < len; ++i) { + // Get the current initialiser + var current = this._queue[i]; // Determine whether we need to initialise + + var needsIt = this._isDeclarative || !current.initialised && running; + running = !current.finished; // Call the initialiser if we need to + + if (needsIt && running) { + current.initialiser.call(this); + current.initialised = true; + } } + } // Run each run function for the position or dt given - return this.attr(x1); - } // Move by left top corner + }, { + key: "_run", + value: function _run(positionOrDt) { + // Run all of the _queue directly + var allfinished = true; + + for (var i = 0, len = this._queue.length; i < len; ++i) { + // Get the current function to run + var current = this._queue[i]; // Run the function if its not finished, we keep track of the finished + // flag for the sake of declarative _queue + + var converged = current.runner.call(this, positionOrDt); + current.finished = current.finished || converged === true; + allfinished = allfinished && current.finished; + } // We report when all of the constructors are finished + + return allfinished; + } }, { - key: "move", - value: function move(x, y) { - return this.attr(this.array().move(x, y).toLine()); - } // Set element size to given width and height + key: "addTransform", + value: function addTransform(transform, index) { + this.transforms.lmultiplyO(transform); + return this; + } + }, { + key: "clearTransform", + value: function clearTransform() { + this.transforms = new Matrix(); + return this; + } // TODO: Keep track of all transformations so that deletion is faster }, { - key: "size", - value: function size(width, height) { - var p = proportionalSize(this, width, height); - return this.attr(this.array().size(p.width, p.height).toLine()); + key: "clearTransformsFromQueue", + value: function clearTransformsFromQueue() { + if (!this.done) { + this._queue = this._queue.filter(function (item) { + return !item.isTransform; + }); + } } - }]); + }], [{ + key: "sanitise", + value: function sanitise(duration, delay, when) { + // Initialise the default parameters + var times = 1; + var swing = false; + var wait = 0; + duration = duration || timeline.duration; + delay = delay || timeline.delay; + when = when || 'last'; // If we have an object, unpack the values - return Line; - }(Shape); - extend(Line, pointed); - registerMethods({ - Container: { - // Create a line element - line: wrapWithAttrCheck(function () { - for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { - args[_key] = arguments[_key]; + if (_typeof(duration) === 'object' && !(duration instanceof Stepper)) { + delay = duration.delay || delay; + when = duration.when || when; + swing = duration.swing || swing; + times = duration.times || times; + wait = duration.wait || wait; + duration = duration.duration || timeline.duration; } - // make sure plot is called as a setter - // x1 is not necessarily a number, it can also be an array, a string and a PointArray - return Line.prototype.plot.apply(this.put(new Line()), args[0] != null ? args : [0, 0, 0, 0]); - }) - } - }); - register(Line); + return { + duration: duration, + delay: delay, + swing: swing, + times: times, + wait: wait, + when: when + }; + } + }]); - var Marker = + return Runner; + }(EventTarget); + Runner.id = 0; + + var FakeRunner = /*#__PURE__*/ - function (_Container) { - _inherits(Marker, _Container); + function () { + function FakeRunner() { + var transforms = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Matrix(); + var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1; + var done = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; - // Initialize node - function Marker(node) { - _classCallCheck(this, Marker); + _classCallCheck(this, FakeRunner); - return _possibleConstructorReturn(this, _getPrototypeOf(Marker).call(this, nodeOrNew('marker', node), node)); - } // Set width of element + this.transforms = transforms; + this.id = id; + this.done = done; + } + _createClass(FakeRunner, [{ + key: "clearTransformsFromQueue", + value: function clearTransformsFromQueue() {} + }]); - _createClass(Marker, [{ - key: "width", - value: function width(_width) { - return this.attr('markerWidth', _width); - } // Set height of element + return FakeRunner; + }(); - }, { - key: "height", - value: function height(_height) { - return this.attr('markerHeight', _height); - } // Set marker refX and refY + extend([Runner, FakeRunner], { + mergeWith: function mergeWith(runner) { + return new FakeRunner(runner.transforms.lmultiply(this.transforms), runner.id); + } + }); // FakeRunner.emptyRunner = new FakeRunner() - }, { - key: "ref", - value: function ref(x, y) { - return this.attr('refX', x).attr('refY', y); - } // Update marker + var lmultiply = function lmultiply(last, curr) { + return last.lmultiplyO(curr); + }; + var getRunnerTransform = function getRunnerTransform(runner) { + return runner.transforms; + }; + + function mergeTransforms() { + // Find the matrix to apply to the element and apply it + var runners = this._transformationRunners.runners; + var netTransform = runners.map(getRunnerTransform).reduce(lmultiply, new Matrix()); + this.transform(netTransform); + + this._transformationRunners.merge(); + + if (this._transformationRunners.length() === 1) { + this._frameId = null; + } + } + + var RunnerArray = + /*#__PURE__*/ + function () { + function RunnerArray() { + _classCallCheck(this, RunnerArray); + + this.runners = []; + this.ids = []; + } + + _createClass(RunnerArray, [{ + key: "add", + value: function add(runner) { + if (this.runners.includes(runner)) return; + var id = runner.id + 1; + var leftSibling = this.ids.reduce(function (last, curr) { + if (curr > last && curr < id) return curr; + return last; + }, 0); + var index = this.ids.indexOf(leftSibling) + 1; + this.ids.splice(index, 0, id); + this.runners.splice(index, 0, runner); + return this; + } }, { - key: "update", - value: function update(block) { - // remove all content - this.clear(); // invoke passed block + key: "getByID", + value: function getByID(id) { + return this.runners[this.ids.indexOf(id + 1)]; + } + }, { + key: "remove", + value: function remove(id) { + var index = this.ids.indexOf(id + 1); + this.ids.splice(index, 1); + this.runners.splice(index, 1); + return this; + } + }, { + key: "merge", + value: function merge() { + var _this2 = this; + + var lastRunner = null; + this.runners.forEach(function (runner, i) { + if (lastRunner && runner.done && lastRunner.done) { + _this2.remove(runner.id); - if (typeof block === 'function') { - block.call(this, this); - } + _this2.edit(lastRunner.id, runner.mergeWith(lastRunner)); + } + lastRunner = runner; + }); return this; - } // Return the fill id - + } }, { - key: "toString", - value: function toString() { - return 'url(#' + this.id() + ')'; + key: "edit", + value: function edit(id, newRunner) { + var index = this.ids.indexOf(id + 1); + this.ids.splice(index, 1, id); + this.runners.splice(index, 1, newRunner); + return this; + } + }, { + key: "length", + value: function length() { + return this.ids.length; + } + }, { + key: "clearBefore", + value: function clearBefore(id) { + var deleteCnt = this.ids.indexOf(id + 1) || 1; + this.ids.splice(0, deleteCnt, 0); + this.runners.splice(0, deleteCnt, new FakeRunner()).forEach(function (r) { + return r.clearTransformsFromQueue(); + }); + return this; } }]); - return Marker; - }(Container); + return RunnerArray; + }(); + + var frameId = 0; registerMethods({ - Container: { - marker: function marker() { - var _this$defs; + Element: { + animate: function animate(duration, delay, when) { + var o = Runner.sanitise(duration, delay, when); + var timeline$$1 = this.timeline(); + return new Runner(o.duration).loop(o).element(this).timeline(timeline$$1).schedule(delay, when); + }, + delay: function delay(by, when) { + return this.animate(0, by, when); + }, + // this function searches for all runners on the element and deletes the ones + // which run before the current one. This is because absolute transformations + // overwfrite anything anyway so there is no need to waste time computing + // other runners + _clearTransformRunnersBefore: function _clearTransformRunnersBefore(currentRunner) { + this._transformationRunners.clearBefore(currentRunner.id); + }, + _currentTransform: function _currentTransform(current) { + return this._transformationRunners.runners // we need the equal sign here to make sure, that also transformations + // on the same runner which execute before the current transformation are + // taken into account + .filter(function (runner) { + return runner.id <= current.id; + }).map(getRunnerTransform).reduce(lmultiply, new Matrix()); + }, + addRunner: function addRunner(runner) { + this._transformationRunners.add(runner); - // Create marker element in defs - return (_this$defs = this.defs()).marker.apply(_this$defs, arguments); + Animator.transform_frame(mergeTransforms.bind(this), this._frameId); + }, + _prepareRunner: function _prepareRunner() { + if (this._frameId == null) { + this._transformationRunners = new RunnerArray().add(new FakeRunner(new Matrix(this))); + this._frameId = frameId++; + } } + } + }); + extend(Runner, { + attr: function attr(a, v) { + return this.styleAttr('attr', a, v); }, - Defs: { - // Create marker - marker: wrapWithAttrCheck(function (width, height, block) { - // Set default viewbox to match the width and height, set ref to cx and cy and set orient to auto - return this.put(new Marker()).size(width, height).ref(width / 2, height / 2).viewbox(0, 0, width, height).attr('orient', 'auto').update(block); - }) + // Add animatable styles + css: function css(s, v) { + return this.styleAttr('css', s, v); }, - marker: { - // Create and attach markers - marker: function marker(_marker, width, height, block) { - var attr = ['marker']; // Build attribute name + styleAttr: function styleAttr(type, name, val) { + // apply attributes individually + if (_typeof(name) === 'object') { + for (var key in val) { + this.styleAttr(type, key, val[key]); + } + } - if (_marker !== 'all') attr.push(_marker); - attr = attr.join('-'); // Set marker attribute + var morpher = new Morphable(this._stepper).to(val); + this.queue(function () { + morpher = morpher.from(this.element()[type](name)); + }, function (pos) { + this.element()[type](name, morpher.at(pos)); + return morpher.done(); + }); + return this; + }, + zoom: function zoom(level, point) { + var morpher = new Morphable(this._stepper).to(new SVGNumber(level)); + this.queue(function () { + morpher = morpher.from(this.zoom()); + }, function (pos) { + this.element().zoom(morpher.at(pos), point); + return morpher.done(); + }); + return this; + }, - _marker = arguments[1] instanceof Marker ? arguments[1] : this.defs().marker(width, height, block); - return this.attr(attr, _marker); - } - } - }); - register(Marker); + /** + ** absolute transformations + **/ + // + // M v -----|-----(D M v = F v)------|-----> T v + // + // 1. define the final state (T) and decompose it (once) + // t = [tx, ty, the, lam, sy, sx] + // 2. on every frame: pull the current state of all previous transforms + // (M - m can change) + // and then write this as m = [tx0, ty0, the0, lam0, sy0, sx0] + // 3. Find the interpolated matrix F(pos) = m + pos * (t - m) + // - Note F(0) = M + // - Note F(1) = T + // 4. Now you get the delta matrix as a result: D = F * inv(M) + transform: function transform(transforms, relative, affine) { + // If we have a declarative function, we should retarget it if possible + relative = transforms.relative || relative; - var Path = - /*#__PURE__*/ - function (_Shape) { - _inherits(Path, _Shape); + if (this._isDeclarative && !relative && this._tryRetarget('transform', transforms)) { + return this; + } // Parse the parameters - // Initialize node - function Path(node) { - _classCallCheck(this, Path); - return _possibleConstructorReturn(this, _getPrototypeOf(Path).call(this, nodeOrNew('path', node), node)); - } // Get array + var isMatrix = Matrix.isMatrixLike(transforms); + affine = transforms.affine != null ? transforms.affine : affine != null ? affine : !isMatrix; // Create a morepher and set its type + var morpher = new Morphable(this._stepper).type(affine ? TransformBag : Matrix); + var origin; + var element; + var current; + var currentAngle; + var startTransform; - _createClass(Path, [{ - key: "array", - value: function array() { - return this._array || (this._array = new PathArray(this.attr('d'))); - } // Plot new path + function setup() { + // make sure element and origin is defined + element = element || this.element(); + origin = origin || getOrigin(transforms, element); + startTransform = new Matrix(relative ? undefined : element); // add the runner to the element so it can merge transformations - }, { - key: "plot", - value: function plot(d) { - return d == null ? this.array() : this.clear().attr('d', typeof d === 'string' ? d : this._array = new PathArray(d)); - } // Clear array cache + element.addRunner(this); // Deactivate all transforms that have run so far if we are absolute - }, { - key: "clear", - value: function clear() { - delete this._array; - return this; - } // Move by left top corner + if (!relative) { + element._clearTransformRunnersBefore(this); + } + } - }, { - key: "move", - value: function move(x, y) { - return this.attr('d', this.array().move(x, y)); - } // Move by left top corner over x-axis + function run(pos) { + // clear all other transforms before this in case something is saved + // on this runner. We are absolute. We dont need these! + if (!relative) this.clearTransform(); - }, { - key: "x", - value: function x(_x) { - return _x == null ? this.bbox().x : this.move(_x, this.bbox().y); - } // Move by left top corner over y-axis + var _transform = new Point(origin).transform(element._currentTransform(this)), + x$$1 = _transform.x, + y$$1 = _transform.y; - }, { - key: "y", - value: function y(_y) { - return _y == null ? this.bbox().y : this.move(this.bbox().x, _y); - } // Set element size to given width and height + var target = new Matrix(_objectSpread({}, transforms, { + origin: [x$$1, y$$1] + })); + var start = this._isDeclarative && current ? current : startTransform; - }, { - key: "size", - value: function size(width, height) { - var p = proportionalSize(this, width, height); - return this.attr('d', this.array().size(p.width, p.height)); - } // Set width of element + if (affine) { + target = target.decompose(x$$1, y$$1); + start = start.decompose(x$$1, y$$1); // Get the current and target angle as it was set - }, { - key: "width", - value: function width(_width) { - return _width == null ? this.bbox().width : this.size(_width, this.bbox().height); - } // Set height of element + var rTarget = target.rotate; + var rCurrent = start.rotate; // Figure out the shortest path to rotate directly + + var possibilities = [rTarget - 360, rTarget, rTarget + 360]; + var distances = possibilities.map(function (a) { + return Math.abs(a - rCurrent); + }); + var shortest = Math.min.apply(Math, _toConsumableArray(distances)); + var index = distances.indexOf(shortest); + target.rotate = possibilities[index]; + } + + if (relative) { + // we have to be careful here not to overwrite the rotation + // with the rotate method of Matrix + if (!isMatrix) { + target.rotate = transforms.rotate || 0; + } + + if (this._isDeclarative && currentAngle) { + start.rotate = currentAngle; + } + } - }, { - key: "height", - value: function height(_height) { - return _height == null ? this.bbox().height : this.size(this.bbox().width, _height); - } - }, { - key: "targets", - value: function targets() { - return baseFind('svg textpath [href*="' + this.id() + '"]'); + morpher.from(start); + morpher.to(target); + var affineParameters = morpher.at(pos); + currentAngle = affineParameters.rotate; + current = new Matrix(affineParameters); + this.addTransform(current); + return morpher.done(); } - }]); - - return Path; - }(Shape); // Define morphable array - Path.prototype.MorphArray = PathArray; // Add parent method - registerMethods({ - Container: { - // Create a wrapped path element - path: wrapWithAttrCheck(function (d) { - // make sure plot is called as a setter - return this.put(new Path()).plot(d || new PathArray()); - }) - } - }); - register(Path); + function retarget(newTransforms) { + // only get a new origin if it changed since the last call + if ((newTransforms.origin || 'center').toString() !== (transforms.origin || 'center').toString()) { + origin = getOrigin(transforms, element); + } // overwrite the old transformations with the new ones - function array() { - return this._array || (this._array = new PointArray(this.attr('points'))); - } // Plot new path - function plot(p) { - return p == null ? this.array() : this.clear().attr('points', typeof p === 'string' ? p : this._array = new PointArray(p)); - } // Clear array cache + transforms = _objectSpread({}, newTransforms, { + origin: origin + }); + } - function clear() { - delete this._array; - return this; - } // Move by left top corner + this.queue(setup, run, retarget, true); + this._isDeclarative && this._rememberMorpher('transform', morpher); + return this; + }, + // Animatable x-axis + x: function x$$1(_x, relative) { + return this._queueNumber('x', _x); + }, + // Animatable y-axis + y: function y$$1(_y) { + return this._queueNumber('y', _y); + }, + dx: function dx(x$$1) { + return this._queueNumberDelta('x', x$$1); + }, + dy: function dy(y$$1) { + return this._queueNumberDelta('y', y$$1); + }, + _queueNumberDelta: function _queueNumberDelta(method, to$$1) { + to$$1 = new SVGNumber(to$$1); // Try to change the target if we have this method already registerd - function move(x, y) { - return this.attr('points', this.array().move(x, y)); - } // Set element size to given width and height + if (this._tryRetarget(method, to$$1)) return this; // Make a morpher and queue the animation - function size(width, height) { - var p = proportionalSize(this, width, height); - return this.attr('points', this.array().size(p.width, p.height)); - } + var morpher = new Morphable(this._stepper).to(to$$1); + var from$$1 = null; + this.queue(function () { + from$$1 = this.element()[method](); + morpher.from(from$$1); + morpher.to(from$$1 + to$$1); + }, function (pos) { + this.element()[method](morpher.at(pos)); + return morpher.done(); + }, function (newTo) { + morpher.to(from$$1 + new SVGNumber(newTo)); + }); // Register the morpher so that if it is changed again, we can retarget it - var poly = /*#__PURE__*/Object.freeze({ - array: array, - plot: plot, - clear: clear, - move: move, - size: size - }); + this._rememberMorpher(method, morpher); - var Polygon = - /*#__PURE__*/ - function (_Shape) { - _inherits(Polygon, _Shape); + return this; + }, + _queueObject: function _queueObject(method, to$$1) { + // Try to change the target if we have this method already registerd + if (this._tryRetarget(method, to$$1)) return this; // Make a morpher and queue the animation - // Initialize node - function Polygon(node) { - _classCallCheck(this, Polygon); + var morpher = new Morphable(this._stepper).to(to$$1); + this.queue(function () { + morpher.from(this.element()[method]()); + }, function (pos) { + this.element()[method](morpher.at(pos)); + return morpher.done(); + }); // Register the morpher so that if it is changed again, we can retarget it - return _possibleConstructorReturn(this, _getPrototypeOf(Polygon).call(this, nodeOrNew('polygon', node), node)); - } + this._rememberMorpher(method, morpher); - return Polygon; - }(Shape); - registerMethods({ - Container: { - // Create a wrapped polygon element - polygon: wrapWithAttrCheck(function (p) { - // make sure plot is called as a setter - return this.put(new Polygon()).plot(p || new PointArray()); - }) - } - }); - extend(Polygon, pointed); - extend(Polygon, poly); - register(Polygon); + return this; + }, + _queueNumber: function _queueNumber(method, value) { + return this._queueObject(method, new SVGNumber(value)); + }, + // Animatable center x-axis + cx: function cx$$1(x$$1) { + return this._queueNumber('cx', x$$1); + }, + // Animatable center y-axis + cy: function cy$$1(y$$1) { + return this._queueNumber('cy', y$$1); + }, + // Add animatable move + move: function move(x$$1, y$$1) { + return this.x(x$$1).y(y$$1); + }, + // Add animatable center + center: function center(x$$1, y$$1) { + return this.cx(x$$1).cy(y$$1); + }, + // Add animatable size + size: function size(width$$1, height$$1) { + // animate bbox based size for all other elements + var box; - var Polyline = - /*#__PURE__*/ - function (_Shape) { - _inherits(Polyline, _Shape); + if (!width$$1 || !height$$1) { + box = this._element.bbox(); + } - // Initialize node - function Polyline(node) { - _classCallCheck(this, Polyline); + if (!width$$1) { + width$$1 = box.width / box.height * height$$1; + } - return _possibleConstructorReturn(this, _getPrototypeOf(Polyline).call(this, nodeOrNew('polyline', node), node)); - } + if (!height$$1) { + height$$1 = box.height / box.width * width$$1; + } - return Polyline; - }(Shape); - registerMethods({ - Container: { - // Create a wrapped polygon element - polyline: wrapWithAttrCheck(function (p) { - // make sure plot is called as a setter - return this.put(new Polyline()).plot(p || new PointArray()); - }) - } - }); - extend(Polyline, pointed); - extend(Polyline, poly); - register(Polyline); + return this.width(width$$1).height(height$$1); + }, + // Add animatable width + width: function width$$1(_width) { + return this._queueNumber('width', _width); + }, + // Add animatable height + height: function height$$1(_height) { + return this._queueNumber('height', _height); + }, + // Add animatable plot + plot: function plot(a, b, c, d) { + // Lines can be plotted with 4 arguments + if (arguments.length === 4) { + return this.plot([a, b, c, d]); + } - var Rect = - /*#__PURE__*/ - function (_Shape) { - _inherits(Rect, _Shape); + var morpher = this._element.MorphArray().to(a); - // Initialize node - function Rect(node) { - _classCallCheck(this, Rect); + this.queue(function () { + morpher.from(this._element.array()); + }, function (pos) { + this._element.plot(morpher.at(pos)); + }); + return this; + }, + // Add leading method + leading: function leading(value) { + return this._queueNumber('leading', value); + }, + // Add animatable viewbox + viewbox: function viewbox(x$$1, y$$1, width$$1, height$$1) { + return this._queueObject('viewbox', new Box(x$$1, y$$1, width$$1, height$$1)); + }, + update: function update(o) { + if (_typeof(o) !== 'object') { + return this.update({ + offset: arguments[0], + color: arguments[1], + opacity: arguments[2] + }); + } - return _possibleConstructorReturn(this, _getPrototypeOf(Rect).call(this, nodeOrNew('rect', node), node)); + if (o.opacity != null) this.attr('stop-opacity', o.opacity); + if (o.color != null) this.attr('stop-color', o.color); + if (o.offset != null) this.attr('offset', o.offset); + return this; } - - return Rect; - }(Shape); - extend(Rect, { - rx: rx, - ry: ry }); - registerMethods({ - Container: { - // Create a rect element - rect: wrapWithAttrCheck(function (width$$1, height$$1) { - return this.put(new Rect()).size(width$$1, height$$1); - }) - } + extend(Runner, { + rx: rx, + ry: ry, + from: from, + to: to }); - register(Rect); function plain(text) { // clear if build mode is disabled @@ -7019,6 +7062,7 @@ var SVG = (function () { extend(Shape, getMethodsFor('Shape')); // extend(Element, getConstructor('Memory')) extend(Container, getMethodsFor('Container')); + extend(Runner, getMethodsFor('Runner')); List.extend(getMethodNames()); registerMorphableType([SVGNumber, Color, Box, Matrix, SVGArray, PointArray, PathArray]); makeMorphable(); diff --git a/spec/spec/sugar.js b/spec/spec/sugar.js index f79d7d5..906dfe7 100644 --- a/spec/spec/sugar.js +++ b/spec/spec/sugar.js @@ -247,8 +247,8 @@ describe('Sugar', function() { it('redirects to x() / y() with adding the current value', function() { rect.dx(5) rect.dy(5) - expect(rect.x).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5')), true) - expect(rect.y).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5')), true) + expect(rect.x).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5'))) + expect(rect.y).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5'))) }) it('allows to add a percentage value', function() { @@ -257,16 +257,16 @@ describe('Sugar', function() { rect.dx('5%') rect.dy('5%') - expect(rect.x).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('10%')), true) - expect(rect.y).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('10%')), true) + expect(rect.x).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('10%'))) + expect(rect.y).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('10%'))) }) it('allows to add a percentage value when no x/y is set', function() { rect.dx('5%') rect.dy('5%') - expect(rect.x).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5%')), true) - expect(rect.y).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5%')), true) + expect(rect.x).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5%'))) + expect(rect.y).toHaveBeenCalledWith(jasmine.objectContaining(new SVG.SVGNumber('5%'))) }) }) diff --git a/src/animation/Runner.js b/src/animation/Runner.js index 4de127a..47929fd 100644 --- a/src/animation/Runner.js +++ b/src/animation/Runner.js @@ -141,10 +141,11 @@ export default class Runner extends EventTarget { These methods allow us to attach basic functions to the runner directly */ - queue (initFn, runFn, isTransform) { + queue (initFn, runFn, retargetFn, isTransform) { this._queue.push({ initialiser: initFn || noop, runner: runFn || noop, + retarget: retargetFn, isTransform: isTransform, initialised: false, finished: false @@ -338,8 +339,8 @@ export default class Runner extends EventTarget { // for the case of transformations, we use the special retarget function // which has access to the outer scope - if (this._history[method].caller.isTransform) { - this._history[method].caller.isTransform(target) + if (this._history[method].caller.retarget) { + this._history[method].caller.retarget(target) // for everything else a simple morpher change is sufficient } else { this._history[method].morpher.to(target) @@ -404,6 +405,15 @@ export default class Runner extends EventTarget { return this } + // TODO: Keep track of all transformations so that deletion is faster + clearTransformsFromQueue () { + if (!this.done) { + this._queue = this._queue.filter((item) => { + return !item.isTransform + }) + } + } + static sanitise (duration, delay, when) { // Initialise the default parameters var times = 1 @@ -442,6 +452,8 @@ class FakeRunner { this.id = id this.done = done } + + clearTransformsFromQueue () { } } extend([Runner, FakeRunner], { @@ -538,6 +550,7 @@ class RunnerArray { let deleteCnt = this.ids.indexOf(id + 1) || 1 this.ids.splice(0, deleteCnt, 0) this.runners.splice(0, deleteCnt, new FakeRunner()) + .forEach((r) => r.clearTransformsFromQueue()) return this } } @@ -758,7 +771,7 @@ extend(Runner, { transforms = { ...newTransforms, origin } } - this.queue(setup, run, retarget) + this.queue(setup, run, retarget, true) this._isDeclarative && this._rememberMorpher('transform', morpher) return this }, @@ -774,28 +787,31 @@ extend(Runner, { }, dx (x) { - return this._queueNumberDelta('dx', x) + return this._queueNumberDelta('x', x) }, dy (y) { - return this._queueNumberDelta('dy', y) + return this._queueNumberDelta('y', y) }, _queueNumberDelta (method, to) { to = new SVGNumber(to) // Try to change the target if we have this method already registerd - if (this._tryRetargetDelta(method, to)) return this + if (this._tryRetarget(method, to)) return this // Make a morpher and queue the animation var morpher = new Morphable(this._stepper).to(to) + var from = null this.queue(function () { - var from = this.element()[method]() + from = this.element()[method]() morpher.from(from) morpher.to(from + to) }, function (pos) { this.element()[method](morpher.at(pos)) return morpher.done() + }, function (newTo) { + morpher.to(from + new SVGNumber(newTo)) }) // Register the morpher so that if it is changed again, we can retarget it diff --git a/src/main.js b/src/main.js index a7deaaa..701b23b 100644 --- a/src/main.js +++ b/src/main.js @@ -7,7 +7,6 @@ import './modules/optional/memory.js' import './modules/optional/sugar.js' import './modules/optional/transform.js' -import List from './types/List.js' import { extend } from './utils/adopter.js' import { getMethodNames, getMethodsFor } from './utils/methods.js' import Box from './types/Box.js' @@ -23,6 +22,7 @@ import EventTarget from './types/EventTarget.js' import Gradient from './elements/Gradient.js' import Image from './elements/Image.js' import Line from './elements/Line.js' +import List from './types/List.js' import Marker from './elements/Marker.js' import Matrix from './types/Matrix.js' import Morphable, { @@ -39,6 +39,7 @@ import PointArray from './types/PointArray.js' import Polygon from './elements/Polygon.js' import Polyline from './elements/Polyline.js' import Rect from './elements/Rect.js' +import Runner from './animation/Runner.js' import SVGArray from './types/SVGArray.js' import SVGNumber from './types/SVGNumber.js' import Shape from './elements/Shape.js' @@ -154,6 +155,8 @@ extend(Shape, getMethodsFor('Shape')) // extend(Element, getConstructor('Memory')) extend(Container, getMethodsFor('Container')) +extend(Runner, getMethodsFor('Runner')) + List.extend(getMethodNames()) registerMorphableType([ diff --git a/src/modules/optional/sugar.js b/src/modules/optional/sugar.js index f4c20fc..6001631 100644 --- a/src/modules/optional/sugar.js +++ b/src/modules/optional/sugar.js @@ -4,7 +4,6 @@ import Color from '../../types/Color.js' import Element from '../../elements/Element.js' import Matrix from '../../types/Matrix.js' import Point from '../../types/Point.js' -import Runner from '../../animation/Runner.js' import SVGNumber from '../../types/SVGNumber.js' // Define list of available attributes for stroke and fill @@ -105,19 +104,21 @@ registerMethods(['Element', 'Runner'], { return this.attr('opacity', value) }, + // Relative move over x and y axes + dmove: function (x, y) { + return this.dx(x).dy(y) + } +}) + +registerMethods('Element', { // Relative move over x axis dx: function (x) { - return this.x(new SVGNumber(x).plus(this instanceof Runner ? 0 : this.x()), true) + return this.x(new SVGNumber(x).plus(this.x())) }, // Relative move over y axis dy: function (y) { - return this.y(new SVGNumber(y).plus(this instanceof Runner ? 0 : this.y()), true) - }, - - // Relative move over x and y axes - dmove: function (x, y) { - return this.dx(x).dy(y) + return this.y(new SVGNumber(y).plus(this.y())) } }) diff --git a/src/types/ArrayPolyfill.js b/src/types/ArrayPolyfill.js index 839a970..4d2309f 100644 --- a/src/types/ArrayPolyfill.js +++ b/src/types/ArrayPolyfill.js @@ -24,6 +24,12 @@ export const subClassArray = (function () { Arr.prototype = Object.create(baseClass.prototype) Arr.prototype.constructor = Arr + Arr.prototype.map = function (fn) { + const arr = new Arr() + arr.push.apply(arr, Array.prototype.map.call(this, fn)) + return arr + } + return Arr } } diff --git a/src/types/List.js b/src/types/List.js index 193ed05..b50a18e 100644 --- a/src/types/List.js +++ b/src/types/List.js @@ -1,7 +1,9 @@ import { extend } from '../utils/adopter.js' import { subClassArray } from './ArrayPolyfill.js' -const List = subClassArray('List', Array, function (arr) { +const List = subClassArray('List', Array, function (arr = []) { + // This catches the case, that native map tries to create an array with new Array(1) + if (typeof arr === 'number') return this this.length = 0 this.push(...arr) }) @@ -13,9 +15,10 @@ extend(List, { if (typeof fnOrMethodName === 'function') { this.forEach((el) => { fnOrMethodName.call(el, el) }) } else { - this.forEach((el) => { - el[fnOrMethodName](...args) - }) + return this.map(el => { return el[fnOrMethodName](...args) }) + // this.forEach((el) => { + // el[fnOrMethodName](...args) + // }) } return this diff --git a/src/types/SVGArray.js b/src/types/SVGArray.js index 4fcb500..7f27ec4 100644 --- a/src/types/SVGArray.js +++ b/src/types/SVGArray.js @@ -10,6 +10,8 @@ export default SVGArray extend(SVGArray, { init (arr) { + // This catches the case, that native map tries to create an array with new Array(1) + if (typeof arr === 'number') return this this.length = 0 this.push(...this.parse(arr)) return this -- cgit v1.2.3 From b9f5c216c6eb75f3a00c6b121da5a72885286fa0 Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Mon, 12 Nov 2018 13:29:15 +0100 Subject: ticking off the last checkbox of (#645). return List whenever possible --- dist/svg.js | 164 +++++++++++++++++++++---------------------- src/elements/Dom.js | 7 +- src/modules/core/selector.js | 7 +- src/types/List.js | 3 - 4 files changed, 89 insertions(+), 92 deletions(-) diff --git a/dist/svg.js b/dist/svg.js index d7dfcd1..8670803 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Mon Nov 12 2018 13:00:40 GMT+0100 (GMT+01:00) +* BUILT: Mon Nov 12 2018 13:26:51 GMT+0100 (GMT+01:00) */; var SVG = (function () { 'use strict'; @@ -1172,6 +1172,82 @@ var SVG = (function () { return EventTarget; }(Base); + /* eslint no-new-func: "off" */ + var subClassArray = function () { + try { + // try es6 subclassing + return Function('name', 'baseClass', '_constructor', ['baseClass = baseClass || Array', 'return {', ' [name]: class extends baseClass {', ' constructor (...args) {', ' super(...args)', ' _constructor && _constructor.apply(this, args)', ' }', ' }', '}[name]'].join('\n')); + } catch (e) { + // Use es5 approach + return function (name) { + var baseClass = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Array; + + var _constructor = arguments.length > 2 ? arguments[2] : undefined; + + var Arr = function Arr() { + baseClass.apply(this, arguments); + _constructor && _constructor.apply(this, arguments); + }; + + Arr.prototype = Object.create(baseClass.prototype); + Arr.prototype.constructor = Arr; + + Arr.prototype.map = function (fn) { + var arr = new Arr(); + arr.push.apply(arr, Array.prototype.map.call(this, fn)); + return arr; + }; + + return Arr; + }; + } + }(); + + var List = subClassArray('List', Array, function () { + var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + // This catches the case, that native map tries to create an array with new Array(1) + if (typeof arr === 'number') return this; + this.length = 0; + this.push.apply(this, _toConsumableArray(arr)); + }); + extend(List, { + each: function each(fnOrMethodName) { + for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + args[_key - 1] = arguments[_key]; + } + + if (typeof fnOrMethodName === 'function') { + this.forEach(function (el) { + fnOrMethodName.call(el, el); + }); + } else { + return this.map(function (el) { + return el[fnOrMethodName].apply(el, args); + }); + } + + return this; + }, + toArray: function toArray() { + return Array.prototype.concat.apply([], this); + } + }); + + List.extend = function (methods) { + methods = methods.reduce(function (obj, name) { + obj[name] = function () { + for (var _len2 = arguments.length, attrs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + attrs[_key2] = arguments[_key2]; + } + + return this.each.apply(this, [name].concat(attrs)); + }; + + return obj; + }, {}); + extend(List, methods); + }; + function noop() {} // Default animation values var timeline = { @@ -1218,37 +1294,6 @@ var SVG = (function () { attrs: attrs }); - /* eslint no-new-func: "off" */ - var subClassArray = function () { - try { - // try es6 subclassing - return Function('name', 'baseClass', '_constructor', ['baseClass = baseClass || Array', 'return {', ' [name]: class extends baseClass {', ' constructor (...args) {', ' super(...args)', ' _constructor && _constructor.apply(this, args)', ' }', ' }', '}[name]'].join('\n')); - } catch (e) { - // Use es5 approach - return function (name) { - var baseClass = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Array; - - var _constructor = arguments.length > 2 ? arguments[2] : undefined; - - var Arr = function Arr() { - baseClass.apply(this, arguments); - _constructor && _constructor.apply(this, arguments); - }; - - Arr.prototype = Object.create(baseClass.prototype); - Arr.prototype.constructor = Arr; - - Arr.prototype.map = function (fn) { - var arr = new Arr(); - arr.push.apply(arr, Array.prototype.map.call(this, fn)); - return arr; - }; - - return Arr; - }; - } - }(); - var SVGArray = subClassArray('SVGArray', Array, function (arr) { this.init(arr); }); @@ -1524,9 +1569,9 @@ var SVG = (function () { }, { key: "children", value: function children() { - return map(this.node.children, function (node) { + return new List(map(this.node.children, function (node) { return adopt(node); - }); + })); } // Remove all elements in this container }, { @@ -3303,9 +3348,9 @@ var SVG = (function () { register(Stop); function baseFind(query, parent) { - return map((parent || globals.document).querySelectorAll(query), function (node) { + return new List(map((parent || globals.document).querySelectorAll(query), function (node) { return adopt(node); - }); + })); } // Scoped find method function find(query) { @@ -3780,53 +3825,6 @@ var SVG = (function () { }); register(Line); - var List = subClassArray('List', Array, function () { - var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - // This catches the case, that native map tries to create an array with new Array(1) - if (typeof arr === 'number') return this; - this.length = 0; - this.push.apply(this, _toConsumableArray(arr)); - }); - extend(List, { - each: function each(fnOrMethodName) { - for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { - args[_key - 1] = arguments[_key]; - } - - if (typeof fnOrMethodName === 'function') { - this.forEach(function (el) { - fnOrMethodName.call(el, el); - }); - } else { - return this.map(function (el) { - return el[fnOrMethodName].apply(el, args); - }); // this.forEach((el) => { - // el[fnOrMethodName](...args) - // }) - } - - return this; - }, - toArray: function toArray() { - return Array.prototype.concat.apply([], this); - } - }); - - List.extend = function (methods) { - methods = methods.reduce(function (obj, name) { - obj[name] = function () { - for (var _len2 = arguments.length, attrs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { - attrs[_key2] = arguments[_key2]; - } - - return this.each.apply(this, [name].concat(attrs)); - }; - - return obj; - }, {}); - extend(List, methods); - }; - var Marker = /*#__PURE__*/ function (_Container) { diff --git a/src/elements/Dom.js b/src/elements/Dom.js index 192b9bd..6d35f1e 100644 --- a/src/elements/Dom.js +++ b/src/elements/Dom.js @@ -6,10 +6,11 @@ import { makeInstance, register } from '../utils/adopter.js' +import { globals } from '../utils/window.js' import { map } from '../utils/utils.js' import { ns } from '../modules/core/namespaces.js' -import { globals } from '../utils/window.js' import EventTarget from '../types/EventTarget.js' +import List from '../types/List.js' import attr from '../modules/core/attr.js' export default class Dom extends EventTarget { @@ -43,9 +44,9 @@ export default class Dom extends EventTarget { // Returns all child elements children () { - return map(this.node.children, function (node) { + return new List(map(this.node.children, function (node) { return adopt(node) - }) + })) } // Remove all elements in this container diff --git a/src/modules/core/selector.js b/src/modules/core/selector.js index f2a7c58..83a919f 100644 --- a/src/modules/core/selector.js +++ b/src/modules/core/selector.js @@ -1,12 +1,13 @@ import { adopt } from '../../utils/adopter.js' +import { globals } from '../../utils/window.js' import { map } from '../../utils/utils.js' import { registerMethods } from '../../utils/methods.js' -import { globals } from '../../utils/window.js' +import List from '../../types/List.js' export default function baseFind (query, parent) { - return map((parent || globals.document).querySelectorAll(query), function (node) { + return new List(map((parent || globals.document).querySelectorAll(query), function (node) { return adopt(node) - }) + })) } // Scoped find method diff --git a/src/types/List.js b/src/types/List.js index b50a18e..8bd3985 100644 --- a/src/types/List.js +++ b/src/types/List.js @@ -16,9 +16,6 @@ extend(List, { this.forEach((el) => { fnOrMethodName.call(el, el) }) } else { return this.map(el => { return el[fnOrMethodName](...args) }) - // this.forEach((el) => { - // el[fnOrMethodName](...args) - // }) } return this -- cgit v1.2.3 From 334d9c73c2f74679a93b1d7b3e39b614f6444faa Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Mon, 12 Nov 2018 13:59:07 +0100 Subject: reworked parents so that it is useful now, changelog --- CHANGELOG.md | 4 +++- dist/svg.js | 14 +++++++------- spec/spec/element.js | 13 +++++++------ src/elements/Element.js | 18 +++++++++++------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8c78c7..94fff52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,12 +29,13 @@ The document follows the conventions described in [“Keep a CHANGELOG”](http: - added `ax(), ay(), amove()` to change texts x and y values directly (#787) - added possibility to pass attributes into a constructor like: `new SVG.Rect({width:100})` - added possibility to pass in additional attribues to element creators e.g. `canvas.rect({x:100})` or `canvas.rect(100, 100, {x:100})` (#796) +- added `SVG.List` (#645) ### Removed - removed `SVG.Array.split()` function - removed workaround for browser bug with stroke-width - removed polyfills -- removed `SVG.Set` +- removed `SVG.Set` in favour of `SVG.List` - removed feature to set style with css string (e.g. "fill:none;display:block;") - removed `loaded()` and `error()` method on `SVG.Image` (#706) - removed sub-pixel offset fix @@ -84,6 +85,7 @@ The document follows the conventions described in [“Keep a CHANGELOG”](http: - `attr()` excepts array now to get multiple values at once - `SVG.Text.rebuild()` now takes every font-size into account (#512) - `fill()` and `stroke()` return the fill and stroke attribute when called as getter (#789) +- `parents()` now gives back all parents until the passed one or document ### Fixed - fixed a bug in clipping and masking where empty nodes persists after removal -> __TODO!__ diff --git a/dist/svg.js b/dist/svg.js index 8670803..3a2d11a 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Mon Nov 12 2018 13:26:51 GMT+0100 (GMT+01:00) +* BUILT: Mon Nov 12 2018 13:58:37 GMT+0100 (GMT+01:00) */; var SVG = (function () { 'use strict'; @@ -1925,15 +1925,15 @@ var SVG = (function () { }, { key: "parents", - value: function parents(type) { - var parents = []; + value: function parents() { + var until = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : globals.document; + until = makeInstance(until); + var parents = new List(); var parent = this; - do { - parent = parent.parent(type); - if (!parent || parent instanceof getClass('HtmlNode')) break; + while ((parent = parent.parent()) && parent.node !== until.node && parent.node !== globals.document) { parents.push(parent); - } while (parent.parent); + } return parents; } // Get referenced element form attribute value diff --git a/spec/spec/element.js b/spec/spec/element.js index 1cb754e..b36ea82 100644 --- a/spec/spec/element.js +++ b/spec/spec/element.js @@ -651,15 +651,16 @@ describe('Element', function() { }) describe('parents()', function() { - it('returns array of parent up to but not including the dom element filtered by type', function() { + it('returns array of parents until the passed element or document', function() { var group1 = draw.group().addClass('test') , group2 = group1.group() - , rect = group2.rect(100,100) + , group3 = group2.group() + , rect = group3.rect(100,100) - expect(rect.parents('.test')[0]).toBe(group1) - expect(rect.parents(SVG.G)[0]).toBe(group2) - expect(rect.parents(SVG.G)[1]).toBe(group1) - expect(rect.parents().length).toBe(3) + expect(rect.parents('.test')[0]).toBe(group3) + expect(rect.parents('.test')[1]).toBe(group2) + expect(rect.parents(group2)[0]).toBe(group3) + expect(rect.parents(group1).length).toBe(2) }) }) diff --git a/src/elements/Element.js b/src/elements/Element.js index 03b5f07..3b96bf4 100644 --- a/src/elements/Element.js +++ b/src/elements/Element.js @@ -1,7 +1,9 @@ import { getClass, makeInstance, register, root } from '../utils/adopter.js' +import { globals } from '../utils/window.js' import { proportionalSize } from '../utils/utils.js' import { reference } from '../modules/core/regex.js' import Dom from './Dom.js' +import List from '../types/List.js' import SVGNumber from '../types/SVGNumber.js' const Doc = getClass(root) @@ -75,16 +77,18 @@ export default class Element extends Dom { } // return array of all ancestors of given type up to the root svg - parents (type) { - let parents = [] + parents (until = globals.document) { + until = makeInstance(until) + let parents = new List() let parent = this - do { - parent = parent.parent(type) - if (!parent || parent instanceof getClass('HtmlNode')) break - + while ( + (parent = parent.parent()) && + parent.node !== until.node && + parent.node !== globals.document + ) { parents.push(parent) - } while (parent.parent) + } return parents } -- cgit v1.2.3 From bf6e2aeb13f9a4bee2be1f8f7a70ca1a73215245 Mon Sep 17 00:00:00 2001 From: Ulrich-Matthias Schäfer Date: Mon, 12 Nov 2018 14:51:34 +0100 Subject: remove native() methods, add methods of types directly to elemenet --- CHANGELOG.md | 1 + dist/svg.js | 3183 ++++++++++++++++++++++---------------------- spec/spec/element.js | 7 - spec/spec/matrix.js | 7 - spec/spec/point.js | 10 - src/elements/Dom.js | 5 - src/elements/Element.js | 15 +- src/modules/core/parser.js | 4 +- src/types/Box.js | 22 +- src/types/Matrix.js | 58 +- src/types/Point.js | 25 +- 11 files changed, 1619 insertions(+), 1718 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94fff52..034cdae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ The document follows the conventions described in [“Keep a CHANGELOG”](http: - removed `show()` from `SVG.A` to avoid name clash (#802) - removed `size()` from `SVG.Text` to avoid name clash (#799) - removed `move(), dmove()` etc for groups to avoid inconsistencies, we will expect users to use transforms to move around groups as they should (especially since they are much simpler now). +- removed `native()` function ### Changed - gradients now have there corresponding node as type and not only radial/linear diff --git a/dist/svg.js b/dist/svg.js index 3a2d11a..ab443a7 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Mon Nov 12 2018 13:58:37 GMT+0100 (GMT+01:00) +* BUILT: Mon Nov 12 2018 14:48:34 GMT+0100 (GMT+01:00) */; var SVG = (function () { 'use strict'; @@ -1089,1699 +1089,1657 @@ var SVG = (function () { return Color; }(); - var EventTarget = + var Point = /*#__PURE__*/ - function (_Base) { - _inherits(EventTarget, _Base); - - function EventTarget() { - var _this; - - var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, - _ref$events = _ref.events, - events = _ref$events === void 0 ? {} : _ref$events; - - _classCallCheck(this, EventTarget); + function () { + // Initialize + function Point() { + _classCallCheck(this, Point); - _this = _possibleConstructorReturn(this, _getPrototypeOf(EventTarget).call(this)); - _this.events = events; - return _this; + this.init.apply(this, arguments); } - _createClass(EventTarget, [{ - key: "addEventListener", - value: function addEventListener() {} // Bind given event to listener + _createClass(Point, [{ + key: "init", + value: function init(x, y) { + var source; + var base = { + x: 0, + y: 0 // ensure source as object - }, { - key: "on", - value: function on$$1(event, listener, binding, options) { - on(this, event, listener, binding, options); + }; + source = Array.isArray(x) ? { + x: x[0], + y: x[1] + } : _typeof(x) === 'object' ? { + x: x.x, + y: x.y + } : { + x: x, + y: y // merge source + }; + this.x = source.x == null ? base.x : source.x; + this.y = source.y == null ? base.y : source.y; return this; - } // Unbind event from listener + } // Clone point }, { - key: "off", - value: function off$$1(event, listener) { - off(this, event, listener); + key: "clone", + value: function clone() { + return new Point(this); + } // transform point with matrix - return this; - } }, { - key: "dispatch", - value: function dispatch$$1(event, data) { - return dispatch(this, event, data); + key: "transform", + value: function transform(m) { + // Perform the matrix multiplication + var x = m.a * this.x + m.c * this.y + m.e; + var y = m.b * this.x + m.d * this.y + m.f; // Return the required point + + return new Point(x, y); } }, { - key: "dispatchEvent", - value: function dispatchEvent(event) { - var bag = this.getEventHolder().events; - if (!bag) return true; - var events = bag[event.type]; + key: "toArray", + value: function toArray() { + return [this.x, this.y]; + } + }]); - for (var i in events) { - for (var j in events[i]) { - events[i][j](event); - } - } + return Point; + }(); + function point(x, y) { + return new Point(x, y).transform(this.screenCTM().inverse()); + } - return !event.defaultPrevented; - } // Fire given event + function parser() { + // Reuse cached element if possible + if (!parser.nodes) { + var svg = makeInstance().size(2, 0); + svg.node.cssText = ['opacity: 0', 'position: absolute', 'left: -100%', 'top: -100%', 'overflow: hidden'].join(';'); + var path = svg.path().node; + parser.nodes = { + svg: svg, + path: path + }; + } - }, { - key: "fire", - value: function fire(event, data) { - this.dispatch(event, data); + if (!parser.nodes.svg.node.parentNode) { + var b = globals.document.body || globals.document.documentElement; + parser.nodes.svg.addTo(b); + } + + return parser.nodes; + } + + function isNulledBox(box) { + return !box.w && !box.h && !box.x && !box.y; + } + + function domContains(node) { + return (globals.document.documentElement.contains || function (node) { + // This is IE - it does not support contains() for top-level SVGs + while (node.parentNode) { + node = node.parentNode; + } + + return node === document; + }).call(globals.document.documentElement, node); + } + + var Box = + /*#__PURE__*/ + function () { + function Box() { + _classCallCheck(this, Box); + + this.init.apply(this, arguments); + } + + _createClass(Box, [{ + key: "init", + value: function init(source) { + var base = [0, 0, 0, 0]; + source = typeof source === 'string' ? source.split(delimiter).map(parseFloat) : Array.isArray(source) ? source : _typeof(source) === 'object' ? [source.left != null ? source.left : source.x, source.top != null ? source.top : source.y, source.width, source.height] : arguments.length === 4 ? [].slice.call(arguments) : base; + this.x = source[0] || 0; + this.y = source[1] || 0; + this.width = this.w = source[2] || 0; + this.height = this.h = source[3] || 0; // Add more bounding box properties + + this.x2 = this.x + this.w; + this.y2 = this.y + this.h; + this.cx = this.x + this.w / 2; + this.cy = this.y + this.h / 2; return this; + } // Merge rect box with another, return a new instance + + }, { + key: "merge", + value: function merge(box) { + var x = Math.min(this.x, box.x); + var y = Math.min(this.y, box.y); + var width = Math.max(this.x + this.width, box.x + box.width) - x; + var height = Math.max(this.y + this.height, box.y + box.height) - y; + return new Box(x, y, width, height); } }, { - key: "getEventHolder", - value: function getEventHolder() { - return this; + key: "transform", + value: function transform(m) { + var xMin = Infinity; + var xMax = -Infinity; + var yMin = Infinity; + var yMax = -Infinity; + var pts = [new Point(this.x, this.y), new Point(this.x2, this.y), new Point(this.x, this.y2), new Point(this.x2, this.y2)]; + pts.forEach(function (p) { + p = p.transform(m); + xMin = Math.min(xMin, p.x); + xMax = Math.max(xMax, p.x); + yMin = Math.min(yMin, p.y); + yMax = Math.max(yMax, p.y); + }); + return new Box(xMin, yMin, xMax - xMin, yMax - yMin); } }, { - key: "getEventTarget", - value: function getEventTarget() { + key: "addOffset", + value: function addOffset() { + // offset by window scroll position, because getBoundingClientRect changes when window is scrolled + this.x += globals.window.pageXOffset; + this.y += globals.window.pageYOffset; return this; } }, { - key: "removeEventListener", - value: function removeEventListener() {} + key: "toString", + value: function toString() { + return this.x + ' ' + this.y + ' ' + this.width + ' ' + this.height; + } + }, { + key: "toArray", + value: function toArray() { + return [this.x, this.y, this.width, this.height]; + } + }, { + key: "isNulled", + value: function isNulled() { + return isNulledBox(this); + } }]); - return EventTarget; - }(Base); + return Box; + }(); - /* eslint no-new-func: "off" */ - var subClassArray = function () { - try { - // try es6 subclassing - return Function('name', 'baseClass', '_constructor', ['baseClass = baseClass || Array', 'return {', ' [name]: class extends baseClass {', ' constructor (...args) {', ' super(...args)', ' _constructor && _constructor.apply(this, args)', ' }', ' }', '}[name]'].join('\n')); - } catch (e) { - // Use es5 approach - return function (name) { - var baseClass = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Array; + function getBox(cb) { + var box; - var _constructor = arguments.length > 2 ? arguments[2] : undefined; + try { + box = cb(this.node); - var Arr = function Arr() { - baseClass.apply(this, arguments); - _constructor && _constructor.apply(this, arguments); - }; + if (isNulledBox(box) && !domContains(this.node)) { + throw new Error('Element not in the dom'); + } + } catch (e) { + try { + var clone = this.clone().addTo(parser().svg).show(); + box = cb(clone.node); + clone.remove(); + } catch (e) { + throw new Error('Getting a bounding box of element "' + this.node.nodeName + '" is not possible'); + } + } - Arr.prototype = Object.create(baseClass.prototype); - Arr.prototype.constructor = Arr; + return box; + } - Arr.prototype.map = function (fn) { - var arr = new Arr(); - arr.push.apply(arr, Array.prototype.map.call(this, fn)); - return arr; - }; + function bbox() { + return new Box(getBox.call(this, function (node) { + return node.getBBox(); + })); + } + function rbox(el) { + var box = new Box(getBox.call(this, function (node) { + return node.getBoundingClientRect(); + })); + if (el) return box.transform(el.screenCTM().inverse()); + return box.addOffset(); + } + registerMethods({ + viewbox: { + viewbox: function viewbox(x, y, width, height) { + // act as getter + if (x == null) return new Box(this.attr('viewBox')); // act as setter - return Arr; - }; + return this.attr('viewBox', new Box(x, y, width, height)); + } } - }(); - - var List = subClassArray('List', Array, function () { - var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - // This catches the case, that native map tries to create an array with new Array(1) - if (typeof arr === 'number') return this; - this.length = 0; - this.push.apply(this, _toConsumableArray(arr)); }); - extend(List, { - each: function each(fnOrMethodName) { - for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { - args[_key - 1] = arguments[_key]; - } - if (typeof fnOrMethodName === 'function') { - this.forEach(function (el) { - fnOrMethodName.call(el, el); - }); - } else { - return this.map(function (el) { - return el[fnOrMethodName].apply(el, args); - }); - } + function closeEnough(a, b, threshold) { + return Math.abs(b - a) < (threshold || 1e-6); + } - return this; - }, - toArray: function toArray() { - return Array.prototype.concat.apply([], this); - } - }); + var Matrix = + /*#__PURE__*/ + function () { + function Matrix() { + _classCallCheck(this, Matrix); - List.extend = function (methods) { - methods = methods.reduce(function (obj, name) { - obj[name] = function () { - for (var _len2 = arguments.length, attrs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { - attrs[_key2] = arguments[_key2]; - } + this.init.apply(this, arguments); + } // Initialize - return this.each.apply(this, [name].concat(attrs)); - }; - return obj; - }, {}); - extend(List, methods); - }; + _createClass(Matrix, [{ + key: "init", + value: function init(source) { + var base = Matrix.fromArray([1, 0, 0, 1, 0, 0]); // ensure source as object - function noop() {} // Default animation values + source = source instanceof Element ? source.matrixify() : typeof source === 'string' ? Matrix.fromArray(source.split(delimiter).map(parseFloat)) : Array.isArray(source) ? Matrix.fromArray(source) : _typeof(source) === 'object' && Matrix.isMatrixLike(source) ? source : _typeof(source) === 'object' ? new Matrix().transform(source) : arguments.length === 6 ? Matrix.fromArray([].slice.call(arguments)) : base; // Merge the source matrix with the base matrix - var timeline = { - duration: 400, - ease: '>', - delay: 0 // Default attribute values + this.a = source.a != null ? source.a : base.a; + this.b = source.b != null ? source.b : base.b; + this.c = source.c != null ? source.c : base.c; + this.d = source.d != null ? source.d : base.d; + this.e = source.e != null ? source.e : base.e; + this.f = source.f != null ? source.f : base.f; + return this; + } // Clones this matrix - }; - var attrs = { - // fill and stroke - 'fill-opacity': 1, - 'stroke-opacity': 1, - 'stroke-width': 0, - 'stroke-linejoin': 'miter', - 'stroke-linecap': 'butt', - fill: '#000000', - stroke: '#000000', - opacity: 1, - // position - x: 0, - y: 0, - cx: 0, - cy: 0, - // size - width: 0, - height: 0, - // radius - r: 0, - rx: 0, - ry: 0, - // gradient - offset: 0, - 'stop-opacity': 1, - 'stop-color': '#000000', - // text - 'font-size': 16, - 'font-family': 'Helvetica, Arial, sans-serif', - 'text-anchor': 'start' - }; + }, { + key: "clone", + value: function clone() { + return new Matrix(this); + } // Transform a matrix into another matrix by manipulating the space - var defaults = /*#__PURE__*/Object.freeze({ - noop: noop, - timeline: timeline, - attrs: attrs - }); + }, { + key: "transform", + value: function transform(o) { + // Check if o is a matrix and then left multiply it directly + if (Matrix.isMatrixLike(o)) { + var matrix = new Matrix(o); + return matrix.multiplyO(this); + } // Get the proposed transformations and the current transformations - var SVGArray = subClassArray('SVGArray', Array, function (arr) { - this.init(arr); - }); - extend(SVGArray, { - init: function init(arr) { - // This catches the case, that native map tries to create an array with new Array(1) - if (typeof arr === 'number') return this; - this.length = 0; - this.push.apply(this, _toConsumableArray(this.parse(arr))); - return this; - }, - toArray: function toArray() { - return Array.prototype.concat.apply([], this); - }, - toString: function toString() { - return this.join(' '); - }, - // Flattens the array if needed - valueOf: function valueOf() { - var ret = []; - ret.push.apply(ret, _toConsumableArray(this)); - return ret; - }, - // Parse whitespace separated string - parse: function parse() { - var array = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; - // If already is an array, no need to parse it - if (array instanceof Array) return array; - return array.trim().split(delimiter).map(parseFloat); - }, - clone: function clone() { - return new this.constructor(this); - }, - toSet: function toSet() { - return new Set(this); - } - }); - var SVGNumber = - /*#__PURE__*/ - function () { - // Initialize - function SVGNumber() { - _classCallCheck(this, SVGNumber); + var t = Matrix.formatTransforms(o); + var current = this; - this.init.apply(this, arguments); - } + var _transform = new Point(t.ox, t.oy).transform(current), + ox = _transform.x, + oy = _transform.y; // Construct the resulting matrix - _createClass(SVGNumber, [{ - key: "init", - value: function init(value, unit) { - unit = Array.isArray(value) ? value[1] : unit; - value = Array.isArray(value) ? value[0] : value; // initialize defaults - this.value = 0; - this.unit = unit || ''; // parse value + var transformer = new Matrix().translateO(t.rx, t.ry).lmultiplyO(current).translateO(-ox, -oy).scaleO(t.scaleX, t.scaleY).skewO(t.skewX, t.skewY).shearO(t.shear).rotateO(t.theta).translateO(ox, oy); // If we want the origin at a particular place, we force it there - if (typeof value === 'number') { - // ensure a valid numeric value - this.value = isNaN(value) ? 0 : !isFinite(value) ? value < 0 ? -3.4e+38 : +3.4e+38 : value; - } else if (typeof value === 'string') { - unit = value.match(numberAndUnit); + if (isFinite(t.px) || isFinite(t.py)) { + var origin = new Point(ox, oy).transform(transformer); // TODO: Replace t.px with isFinite(t.px) - if (unit) { - // make value numeric - this.value = parseFloat(unit[1]); // normalize + var dx = t.px ? t.px - origin.x : 0; + var dy = t.py ? t.py - origin.y : 0; + transformer.translateO(dx, dy); + } // Translate now after positioning - if (unit[5] === '%') { - this.value /= 100; - } else if (unit[5] === 's') { - this.value *= 1000; - } // store unit + transformer.translateO(t.tx, t.ty); + return transformer; + } // Applies a matrix defined by its affine parameters - this.unit = unit[5]; - } - } else { - if (value instanceof SVGNumber) { - this.value = value.valueOf(); - this.unit = value.unit; - } - } + }, { + key: "compose", + value: function compose(o) { + if (o.origin) { + o.originX = o.origin[0]; + o.originY = o.origin[1]; + } // Get the parameters + + + var ox = o.originX || 0; + var oy = o.originY || 0; + var sx = o.scaleX || 1; + var sy = o.scaleY || 1; + var lam = o.shear || 0; + var theta = o.rotate || 0; + var tx = o.translateX || 0; + var ty = o.translateY || 0; // Apply the standard matrix + + var result = new Matrix().translateO(-ox, -oy).scaleO(sx, sy).shearO(lam).rotateO(theta).translateO(tx, ty).lmultiplyO(this).translateO(ox, oy); + return result; + } // Decomposes this matrix into its affine parameters + + }, { + key: "decompose", + value: function decompose() { + var cx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0; + var cy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0; + // Get the parameters from the matrix + var a = this.a; + var b = this.b; + var c = this.c; + var d = this.d; + var e = this.e; + var f = this.f; // Figure out if the winding direction is clockwise or counterclockwise + + var determinant = a * d - b * c; + var ccw = determinant > 0 ? 1 : -1; // Since we only shear in x, we can use the x basis to get the x scale + // and the rotation of the resulting matrix + + var sx = ccw * Math.sqrt(a * a + b * b); + var thetaRad = Math.atan2(ccw * b, ccw * a); + var theta = 180 / Math.PI * thetaRad; + var ct = Math.cos(thetaRad); + var st = Math.sin(thetaRad); // We can then solve the y basis vector simultaneously to get the other + // two affine parameters directly from these parameters + + var lam = (a * c + b * d) / determinant; + var sy = c * sx / (lam * a - b) || d * sx / (lam * b + a); // Use the translations + + var tx = e - cx + cx * ct * sx + cy * (lam * ct * sx - st * sy); + var ty = f - cy + cx * st * sx + cy * (lam * st * sx + ct * sy); // Construct the decomposition and return it + + return { + // Return the affine parameters + scaleX: sx, + scaleY: sy, + shear: lam, + rotate: theta, + translateX: tx, + translateY: ty, + originX: cx, + originY: cy, + // Return the matrix parameters + a: this.a, + b: this.b, + c: this.c, + d: this.d, + e: this.e, + f: this.f + }; + } // Left multiplies by the given matrix - return this; - } }, { - key: "toString", - value: function toString() { - return (this.unit === '%' ? ~~(this.value * 1e8) / 1e6 : this.unit === 's' ? this.value / 1e3 : this.value) + this.unit; + key: "multiply", + value: function multiply(matrix) { + return this.clone().multiplyO(matrix); } }, { - key: "toJSON", - value: function toJSON() { - return this.toString(); + key: "multiplyO", + value: function multiplyO(matrix) { + // Get the matrices + var l = this; + var r = matrix instanceof Matrix ? matrix : new Matrix(matrix); + return Matrix.matrixMultiply(l, r, this); } }, { - key: "toArray", - value: function toArray() { - return [this.value, this.unit]; + key: "lmultiply", + value: function lmultiply(matrix) { + return this.clone().lmultiplyO(matrix); } }, { - key: "valueOf", - value: function valueOf() { - return this.value; - } // Add number - - }, { - key: "plus", - value: function plus(number) { - number = new SVGNumber(number); - return new SVGNumber(this + number, this.unit || number.unit); - } // Subtract number - - }, { - key: "minus", - value: function minus(number) { - number = new SVGNumber(number); - return new SVGNumber(this - number, this.unit || number.unit); - } // Multiply number - - }, { - key: "times", - value: function times(number) { - number = new SVGNumber(number); - return new SVGNumber(this * number, this.unit || number.unit); - } // Divide number + key: "lmultiplyO", + value: function lmultiplyO(matrix) { + var r = this; + var l = matrix instanceof Matrix ? matrix : new Matrix(matrix); + return Matrix.matrixMultiply(l, r, this); + } // Inverses matrix }, { - key: "divide", - value: function divide(number) { - number = new SVGNumber(number); - return new SVGNumber(this / number, this.unit || number.unit); - } - }]); - - return SVGNumber; - }(); + key: "inverseO", + value: function inverseO() { + // Get the current parameters out of the matrix + var a = this.a; + var b = this.b; + var c = this.c; + var d = this.d; + var e = this.e; + var f = this.f; // Invert the 2x2 matrix in the top left - var hooks = []; - function registerAttrHook(fn) { - hooks.push(fn); - } // Set svg element attribute + var det = a * d - b * c; + if (!det) throw new Error('Cannot invert ' + this); // Calculate the top 2x2 matrix - function attr(attr, val, ns) { - var _this = this; + var na = d / det; + var nb = -b / det; + var nc = -c / det; + var nd = a / det; // Apply the inverted matrix to the top right - // act as full getter - if (attr == null) { - // get an object of attributes - attr = {}; - val = this.node.attributes; - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; + var ne = -(na * e + nc * f); + var nf = -(nb * e + nd * f); // Construct the inverted matrix - try { - for (var _iterator = val[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { - var node = _step.value; - attr[node.nodeName] = isNumber.test(node.nodeValue) ? parseFloat(node.nodeValue) : node.nodeValue; - } - } catch (err) { - _didIteratorError = true; - _iteratorError = err; - } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + this.a = na; + this.b = nb; + this.c = nc; + this.d = nd; + this.e = ne; + this.f = nf; + return this; } + }, { + key: "inverse", + value: function inverse() { + return this.clone().inverseO(); + } // Translate matrix - return attr; - } else if (attr instanceof Array) { - // loop through array and get all values - return attr.reduce(function (last, curr) { - last[curr] = _this.attr(curr); - return last; - }, {}); - } else if (_typeof(attr) === 'object') { - // apply every attribute individually if an object is passed - for (val in attr) { - this.attr(val, attr[val]); + }, { + key: "translate", + value: function translate(x, y) { + return this.clone().translateO(x, y); } - } else if (val === null) { - // remove value - this.node.removeAttribute(attr); - } else if (val == null) { - // act as a getter if the first and only argument is not an object - val = this.node.getAttribute(attr); - return val == null ? attrs[attr] : isNumber.test(val) ? parseFloat(val) : val; - } else { - // Loop through hooks and execute them to convert value - val = hooks.reduce(function (_val, hook) { - return hook(attr, _val, _this); - }, val); // ensure correct numeric values (also accepts NaN and Infinity) - - if (typeof val === 'number') { - val = new SVGNumber(val); - } else if (Color.isColor(val)) { - // ensure full hex color - val = new Color(val); - } else if (val.constructor === Array) { - // Check for plain arrays and parse array values - val = new SVGArray(val); - } // if the passed attribute is leading... - - - if (attr === 'leading') { - // ... call the leading method instead - if (this.leading) { - this.leading(val); - } - } else { - // set given attribute on node - typeof ns === 'string' ? this.node.setAttributeNS(ns, attr, val.toString()) : this.node.setAttribute(attr, val.toString()); - } // rebuild if required + }, { + key: "translateO", + value: function translateO(x, y) { + this.e += x || 0; + this.f += y || 0; + return this; + } // Scale matrix + }, { + key: "scale", + value: function scale(x, y, cx, cy) { + var _this$clone; - if (this.rebuild && (attr === 'font-size' || attr === 'x')) { - this.rebuild(); + return (_this$clone = this.clone()).scaleO.apply(_this$clone, arguments); } - } - - return this; - } - - var Dom = - /*#__PURE__*/ - function (_EventTarget) { - _inherits(Dom, _EventTarget); - - function Dom(node, attrs) { - var _this2; + }, { + key: "scaleO", + value: function scaleO(x) { + var y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : x; + var cx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; + var cy = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0; - _classCallCheck(this, Dom); + // Support uniform scaling + if (arguments.length === 3) { + cy = cx; + cx = y; + y = x; + } - _this2 = _possibleConstructorReturn(this, _getPrototypeOf(Dom).call(this, node)); - _this2.node = node; - _this2.type = node.nodeName; + var a = this.a, + b = this.b, + c = this.c, + d = this.d, + e = this.e, + f = this.f; + this.a = a * x; + this.b = b * y; + this.c = c * x; + this.d = d * y; + this.e = e * x - cx * x + cx; + this.f = f * y - cy * y + cy; + return this; + } // Rotate matrix - if (attrs && node !== attrs) { - _this2.attr(attrs); + }, { + key: "rotate", + value: function rotate(r, cx, cy) { + return this.clone().rotateO(r, cx, cy); } - - return _this2; - } // Add given element at a position - - - _createClass(Dom, [{ - key: "add", - value: function add(element, i) { - element = makeInstance(element); - - if (i == null) { - this.node.appendChild(element.node); - } else if (element.node !== this.node.childNodes[i]) { - this.node.insertBefore(element.node, this.node.childNodes[i]); - } - + }, { + key: "rotateO", + value: function rotateO(r) { + var cx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0; + var cy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; + // Convert degrees to radians + r = radians(r); + var cos = Math.cos(r); + var sin = Math.sin(r); + var a = this.a, + b = this.b, + c = this.c, + d = this.d, + e = this.e, + f = this.f; + this.a = a * cos - b * sin; + this.b = b * cos + a * sin; + this.c = c * cos - d * sin; + this.d = d * cos + c * sin; + this.e = e * cos - f * sin + cy * sin - cx * cos + cx; + this.f = f * cos + e * sin - cx * sin - cy * cos + cy; return this; - } // Add element to given container and return self + } // Flip matrix on x or y, at a given offset }, { - key: "addTo", - value: function addTo(parent) { - return makeInstance(parent).put(this); - } // Returns all child elements - + key: "flip", + value: function flip(axis, around) { + return this.clone().flipO(axis, around); + } }, { - key: "children", - value: function children() { - return new List(map(this.node.children, function (node) { - return adopt(node); - })); - } // Remove all elements in this container + key: "flipO", + value: function flipO(axis, around) { + return axis === 'x' ? this.scaleO(-1, 1, around, 0) : axis === 'y' ? this.scaleO(1, -1, 0, around) : this.scaleO(-1, -1, axis, around || axis); // Define an x, y flip point + } // Shear matrix }, { - key: "clear", - value: function clear() { - // remove children - while (this.node.hasChildNodes()) { - this.node.removeChild(this.node.lastChild); - } // remove defs reference - - - delete this._defs; + key: "shear", + value: function shear(a, cx, cy) { + return this.clone().shearO(a, cx, cy); + } + }, { + key: "shearO", + value: function shearO(lx) { + var cy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; + var a = this.a, + b = this.b, + c = this.c, + d = this.d, + e = this.e, + f = this.f; + this.a = a + b * lx; + this.c = c + d * lx; + this.e = e + f * lx - cy * lx; return this; - } // Clone element + } // Skew Matrix }, { - key: "clone", - value: function clone() { - // write dom data to the dom so the clone can pickup the data - this.writeDataToDom(); // clone element and assign new id - - return assignNewId(this.node.cloneNode(true)); - } // Iterates over all children and invokes a given block + key: "skew", + value: function skew(x, y, cx, cy) { + var _this$clone2; + return (_this$clone2 = this.clone()).skewO.apply(_this$clone2, arguments); + } }, { - key: "each", - value: function each(block, deep) { - var children = this.children(); - var i, il; + key: "skewO", + value: function skewO(x) { + var y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : x; + var cx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; + var cy = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0; - for (i = 0, il = children.length; i < il; i++) { - block.apply(children[i], [i, children]); + // support uniformal skew + if (arguments.length === 3) { + cy = cx; + cx = y; + y = x; + } // Convert degrees to radians - if (deep) { - children[i].each(block, deep); - } - } + x = radians(x); + y = radians(y); + var lx = Math.tan(x); + var ly = Math.tan(y); + var a = this.a, + b = this.b, + c = this.c, + d = this.d, + e = this.e, + f = this.f; + this.a = a + b * lx; + this.b = b + a * ly; + this.c = c + d * lx; + this.d = d + c * ly; + this.e = e + f * lx - cy * lx; + this.f = f + e * ly - cx * ly; return this; - } // Get first child + } // SkewX }, { - key: "first", - value: function first() { - return adopt(this.node.firstChild); - } // Get a element at the given index + key: "skewX", + value: function skewX(x, cx, cy) { + return this.skew(x, 0, cx, cy); + } + }, { + key: "skewXO", + value: function skewXO(x, cx, cy) { + return this.skewO(x, 0, cx, cy); + } // SkewY }, { - key: "get", - value: function get(i) { - return adopt(this.node.childNodes[i]); + key: "skewY", + value: function skewY(y, cx, cy) { + return this.skew(0, y, cx, cy); } }, { - key: "getEventHolder", - value: function getEventHolder() { - return this.node; + key: "skewYO", + value: function skewYO(y, cx, cy) { + return this.skewO(0, y, cx, cy); + } // Transform around a center point + + }, { + key: "aroundO", + value: function aroundO(cx, cy, matrix) { + var dx = cx || 0; + var dy = cy || 0; + return this.translateO(-dx, -dy).lmultiplyO(matrix).translateO(dx, dy); } }, { - key: "getEventTarget", - value: function getEventTarget() { - return this.node; - } // Checks if the given element is a child + key: "around", + value: function around(cx, cy, matrix) { + return this.clone().aroundO(cx, cy, matrix); + } // Check if two matrices are equal }, { - key: "has", - value: function has(element) { - return this.index(element) >= 0; - } // Get / set id + key: "equals", + value: function equals(other) { + var comp = new Matrix(other); + return closeEnough(this.a, comp.a) && closeEnough(this.b, comp.b) && closeEnough(this.c, comp.c) && closeEnough(this.d, comp.d) && closeEnough(this.e, comp.e) && closeEnough(this.f, comp.f); + } // Convert matrix to string }, { - key: "id", - value: function id(_id) { - // generate new id if no id set - if (typeof _id === 'undefined' && !this.node.id) { - this.node.id = eid(this.type); - } // dont't set directly width this.node.id to make `null` work correctly - + key: "toString", + value: function toString() { + return 'matrix(' + this.a + ',' + this.b + ',' + this.c + ',' + this.d + ',' + this.e + ',' + this.f + ')'; + } + }, { + key: "toArray", + value: function toArray() { + return [this.a, this.b, this.c, this.d, this.e, this.f]; + } + }, { + key: "valueOf", + value: function valueOf() { + return { + a: this.a, + b: this.b, + c: this.c, + d: this.d, + e: this.e, + f: this.f + }; + } + }], [{ + key: "fromArray", + value: function fromArray(a) { + return { + a: a[0], + b: a[1], + c: a[2], + d: a[3], + e: a[4], + f: a[5] + }; + } + }, { + key: "isMatrixLike", + value: function isMatrixLike(o) { + return o.a != null || o.b != null || o.c != null || o.d != null || o.e != null || o.f != null; + } + }, { + key: "formatTransforms", + value: function formatTransforms(o) { + // Get all of the parameters required to form the matrix + var flipBoth = o.flip === 'both' || o.flip === true; + var flipX = o.flip && (flipBoth || o.flip === 'x') ? -1 : 1; + var flipY = o.flip && (flipBoth || o.flip === 'y') ? -1 : 1; + var skewX = o.skew && o.skew.length ? o.skew[0] : isFinite(o.skew) ? o.skew : isFinite(o.skewX) ? o.skewX : 0; + var skewY = o.skew && o.skew.length ? o.skew[1] : isFinite(o.skew) ? o.skew : isFinite(o.skewY) ? o.skewY : 0; + var scaleX = o.scale && o.scale.length ? o.scale[0] * flipX : isFinite(o.scale) ? o.scale * flipX : isFinite(o.scaleX) ? o.scaleX * flipX : flipX; + var scaleY = o.scale && o.scale.length ? o.scale[1] * flipY : isFinite(o.scale) ? o.scale * flipY : isFinite(o.scaleY) ? o.scaleY * flipY : flipY; + var shear = o.shear || 0; + var theta = o.rotate || o.theta || 0; + var origin = new Point(o.origin || o.around || o.ox || o.originX, o.oy || o.originY); + var ox = origin.x; + var oy = origin.y; + var position = new Point(o.position || o.px || o.positionX, o.py || o.positionY); + var px = position.x; + var py = position.y; + var translate = new Point(o.translate || o.tx || o.translateX, o.ty || o.translateY); + var tx = translate.x; + var ty = translate.y; + var relative = new Point(o.relative || o.rx || o.relativeX, o.ry || o.relativeY); + var rx = relative.x; + var ry = relative.y; // Populate all of the values - return this.attr('id', _id); - } // Gets index of given element + return { + scaleX: scaleX, + scaleY: scaleY, + skewX: skewX, + skewY: skewY, + shear: shear, + theta: theta, + rx: rx, + ry: ry, + tx: tx, + ty: ty, + ox: ox, + oy: oy, + px: px, + py: py + }; + } // left matrix, right matrix, target matrix which is overwritten }, { - key: "index", - value: function index(element) { - return [].slice.call(this.node.childNodes).indexOf(element.node); - } // Get the last child + key: "matrixMultiply", + value: function matrixMultiply(l, r, o) { + // Work out the product directly + var a = l.a * r.a + l.c * r.b; + var b = l.b * r.a + l.d * r.b; + var c = l.a * r.c + l.c * r.d; + var d = l.b * r.c + l.d * r.d; + var e = l.e + l.a * r.e + l.c * r.f; + var f = l.f + l.b * r.e + l.d * r.f; // make sure to use local variables because l/r and o could be the same - }, { - key: "last", - value: function last() { - return adopt(this.node.lastChild); - } // matches the element vs a css selector + o.a = a; + o.b = b; + o.c = c; + o.d = d; + o.e = e; + o.f = f; + return o; + } + }]); - }, { - key: "matches", - value: function matches(selector) { - var el = this.node; - return (el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector).call(el, selector); - } // Returns the svg node to call native svg methods on it + return Matrix; + }(); + function ctm() { + return new Matrix(this.node.getCTM()); + } + function screenCTM() { + /* https://bugzilla.mozilla.org/show_bug.cgi?id=1344537 + This is needed because FF does not return the transformation matrix + for the inner coordinate system when getScreenCTM() is called on nested svgs. + However all other Browsers do that */ + if (typeof this.isRoot === 'function' && !this.isRoot()) { + var rect = this.rect(1, 1); + var m = rect.node.getScreenCTM(); + rect.remove(); + return new Matrix(m); + } - }, { - key: "native", - value: function native() { - return this.node; - } // Returns the parent element instance + return new Matrix(this.node.getScreenCTM()); + } - }, { - key: "parent", - value: function parent(type) { - var parent = this; // check for parent + var EventTarget = + /*#__PURE__*/ + function (_Base) { + _inherits(EventTarget, _Base); - if (!parent.node.parentNode) return null; // get parent element + function EventTarget() { + var _this; - parent = adopt(parent.node.parentNode); - if (!type) return parent; // loop trough ancestors if type is given + var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, + _ref$events = _ref.events, + events = _ref$events === void 0 ? {} : _ref$events; - while (parent && parent.node instanceof globals.window.SVGElement) { - // FIXME: That shouldnt be neccessary - if (typeof type === 'string' ? parent.matches(type) : parent instanceof type) return parent; - parent = adopt(parent.node.parentNode); - } - } // Basically does the same as `add()` but returns the added element instead + _classCallCheck(this, EventTarget); - }, { - key: "put", - value: function put(element, i) { - this.add(element, i); - return element; - } // Add element to given container and return container + _this = _possibleConstructorReturn(this, _getPrototypeOf(EventTarget).call(this)); + _this.events = events; + return _this; + } - }, { - key: "putIn", - value: function putIn(parent) { - return makeInstance(parent).add(this); - } // Remove element + _createClass(EventTarget, [{ + key: "addEventListener", + value: function addEventListener() {} // Bind given event to listener }, { - key: "remove", - value: function remove() { - if (this.parent()) { - this.parent().removeElement(this); - } + key: "on", + value: function on$$1(event, listener, binding, options) { + on(this, event, listener, binding, options); return this; - } // Remove a given child + } // Unbind event from listener }, { - key: "removeElement", - value: function removeElement(element) { - this.node.removeChild(element.node); - return this; - } // Replace this with element + key: "off", + value: function off$$1(event, listener) { + off(this, event, listener); + return this; + } }, { - key: "replace", - value: function replace(element) { - element = makeInstance(element); - this.node.parentNode.replaceChild(element.node, this.node); - return element; + key: "dispatch", + value: function dispatch$$1(event, data) { + return dispatch(this, event, data); } }, { - key: "round", - value: function round() { - var precision = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2; - var map$$1 = arguments.length > 1 ? arguments[1] : undefined; - var factor = Math.pow(10, precision); - var attrs = this.attr(); // If we have no map, build one from attrs + key: "dispatchEvent", + value: function dispatchEvent(event) { + var bag = this.getEventHolder().events; + if (!bag) return true; + var events = bag[event.type]; - if (!map$$1) { - map$$1 = Object.keys(attrs); - } // Holds rounded attributes + for (var i in events) { + for (var j in events[i]) { + events[i][j](event); + } + } + return !event.defaultPrevented; + } // Fire given event - var newAttrs = {}; - map$$1.forEach(function (key) { - newAttrs[key] = Math.round(attrs[key] * factor) / factor; - }); - this.attr(newAttrs); + }, { + key: "fire", + value: function fire(event, data) { + this.dispatch(event, data); return this; - } // Return id on string conversion - + } }, { - key: "toString", - value: function toString() { - return this.id(); - } // Import raw svg - + key: "getEventHolder", + value: function getEventHolder() { + return this; + } }, { - key: "svg", - value: function svg(svgOrFn, outerHTML) { - var well, len, fragment; - - if (svgOrFn === false) { - outerHTML = false; - svgOrFn = null; - } // act as getter if no svg string is given - - - if (svgOrFn == null || typeof svgOrFn === 'function') { - // The default for exports is, that the outerNode is included - outerHTML = outerHTML == null ? true : outerHTML; // write svgjs data to the dom - - this.writeDataToDom(); - var current = this; // An export modifier was passed - - if (svgOrFn != null) { - current = adopt(current.node.cloneNode(true)); // If the user wants outerHTML we need to process this node, too - - if (outerHTML) { - var result = svgOrFn(current); - current = result || current; // The user does not want this node? Well, then he gets nothing - - if (result === false) return ''; - } // Deep loop through all children and apply modifier - - - current.each(function () { - var result = svgOrFn(this); - - var _this = result || this; // If modifier returns false, discard node - - - if (result === false) { - this.remove(); // If modifier returns new node, use it - } else if (result && this !== _this) { - this.replace(_this); - } - }, true); - } // Return outer or inner content - - - return outerHTML ? current.node.outerHTML : current.node.innerHTML; - } // Act as setter if we got a string - // The default for import is, that the current node is not replaced + key: "getEventTarget", + value: function getEventTarget() { + return this; + } + }, { + key: "removeEventListener", + value: function removeEventListener() {} + }]); + return EventTarget; + }(Base); - outerHTML = outerHTML == null ? false : outerHTML; // Create temporary holder + /* eslint no-new-func: "off" */ + var subClassArray = function () { + try { + // try es6 subclassing + return Function('name', 'baseClass', '_constructor', ['baseClass = baseClass || Array', 'return {', ' [name]: class extends baseClass {', ' constructor (...args) {', ' super(...args)', ' _constructor && _constructor.apply(this, args)', ' }', ' }', '}[name]'].join('\n')); + } catch (e) { + // Use es5 approach + return function (name) { + var baseClass = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Array; - well = globals.document.createElementNS(ns, 'svg'); - fragment = globals.document.createDocumentFragment(); // Dump raw svg + var _constructor = arguments.length > 2 ? arguments[2] : undefined; - well.innerHTML = svgOrFn; // Transplant nodes into the fragment + var Arr = function Arr() { + baseClass.apply(this, arguments); + _constructor && _constructor.apply(this, arguments); + }; - for (len = well.children.length; len--;) { - fragment.appendChild(well.firstElementChild); - } // Add the whole fragment at once + Arr.prototype = Object.create(baseClass.prototype); + Arr.prototype.constructor = Arr; + Arr.prototype.map = function (fn) { + var arr = new Arr(); + arr.push.apply(arr, Array.prototype.map.call(this, fn)); + return arr; + }; - return outerHTML ? this.replace(fragment) : this.add(fragment); - } // write svgjs data to the dom + return Arr; + }; + } + }(); - }, { - key: "writeDataToDom", - value: function writeDataToDom() { - // dump variables recursively - this.each(function () { - this.writeDataToDom(); + var List = subClassArray('List', Array, function () { + var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + // This catches the case, that native map tries to create an array with new Array(1) + if (typeof arr === 'number') return this; + this.length = 0; + this.push.apply(this, _toConsumableArray(arr)); + }); + extend(List, { + each: function each(fnOrMethodName) { + for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + args[_key - 1] = arguments[_key]; + } + + if (typeof fnOrMethodName === 'function') { + this.forEach(function (el) { + fnOrMethodName.call(el, el); + }); + } else { + return this.map(function (el) { + return el[fnOrMethodName].apply(el, args); }); - return this; } - }]); - return Dom; - }(EventTarget); - extend(Dom, { - attr: attr + return this; + }, + toArray: function toArray() { + return Array.prototype.concat.apply([], this); + } }); - register(Dom); - - var Doc = getClass(root); - - var Element = - /*#__PURE__*/ - function (_Dom) { - _inherits(Element, _Dom); - - function Element(node, attrs) { - var _this; - _classCallCheck(this, Element); + List.extend = function (methods) { + methods = methods.reduce(function (obj, name) { + obj[name] = function () { + for (var _len2 = arguments.length, attrs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + attrs[_key2] = arguments[_key2]; + } - _this = _possibleConstructorReturn(this, _getPrototypeOf(Element).call(this, node, attrs)); // initialize data object + return this.each.apply(this, [name].concat(attrs)); + }; - _this.dom = {}; // create circular reference + return obj; + }, {}); + extend(List, methods); + }; - _this.node.instance = _assertThisInitialized(_assertThisInitialized(_this)); + function noop() {} // Default animation values - if (node.hasAttribute('svgjs:data')) { - // pull svgjs data from the dom (getAttributeNS doesn't work in html5) - _this.setData(JSON.parse(node.getAttribute('svgjs:data')) || {}); - } + var timeline = { + duration: 400, + ease: '>', + delay: 0 // Default attribute values - return _this; - } // Move element by its center + }; + var attrs = { + // fill and stroke + 'fill-opacity': 1, + 'stroke-opacity': 1, + 'stroke-width': 0, + 'stroke-linejoin': 'miter', + 'stroke-linecap': 'butt', + fill: '#000000', + stroke: '#000000', + opacity: 1, + // position + x: 0, + y: 0, + cx: 0, + cy: 0, + // size + width: 0, + height: 0, + // radius + r: 0, + rx: 0, + ry: 0, + // gradient + offset: 0, + 'stop-opacity': 1, + 'stop-color': '#000000', + // text + 'font-size': 16, + 'font-family': 'Helvetica, Arial, sans-serif', + 'text-anchor': 'start' + }; + var defaults = /*#__PURE__*/Object.freeze({ + noop: noop, + timeline: timeline, + attrs: attrs + }); - _createClass(Element, [{ - key: "center", - value: function center(x, y) { - return this.cx(x).cy(y); - } // Move by center over x-axis + var SVGArray = subClassArray('SVGArray', Array, function (arr) { + this.init(arr); + }); + extend(SVGArray, { + init: function init(arr) { + // This catches the case, that native map tries to create an array with new Array(1) + if (typeof arr === 'number') return this; + this.length = 0; + this.push.apply(this, _toConsumableArray(this.parse(arr))); + return this; + }, + toArray: function toArray() { + return Array.prototype.concat.apply([], this); + }, + toString: function toString() { + return this.join(' '); + }, + // Flattens the array if needed + valueOf: function valueOf() { + var ret = []; + ret.push.apply(ret, _toConsumableArray(this)); + return ret; + }, + // Parse whitespace separated string + parse: function parse() { + var array = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + // If already is an array, no need to parse it + if (array instanceof Array) return array; + return array.trim().split(delimiter).map(parseFloat); + }, + clone: function clone() { + return new this.constructor(this); + }, + toSet: function toSet() { + return new Set(this); + } + }); - }, { - key: "cx", - value: function cx(x) { - return x == null ? this.x() + this.width() / 2 : this.x(x - this.width() / 2); - } // Move by center over y-axis + var SVGNumber = + /*#__PURE__*/ + function () { + // Initialize + function SVGNumber() { + _classCallCheck(this, SVGNumber); - }, { - key: "cy", - value: function cy(y) { - return y == null ? this.y() + this.height() / 2 : this.y(y - this.height() / 2); - } // Get defs + this.init.apply(this, arguments); + } - }, { - key: "defs", - value: function defs() { - return this.doc().defs(); - } // Get parent document + _createClass(SVGNumber, [{ + key: "init", + value: function init(value, unit) { + unit = Array.isArray(value) ? value[1] : unit; + value = Array.isArray(value) ? value[0] : value; // initialize defaults - }, { - key: "doc", - value: function doc() { - var p = this.parent(Doc); - return p && p.doc(); - } - }, { - key: "getEventHolder", - value: function getEventHolder() { - return this; - } // Set height of element + this.value = 0; + this.unit = unit || ''; // parse value - }, { - key: "height", - value: function height(_height) { - return this.attr('height', _height); - } // Checks whether the given point inside the bounding box of the element + if (typeof value === 'number') { + // ensure a valid numeric value + this.value = isNaN(value) ? 0 : !isFinite(value) ? value < 0 ? -3.4e+38 : +3.4e+38 : value; + } else if (typeof value === 'string') { + unit = value.match(numberAndUnit); - }, { - key: "inside", - value: function inside(x, y) { - var box = this.bbox(); - return x > box.x && y > box.y && x < box.x + box.width && y < box.y + box.height; - } // Move element to given x and y values + if (unit) { + // make value numeric + this.value = parseFloat(unit[1]); // normalize - }, { - key: "move", - value: function move(x, y) { - return this.x(x).y(y); - } // return array of all ancestors of given type up to the root svg + if (unit[5] === '%') { + this.value /= 100; + } else if (unit[5] === 's') { + this.value *= 1000; + } // store unit - }, { - key: "parents", - value: function parents() { - var until = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : globals.document; - until = makeInstance(until); - var parents = new List(); - var parent = this; - while ((parent = parent.parent()) && parent.node !== until.node && parent.node !== globals.document) { - parents.push(parent); + this.unit = unit[5]; + } + } else { + if (value instanceof SVGNumber) { + this.value = value.valueOf(); + this.unit = value.unit; + } } - return parents; - } // Get referenced element form attribute value - + return this; + } }, { - key: "reference", - value: function reference$$1(attr) { - attr = this.attr(attr); - if (!attr) return null; - var m = attr.match(reference); - return m ? makeInstance(m[1]) : null; - } // set given data to the elements data property - + key: "toString", + value: function toString() { + return (this.unit === '%' ? ~~(this.value * 1e8) / 1e6 : this.unit === 's' ? this.value / 1e3 : this.value) + this.unit; + } }, { - key: "setData", - value: function setData(o) { - this.dom = o; - return this; - } // Set element size to given width and height - + key: "toJSON", + value: function toJSON() { + return this.toString(); + } + }, { + key: "toArray", + value: function toArray() { + return [this.value, this.unit]; + } }, { - key: "size", - value: function size(width, height) { - var p = proportionalSize(this, width, height); - return this.width(new SVGNumber(p.width)).height(new SVGNumber(p.height)); - } // Set width of element + key: "valueOf", + value: function valueOf() { + return this.value; + } // Add number }, { - key: "width", - value: function width(_width) { - return this.attr('width', _width); - } // write svgjs data to the dom + key: "plus", + value: function plus(number) { + number = new SVGNumber(number); + return new SVGNumber(this + number, this.unit || number.unit); + } // Subtract number }, { - key: "writeDataToDom", - value: function writeDataToDom() { - // remove previously set data - this.node.removeAttribute('svgjs:data'); - - if (Object.keys(this.dom).length) { - this.node.setAttribute('svgjs:data', JSON.stringify(this.dom)); // see #428 - } - - return _get(_getPrototypeOf(Element.prototype), "writeDataToDom", this).call(this); - } // Move over x-axis + key: "minus", + value: function minus(number) { + number = new SVGNumber(number); + return new SVGNumber(this - number, this.unit || number.unit); + } // Multiply number }, { - key: "x", - value: function x(_x) { - return this.attr('x', _x); - } // Move over y-axis + key: "times", + value: function times(number) { + number = new SVGNumber(number); + return new SVGNumber(this * number, this.unit || number.unit); + } // Divide number }, { - key: "y", - value: function y(_y) { - return this.attr('y', _y); + key: "divide", + value: function divide(number) { + number = new SVGNumber(number); + return new SVGNumber(this / number, this.unit || number.unit); } }]); - return Element; - }(Dom); - register(Element); - - var Container = - /*#__PURE__*/ - function (_Element) { - _inherits(Container, _Element); + return SVGNumber; + }(); - function Container() { - _classCallCheck(this, Container); + var hooks = []; + function registerAttrHook(fn) { + hooks.push(fn); + } // Set svg element attribute - return _possibleConstructorReturn(this, _getPrototypeOf(Container).apply(this, arguments)); - } + function attr(attr, val, ns) { + var _this = this; - _createClass(Container, [{ - key: "flatten", - value: function flatten(parent) { - this.each(function () { - if (this instanceof Container) return this.flatten(parent).ungroup(parent); - return this.toParent(parent); - }); // we need this so that Doc does not get removed + // act as full getter + if (attr == null) { + // get an object of attributes + attr = {}; + val = this.node.attributes; + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; - this.node.firstElementChild || this.remove(); - return this; + try { + for (var _iterator = val[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var node = _step.value; + attr[node.nodeName] = isNumber.test(node.nodeValue) ? parseFloat(node.nodeValue) : node.nodeValue; + } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return != null) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } } - }, { - key: "ungroup", - value: function ungroup(parent) { - parent = parent || this.parent(); - this.each(function () { - return this.toParent(parent); - }); - this.remove(); - return this; + + return attr; + } else if (attr instanceof Array) { + // loop through array and get all values + return attr.reduce(function (last, curr) { + last[curr] = _this.attr(curr); + return last; + }, {}); + } else if (_typeof(attr) === 'object') { + // apply every attribute individually if an object is passed + for (val in attr) { + this.attr(val, attr[val]); } - }]); + } else if (val === null) { + // remove value + this.node.removeAttribute(attr); + } else if (val == null) { + // act as a getter if the first and only argument is not an object + val = this.node.getAttribute(attr); + return val == null ? attrs[attr] : isNumber.test(val) ? parseFloat(val) : val; + } else { + // Loop through hooks and execute them to convert value + val = hooks.reduce(function (_val, hook) { + return hook(attr, _val, _this); + }, val); // ensure correct numeric values (also accepts NaN and Infinity) - return Container; - }(Element); - register(Container); + if (typeof val === 'number') { + val = new SVGNumber(val); + } else if (Color.isColor(val)) { + // ensure full hex color + val = new Color(val); + } else if (val.constructor === Array) { + // Check for plain arrays and parse array values + val = new SVGArray(val); + } // if the passed attribute is leading... - var Defs = - /*#__PURE__*/ - function (_Container) { - _inherits(Defs, _Container); - function Defs(node) { - _classCallCheck(this, Defs); + if (attr === 'leading') { + // ... call the leading method instead + if (this.leading) { + this.leading(val); + } + } else { + // set given attribute on node + typeof ns === 'string' ? this.node.setAttributeNS(ns, attr, val.toString()) : this.node.setAttribute(attr, val.toString()); + } // rebuild if required - return _possibleConstructorReturn(this, _getPrototypeOf(Defs).call(this, nodeOrNew('defs', node), node)); - } - _createClass(Defs, [{ - key: "flatten", - value: function flatten() { - return this; - } - }, { - key: "ungroup", - value: function ungroup() { - return this; + if (this.rebuild && (attr === 'font-size' || attr === 'x')) { + this.rebuild(); } - }]); + } - return Defs; - }(Container); - register(Defs); + return this; + } - var Doc$1 = + var Dom = /*#__PURE__*/ - function (_Container) { - _inherits(Doc, _Container); + function (_EventTarget) { + _inherits(Dom, _EventTarget); - function Doc(node) { - var _this; + function Dom(node, attrs) { + var _this2; - _classCallCheck(this, Doc); + _classCallCheck(this, Dom); - _this = _possibleConstructorReturn(this, _getPrototypeOf(Doc).call(this, nodeOrNew('svg', node), node)); + _this2 = _possibleConstructorReturn(this, _getPrototypeOf(Dom).call(this, node)); + _this2.node = node; + _this2.type = node.nodeName; - _this.namespace(); + if (attrs && node !== attrs) { + _this2.attr(attrs); + } - return _this; - } + return _this2; + } // Add given element at a position - _createClass(Doc, [{ - key: "isRoot", - value: function isRoot() { - return !this.node.parentNode || !(this.node.parentNode instanceof globals.window.SVGElement) || this.node.parentNode.nodeName === '#document'; - } // Check if this is a root svg - // If not, call docs from this element - }, { - key: "doc", - value: function doc() { - if (this.isRoot()) return this; - return _get(_getPrototypeOf(Doc.prototype), "doc", this).call(this); - } // Add namespaces + _createClass(Dom, [{ + key: "add", + value: function add(element, i) { + element = makeInstance(element); - }, { - key: "namespace", - value: function namespace() { - if (!this.isRoot()) return this.doc().namespace(); - return this.attr({ - xmlns: ns, - version: '1.1' - }).attr('xmlns:xlink', xlink, xmlns).attr('xmlns:svgjs', svgjs, xmlns); - } // Creates and returns defs element + if (i == null) { + this.node.appendChild(element.node); + } else if (element.node !== this.node.childNodes[i]) { + this.node.insertBefore(element.node, this.node.childNodes[i]); + } - }, { - key: "defs", - value: function defs() { - if (!this.isRoot()) return this.doc().defs(); - return adopt(this.node.getElementsByTagName('defs')[0]) || this.put(new Defs()); - } // custom parent method + return this; + } // Add element to given container and return self }, { - key: "parent", - value: function parent(type) { - if (this.isRoot()) { - return this.node.parentNode.nodeName === '#document' ? null : adopt(this.node.parentNode); - } + key: "addTo", + value: function addTo(parent) { + return makeInstance(parent).put(this); + } // Returns all child elements + + }, { + key: "children", + value: function children() { + return new List(map(this.node.children, function (node) { + return adopt(node); + })); + } // Remove all elements in this container - return _get(_getPrototypeOf(Doc.prototype), "parent", this).call(this, type); - } }, { key: "clear", value: function clear() { // remove children while (this.node.hasChildNodes()) { this.node.removeChild(this.node.lastChild); - } - - return this; - } - }]); - - return Doc; - }(Container); - registerMethods({ - Container: { - // Create nested svg document - nested: wrapWithAttrCheck(function () { - return this.put(new Doc$1()); - }) - } - }); - register(Doc$1, 'Doc', true); + } // remove defs reference - function parser() { - // Reuse cached element if possible - if (!parser.nodes) { - var svg = new Doc$1().size(2, 0); - svg.node.cssText = ['opacity: 0', 'position: absolute', 'left: -100%', 'top: -100%', 'overflow: hidden'].join(';'); - var path = svg.path().node; - parser.nodes = { - svg: svg, - path: path - }; - } - if (!parser.nodes.svg.node.parentNode) { - var b = globals.document.body || globals.document.documentElement; - parser.nodes.svg.addTo(b); - } + delete this._defs; + return this; + } // Clone element - return parser.nodes; - } + }, { + key: "clone", + value: function clone() { + // write dom data to the dom so the clone can pickup the data + this.writeDataToDom(); // clone element and assign new id - var Point = - /*#__PURE__*/ - function () { - // Initialize - function Point() { - _classCallCheck(this, Point); + return assignNewId(this.node.cloneNode(true)); + } // Iterates over all children and invokes a given block - this.init.apply(this, arguments); - } + }, { + key: "each", + value: function each(block, deep) { + var children = this.children(); + var i, il; - _createClass(Point, [{ - key: "init", - value: function init(x, y) { - var source; - var base = { - x: 0, - y: 0 // ensure source as object + for (i = 0, il = children.length; i < il; i++) { + block.apply(children[i], [i, children]); - }; - source = Array.isArray(x) ? { - x: x[0], - y: x[1] - } : _typeof(x) === 'object' ? { - x: x.x, - y: x.y - } : { - x: x, - y: y // merge source + if (deep) { + children[i].each(block, deep); + } + } - }; - this.x = source.x == null ? base.x : source.x; - this.y = source.y == null ? base.y : source.y; return this; - } // Clone point + } // Get first child }, { - key: "clone", - value: function clone() { - return new Point(this); - } // Convert to native SVGPoint + key: "first", + value: function first() { + return adopt(this.node.firstChild); + } // Get a element at the given index }, { - key: "native", - value: function native() { - // create new point - var point = parser().svg.node.createSVGPoint(); // update with current values - - point.x = this.x; - point.y = this.y; - return point; - } // transform point with matrix + key: "get", + value: function get(i) { + return adopt(this.node.childNodes[i]); + } + }, { + key: "getEventHolder", + value: function getEventHolder() { + return this.node; + } + }, { + key: "getEventTarget", + value: function getEventTarget() { + return this.node; + } // Checks if the given element is a child }, { - key: "transform", - value: function transform(m) { - // Perform the matrix multiplication - var x = m.a * this.x + m.c * this.y + m.e; - var y = m.b * this.x + m.d * this.y + m.f; // Return the required point + key: "has", + value: function has(element) { + return this.index(element) >= 0; + } // Get / set id - return new Point(x, y); - } }, { - key: "toArray", - value: function toArray() { - return [this.x, this.y]; - } - }]); + key: "id", + value: function id(_id) { + // generate new id if no id set + if (typeof _id === 'undefined' && !this.node.id) { + this.node.id = eid(this.type); + } // dont't set directly width this.node.id to make `null` work correctly - return Point; - }(); - registerMethods({ - Element: { - // Get point - point: function point(x, y) { - return new Point(x, y).transform(this.screenCTM().inverse()); - } - } - }); - var abcdef = 'abcdef'.split(''); + return this.attr('id', _id); + } // Gets index of given element - function closeEnough(a, b, threshold) { - return Math.abs(b - a) < (threshold || 1e-6); - } + }, { + key: "index", + value: function index(element) { + return [].slice.call(this.node.childNodes).indexOf(element.node); + } // Get the last child - var Matrix = - /*#__PURE__*/ - function () { - function Matrix() { - _classCallCheck(this, Matrix); + }, { + key: "last", + value: function last() { + return adopt(this.node.lastChild); + } // matches the element vs a css selector - this.init.apply(this, arguments); - } // Initialize + }, { + key: "matches", + value: function matches(selector) { + var el = this.node; + return (el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector).call(el, selector); + } // Returns the parent element instance + }, { + key: "parent", + value: function parent(type) { + var parent = this; // check for parent - _createClass(Matrix, [{ - key: "init", - value: function init(source) { - var base = Matrix.fromArray([1, 0, 0, 1, 0, 0]); // ensure source as object + if (!parent.node.parentNode) return null; // get parent element - source = source instanceof Element ? source.matrixify() : typeof source === 'string' ? Matrix.fromArray(source.split(delimiter).map(parseFloat)) : Array.isArray(source) ? Matrix.fromArray(source) : _typeof(source) === 'object' && Matrix.isMatrixLike(source) ? source : _typeof(source) === 'object' ? new Matrix().transform(source) : arguments.length === 6 ? Matrix.fromArray([].slice.call(arguments)) : base; // Merge the source matrix with the base matrix + parent = adopt(parent.node.parentNode); + if (!type) return parent; // loop trough ancestors if type is given - this.a = source.a != null ? source.a : base.a; - this.b = source.b != null ? source.b : base.b; - this.c = source.c != null ? source.c : base.c; - this.d = source.d != null ? source.d : base.d; - this.e = source.e != null ? source.e : base.e; - this.f = source.f != null ? source.f : base.f; - return this; - } // Clones this matrix + while (parent && parent.node instanceof globals.window.SVGElement) { + // FIXME: That shouldnt be neccessary + if (typeof type === 'string' ? parent.matches(type) : parent instanceof type) return parent; + parent = adopt(parent.node.parentNode); + } + } // Basically does the same as `add()` but returns the added element instead }, { - key: "clone", - value: function clone() { - return new Matrix(this); - } // Transform a matrix into another matrix by manipulating the space + key: "put", + value: function put(element, i) { + this.add(element, i); + return element; + } // Add element to given container and return container }, { - key: "transform", - value: function transform(o) { - // Check if o is a matrix and then left multiply it directly - if (Matrix.isMatrixLike(o)) { - var matrix = new Matrix(o); - return matrix.multiplyO(this); - } // Get the proposed transformations and the current transformations - + key: "putIn", + value: function putIn(parent) { + return makeInstance(parent).add(this); + } // Remove element - var t = Matrix.formatTransforms(o); - var current = this; + }, { + key: "remove", + value: function remove() { + if (this.parent()) { + this.parent().removeElement(this); + } - var _transform = new Point(t.ox, t.oy).transform(current), - ox = _transform.x, - oy = _transform.y; // Construct the resulting matrix + return this; + } // Remove a given child + }, { + key: "removeElement", + value: function removeElement(element) { + this.node.removeChild(element.node); + return this; + } // Replace this with element - var transformer = new Matrix().translateO(t.rx, t.ry).lmultiplyO(current).translateO(-ox, -oy).scaleO(t.scaleX, t.scaleY).skewO(t.skewX, t.skewY).shearO(t.shear).rotateO(t.theta).translateO(ox, oy); // If we want the origin at a particular place, we force it there + }, { + key: "replace", + value: function replace(element) { + element = makeInstance(element); + this.node.parentNode.replaceChild(element.node, this.node); + return element; + } + }, { + key: "round", + value: function round() { + var precision = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2; + var map$$1 = arguments.length > 1 ? arguments[1] : undefined; + var factor = Math.pow(10, precision); + var attrs = this.attr(); // If we have no map, build one from attrs - if (isFinite(t.px) || isFinite(t.py)) { - var origin = new Point(ox, oy).transform(transformer); // TODO: Replace t.px with isFinite(t.px) + if (!map$$1) { + map$$1 = Object.keys(attrs); + } // Holds rounded attributes - var dx = t.px ? t.px - origin.x : 0; - var dy = t.py ? t.py - origin.y : 0; - transformer.translateO(dx, dy); - } // Translate now after positioning + var newAttrs = {}; + map$$1.forEach(function (key) { + newAttrs[key] = Math.round(attrs[key] * factor) / factor; + }); + this.attr(newAttrs); + return this; + } // Return id on string conversion - transformer.translateO(t.tx, t.ty); - return transformer; - } // Applies a matrix defined by its affine parameters + }, { + key: "toString", + value: function toString() { + return this.id(); + } // Import raw svg }, { - key: "compose", - value: function compose(o) { - if (o.origin) { - o.originX = o.origin[0]; - o.originY = o.origin[1]; - } // Get the parameters + key: "svg", + value: function svg(svgOrFn, outerHTML) { + var well, len, fragment; + if (svgOrFn === false) { + outerHTML = false; + svgOrFn = null; + } // act as getter if no svg string is given - var ox = o.originX || 0; - var oy = o.originY || 0; - var sx = o.scaleX || 1; - var sy = o.scaleY || 1; - var lam = o.shear || 0; - var theta = o.rotate || 0; - var tx = o.translateX || 0; - var ty = o.translateY || 0; // Apply the standard matrix - var result = new Matrix().translateO(-ox, -oy).scaleO(sx, sy).shearO(lam).rotateO(theta).translateO(tx, ty).lmultiplyO(this).translateO(ox, oy); - return result; - } // Decomposes this matrix into its affine parameters + if (svgOrFn == null || typeof svgOrFn === 'function') { + // The default for exports is, that the outerNode is included + outerHTML = outerHTML == null ? true : outerHTML; // write svgjs data to the dom - }, { - key: "decompose", - value: function decompose() { - var cx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0; - var cy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0; - // Get the parameters from the matrix - var a = this.a; - var b = this.b; - var c = this.c; - var d = this.d; - var e = this.e; - var f = this.f; // Figure out if the winding direction is clockwise or counterclockwise + this.writeDataToDom(); + var current = this; // An export modifier was passed - var determinant = a * d - b * c; - var ccw = determinant > 0 ? 1 : -1; // Since we only shear in x, we can use the x basis to get the x scale - // and the rotation of the resulting matrix + if (svgOrFn != null) { + current = adopt(current.node.cloneNode(true)); // If the user wants outerHTML we need to process this node, too - var sx = ccw * Math.sqrt(a * a + b * b); - var thetaRad = Math.atan2(ccw * b, ccw * a); - var theta = 180 / Math.PI * thetaRad; - var ct = Math.cos(thetaRad); - var st = Math.sin(thetaRad); // We can then solve the y basis vector simultaneously to get the other - // two affine parameters directly from these parameters + if (outerHTML) { + var result = svgOrFn(current); + current = result || current; // The user does not want this node? Well, then he gets nothing - var lam = (a * c + b * d) / determinant; - var sy = c * sx / (lam * a - b) || d * sx / (lam * b + a); // Use the translations + if (result === false) return ''; + } // Deep loop through all children and apply modifier - var tx = e - cx + cx * ct * sx + cy * (lam * ct * sx - st * sy); - var ty = f - cy + cx * st * sx + cy * (lam * st * sx + ct * sy); // Construct the decomposition and return it - return { - // Return the affine parameters - scaleX: sx, - scaleY: sy, - shear: lam, - rotate: theta, - translateX: tx, - translateY: ty, - originX: cx, - originY: cy, - // Return the matrix parameters - a: this.a, - b: this.b, - c: this.c, - d: this.d, - e: this.e, - f: this.f - }; - } // Left multiplies by the given matrix + current.each(function () { + var result = svgOrFn(this); - }, { - key: "multiply", - value: function multiply(matrix) { - return this.clone().multiplyO(matrix); - } - }, { - key: "multiplyO", - value: function multiplyO(matrix) { - // Get the matrices - var l = this; - var r = matrix instanceof Matrix ? matrix : new Matrix(matrix); - return Matrix.matrixMultiply(l, r, this); - } - }, { - key: "lmultiply", - value: function lmultiply(matrix) { - return this.clone().lmultiplyO(matrix); - } - }, { - key: "lmultiplyO", - value: function lmultiplyO(matrix) { - var r = this; - var l = matrix instanceof Matrix ? matrix : new Matrix(matrix); - return Matrix.matrixMultiply(l, r, this); - } // Inverses matrix + var _this = result || this; // If modifier returns false, discard node - }, { - key: "inverseO", - value: function inverseO() { - // Get the current parameters out of the matrix - var a = this.a; - var b = this.b; - var c = this.c; - var d = this.d; - var e = this.e; - var f = this.f; // Invert the 2x2 matrix in the top left - var det = a * d - b * c; - if (!det) throw new Error('Cannot invert ' + this); // Calculate the top 2x2 matrix + if (result === false) { + this.remove(); // If modifier returns new node, use it + } else if (result && this !== _this) { + this.replace(_this); + } + }, true); + } // Return outer or inner content - var na = d / det; - var nb = -b / det; - var nc = -c / det; - var nd = a / det; // Apply the inverted matrix to the top right - var ne = -(na * e + nc * f); - var nf = -(nb * e + nd * f); // Construct the inverted matrix + return outerHTML ? current.node.outerHTML : current.node.innerHTML; + } // Act as setter if we got a string + // The default for import is, that the current node is not replaced - this.a = na; - this.b = nb; - this.c = nc; - this.d = nd; - this.e = ne; - this.f = nf; - return this; - } - }, { - key: "inverse", - value: function inverse() { - return this.clone().inverseO(); - } // Translate matrix - }, { - key: "translate", - value: function translate(x, y) { - return this.clone().translateO(x, y); - } - }, { - key: "translateO", - value: function translateO(x, y) { - this.e += x || 0; - this.f += y || 0; - return this; - } // Scale matrix + outerHTML = outerHTML == null ? false : outerHTML; // Create temporary holder - }, { - key: "scale", - value: function scale(x, y, cx, cy) { - var _this$clone; + well = globals.document.createElementNS(ns, 'svg'); + fragment = globals.document.createDocumentFragment(); // Dump raw svg - return (_this$clone = this.clone()).scaleO.apply(_this$clone, arguments); - } - }, { - key: "scaleO", - value: function scaleO(x) { - var y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : x; - var cx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; - var cy = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0; + well.innerHTML = svgOrFn; // Transplant nodes into the fragment - // Support uniform scaling - if (arguments.length === 3) { - cy = cx; - cx = y; - y = x; - } + for (len = well.children.length; len--;) { + fragment.appendChild(well.firstElementChild); + } // Add the whole fragment at once - var a = this.a, - b = this.b, - c = this.c, - d = this.d, - e = this.e, - f = this.f; - this.a = a * x; - this.b = b * y; - this.c = c * x; - this.d = d * y; - this.e = e * x - cx * x + cx; - this.f = f * y - cy * y + cy; - return this; - } // Rotate matrix - }, { - key: "rotate", - value: function rotate(r, cx, cy) { - return this.clone().rotateO(r, cx, cy); - } - }, { - key: "rotateO", - value: function rotateO(r) { - var cx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0; - var cy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; - // Convert degrees to radians - r = radians(r); - var cos = Math.cos(r); - var sin = Math.sin(r); - var a = this.a, - b = this.b, - c = this.c, - d = this.d, - e = this.e, - f = this.f; - this.a = a * cos - b * sin; - this.b = b * cos + a * sin; - this.c = c * cos - d * sin; - this.d = d * cos + c * sin; - this.e = e * cos - f * sin + cy * sin - cx * cos + cx; - this.f = f * cos + e * sin - cx * sin - cy * cos + cy; - return this; - } // Flip matrix on x or y, at a given offset + return outerHTML ? this.replace(fragment) : this.add(fragment); + } // write svgjs data to the dom }, { - key: "flip", - value: function flip(axis, around) { - return this.clone().flipO(axis, around); + key: "writeDataToDom", + value: function writeDataToDom() { + // dump variables recursively + this.each(function () { + this.writeDataToDom(); + }); + return this; } - }, { - key: "flipO", - value: function flipO(axis, around) { - return axis === 'x' ? this.scaleO(-1, 1, around, 0) : axis === 'y' ? this.scaleO(1, -1, 0, around) : this.scaleO(-1, -1, axis, around || axis); // Define an x, y flip point - } // Shear matrix + }]); - }, { - key: "shear", - value: function shear(a, cx, cy) { - return this.clone().shearO(a, cx, cy); - } - }, { - key: "shearO", - value: function shearO(lx) { - var cy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; - var a = this.a, - b = this.b, - c = this.c, - d = this.d, - e = this.e, - f = this.f; - this.a = a + b * lx; - this.c = c + d * lx; - this.e = e + f * lx - cy * lx; - return this; - } // Skew Matrix + return Dom; + }(EventTarget); + extend(Dom, { + attr: attr + }); + register(Dom); - }, { - key: "skew", - value: function skew(x, y, cx, cy) { - var _this$clone2; + var Doc = getClass(root); - return (_this$clone2 = this.clone()).skewO.apply(_this$clone2, arguments); + var Element = + /*#__PURE__*/ + function (_Dom) { + _inherits(Element, _Dom); + + function Element(node, attrs) { + var _this; + + _classCallCheck(this, Element); + + _this = _possibleConstructorReturn(this, _getPrototypeOf(Element).call(this, node, attrs)); // initialize data object + + _this.dom = {}; // create circular reference + + _this.node.instance = _assertThisInitialized(_assertThisInitialized(_this)); + + if (node.hasAttribute('svgjs:data')) { + // pull svgjs data from the dom (getAttributeNS doesn't work in html5) + _this.setData(JSON.parse(node.getAttribute('svgjs:data')) || {}); } - }, { - key: "skewO", - value: function skewO(x) { - var y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : x; - var cx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; - var cy = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0; - // support uniformal skew - if (arguments.length === 3) { - cy = cx; - cx = y; - y = x; - } // Convert degrees to radians + return _this; + } // Move element by its center - x = radians(x); - y = radians(y); - var lx = Math.tan(x); - var ly = Math.tan(y); - var a = this.a, - b = this.b, - c = this.c, - d = this.d, - e = this.e, - f = this.f; - this.a = a + b * lx; - this.b = b + a * ly; - this.c = c + d * lx; - this.d = d + c * ly; - this.e = e + f * lx - cy * lx; - this.f = f + e * ly - cx * ly; - return this; - } // SkewX + _createClass(Element, [{ + key: "center", + value: function center(x, y) { + return this.cx(x).cy(y); + } // Move by center over x-axis }, { - key: "skewX", - value: function skewX(x, cx, cy) { - return this.skew(x, 0, cx, cy); - } + key: "cx", + value: function cx(x) { + return x == null ? this.x() + this.width() / 2 : this.x(x - this.width() / 2); + } // Move by center over y-axis + }, { - key: "skewXO", - value: function skewXO(x, cx, cy) { - return this.skewO(x, 0, cx, cy); - } // SkewY + key: "cy", + value: function cy(y) { + return y == null ? this.y() + this.height() / 2 : this.y(y - this.height() / 2); + } // Get defs }, { - key: "skewY", - value: function skewY(y, cx, cy) { - return this.skew(0, y, cx, cy); + key: "defs", + value: function defs() { + return this.doc().defs(); + } // Get parent document + + }, { + key: "doc", + value: function doc() { + var p = this.parent(Doc); + return p && p.doc(); } }, { - key: "skewYO", - value: function skewYO(y, cx, cy) { - return this.skewO(0, y, cx, cy); - } // Transform around a center point + key: "getEventHolder", + value: function getEventHolder() { + return this; + } // Set height of element }, { - key: "aroundO", - value: function aroundO(cx, cy, matrix) { - var dx = cx || 0; - var dy = cy || 0; - return this.translateO(-dx, -dy).lmultiplyO(matrix).translateO(dx, dy); - } + key: "height", + value: function height(_height) { + return this.attr('height', _height); + } // Checks whether the given point inside the bounding box of the element + }, { - key: "around", - value: function around(cx, cy, matrix) { - return this.clone().aroundO(cx, cy, matrix); - } // Convert to native SVGMatrix + key: "inside", + value: function inside(x, y) { + var box = this.bbox(); + return x > box.x && y > box.y && x < box.x + box.width && y < box.y + box.height; + } // Move element to given x and y values + + }, { + key: "move", + value: function move(x, y) { + return this.x(x).y(y); + } // return array of all ancestors of given type up to the root svg }, { - key: "native", - value: function native() { - // create new matrix - var matrix = parser().svg.node.createSVGMatrix(); // update with current values + key: "parents", + value: function parents() { + var until = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : globals.document; + until = makeInstance(until); + var parents = new List(); + var parent = this; - for (var i = abcdef.length - 1; i >= 0; i--) { - matrix[abcdef[i]] = this[abcdef[i]]; + while ((parent = parent.parent()) && parent.node !== until.node && parent.node !== globals.document) { + parents.push(parent); } - return matrix; - } // Check if two matrices are equal + return parents; + } // Get referenced element form attribute value }, { - key: "equals", - value: function equals(other) { - var comp = new Matrix(other); - return closeEnough(this.a, comp.a) && closeEnough(this.b, comp.b) && closeEnough(this.c, comp.c) && closeEnough(this.d, comp.d) && closeEnough(this.e, comp.e) && closeEnough(this.f, comp.f); - } // Convert matrix to string + key: "reference", + value: function reference$$1(attr) { + attr = this.attr(attr); + if (!attr) return null; + var m = attr.match(reference); + return m ? makeInstance(m[1]) : null; + } // set given data to the elements data property }, { - key: "toString", - value: function toString() { - return 'matrix(' + this.a + ',' + this.b + ',' + this.c + ',' + this.d + ',' + this.e + ',' + this.f + ')'; - } - }, { - key: "toArray", - value: function toArray() { - return [this.a, this.b, this.c, this.d, this.e, this.f]; - } - }, { - key: "valueOf", - value: function valueOf() { - return { - a: this.a, - b: this.b, - c: this.c, - d: this.d, - e: this.e, - f: this.f - }; - } - }], [{ - key: "fromArray", - value: function fromArray(a) { - return { - a: a[0], - b: a[1], - c: a[2], - d: a[3], - e: a[4], - f: a[5] - }; - } - }, { - key: "isMatrixLike", - value: function isMatrixLike(o) { - return o.a != null || o.b != null || o.c != null || o.d != null || o.e != null || o.f != null; - } - }, { - key: "formatTransforms", - value: function formatTransforms(o) { - // Get all of the parameters required to form the matrix - var flipBoth = o.flip === 'both' || o.flip === true; - var flipX = o.flip && (flipBoth || o.flip === 'x') ? -1 : 1; - var flipY = o.flip && (flipBoth || o.flip === 'y') ? -1 : 1; - var skewX = o.skew && o.skew.length ? o.skew[0] : isFinite(o.skew) ? o.skew : isFinite(o.skewX) ? o.skewX : 0; - var skewY = o.skew && o.skew.length ? o.skew[1] : isFinite(o.skew) ? o.skew : isFinite(o.skewY) ? o.skewY : 0; - var scaleX = o.scale && o.scale.length ? o.scale[0] * flipX : isFinite(o.scale) ? o.scale * flipX : isFinite(o.scaleX) ? o.scaleX * flipX : flipX; - var scaleY = o.scale && o.scale.length ? o.scale[1] * flipY : isFinite(o.scale) ? o.scale * flipY : isFinite(o.scaleY) ? o.scaleY * flipY : flipY; - var shear = o.shear || 0; - var theta = o.rotate || o.theta || 0; - var origin = new Point(o.origin || o.around || o.ox || o.originX, o.oy || o.originY); - var ox = origin.x; - var oy = origin.y; - var position = new Point(o.position || o.px || o.positionX, o.py || o.positionY); - var px = position.x; - var py = position.y; - var translate = new Point(o.translate || o.tx || o.translateX, o.ty || o.translateY); - var tx = translate.x; - var ty = translate.y; - var relative = new Point(o.relative || o.rx || o.relativeX, o.ry || o.relativeY); - var rx = relative.x; - var ry = relative.y; // Populate all of the values + key: "setData", + value: function setData(o) { + this.dom = o; + return this; + } // Set element size to given width and height - return { - scaleX: scaleX, - scaleY: scaleY, - skewX: skewX, - skewY: skewY, - shear: shear, - theta: theta, - rx: rx, - ry: ry, - tx: tx, - ty: ty, - ox: ox, - oy: oy, - px: px, - py: py - }; - } // left matrix, right matrix, target matrix which is overwritten + }, { + key: "size", + value: function size(width, height) { + var p = proportionalSize(this, width, height); + return this.width(new SVGNumber(p.width)).height(new SVGNumber(p.height)); + } // Set width of element }, { - key: "matrixMultiply", - value: function matrixMultiply(l, r, o) { - // Work out the product directly - var a = l.a * r.a + l.c * r.b; - var b = l.b * r.a + l.d * r.b; - var c = l.a * r.c + l.c * r.d; - var d = l.b * r.c + l.d * r.d; - var e = l.e + l.a * r.e + l.c * r.f; - var f = l.f + l.b * r.e + l.d * r.f; // make sure to use local variables because l/r and o could be the same + key: "width", + value: function width(_width) { + return this.attr('width', _width); + } // write svgjs data to the dom - o.a = a; - o.b = b; - o.c = c; - o.d = d; - o.e = e; - o.f = f; - return o; - } - }]); + }, { + key: "writeDataToDom", + value: function writeDataToDom() { + // remove previously set data + this.node.removeAttribute('svgjs:data'); - return Matrix; - }(); - registerMethods({ - Element: { - // Get current matrix - ctm: function ctm() { - return new Matrix(this.node.getCTM()); - }, - // Get current screen matrix - screenCTM: function screenCTM() { - /* https://bugzilla.mozilla.org/show_bug.cgi?id=1344537 - This is needed because FF does not return the transformation matrix - for the inner coordinate system when getScreenCTM() is called on nested svgs. - However all other Browsers do that */ - if (typeof this.isRoot === 'function' && !this.isRoot()) { - var rect = this.rect(1, 1); - var m = rect.node.getScreenCTM(); - rect.remove(); - return new Matrix(m); + if (Object.keys(this.dom).length) { + this.node.setAttribute('svgjs:data', JSON.stringify(this.dom)); // see #428 } - return new Matrix(this.node.getScreenCTM()); + return _get(_getPrototypeOf(Element.prototype), "writeDataToDom", this).call(this); + } // Move over x-axis + + }, { + key: "x", + value: function x(_x) { + return this.attr('x', _x); + } // Move over y-axis + + }, { + key: "y", + value: function y(_y) { + return this.attr('y', _y); } - } + }]); + + return Element; + }(Dom); + extend(Element, { + bbox: bbox, + rbox: rbox, + point: point, + ctm: ctm, + screenCTM: screenCTM }); + register(Element); var sugar = { stroke: ['color', 'width', 'opacity', 'linecap', 'linejoin', 'miterlimit', 'dasharray', 'dashoffset'], @@ -2935,238 +2893,95 @@ var SVG = (function () { return a === 'leading' ? this.leading(v) : a === 'anchor' ? this.attr('text-anchor', v) : a === 'size' || a === 'family' || a === 'weight' || a === 'stretch' || a === 'variant' || a === 'style' ? this.attr('font-' + a, v) : this.attr(a, v); } }); - registerMethods('Text', { - ax: function ax(x) { - return this.attr('x', x); - }, - ay: function ay(y) { - return this.attr('y', y); - }, - amove: function amove(x, y) { - return this.ax(x).ay(y); - } - }); // Add events to elements - - var methods$1 = ['click', 'dblclick', 'mousedown', 'mouseup', 'mouseover', 'mouseout', 'mousemove', 'mouseenter', 'mouseleave', 'touchstart', 'touchmove', 'touchleave', 'touchend', 'touchcancel'].reduce(function (last, event) { - // add event to Element - var fn = function fn(f) { - if (f === null) { - off(this, event); - } else { - on(this, event, f); - } - - return this; - }; - - last[event] = fn; - return last; - }, {}); - registerMethods('Element', methods$1); - - function untransform() { - return this.attr('transform', null); - } // merge the whole transformation chain into one matrix and returns it - - function matrixify() { - var matrix = (this.attr('transform') || ''). // split transformations - split(transforms).slice(0, -1).map(function (str) { - // generate key => value pairs - var kv = str.trim().split('('); - return [kv[0], kv[1].split(delimiter).map(function (str) { - return parseFloat(str); - })]; - }).reverse() // merge every transformation into one matrix - .reduce(function (matrix, transform) { - if (transform[0] === 'matrix') { - return matrix.lmultiply(Matrix.fromArray(transform[1])); - } - - return matrix[transform[0]].apply(matrix, transform[1]); - }, new Matrix()); - return matrix; - } // add an element to another parent without changing the visual representation on the screen - - function toParent(parent) { - if (this === parent) return this; - var ctm = this.screenCTM(); - var pCtm = parent.screenCTM().inverse(); - this.addTo(parent).untransform().transform(pCtm.multiply(ctm)); - return this; - } // same as above with parent equals root-svg - - function toDoc() { - return this.toParent(this.doc()); - } // Add transformations - - function transform(o, relative) { - // Act as a getter if no object was passed - if (o == null || typeof o === 'string') { - var decomposed = new Matrix(this).decompose(); - return decomposed[o] || decomposed; - } - - if (!Matrix.isMatrixLike(o)) { - // Set the origin according to the defined transform - o = _objectSpread({}, o, { - origin: getOrigin(o, this) - }); - } // The user can pass a boolean, an Element or an Matrix or nothing - - - var cleanRelative = relative === true ? this : relative || false; - var result = new Matrix(cleanRelative).transform(o); - return this.attr('transform', result); - } - registerMethods('Element', { - untransform: untransform, - matrixify: matrixify, - toParent: toParent, - toDoc: toDoc, - transform: transform - }); - - function isNulledBox(box) { - return !box.w && !box.h && !box.x && !box.y; - } - - function domContains(node) { - return (globals.document.documentElement.contains || function (node) { - // This is IE - it does not support contains() for top-level SVGs - while (node.parentNode) { - node = node.parentNode; - } - - return node === document; - }).call(globals.document.documentElement, node); - } - - var Box = - /*#__PURE__*/ - function () { - function Box() { - _classCallCheck(this, Box); - - this.init.apply(this, arguments); - } - - _createClass(Box, [{ - key: "init", - value: function init(source) { - var base = [0, 0, 0, 0]; - source = typeof source === 'string' ? source.split(delimiter).map(parseFloat) : Array.isArray(source) ? source : _typeof(source) === 'object' ? [source.left != null ? source.left : source.x, source.top != null ? source.top : source.y, source.width, source.height] : arguments.length === 4 ? [].slice.call(arguments) : base; - this.x = source[0] || 0; - this.y = source[1] || 0; - this.width = this.w = source[2] || 0; - this.height = this.h = source[3] || 0; // Add more bounding box properties - - this.x2 = this.x + this.w; - this.y2 = this.y + this.h; - this.cx = this.x + this.w / 2; - this.cy = this.y + this.h / 2; - return this; - } // Merge rect box with another, return a new instance - - }, { - key: "merge", - value: function merge(box) { - var x = Math.min(this.x, box.x); - var y = Math.min(this.y, box.y); - var width = Math.max(this.x + this.width, box.x + box.width) - x; - var height = Math.max(this.y + this.height, box.y + box.height) - y; - return new Box(x, y, width, height); - } - }, { - key: "transform", - value: function transform(m) { - var xMin = Infinity; - var xMax = -Infinity; - var yMin = Infinity; - var yMax = -Infinity; - var pts = [new Point(this.x, this.y), new Point(this.x2, this.y), new Point(this.x, this.y2), new Point(this.x2, this.y2)]; - pts.forEach(function (p) { - p = p.transform(m); - xMin = Math.min(xMin, p.x); - xMax = Math.max(xMax, p.x); - yMin = Math.min(yMin, p.y); - yMax = Math.max(yMax, p.y); - }); - return new Box(xMin, yMin, xMax - xMin, yMax - yMin); - } - }, { - key: "addOffset", - value: function addOffset() { - // offset by window scroll position, because getBoundingClientRect changes when window is scrolled - this.x += globals.window.pageXOffset; - this.y += globals.window.pageYOffset; - return this; - } - }, { - key: "toString", - value: function toString() { - return this.x + ' ' + this.y + ' ' + this.width + ' ' + this.height; - } - }, { - key: "toArray", - value: function toArray() { - return [this.x, this.y, this.width, this.height]; - } - }, { - key: "isNulled", - value: function isNulled() { - return isNulledBox(this); + registerMethods('Text', { + ax: function ax(x) { + return this.attr('x', x); + }, + ay: function ay(y) { + return this.attr('y', y); + }, + amove: function amove(x, y) { + return this.ax(x).ay(y); + } + }); // Add events to elements + + var methods$1 = ['click', 'dblclick', 'mousedown', 'mouseup', 'mouseover', 'mouseout', 'mousemove', 'mouseenter', 'mouseleave', 'touchstart', 'touchmove', 'touchleave', 'touchend', 'touchcancel'].reduce(function (last, event) { + // add event to Element + var fn = function fn(f) { + if (f === null) { + off(this, event); + } else { + on(this, event, f); } - }]); - return Box; - }(); + return this; + }; - function getBox(cb) { - var box; + last[event] = fn; + return last; + }, {}); + registerMethods('Element', methods$1); - try { - box = cb(this.node); + function untransform() { + return this.attr('transform', null); + } // merge the whole transformation chain into one matrix and returns it - if (isNulledBox(box) && !domContains(this.node)) { - throw new Error('Element not in the dom'); - } - } catch (e) { - try { - var clone = this.clone().addTo(parser().svg).show(); - box = cb(clone.node); - clone.remove(); - } catch (e) { - throw new Error('Getting a bounding box of element "' + this.node.nodeName + '" is not possible'); + function matrixify() { + var matrix = (this.attr('transform') || ''). // split transformations + split(transforms).slice(0, -1).map(function (str) { + // generate key => value pairs + var kv = str.trim().split('('); + return [kv[0], kv[1].split(delimiter).map(function (str) { + return parseFloat(str); + })]; + }).reverse() // merge every transformation into one matrix + .reduce(function (matrix, transform) { + if (transform[0] === 'matrix') { + return matrix.lmultiply(Matrix.fromArray(transform[1])); } - } - return box; - } + return matrix[transform[0]].apply(matrix, transform[1]); + }, new Matrix()); + return matrix; + } // add an element to another parent without changing the visual representation on the screen - registerMethods({ - Element: { - // Get bounding box - bbox: function bbox() { - return new Box(getBox.call(this, function (node) { - return node.getBBox(); - })); - }, - rbox: function rbox(el) { - var box = new Box(getBox.call(this, function (node) { - return node.getBoundingClientRect(); - })); - if (el) return box.transform(el.screenCTM().inverse()); - return box.addOffset(); - } - }, - viewbox: { - viewbox: function viewbox(x, y, width, height) { - // act as getter - if (x == null) return new Box(this.attr('viewBox')); // act as setter + function toParent(parent) { + if (this === parent) return this; + var ctm$$1 = this.screenCTM(); + var pCtm = parent.screenCTM().inverse(); + this.addTo(parent).untransform().transform(pCtm.multiply(ctm$$1)); + return this; + } // same as above with parent equals root-svg - return this.attr('viewBox', new Box(x, y, width, height)); - } + function toDoc() { + return this.toParent(this.doc()); + } // Add transformations + + function transform(o, relative) { + // Act as a getter if no object was passed + if (o == null || typeof o === 'string') { + var decomposed = new Matrix(this).decompose(); + return decomposed[o] || decomposed; } + + if (!Matrix.isMatrixLike(o)) { + // Set the origin according to the defined transform + o = _objectSpread({}, o, { + origin: getOrigin(o, this) + }); + } // The user can pass a boolean, an Element or an Matrix or nothing + + + var cleanRelative = relative === true ? this : relative || false; + var result = new Matrix(cleanRelative).transform(o); + return this.attr('transform', result); + } + registerMethods('Element', { + untransform: untransform, + matrixify: matrixify, + toParent: toParent, + toDoc: toDoc, + transform: transform }); function rx(rx) { @@ -3282,6 +3097,152 @@ var SVG = (function () { }); register(Circle); + var Container = + /*#__PURE__*/ + function (_Element) { + _inherits(Container, _Element); + + function Container() { + _classCallCheck(this, Container); + + return _possibleConstructorReturn(this, _getPrototypeOf(Container).apply(this, arguments)); + } + + _createClass(Container, [{ + key: "flatten", + value: function flatten(parent) { + this.each(function () { + if (this instanceof Container) return this.flatten(parent).ungroup(parent); + return this.toParent(parent); + }); // we need this so that Doc does not get removed + + this.node.firstElementChild || this.remove(); + return this; + } + }, { + key: "ungroup", + value: function ungroup(parent) { + parent = parent || this.parent(); + this.each(function () { + return this.toParent(parent); + }); + this.remove(); + return this; + } + }]); + + return Container; + }(Element); + register(Container); + + var Defs = + /*#__PURE__*/ + function (_Container) { + _inherits(Defs, _Container); + + function Defs(node) { + _classCallCheck(this, Defs); + + return _possibleConstructorReturn(this, _getPrototypeOf(Defs).call(this, nodeOrNew('defs', node), node)); + } + + _createClass(Defs, [{ + key: "flatten", + value: function flatten() { + return this; + } + }, { + key: "ungroup", + value: function ungroup() { + return this; + } + }]); + + return Defs; + }(Container); + register(Defs); + + var Doc$1 = + /*#__PURE__*/ + function (_Container) { + _inherits(Doc, _Container); + + function Doc(node) { + var _this; + + _classCallCheck(this, Doc); + + _this = _possibleConstructorReturn(this, _getPrototypeOf(Doc).call(this, nodeOrNew('svg', node), node)); + + _this.namespace(); + + return _this; + } + + _createClass(Doc, [{ + key: "isRoot", + value: function isRoot() { + return !this.node.parentNode || !(this.node.parentNode instanceof globals.window.SVGElement) || this.node.parentNode.nodeName === '#document'; + } // Check if this is a root svg + // If not, call docs from this element + + }, { + key: "doc", + value: function doc() { + if (this.isRoot()) return this; + return _get(_getPrototypeOf(Doc.prototype), "doc", this).call(this); + } // Add namespaces + + }, { + key: "namespace", + value: function namespace() { + if (!this.isRoot()) return this.doc().namespace(); + return this.attr({ + xmlns: ns, + version: '1.1' + }).attr('xmlns:xlink', xlink, xmlns).attr('xmlns:svgjs', svgjs, xmlns); + } // Creates and returns defs element + + }, { + key: "defs", + value: function defs() { + if (!this.isRoot()) return this.doc().defs(); + return adopt(this.node.getElementsByTagName('defs')[0]) || this.put(new Defs()); + } // custom parent method + + }, { + key: "parent", + value: function parent(type) { + if (this.isRoot()) { + return this.node.parentNode.nodeName === '#document' ? null : adopt(this.node.parentNode); + } + + return _get(_getPrototypeOf(Doc.prototype), "parent", this).call(this, type); + } + }, { + key: "clear", + value: function clear() { + // remove children + while (this.node.hasChildNodes()) { + this.node.removeChild(this.node.lastChild); + } + + return this; + } + }]); + + return Doc; + }(Container); + registerMethods({ + Container: { + // Create nested svg document + nested: wrapWithAttrCheck(function () { + return this.put(new Doc$1()); + }) + } + }); + register(Doc$1, 'Doc', true); + var Ellipse = /*#__PURE__*/ function (_Shape) { @@ -3440,7 +3401,7 @@ var SVG = (function () { } }, { key: "bbox", - value: function bbox() { + value: function bbox$$1() { return new Box(); } }]); @@ -3515,7 +3476,7 @@ var SVG = (function () { } }, { key: "bbox", - value: function bbox() { + value: function bbox$$1() { return new Box(); } }]); @@ -6067,12 +6028,12 @@ var SVG = (function () { }); return this; }, - zoom: function zoom(level, point) { + zoom: function zoom(level, point$$1) { var morpher = new Morphable(this._stepper).to(new SVGNumber(level)); this.queue(function () { morpher = morpher.from(this.zoom()); }, function (pos) { - this.element().zoom(morpher.at(pos), point); + this.element().zoom(morpher.at(pos), point$$1); return morpher.done(); }); return this; diff --git a/spec/spec/element.js b/spec/spec/element.js index b36ea82..9afedc6 100644 --- a/spec/spec/element.js +++ b/spec/spec/element.js @@ -10,13 +10,6 @@ describe('Element', function() { expect(rect.node.instance).toBe(rect) }) - describe('native()', function() { - it('returns the node reference', function() { - var rect = draw.rect(100,100) - expect(rect.native()).toBe(rect.node) - }) - }) - describe('attr()', function() { var rect diff --git a/spec/spec/matrix.js b/spec/spec/matrix.js index 42ac1fe..b6c0348 100644 --- a/spec/spec/matrix.js +++ b/spec/spec/matrix.js @@ -372,11 +372,4 @@ describe('Matrix', function() { expect(matrix.f).toBeCloseTo(-81.2931393017) }) }) - - describe('native()', function() { - it('returns the node reference', function() { - expect(new SVG.Matrix().native() instanceof window.SVGMatrix).toBeTruthy() - }) - }) - }) diff --git a/spec/spec/point.js b/spec/spec/point.js index 768d7e9..8be944a 100644 --- a/spec/spec/point.js +++ b/spec/spec/point.js @@ -60,16 +60,6 @@ describe('Point', function() { expect(point.y).toBe(4) }) }) - - describe('with native SVGPoint given', function() { - it('creates a point from native SVGPoint', function() { - var point = new SVG.Point(new SVG.Point(2,4).native()) - - expect(point.x).toBe(2) - expect(point.y).toBe(4) - }) - }) - }) describe('clone()', function() { diff --git a/src/elements/Dom.js b/src/elements/Dom.js index 6d35f1e..55d5858 100644 --- a/src/elements/Dom.js +++ b/src/elements/Dom.js @@ -137,11 +137,6 @@ export default class Dom extends EventTarget { return (el.matches || el.matchesSelector || el.msMatchesSelector || el.mozMatchesSelector || el.webkitMatchesSelector || el.oMatchesSelector).call(el, selector) } - // Returns the svg node to call native svg methods on it - native () { - return this.node - } - // Returns the parent element instance parent (type) { var parent = this diff --git a/src/elements/Element.js b/src/elements/Element.js index 3b96bf4..456ddad 100644 --- a/src/elements/Element.js +++ b/src/elements/Element.js @@ -1,5 +1,14 @@ -import { getClass, makeInstance, register, root } from '../utils/adopter.js' +import { bbox, rbox } from '../types/Box.js' +import { ctm, screenCTM } from '../types/Matrix.js' +import { + extend, + getClass, + makeInstance, + register, + root +} from '../utils/adopter.js' import { globals } from '../utils/window.js' +import { point } from '../types/Point.js' import { proportionalSize } from '../utils/utils.js' import { reference } from '../modules/core/regex.js' import Dom from './Dom.js' @@ -145,4 +154,8 @@ export default class Element extends Dom { } } +extend(Element, { + bbox, rbox, point, ctm, screenCTM +}) + register(Element) diff --git a/src/modules/core/parser.js b/src/modules/core/parser.js index ccbbc54..1ff2380 100644 --- a/src/modules/core/parser.js +++ b/src/modules/core/parser.js @@ -1,10 +1,10 @@ -import Doc from '../../elements/Doc.js' import { globals } from '../../utils/window.js' +import { makeInstance } from '../../utils/adopter.js' export default function parser () { // Reuse cached element if possible if (!parser.nodes) { - let svg = new Doc().size(2, 0) + let svg = makeInstance().size(2, 0) svg.node.cssText = [ 'opacity: 0', 'position: absolute', diff --git a/src/types/Box.js b/src/types/Box.js index 8c1c4ca..e55f114 100644 --- a/src/types/Box.js +++ b/src/types/Box.js @@ -125,19 +125,17 @@ function getBox (cb) { return box } +export function bbox () { + return new Box(getBox.call(this, (node) => node.getBBox())) +} + +export function rbox (el) { + let box = new Box(getBox.call(this, (node) => node.getBoundingClientRect())) + if (el) return box.transform(el.screenCTM().inverse()) + return box.addOffset() +} + registerMethods({ - Element: { - // Get bounding box - bbox () { - return new Box(getBox.call(this, (node) => node.getBBox())) - }, - - rbox (el) { - let box = new Box(getBox.call(this, (node) => node.getBoundingClientRect())) - if (el) return box.transform(el.screenCTM().inverse()) - return box.addOffset() - } - }, viewbox: { viewbox (x, y, width, height) { // act as getter diff --git a/src/types/Matrix.js b/src/types/Matrix.js index ee12488..a1eb317 100644 --- a/src/types/Matrix.js +++ b/src/types/Matrix.js @@ -1,12 +1,7 @@ import { delimiter } from '../modules/core/regex.js' import { radians } from '../utils/utils.js' -import { registerMethods } from '../utils/methods.js' import Element from '../elements/Element.js' import Point from './Point.js' -import parser from '../modules/core/parser.js' - -// Create matrix array for looping -const abcdef = 'abcdef'.split('') function closeEnough (a, b, threshold) { return Math.abs(b - a) < (threshold || 1e-6) @@ -379,19 +374,6 @@ export default class Matrix { return this.clone().aroundO(cx, cy, matrix) } - // Convert to native SVGMatrix - native () { - // create new matrix - var matrix = parser().svg.node.createSVGMatrix() - - // update with current values - for (var i = abcdef.length - 1; i >= 0; i--) { - matrix[abcdef[i]] = this[abcdef[i]] - } - - return matrix - } - // Check if two matrices are equal equals (other) { var comp = new Matrix(other) @@ -499,26 +481,20 @@ export default class Matrix { } } -registerMethods({ - Element: { - // Get current matrix - ctm () { - return new Matrix(this.node.getCTM()) - }, - - // Get current screen matrix - screenCTM () { - /* https://bugzilla.mozilla.org/show_bug.cgi?id=1344537 - This is needed because FF does not return the transformation matrix - for the inner coordinate system when getScreenCTM() is called on nested svgs. - However all other Browsers do that */ - if (typeof this.isRoot === 'function' && !this.isRoot()) { - var rect = this.rect(1, 1) - var m = rect.node.getScreenCTM() - rect.remove() - return new Matrix(m) - } - return new Matrix(this.node.getScreenCTM()) - } - } -}) +export function ctm () { + return new Matrix(this.node.getCTM()) +} + +export function screenCTM () { + /* https://bugzilla.mozilla.org/show_bug.cgi?id=1344537 + This is needed because FF does not return the transformation matrix + for the inner coordinate system when getScreenCTM() is called on nested svgs. + However all other Browsers do that */ + if (typeof this.isRoot === 'function' && !this.isRoot()) { + var rect = this.rect(1, 1) + var m = rect.node.getScreenCTM() + rect.remove() + return new Matrix(m) + } + return new Matrix(this.node.getScreenCTM()) +} diff --git a/src/types/Point.js b/src/types/Point.js index 6a2b968..27d81ea 100644 --- a/src/types/Point.js +++ b/src/types/Point.js @@ -1,6 +1,3 @@ -import { registerMethods } from '../utils/methods.js' -import parser from '../modules/core/parser.js' - export default class Point { // Initialize constructor (...args) { @@ -28,17 +25,6 @@ export default class Point { return new Point(this) } - // Convert to native SVGPoint - native () { - // create new point - var point = parser().svg.node.createSVGPoint() - - // update with current values - point.x = this.x - point.y = this.y - return point - } - // transform point with matrix transform (m) { // Perform the matrix multiplication @@ -54,11 +40,6 @@ export default class Point { } } -registerMethods({ - Element: { - // Get point - point: function (x, y) { - return new Point(x, y).transform(this.screenCTM().inverse()) - } - } -}) +export function point (x, y) { + return new Point(x, y).transform(this.screenCTM().inverse()) +} -- cgit v1.2.3