Un-mixin ReactBrowserComponentMixin from ReactTextComponent
Andreas Svensson committed
May 25, 2014 at 11:19 UTC
14ba6ee78807b1a64d09b86a39e0125ebbf4f7eb
2 files changed
+16
-9
src/browser/ReactTextComponent.js
-1
@@ -47,7 +47,6 @@ var ReactTextComponent = function(props) {
47
};
48
49
mixInto(ReactTextComponent, ReactComponent.Mixin);
50
-mixInto(ReactTextComponent, ReactBrowserComponentMixin);
50
mixInto(ReactTextComponent, {
51
52
/**
src/core/__tests__/ReactMultiChildText-test.js
+16
-8
@@ -58,8 +58,9 @@ var updateChildren = function(d, children) {
58
};
59
60
var expectChildren = function(d, children) {
61
+ var textNode;
62
if (typeof children === 'string') {
62
- var textNode = d.getDOMNode().firstChild;
63
+ textNode = d.getDOMNode().firstChild;
64
65
if (children === '') {
66
expect(textNode != null).toBe(false);
@@ -75,13 +76,20 @@ var expectChildren = function(d, children) {
76
var child = children[i];
77
78
if (typeof child === 'string') {
78
- var textWrapperNode =
79
- reactComponentExpect(d)
80
- .expectRenderedChildAt(i)
81
- .toBeTextComponent()
82
- .instance();
83
-
84
- expectChildren(textWrapperNode, child);
79
+ reactComponentExpect(d)
80
+ .expectRenderedChildAt(i)
81
+ .toBeTextComponent()
82
+ .instance();
83
+
84
+ textNode = d.getDOMNode().childNodes[i].firstChild;
85
+
86
+ if (child === '') {
87
+ expect(textNode != null).toBe(false);
88
+ } else {
89
+ expect(textNode != null).toBe(true);
90
+ expect(textNode.nodeType).toBe(3);
91
+ expect(textNode.data).toBe('' + child);
92
+ }
93
} else {
94
var elementDOMNode =
95
reactComponentExpect(d)