Skip to content

Commit 3186f4c

Browse files
author
jim
committed
Cleanup and bug fixes for merge.
1 parent 574328a commit 3186f4c

File tree

5 files changed

+97
-47
lines changed

5 files changed

+97
-47
lines changed

‎src/renderers/dom/client/wrappers/ReactDOMInput.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ var ReactDOMInput = {
7575
}, props, {
7676
defaultChecked: undefined,
7777
defaultValue: undefined,
78-
value: value != null ? value : props.defaultValue,
78+
value: value != null ? value : inst._wrapperState.initialValue,
7979
checked: checked != null ? checked : inst._wrapperState.initialChecked,
8080
onChange: inst._wrapperState.onChange,
8181
});
@@ -138,8 +138,10 @@ var ReactDOMInput = {
138138
warnIfValueIsNull(props);
139139
}
140140

141+
var defaultValue = props.defaultValue;
141142
inst._wrapperState = {
142143
initialChecked: props.defaultChecked || false,
144+
initialValue: props.value ? props.value : defaultValue,
143145
listeners: null,
144146
onChange: _handleChange.bind(inst),
145147
};
@@ -217,6 +219,18 @@ var ReactDOMInput = {
217219
}
218220
}
219221
},
222+
223+
finishMounting: function() {
224+
var inst = this;
225+
var props = inst._currentElement.props;
226+
if (!props.value && props.defaultValue) {
227+
invariant(inst._rootNodeID, 'Must be mounted to initialize initial input value');
228+
var node = ReactDOMComponentTree.getNodeFromInstance(inst);
229+
var tmp = node.value;
230+
node.defaultValue = ''+props.defaultValue;
231+
node.value = tmp;
232+
}
233+
},
220234
};
221235

222236
function _handleChange(event) {

‎src/renderers/dom/client/wrappers/ReactDOMTextarea.js

Lines changed: 50 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -66,44 +66,12 @@ var ReactDOMTextarea = {
6666

6767
var value = LinkedValueUtils.getValue(props);
6868

69-
// only bother fetching default value if we're going to use it
70-
if (value == null) {
71-
var defaultValue = props.defaultValue;
72-
// TODO (yungsters): Remove support for children content in <textarea>.
73-
var children = props.children;
74-
if (children != null) {
75-
if (__DEV__) {
76-
warning(
77-
false,
78-
'Use the `defaultValue` or `value` props instead of setting ' +
79-
'children on <textarea>.'
80-
);
81-
}
82-
invariant(
83-
defaultValue == null,
84-
'If you supply `defaultValue` on a <textarea>, do not pass children.'
85-
);
86-
if (Array.isArray(children)) {
87-
invariant(
88-
children.length <= 1,
89-
'<textarea> can only have at most one child.'
90-
);
91-
children = children[0];
92-
}
93-
94-
defaultValue = '' + children;
95-
}
96-
if (defaultValue == null) {
97-
defaultValue = '';
98-
}
99-
}
100-
10169
// The value can be a boolean or object so that's why it's
10270
// forced to be a string.
10371
var nativeProps = Object.assign({}, props, {
104-
defaultValue: '' + (value != null ? value : defaultValue),
10572
value: undefined,
106-
children: undefined,
73+
defaultValue: undefined,
74+
children: '' + (value != null ? value : inst._wrapperState.initialValue),
10775
onChange: inst._wrapperState.onChange,
10876
});
10977

@@ -142,7 +110,43 @@ var ReactDOMTextarea = {
142110
warnIfValueIsNull(props);
143111
}
144112

113+
114+
var value = LinkedValueUtils.getValue(props);
115+
116+
// only bother fetching default value if we're going to use it
117+
if (value == null) {
118+
var defaultValue = props.defaultValue;
119+
// TODO (yungsters): Remove support for children content in <textarea>.
120+
var children = props.children;
121+
if (children != null) {
122+
if (__DEV__) {
123+
warning(
124+
false,
125+
'Use the `defaultValue` or `value` props instead of setting ' +
126+
'children on <textarea>.'
127+
);
128+
}
129+
invariant(
130+
defaultValue == null,
131+
'If you supply `defaultValue` on a <textarea>, do not pass children.'
132+
);
133+
if (Array.isArray(children)) {
134+
invariant(
135+
children.length <= 1,
136+
'<textarea> can only have at most one child.'
137+
);
138+
children = children[0];
139+
}
140+
141+
defaultValue = '' + children;
142+
}
143+
if (defaultValue == null) {
144+
defaultValue = '';
145+
}
146+
}
147+
145148
inst._wrapperState = {
149+
initialValue: '' + (value != null ? value : defaultValue),
146150
listeners: null,
147151
onChange: _handleChange.bind(inst),
148152
};
@@ -169,6 +173,18 @@ var ReactDOMTextarea = {
169173
}
170174
}
171175
},
176+
177+
finishMounting: function() {
178+
var inst = this;
179+
var props = inst._currentElement.props;
180+
if (props.value == null && props.defaultValue) {
181+
invariant(inst._rootNodeID, 'Must be mounted to initialize initial input value');
182+
var node = ReactDOMComponentTree.getNodeFromInstance(inst);
183+
var tmp = node.innerHTML;
184+
node.defaultValue = ''+props.defaultValue;
185+
node.innerHTML = tmp;
186+
}
187+
},
172188
};
173189

