Skip to content

Commit 13ed031

Browse files
committed
Remove some invariants and deadcode
These are not necessary if we enable type checks. Static or dynamic. They're distracting my greppability. Also, some dead code in shallow rendering.
1 parent df87ea1 commit 13ed031

File tree

4 files changed

+5
-38
lines changed

4 files changed

+5
-38
lines changed

src/browser/ui/ReactDOMComponent.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ ReactDOMComponent.Mixin = {
172172
* @return {string} The computed markup.
173173
*/
174174
mountComponent: function(rootID, transaction, mountDepth, context) {
175-
invariant(context !== undefined, "Context is required parameter");
176175
ReactComponent.Mixin.mountComponent.call(
177176
this,
178177
rootID,
@@ -287,7 +286,6 @@ ReactDOMComponent.Mixin = {
287286
},
288287

289288
receiveComponent: function(nextElement, transaction, context) {
290-
invariant(context !== undefined, "Context is required parameter");
291289
if (nextElement === this._currentElement &&
292290
nextElement._owner != null) {
293291
// Since elements are immutable after the owner is rendered,
@@ -316,8 +314,6 @@ ReactDOMComponent.Mixin = {
316314
* @overridable
317315
*/
318316
updateComponent: function(transaction, prevElement, nextElement, context) {
319-
if(context === undefined) throw new Error("Context required for mounting");
320-
if(context === null) throw new Error("Assert: context is not null");
321317
assertValidProps(this._currentElement.props);
322318
ReactComponent.Mixin.updateComponent.call(
323319
this,
@@ -435,7 +431,6 @@ ReactDOMComponent.Mixin = {
435431
* @param {ReactReconcileTransaction} transaction
436432
*/
437433
_updateDOMChildren: function(lastProps, transaction, context) {
438-
invariant(context !== undefined, "Context is required parameter");
439434
var nextProps = this._currentElement.props;
440435

441436
var lastContent =

src/core/ReactComponent.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ var ReactComponent = {
108108
* @internal
109109
*/
110110
mountComponent: function(rootID, transaction, mountDepth, context) {
111-
invariant(context !== undefined, "Context is required parameter");
112111
var ref = this._currentElement.ref;
113112
if (ref != null) {
114113
var owner = this._currentElement._owner;
@@ -144,7 +143,6 @@ var ReactComponent = {
144143
* @internal
145144
*/
146145
updateComponent: function(transaction, prevElement, nextElement, context) {
147-
invariant(context !== undefined, "Context is required parameter");
148146
// If either the owner or a `ref` has changed, make sure the newest owner
149147
// has stored a reference to `this`, and the previous owner (if different)
150148
// has forgotten the reference to `this`. We use the element instead

src/core/ReactCompositeComponent.js

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ var ReactCompositeComponentMixin = assign({},
158158
* @internal
159159
*/
160160
mountComponent: function(rootID, transaction, mountDepth, context) {
161-
invariant(context !== undefined, "Context is required parameter");
162161
ReactComponent.Mixin.mountComponent.call(
163162
this,
164163
rootID,
@@ -520,7 +519,6 @@ var ReactCompositeComponentMixin = assign({},
520519
},
521520

522521
receiveComponent: function(nextElement, transaction, context) {
523-
invariant(context !== undefined, "Context is required parameter");
524522
if (nextElement === this._currentElement &&
525523
nextElement._owner != null) {
526524
// Since elements are immutable after the owner is rendered,
@@ -589,8 +587,6 @@ var ReactCompositeComponentMixin = assign({},
589587
* TODO: Remove this check when owner-context is removed
590588
*/
591589
_warnIfContextsDiffer: function(ownerBasedContext, parentBasedContext) {
592-
invariant(ownerBasedContext !== undefined, "Owner based context is required parameter");
593-
invariant(parentBasedContext !== undefined, "Parent based ontext is required parameter");
594590
var ownerKeys = Object.keys(ownerBasedContext).sort();
595591
var parentKeys = Object.keys(parentBasedContext).sort();
596592
if (ownerKeys.length != parentKeys.length || ownerKeys.toString() != parentKeys.toString()) {
@@ -720,8 +716,6 @@ var ReactCompositeComponentMixin = assign({},
720716
transaction,
721717
unmaskedContext
722718
) {
723-
invariant(unmaskedContext !== undefined, "Context required for mounting");
724-
invariant(unmaskedContext !== null, "Context must be non-null");
725719
var inst = this._instance;
726720

727721
var prevProps = inst.props;
@@ -755,7 +749,6 @@ var ReactCompositeComponentMixin = assign({},
755749
* @internal
756750
*/
757751
_updateRenderedComponent: function(transaction, context) {
758-
invariant(context !== undefined, "Context is required parameter");
759752
var prevComponentInstance = this._renderedComponent;
760753
var prevRenderedElement = prevComponentInstance._currentElement;
761754
var nextRenderedElement = this._renderValidatedComponent();
@@ -968,25 +961,11 @@ var ShallowMixin = assign({},
968961
var prevComponentInstance = this._renderedComponent;
969962
var prevRenderedElement = prevComponentInstance._currentElement;
970963
// Use the without-owner-or-context variant of _rVC below:
971-
var nextRenderedElement = this._renderValidatedComponentWithoutOwnerOrContext();
972-
if (shouldUpdateReactComponent(prevRenderedElement, nextRenderedElement)) {
973-
prevComponentInstance.receiveComponent(
974-
nextRenderedElement,
975-
transaction
976-
);
977-
} else {
978-
// These two IDs are actually the same! But nothing should rely on that.
979-
var thisID = this._rootNodeID;
980-
var prevComponentID = prevComponentInstance._rootNodeID;
981-
// Don't unmount previous instance since it was never mounted, due to
982-
// shallow render.
983-
//prevComponentInstance.unmountComponent();
984-
this._renderedComponent = nextRenderedElement;
985-
// ^ no instantiateReactComponent
986-
//
987-
// no recursive mountComponent
988-
return nextRenderedElement;
989-
}
964+
var nextRenderedElement =
965+
this._renderValidatedComponentWithoutOwnerOrContext();
966+
// This is a noop in shallow render
967+
shouldUpdateReactComponent(prevRenderedElement, nextRenderedElement);
968+
this._renderedComponent = nextRenderedElement;
990969
}
991970

992971
});

src/core/ReactMultiChild.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ var ReactMultiChildUpdateTypes = require('ReactMultiChildUpdateTypes');
1717

1818
var flattenChildren = require('flattenChildren');
1919
var instantiateReactComponent = require('instantiateReactComponent');
20-
var invariant = require('invariant');
2120
var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
2221

2322
/**
@@ -180,7 +179,6 @@ var ReactMultiChild = {
180179
* @internal
181180
*/
182181
mountChildren: function(nestedChildren, transaction, context) {
183-
invariant(context !== undefined, "Context is required parameter");
184182
var children = flattenChildren(nestedChildren);
185183
var mountImages = [];
186184
var index = 0;
@@ -244,7 +242,6 @@ var ReactMultiChild = {
244242
* @internal
245243
*/
246244
updateChildren: function(nextNestedChildren, transaction, context) {
247-
invariant(context !== undefined, "Context is required parameter");
248245
updateDepth++;
249246
var errorThrown = true;
250247
try {
@@ -268,7 +265,6 @@ var ReactMultiChild = {
268265
* @protected
269266
*/
270267
_updateChildren: function(nextNestedChildren, transaction, context) {
271-
invariant(context !== undefined, "Context is required parameter");
272268
var nextChildren = flattenChildren(nextNestedChildren);
273269
var prevChildren = this._renderedChildren;
274270
if (!nextChildren && !prevChildren) {
@@ -400,7 +396,6 @@ var ReactMultiChild = {
400396
index,
401397
transaction,
402398
context) {
403-
invariant(context !== undefined, "Context is required parameter");
404399
// Inlined for performance, see `ReactInstanceHandles.createReactID`.
405400
var rootID = this._rootNodeID + name;
406401
var mountImage = child.mountComponent(

0 commit comments

Comments
 (0)