mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Revert "Removed setProps and replaceProps (both previously deprecated)"
This reverts commit 721fe73541. We'll keep these with a warning for one more release.
This commit is contained in:
1 parent
2d86486fd1
commit
4eb889b72e
16 files changed
+386
-45
No files matched your search
@@ -121,9 +121,9 @@ describe('ReactContextValidator', function() {
|
||||
},
|
||||
});
|
||||
|
||||
var container = document.createElement('div');
|
||||
React.render(<Parent foo="abc" />, container);
|
||||
React.render(<Parent foo="def" />, container);
|
||||
var instance = <Parent foo="abc" />;
|
||||
instance = ReactTestUtils.renderIntoDocument(instance);
|
||||
instance.replaceProps({foo: 'def'});
|
||||
expect(actualComponentWillReceiveProps).toEqual({foo: 'def'});
|
||||
expect(actualShouldComponentUpdate).toEqual({foo: 'def'});
|
||||
expect(actualComponentWillUpdate).toEqual({foo: 'def'});
|
||||
|
||||
@@ -728,6 +728,38 @@ var ReactClassMixin = {
|
||||
isMounted: function() {
|
||||
return this.updater.isMounted(this);
|
||||
},
|
||||
|
||||
/**
|
||||
* Sets a subset of the props.
|
||||
*
|
||||
* @param {object} partialProps Subset of the next props.
|
||||
* @param {?function} callback Called after props are updated.
|
||||
* @final
|
||||
* @public
|
||||
* @deprecated
|
||||
*/
|
||||
setProps: function(partialProps, callback) {
|
||||
this.updater.enqueueSetProps(this, partialProps);
|
||||
if (callback) {
|
||||
this.updater.enqueueCallback(this, callback);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Replace all the props.
|
||||
*
|
||||
* @param {object} newProps Subset of the next props.
|
||||
* @param {?function} callback Called after props are updated.
|
||||
* @final
|
||||
* @public
|
||||
* @deprecated
|
||||
*/
|
||||
replaceProps: function(newProps, callback) {
|
||||
this.updater.enqueueReplaceProps(this, newProps);
|
||||
if (callback) {
|
||||
this.updater.enqueueCallback(this, callback);
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
var ReactClassComponent = function() {};
|
||||
|
||||
@@ -112,11 +112,19 @@ if (__DEV__) {
|
||||
'Instead, make sure to clean up subscriptions and pending requests in ' +
|
||||
'componentWillUnmount to prevent memory leaks.',
|
||||
],
|
||||
replaceProps: [
|
||||
'replaceProps',
|
||||
'Instead, call React.render again at the top level.',
|
||||
],
|
||||
replaceState: [
|
||||
'replaceState',
|
||||
'Refactor your code to use setState instead (see ' +
|
||||
'https://github.com/facebook/react/issues/3236).',
|
||||
],
|
||||
setProps: [
|
||||
'setProps',
|
||||
'Instead, call React.render again at the top level.',
|
||||
],
|
||||
};
|
||||
var defineDeprecationWarning = function(methodName, info) {
|
||||
try {
|
||||
|
||||
@@ -98,6 +98,29 @@ var ReactNoopUpdateQueue = {
|
||||
enqueueSetState: function(publicInstance, partialState) {
|
||||
warnTDZ(publicInstance, 'setState');
|
||||
},
|
||||
|
||||
/**
|
||||
* Sets a subset of the props.
|
||||
*
|
||||
* @param {ReactClass} publicInstance The instance that should rerender.
|
||||
* @param {object} partialProps Subset of the next props.
|
||||
* @internal
|
||||
*/
|
||||
enqueueSetProps: function(publicInstance, partialProps) {
|
||||
warnTDZ(publicInstance, 'setProps');
|
||||
},
|
||||
|
||||
/**
|
||||
* Replaces all of the props.
|
||||
*
|
||||
* @param {ReactClass} publicInstance The instance that should rerender.
|
||||
* @param {object} props New props.
|
||||
* @internal
|
||||
*/
|
||||
enqueueReplaceProps: function(publicInstance, props) {
|
||||
warnTDZ(publicInstance, 'replaceProps');
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
module.exports = ReactNoopUpdateQueue;
|
||||
@@ -346,7 +346,9 @@ describe 'ReactCoffeeScriptClass', ->
|
||||
expect(-> instance.getDOMNode()).toThrow()
|
||||
expect(-> instance.replaceState {}).toThrow()
|
||||
expect(-> instance.isMounted()).toThrow()
|
||||
expect(console.error.calls.length).toBe 3
|
||||
expect(-> instance.setProps name: 'bar').toThrow()
|
||||
expect(-> instance.replaceProps name: 'bar').toThrow()
|
||||
expect(console.error.calls.length).toBe 5
|
||||
expect(console.error.calls[0].args[0]).toContain(
|
||||
'getDOMNode(...) is deprecated in plain JavaScript React classes'
|
||||
)
|
||||
@@ -356,6 +358,12 @@ describe 'ReactCoffeeScriptClass', ->
|
||||
expect(console.error.calls[2].args[0]).toContain(
|
||||
'isMounted(...) is deprecated in plain JavaScript React classes'
|
||||
)
|
||||
expect(console.error.calls[3].args[0]).toContain(
|
||||
'setProps(...) is deprecated in plain JavaScript React classes'
|
||||
)
|
||||
expect(console.error.calls[4].args[0]).toContain(
|
||||
'replaceProps(...) is deprecated in plain JavaScript React classes'
|
||||
)
|
||||
|
||||
it 'supports this.context passed via getChildContext', ->
|
||||
class Bar
|
||||
|
||||
@@ -404,7 +404,9 @@ describe('ReactES6Class', function() {
|
||||
expect(() => instance.getDOMNode()).toThrow();
|
||||
expect(() => instance.replaceState({})).toThrow();
|
||||
expect(() => instance.isMounted()).toThrow();
|
||||
expect(console.error.calls.length).toBe(3);
|
||||
expect(() => instance.setProps({name: 'bar'})).toThrow();
|
||||
expect(() => instance.replaceProps({name: 'bar'})).toThrow();
|
||||
expect(console.error.calls.length).toBe(5);
|
||||
expect(console.error.calls[0].args[0]).toContain(
|
||||
'getDOMNode(...) is deprecated in plain JavaScript React classes. ' +
|
||||
'Use React.findDOMNode(component) instead.'
|
||||
@@ -415,6 +417,12 @@ describe('ReactES6Class', function() {
|
||||
expect(console.error.calls[2].args[0]).toContain(
|
||||
'isMounted(...) is deprecated in plain JavaScript React classes'
|
||||
);
|
||||
expect(console.error.calls[3].args[0]).toContain(
|
||||
'setProps(...) is deprecated in plain JavaScript React classes'
|
||||
);
|
||||
expect(console.error.calls[4].args[0]).toContain(
|
||||
'replaceProps(...) is deprecated in plain JavaScript React classes'
|
||||
);
|
||||
});
|
||||
|
||||
it('supports this.context passed via getChildContext', function() {
|
||||
|
||||
@@ -492,7 +492,9 @@ describe('ReactTypeScriptClass', function() {
|
||||
expect(() => instance.getDOMNode()).toThrow();
|
||||
expect(() => instance.replaceState({})).toThrow();
|
||||
expect(() => instance.isMounted()).toThrow();
|
||||
expect((<any>console.error).argsForCall.length).toBe(3);
|
||||
expect(() => instance.setProps({ name: 'bar' })).toThrow();
|
||||
expect(() => instance.replaceProps({ name: 'bar' })).toThrow();
|
||||
expect((<any>console.error).argsForCall.length).toBe(5);
|
||||
expect((<any>console.error).argsForCall[0][0]).toContain(
|
||||
'getDOMNode(...) is deprecated in plain JavaScript React classes'
|
||||
);
|
||||
@@ -502,6 +504,12 @@ describe('ReactTypeScriptClass', function() {
|
||||
expect((<any>console.error).argsForCall[2][0]).toContain(
|
||||
'isMounted(...) is deprecated in plain JavaScript React classes'
|
||||
);
|
||||
expect((<any>console.error).argsForCall[3][0]).toContain(
|
||||
'setProps(...) is deprecated in plain JavaScript React classes'
|
||||
);
|
||||
expect((<any>console.error).argsForCall[4][0]).toContain(
|
||||
'replaceProps(...) is deprecated in plain JavaScript React classes'
|
||||
);
|
||||
});
|
||||
|
||||
it('supports this.context passed via getChildContext', function() {
|
||||
|
||||
Reference in new issue
Block a user