Skip to content

Commit d461d7f

Browse files
KagamiChanKagamiChan
committed
chore: rebuild libs to pass tests
1 parent 6aae839 commit d461d7f

File tree

5 files changed

+107
-34
lines changed

5 files changed

+107
-34
lines changed

‎lib/ToastContainer.js

+19-15
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@ var _react = require("react");
2020

2121
var _react2 = _interopRequireDefault(_react);
2222

23-
var _reactAddonsUpdate = require("react-addons-update");
23+
var _propTypes = require("prop-types");
2424

25-
var _reactAddonsUpdate2 = _interopRequireDefault(_reactAddonsUpdate);
25+
var _propTypes2 = _interopRequireDefault(_propTypes);
26+
27+
var _immutabilityHelper = require("immutability-helper");
28+
29+
var _immutabilityHelper2 = _interopRequireDefault(_immutabilityHelper);
2630

2731
var _ToastMessage = require("./ToastMessage");
2832

@@ -102,7 +106,7 @@ var ToastContainer = function (_Component) {
102106
}
103107
var key = this.state.toastId++;
104108
var toastId = key;
105-
var newToast = (0, _reactAddonsUpdate2.default)(optionsOverride, {
109+
var newToast = (0, _immutabilityHelper2.default)(optionsOverride, {
106110
$merge: {
107111
type: type,
108112
title: title,
@@ -123,7 +127,7 @@ var ToastContainer = function (_Component) {
123127

124128
var messageOperation = _defineProperty({}, "" + (this.props.newestOnTop ? "$unshift" : "$push"), [message]);
125129

126-
var nextState = (0, _reactAddonsUpdate2.default)(this.state, {
130+
var nextState = (0, _immutabilityHelper2.default)(this.state, {
127131
toasts: toastOperation,
128132
messageList: messageOperation
129133
});
@@ -152,7 +156,7 @@ var ToastContainer = function (_Component) {
152156
if (found || toast.toastId !== toastId) {
153157
return false;
154158
}
155-
_this4.setState((0, _reactAddonsUpdate2.default)(_this4.state, {
159+
_this4.setState((0, _immutabilityHelper2.default)(_this4.state, {
156160
toasts: { $splice: [[index, 1]] },
157161
messageList: { $splice: [[index, 1]] }
158162
}));
@@ -180,17 +184,17 @@ var ToastContainer = function (_Component) {
180184
}(_react.Component);
181185

182186
ToastContainer.propTypes = {
183-
toastType: _react.PropTypes.shape({
184-
error: _react.PropTypes.string,
185-
info: _react.PropTypes.string,
186-
success: _react.PropTypes.string,
187-
warning: _react.PropTypes.string
187+
toastType: _propTypes2.default.shape({
188+
error: _propTypes2.default.string,
189+
info: _propTypes2.default.string,
190+
success: _propTypes2.default.string,
191+
warning: _propTypes2.default.string
188192
}).isRequired,
189-
id: _react.PropTypes.string.isRequired,
190-
toastMessageFactory: _react.PropTypes.func.isRequired,
191-
preventDuplicates: _react.PropTypes.bool.isRequired,
192-
newestOnTop: _react.PropTypes.bool.isRequired,
193-
onClick: _react.PropTypes.func.isRequired
193+
id: _propTypes2.default.string.isRequired,
194+
toastMessageFactory: _propTypes2.default.func.isRequired,
195+
preventDuplicates: _propTypes2.default.bool.isRequired,
196+
newestOnTop: _propTypes2.default.bool.isRequired,
197+
onClick: _propTypes2.default.func.isRequired
194198
};
195199
ToastContainer.defaultProps = {
196200
toastType: {

‎lib/ToastContainer.test.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ var _reactDom = require("react-dom");
88

99
var _reactDom2 = _interopRequireDefault(_reactDom);
1010

11-
var _reactAddonsTestUtils = require("react-addons-test-utils");
11+
var _testUtils = require("react-dom/test-utils");
1212

13-
var _reactAddonsTestUtils2 = _interopRequireDefault(_reactAddonsTestUtils);
13+
var _testUtils2 = _interopRequireDefault(_testUtils);
1414

1515
var _index = require("./index");
1616

1717
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1818

19+
// jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000
20+
1921
describe("ToastContainer", function () {
2022
var dom = void 0;
2123

@@ -42,8 +44,8 @@ describe("ToastContainer", function () {
4244
component.success("yeah,", "cool");
4345
expect(dom.firstChild.childNodes.length).not.toBe(0);
4446

45-
var toastComp = _reactAddonsTestUtils2.default.findRenderedDOMComponentWithClass(component, "toast");
46-
_reactAddonsTestUtils2.default.Simulate.click(toastComp);
47+
var toastComp = _testUtils2.default.findRenderedDOMComponentWithClass(component, "toast");
48+
_testUtils2.default.Simulate.click(toastComp);
4749

4850
setTimeout(function () {
4951
expect(dom.firstChild.childNodes.length).toBe(0);

‎lib/ToastMessage/animationMixin.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66

7-
var _ReactTransitionEvents = require("react/lib/ReactTransitionEvents");
8-
9-
var _ReactTransitionEvents2 = _interopRequireDefault(_ReactTransitionEvents);
10-
117
var _reactDom = require("react-dom");
128

139
var _reactDom2 = _interopRequireDefault(_reactDom);
@@ -16,6 +12,10 @@ var _elementClass = require("element-class");
1612

1713
var _elementClass2 = _interopRequireDefault(_elementClass);
1814

15+
var _transitionEvents = require("./transitionEvents");
16+
17+
var _transitionEvents2 = _interopRequireDefault(_transitionEvents);
18+
1919
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2020

2121
var TICK = 17;
@@ -45,11 +45,11 @@ exports.default = {
4545
var onHideComplete = function onHideComplete() {
4646
if (_this.isHiding) {
4747
_this._set_is_hiding(false);
48-
_ReactTransitionEvents2.default.removeEndEventListener(node, onHideComplete);
48+
_transitionEvents2.default.removeEndEventListener(node, onHideComplete);
4949
_this._handle_remove();
5050
}
5151
};
52-
_ReactTransitionEvents2.default.addEndEventListener(node, onHideComplete);
52+
_transitionEvents2.default.addEndEventListener(node, onHideComplete);
5353

5454
if (this.props.timeOut > 0) {
5555
this._set_interval_id(setTimeout(this.hideToast, this.props.timeOut));
@@ -76,10 +76,10 @@ exports.default = {
7676
classList.remove(className);
7777
classList.remove(activeClassName);
7878

79-
_ReactTransitionEvents2.default.removeEndEventListener(node, endListener);
79+
_transitionEvents2.default.removeEndEventListener(node, endListener);
8080
};
8181

82-
_ReactTransitionEvents2.default.addEndEventListener(node, endListener);
82+
_transitionEvents2.default.addEndEventListener(node, endListener);
8383

8484
(0, _elementClass2.default)(node).add(className);
8585

@@ -108,10 +108,10 @@ exports.default = {
108108
return (0, _elementClass2.default)(node).remove(anim);
109109
});
110110

111-
_ReactTransitionEvents2.default.removeEndEventListener(node, endListener);
111+
_transitionEvents2.default.removeEndEventListener(node, endListener);
112112
};
113113

114-
_ReactTransitionEvents2.default.addEndEventListener(node, endListener);
114+
_transitionEvents2.default.addEndEventListener(node, endListener);
115115

116116
animations.forEach(function (anim) {
117117
return (0, _elementClass2.default)(node).add(anim);

‎lib/ToastMessage/index.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ var _react = require("react");
99

1010
var _react2 = _interopRequireDefault(_react);
1111

12-
var _reactAddonsUpdate = require("react-addons-update");
12+
var _createReactClass = require("create-react-class");
1313

14-
var _reactAddonsUpdate2 = _interopRequireDefault(_reactAddonsUpdate);
14+
var _createReactClass2 = _interopRequireDefault(_createReactClass);
15+
16+
var _immutabilityHelper = require("immutability-helper");
17+
18+
var _immutabilityHelper2 = _interopRequireDefault(_immutabilityHelper);
1519

1620
var _classnames = require("classnames");
1721

@@ -102,12 +106,12 @@ var ToastMessageSpec = {
102106
}
103107
};
104108

105-
var animation = exports.animation = _react2.default.createClass((0, _reactAddonsUpdate2.default)(ToastMessageSpec, {
109+
var animation = exports.animation = (0, _createReactClass2.default)((0, _immutabilityHelper2.default)(ToastMessageSpec, {
106110
displayName: { $set: "ToastMessage.animation" },
107111
mixins: { $set: [_animationMixin2.default] }
108112
}));
109113

110-
var jQuery = exports.jQuery = _react2.default.createClass((0, _reactAddonsUpdate2.default)(ToastMessageSpec, {
114+
var jQuery = exports.jQuery = (0, _createReactClass2.default)((0, _immutabilityHelper2.default)(ToastMessageSpec, {
111115
displayName: { $set: "ToastMessage.jQuery" },
112116
mixins: { $set: [_jQueryMixin2.default] }
113117
}));
@@ -119,7 +123,7 @@ ToastMessageSpec.handleMouseEnter = noop;
119123
ToastMessageSpec.handleMouseLeave = noop;
120124
ToastMessageSpec.hideToast = noop;
121125

122-
var ToastMessage = _react2.default.createClass(ToastMessageSpec);
126+
var ToastMessage = (0, _createReactClass2.default)(ToastMessageSpec);
123127

124128
ToastMessage.animation = animation;
125129
ToastMessage.jQuery = jQuery;

‎lib/ToastMessage/transitionEvents.js

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
"use strict";
2+
3+
Object.defineProperty(exports, "__esModule", {
4+
value: true
5+
});
6+
var endEvents = [];
7+
8+
var EVENTS = {
9+
transitionend: {
10+
transition: "transitionend",
11+
WebkitTransition: "webkitTransitionEnd",
12+
MozTransition: "mozTransitionEnd",
13+
msTransition: "MSTransitionEnd",
14+
OTransition: "oTransitionEnd"
15+
},
16+
17+
animationend: {
18+
animation: "animationend",
19+
WebkitAnimation: "webkitAnimationEnd",
20+
MozAnimation: "mozAnimationEnd",
21+
msAnimation: "MSAnimationEnd",
22+
OAnimation: "oAnimationEnd"
23+
}
24+
};
25+
26+
if (typeof window !== "undefined") {
27+
var style = document.createElement("div").style;
28+
for (var eventType in EVENTS) {
29+
if (!EVENTS.hasOwnProperty(eventType)) {
30+
continue;
31+
}
32+
var prefixes = EVENTS[eventType];
33+
for (var styleProp in prefixes) {
34+
if (prefixes.hasOwnProperty(styleProp) && styleProp in style) {
35+
endEvents.push(prefixes[styleProp]);
36+
break;
37+
}
38+
}
39+
}
40+
}
41+
42+
var TransitionEvents = {
43+
addEndEventListener: function addEndEventListener(node, eventListener) {
44+
if (endEvents.length === 0) {
45+
setTimeout(eventListener, 0);
46+
return;
47+
}
48+
endEvents.forEach(function (event) {
49+
node.addEventListener(event, eventListener, false);
50+
});
51+
},
52+
53+
removeEndEventListener: function removeEndEventListener(node, eventListener) {
54+
if (endEvents.length === 0) {
55+
return;
56+
}
57+
endEvents.forEach(function (event) {
58+
node.removeEventListener(event, eventListener, false);
59+
});
60+
}
61+
};
62+
63+
exports.default = TransitionEvents;

0 commit comments

Comments
 (0)