diff --git a/package.json b/package.json index f6d6892..57165cf 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "react-component" ], "peerDependencies": { - "react": ">=0.13.0" + "react": ">=0.13.0 <0.15.0 || ^0.14.0-alpha" }, "scripts": { "start": "babel --watch --source-maps-inline --optional='es7.classProperties' --out-dir='lib' src", @@ -47,8 +47,18 @@ "underscore" ], "scriptPreprocessor": "/node_modules/babel-jest", - "testFileExtensions": ["jsx", "js"], - "moduleFileExtensions": ["js", "json", "jsx"] + "testFileExtensions": [ + "jsx", + "js" + ], + "moduleFileExtensions": [ + "js", + "json", + "jsx" + ] }, - "license": "MIT" + "license": "MIT", + "dependencies": { + "exenv": "^1.2.0" + } } diff --git a/src/components/Button.jsx b/src/components/Button.jsx index 5946bc6..8d9ff40 100644 --- a/src/components/Button.jsx +++ b/src/components/Button.jsx @@ -8,8 +8,7 @@ import config from '../config/button'; const buttonTypes = ['button', 'submit', 'reset']; // Enable React Touch Events -React.initializeTouchEvents(true); - +React.initializeTouchEvents && React.initializeTouchEvents(true); /** * Returns an object with properties that are relevant for the button element. diff --git a/src/components/ComboBox.jsx b/src/components/ComboBox.jsx index 3fd6699..3ab7a9b 100644 --- a/src/components/ComboBox.jsx +++ b/src/components/ComboBox.jsx @@ -5,7 +5,7 @@ import {omit, extend, filterReactChildren, has, isEmpty, find, getArrayForReactC import style from '../style/combo-box'; // Enable React Touch Events -React.initializeTouchEvents(true); +React.initializeTouchEvents && React.initializeTouchEvents(true); /** * Update hover style for the specified styleId. diff --git a/src/components/Rating.jsx b/src/components/Rating.jsx index 8ce2b47..9ef6c5a 100644 --- a/src/components/Rating.jsx +++ b/src/components/Rating.jsx @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import { canUseDOM } from 'react/lib/ExecutionEnvironment'; +import { canUseDOM } from 'exenv'; import {extend, omit, has} from '../utils/helpers'; import style from '../style/rating.js'; import {injectStyles, removeStyle} from '../utils/inject-style'; @@ -8,8 +8,7 @@ import config from '../config/rating'; import {requestAnimationFrame, cancelAnimationFrame} from '../utils/animation-frame-management'; // Enable React Touch Events -React.initializeTouchEvents(true); - +React.initializeTouchEvents && React.initializeTouchEvents(true); /** * sanitize properties for the wrapping div. diff --git a/src/components/Select.jsx b/src/components/Select.jsx index 3e251ed..326a454 100644 --- a/src/components/Select.jsx +++ b/src/components/Select.jsx @@ -1,6 +1,6 @@ import React, {Component, PropTypes} from 'react'; import {omit, extend, filter, filterReactChildren, find, first, flattenReactChildren, isEmpty, findIndex, last, uniqueId, has, some} from '../utils/helpers'; -import { canUseDOM } from 'react/lib/ExecutionEnvironment'; +import { canUseDOM } from 'exenv'; import unionClassNames from '../utils/union-class-names'; import {injectStyles, removeStyle} from '../utils/inject-style'; import style from '../style/select'; @@ -8,7 +8,7 @@ import config from '../config/select'; import isComponentOfType from '../utils/is-component-of-type.js'; // Enable React Touch Events -React.initializeTouchEvents(true); +React.initializeTouchEvents && React.initializeTouchEvents(true); /** * Returns true if the provided property is a Placeholder component from Belle. diff --git a/src/components/Toggle.jsx b/src/components/Toggle.jsx index 3d39021..f7d2843 100644 --- a/src/components/Toggle.jsx +++ b/src/components/Toggle.jsx @@ -8,7 +8,7 @@ import {requestAnimationFrame, cancelAnimationFrame} from '../utils/animation-fr import unionClassNames from '../utils/union-class-names'; // Enable React Touch Events -React.initializeTouchEvents(true); +React.initializeTouchEvents && React.initializeTouchEvents(true); function sanitizeChildProps(properties) { return omit(properties, [ diff --git a/src/utils/animation-frame-management.js b/src/utils/animation-frame-management.js index 2acda37..a31b131 100644 --- a/src/utils/animation-frame-management.js +++ b/src/utils/animation-frame-management.js @@ -1,6 +1,6 @@ // Inspired by https://gist.github.com/paulirish/1579671 -import { canUseDOM } from 'react/lib/ExecutionEnvironment'; +import { canUseDOM } from 'exenv'; export let requestAnimationFrame; export let cancelAnimationFrame; diff --git a/src/utils/calculate-textarea-height.js b/src/utils/calculate-textarea-height.js index 9062fa1..8b358b1 100644 --- a/src/utils/calculate-textarea-height.js +++ b/src/utils/calculate-textarea-height.js @@ -1,4 +1,4 @@ -import { canUseDOM } from 'react/lib/ExecutionEnvironment'; +import { canUseDOM } from 'exenv'; let hiddenTextarea; const computedStyleCache = {}; diff --git a/src/utils/inject-style.js b/src/utils/inject-style.js index 5969541..94428cc 100644 --- a/src/utils/inject-style.js +++ b/src/utils/inject-style.js @@ -1,6 +1,6 @@ import {flatten, mapObject} from '../utils/helpers'; import CSSPropertyOperations from 'react/lib/CSSPropertyOperations'; -import { canUseDOM } from 'react/lib/ExecutionEnvironment'; +import { canUseDOM } from 'exenv'; import animations from '../style/animations'; let styleElement;