174190
function _handleChange(event) {

‎src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ describe('ReactDOMInput', function() {
1818
var EventConstants;
1919
var React;
2020
var ReactDOM;
21+
var ReactDOMServer;
2122
var ReactDOMFeatureFlags;
2223
var ReactLink;
2324
var ReactTestUtils;
@@ -27,6 +28,7 @@ describe('ReactDOMInput', function() {
2728
EventConstants = require('EventConstants');
2829
React = require('React');
2930
ReactDOM = require('ReactDOM');
31+
ReactDOMServer = require('ReactDOMServer');
3032
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
3133
ReactLink = require('ReactLink');
3234
ReactTestUtils = require('ReactTestUtils');
@@ -67,7 +69,7 @@ describe('ReactDOMInput', function() {
6769

6870
ReactDOM.render(<input type="text" defaultValue="1" />, container);
6971

70-
expect(node.value).toBe('1');
72+
expect(node.value).toBe('0');
7173
});
7274

7375
it('should take `defaultValue` when changing to uncontrolled input', function() {
@@ -79,7 +81,14 @@ describe('ReactDOMInput', function() {
7981

8082
ReactDOM.render(<input type="text" defaultValue="1" />, container);
8183

82-
expect(node.value).toBe('1');
84+
expect(node.value).toBe('0');
85+
});
86+
87+
it('should render value for SSR', function() {
88+
var image = ReactDOMServer.renderToString(<input type="text" defaultValue="1" />);
89+
var div = document.createElement('div');
90+
div.innerHTML = image;
91+
expect(div.firstChild.getAttribute('value')).toBe('1');
8392
});
8493

8594
it('should display "foobar" for `defaultValue` of `objToString`', function() {

‎src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ var emptyFunction = require('emptyFunction');
1616
describe('ReactDOMTextarea', function() {
1717
var React;
1818
var ReactDOM;
19+
var ReactDOMServer;
1920
var ReactLink;
2021
var ReactTestUtils;
2122

@@ -24,6 +25,7 @@ describe('ReactDOMTextarea', function() {
2425
beforeEach(function() {
2526
React = require('React');
2627
ReactDOM = require('ReactDOM');
28+
ReactDOMServer = require('ReactDOMServer');
2729
ReactLink = require('ReactLink');
2830
ReactTestUtils = require('ReactTestUtils');
2931

@@ -50,7 +52,7 @@ describe('ReactDOMTextarea', function() {
5052

5153
// Changing `defaultValue` should change if no value set.
5254
renderTextarea(<textarea defaultValue="gorilla" />, container, true);
53-
expect(node.value).toEqual('gorilla');
55+
expect(node.value).toEqual('giraffe');
5456

5557
node.value = 'cat';
5658

@@ -113,6 +115,13 @@ describe('ReactDOMTextarea', function() {
113115
expect(node.value).toEqual('gorilla');
114116
});
115117

118+
it('should render value for SSR', function() {
119+
var image = ReactDOMServer.renderToString(<textarea defaultValue="1" />);
120+
var div = document.createElement('div');
121+
div.innerHTML = image;
122+
expect(div.firstChild.innerHTML).toBe('1');
123+
});
124+
116125
it('should allow setting `value` to `true`', function() {
117126
var container = document.createElement('div');
118127
var stub = <textarea value="giraffe" onChange={emptyFunction} />;
@@ -163,27 +172,27 @@ describe('ReactDOMTextarea', function() {
163172
it('should take updates to `defaultValue` for uncontrolled textarea', function() {
164173
var container = document.createElement('div');
165174

166-
var node = ReactDOM.render(<textarea type="text" defaultValue="0" />, container);
175+
var node = ReactDOM.render(<textarea defaultValue="0" />, container);
167176

168177
expect(node.value).toBe('0');
169178

170-
ReactDOM.render(<textarea type="text" defaultValue="1" />, container);
179+
ReactDOM.render(<textarea defaultValue="1" />, container);
171180

172-
expect(node.value).toBe('1');
181+
expect(node.value).toBe('0');
173182
});
174183

175184
it('should take updates to children in lieu of `defaultValue` for uncontrolled textarea', function() {
176185
var container = document.createElement('div');
177186

178-
var node = ReactDOM.render(<textarea type="text" defaultValue="0" />, container);
187+
var node = ReactDOM.render(<textarea defaultValue="0" />, container);
179188

180189
expect(node.value).toBe('0');
181190

182191
spyOn(console, 'error'); // deprecation warning for `children` content
183192

184-
ReactDOM.render(<textarea type="text">1</textarea>, container);
193+
ReactDOM.render(<textarea>1</textarea>, container);
185194

186-
expect(node.value).toBe('1');
195+
expect(node.value).toBe('0');
187196
});
188197

189198
it('should not incur unnecessary DOM mutations', function() {
@@ -228,9 +237,9 @@ describe('ReactDOMTextarea', function() {
228237
expect(console.error.argsForCall.length).toBe(1);
229238
expect(node.value).toBe('giraffe');
230239

231-
// Changing children should cause value to change (new behavior of `defaultValue`)
240+
// Changing children should do nothing, it functions like `defaultValue`.
232241
stub = ReactDOM.render(<textarea>gorilla</textarea>, container);
233-
expect(node.value).toEqual('gorilla');
242+
expect(node.value).toEqual('giraffe');
234243
});
235244

236245
it('should not keep value when switching to uncontrolled element if not changed', function() {
@@ -242,7 +251,7 @@ describe('ReactDOMTextarea', function() {
242251

243252
ReactDOM.render(<textarea defaultValue="gorilla"></textarea>, container);
244253

245-
expect(node.value).toEqual('gorilla');
254+
expect(node.value).toEqual('kitten');
246255
});
247256

248257
it('should keep value when switching to uncontrolled element if changed', function() {

‎src/renderers/dom/shared/ReactDOMComponent.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ ReactDOMComponent.Mixin = {
488488
ReactDOMInput.mountWrapper(this, props, nativeParent);
489489
props = ReactDOMInput.getNativeProps(this, props);
490490
transaction.getReactMountReady().enqueue(trapBubbledEventsLocal, this);
491+
transaction.getReactMountReady().enqueue(ReactDOMInput.finishMounting, this);
491492
break;
492493
case 'option':
493494
ReactDOMOption.mountWrapper(this, props, nativeParent);
@@ -502,6 +503,7 @@ ReactDOMComponent.Mixin = {
502503
ReactDOMTextarea.mountWrapper(this, props, nativeParent);
503504
props = ReactDOMTextarea.getNativeProps(this, props);
504505
transaction.getReactMountReady().enqueue(trapBubbledEventsLocal, this);
506+
transaction.getReactMountReady().enqueue(ReactDOMTextarea.finishMounting, this);
505507
break;
506508
}
507509

0 commit comments

Comments
 (0)