fix defs and reference, tests for Element

2 files changed, 15 insertions, 14 deletions

diff --git a/src/elements/Element.js b/src/elements/Element.js
index d75db17..bb11611 100644
--- a/src/elements/Element.js
+++ b/src/elements/Element.js
@@ -1,4 +1,4 @@
-import { bbox, rbox } from '../types/Box.js'
+import { bbox, rbox, inside } from '../types/Box.js'
 import { ctm, screenCTM } from '../types/Matrix.js'
 import {
   extend,
@@ -52,7 +52,8 @@ export default class Element extends Dom {
 
   // Get defs
   defs () {
-    return this.root().defs()
+    const root = this.root()
+    return root && root.defs()
   }
 
   // Relative move over x and y axes
@@ -85,16 +86,6 @@ export default class Element extends Dom {
     return this.attr('height', height)
   }
 
-  // Checks whether the given point inside the bounding box of the element
-  inside (x, y) {
-    const 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
   move (x, y) {
     return this.x(x).y(y)
@@ -126,7 +117,7 @@ export default class Element extends Dom {
     attr = this.attr(attr)
     if (!attr) return null
 
-    const m = attr.match(reference)
+    const m = (attr + '').match(reference)
     return m ? makeInstance(m[1]) : null
   }
 
@@ -174,7 +165,7 @@ export default class Element extends Dom {
 }
 
 extend(Element, {
-  bbox, rbox, point, ctm, screenCTM
+  bbox, rbox, inside, point, ctm, screenCTM
 })
 
 register(Element, 'Element')
diff --git a/src/types/Box.js b/src/types/Box.js
index 6d7d8a9..ae0f2cd 100644
--- a/src/types/Box.js
+++ b/src/types/Box.js
@@ -148,6 +148,16 @@ export function rbox (el) {
   return box.addOffset()
 }
 
+// Checks whether the given point is inside the bounding box
+export function inside (x, y) {
+  const box = this.bbox()
+
+  return x > box.x
+    && y > box.y
+    && x < box.x + box.width
+    && y < box.y + box.height
+}
+
 registerMethods({
   viewbox: {
     viewbox (x, y, width, height) {