replace local utilities with tealight

jlmakes · jlmakes · commit 276d044c2326 · 2017-11-24T05:43:39.000+01:00
diff --git a/package.json b/package.json
@@ -31,7 +31,8 @@
 		"url": "https://github.com/jlmakes/scrollreveal/issues"
 	},
 	"dependencies": {
-		"rematrix": "^0.2.1"
+		"rematrix": "^0.2.1",
+		"tealight": "^0.1.0"
 	},
 	"devDependencies": {
 		"chai": "^4.1.2",
diff --git a/src/instance/constructor.js b/src/instance/constructor.js
@@ -9,8 +9,8 @@ import sync from './methods/sync'
 import delegate from './functions/delegate'
 
 import { isMobile, transformSupported, transitionSupported } from '../utils/browser'
-import { getNode, logger } from '../utils/core'
-import { deepAssign } from '../utils/generic'
+import { logger } from '../utils/core'
+import { deepAssign, getNode } from 'tealight'
 
 import { version } from '../../package.json'
 
diff --git a/src/instance/functions/delegate.js b/src/instance/functions/delegate.js
@@ -1,13 +1,11 @@
 import animate from './animate'
 import sequence from './sequence'
 
-import { mathSign } from '../../polyfills/mathSign'
-import { requestAnimationFrame } from '../../polyfills/requestAnimationFrame'
+import { each, mathSign, raf } from 'tealight'
 import { getGeometry, getScrolled, isElementVisible } from '../../utils/core'
-import { each } from '../../utils/generic'
 
 export default function delegate (event = { type: 'init' }, elements = this.store.elements) {
-	requestAnimationFrame(() => {
+	raf(() => {
 		const stale = event.type === 'init' || event.type === 'resize'
 
 		each(this.store.containers, container => {
diff --git a/src/instance/functions/initialize.js b/src/instance/functions/initialize.js
@@ -1,4 +1,4 @@
-import { each } from '../../utils/generic'
+import { each } from 'tealight'
 import rinse from './rinse'
 
 export default function initialize () {
diff --git a/src/instance/functions/rinse.js b/src/instance/functions/rinse.js
@@ -1,5 +1,4 @@
-import { each } from '../../utils/generic'
-import { getNodes } from '../../utils/core'
+import { each, getNodes } from 'tealight'
 
 export default function rinse () {
 	const struct = () => ({
diff --git a/src/instance/functions/sequence.js b/src/instance/functions/sequence.js
@@ -1,5 +1,6 @@
 import animate from './animate'
-import { each, nextUniqueId } from '../../utils/generic'
+import { each } from 'tealight'
+import { nextUniqueId } from '../../utils/generic'
 
 export default function sequence (element, pristine = this.pristine) {
 	const seq = this.store.sequences[element.sequence.id]
diff --git a/src/instance/methods/clean.js b/src/instance/methods/clean.js
@@ -1,5 +1,5 @@
-import { each } from '../../utils/generic'
-import { getNodes, logger } from '../../utils/core'
+import { each, getNodes } from 'tealight'
+import { logger } from '../../utils/core'
 import rinse from '../functions/rinse'
 
 export default function clean (target) {
diff --git a/src/instance/methods/destroy.js b/src/instance/methods/destroy.js
@@ -1,4 +1,4 @@
-import { each } from '../../utils/generic'
+import { each } from 'tealight'
 
 export default function destroy () {
 	/**
diff --git a/src/instance/methods/reveal.js b/src/instance/methods/reveal.js
@@ -3,8 +3,9 @@ import style from '../functions/style'
 import initialize from '../functions/initialize'
 import { Sequence } from '../functions/sequence'
 
-import { getNode, getNodes, logger } from '../../utils/core'
-import { deepAssign, each, nextUniqueId } from '../../utils/generic'
+import { deepAssign, each, getNode, getNodes } from 'tealight'
+import { logger } from '../../utils/core'
+import { nextUniqueId } from '../../utils/generic'
 import { isMobile } from '../../utils/browser'
 
 export default function reveal (target, options, interval, sync) {
@@ -63,9 +64,9 @@ export default function reveal (target, options, interval, sync) {
 			const config = deepAssign({}, element.config || this.defaults, options)
 
 			/**
-			* Verify the current device passes our platform configuration,
-			* and cache the result for the rest of the loop.
-			*/
+			 * Verify the current device passes our platform configuration,
+			 * and cache the result for the rest of the loop.
+			 */
 			let disabled
 			{
 				if (disabled == null) {
@@ -115,10 +116,10 @@ export default function reveal (target, options, interval, sync) {
 		}, [])
 
 		/**
-		* Modifying the DOM via setAttribute needs to be handled
-		* separately from reading computed styles in the map above
-		* for the browser to batch DOM changes (limiting reflows)
-		*/
+		 * Modifying the DOM via setAttribute needs to be handled
+		 * separately from reading computed styles in the map above
+		 * for the browser to batch DOM changes (limiting reflows)
+		 */
 		each(elements, element => {
 			this.store.elements[element.id] = element
 			element.node.setAttribute('data-sr-id', element.id)
@@ -144,16 +145,16 @@ export default function reveal (target, options, interval, sync) {
 	}
 
 	/**
-	* If reveal wasn't invoked by sync, we want to
-	* make sure to add this call to the history.
-	*/
+	 * If reveal wasn't invoked by sync, we want to
+	 * make sure to add this call to the history.
+	 */
 	if (!sync) {
 		this.store.history.push({ target, options, interval })
 
 		/**
-		* Push initialization to the event queue, giving
-		* multiple reveal calls time to be interpreted.
-		*/
+		 * Push initialization to the event queue, giving
+		 * multiple reveal calls time to be interpreted.
+		 */
 		if (this.initTimeout) {
 			window.clearTimeout(this.initTimeout)
 		}
diff --git a/src/instance/methods/sync.js b/src/instance/methods/sync.js
@@ -1,7 +1,7 @@
 import initialize from '../functions/initialize'
 import reveal from './reveal'
 
-import { each } from '../../utils/generic'
+import { each } from 'tealight'
 
 /**
  * Re-runs the reveal method for each record stored in history,
diff --git a/src/polyfills/mathSign.js b/src/polyfills/mathSign.js
diff --git a/src/polyfills/requestAnimationFrame.js b/src/polyfills/requestAnimationFrame.js
diff --git a/src/utils/browser.js b/src/utils/browser.js
@@ -27,27 +27,6 @@ export function isMobile (agent = navigator.userAgent) {
 	return /Android|iPhone|iPad|iPod/i.test(agent)
 }
 
-export function isNode (target) {
-	return typeof window.Node === 'object'
-		? target instanceof window.Node
-		: target !== null &&
-			typeof target === 'object' &&
-			typeof target.nodeType === 'number' &&
-			typeof target.nodeName === 'string'
-}
-
-export function isNodeList (target) {
-	const prototypeToString = Object.prototype.toString.call(target)
-	const regex = /^\[object (HTMLCollection|NodeList|Object)\]$/
-
-	return typeof window.NodeList === 'object'
-		? target instanceof window.NodeList
-		: typeof target === 'object' &&
-			typeof target.length === 'number' &&
-			regex.test(prototypeToString) &&
-			(target.length === 0 || isNode(target[0]))
-}
-
 export function transformSupported () {
 	const style = document.documentElement.style
 	return 'transform' in style || 'WebkitTransform' in style
diff --git a/src/utils/core.js b/src/utils/core.js
@@ -1,5 +1,3 @@
-import { isNode, isNodeList } from '../utils/browser'
-
 export function isElementVisible (element) {
 	const container = this.store.containers[element.containerId]
 	const viewFactor = Math.max(0, Math.min(1, element.config.viewFactor))
@@ -62,42 +60,6 @@ export function getGeometry (target, isContainer) {
 	}
 }
 
-export function getNode (target, container = document) {
-	let node = null
-	if (typeof target === 'string') {
-		try {
-			node = container.querySelector(target)
-		} catch (e) {
-			throw new Error(`"${target}" is not a valid selector.`)
-		}
-		if (!node) {
-			throw new Error(`The selector "${target}" matches 0 elements.`)
-		}
-	}
-	return isNode(target) ? target : node
-}
-
-export function getNodes (target, container = document) {
-	if (target instanceof Array) {
-		return target
-	}
-	if (isNode(target)) {
-		return [target]
-	}
-	if (isNodeList(target)) {
-		return Array.prototype.slice.call(target)
-	}
-	if (typeof target === 'string') {
-		let query
-		try {
-			query = container.querySelectorAll(target)
-		} catch (e) {
-			throw new Error(`"${target}" is not a valid selector.`)
-		}
-		return Array.prototype.slice.call(query)
-	}
-}
-
 export function getScrolled (container) {
 	return container.node === document.documentElement
 		? {
diff --git a/src/utils/generic.js b/src/utils/generic.js
@@ -1,47 +1,3 @@
-export function deepAssign (target, ...sources) {
-	if (isObject(target)) {
-		each(sources, source => {
-			each(source, (data, key) => {
-				if (isObject(data)) {
-					if (!target[key] || !isObject(target[key])) {
-						target[key] = {}
-					}
-					deepAssign(target[key], data)
-				} else {
-					target[key] = data
-				}
-			})
-		})
-		return target
-	} else {
-		throw new TypeError('Expected an object literal.')
-	}
-}
-
-export function isObject (object) {
-	return (
-		object !== null &&
-		typeof object === 'object' &&
-		(object.constructor === Object ||
-			Object.prototype.toString.call(object) === '[object Object]')
-	)
-}
-
-export function each (collection, callback) {
-	if (isObject(collection)) {
-		const keys = Object.keys(collection)
-		for (let i = 0; i < keys.length; i++) {
-			callback(collection[keys[i]], keys[i], collection)
-		}
-	} else if (Array.isArray(collection)) {
-		for (let i = 0; i < collection.length; i++) {
-			callback(collection[i], i, collection)
-		}
-	} else {
-		throw new TypeError('Expected either an array or object literal.')
-	}
-}
-
 export const nextUniqueId = (() => {
 	let uid = 0
 	return () => uid++
diff --git a/test/polyfills/mathSign.spec.js b/test/polyfills/mathSign.spec.js
diff --git a/test/polyfills/requestAnimationFrame.spec.js b/test/polyfills/requestAnimationFrame.spec.js
diff --git a/test/utils/browser.spec.js b/test/utils/browser.spec.js
@@ -83,31 +83,6 @@ describe('Browser Utilities', () => {
 		})
 	})
 
-	describe('isNode()', () => {
-		it('should return true when passed a DOM node', () => {
-			const result = browser.isNode(document.querySelector('body'))
-			expect(result).to.be.true
-		})
-
-		it('should return false when passed HTML as a string', () => {
-			const result = browser.isNode('<div class="foo"></div>')
-			expect(result).to.be.false
-		})
-	})
-
-	describe('isNodeList()', () => {
-		it('should return true when passed a DOM node list', () => {
-			const result = browser.isNodeList(document.querySelectorAll('script'))
-			expect(result).to.be.true
-		})
-
-		it('should return false when passed an array of HTML elements', () => {
-			const elements = document.querySelectorAll('body')
-			const result = browser.isNodeList(Array.prototype.slice.call(elements))
-			expect(result).to.be.false
-		})
-	})
-
 	describe('transformSupported()', () => {
 		it('should return true', () => {
 			expect(browser.transformSupported()).to.be.true
diff --git a/test/utils/core.spec.js b/test/utils/core.spec.js
diff --git a/test/utils/generic.spec.js b/test/utils/generic.spec.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { each } from '../../utils/generic'`
	`1`	`+import { each } from 'tealight'`
`2`	`2`	`import rinse from './rinse'`
`3`	`3`
`4`	`4`	`export default function initialize () {`