@@ -6,8 +6,6 @@ let emptyObject = Js.Obj.empty ();
6
6
7
7
var _invariant = require('fbjs/lib/invariant');
8
8
9
- var MIXINS_KEY = 'mixins';
10
-
11
9
// Helper function to allow the creation of anonymous functions which do not
12
10
// have .name set to the name of the variable being assigned to.
13
11
function identity(fn) {
@@ -291,13 +289,6 @@ function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) {
291
289
displayName: function(Constructor, displayName) {
292
290
Constructor.displayName = displayName;
293
291
},
294
- mixins: function(Constructor, mixins) {
295
- if (mixins) {
296
- for (var i = 0; i < mixins.length; i++) {
297
- mixSpecIntoComponent(Constructor, mixins[i]);
298
- }
299
- }
300
- },
301
292
childContextTypes: function(Constructor, childContextTypes) {
302
293
Constructor.childContextTypes = _assign(
303
294
{},
@@ -384,23 +375,11 @@ function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) {
384
375
var proto = Constructor.prototype;
385
376
var autoBindPairs = proto.__reactAutoBindPairs;
386
377
387
- // By handling mixins before any other properties, we ensure the same
388
- // chaining order is applied to methods with DEFINE_MANY policy, whether
389
- // mixins are listed before or after these methods in the spec.
390
- if (spec.hasOwnProperty(MIXINS_KEY)) {
391
- RESERVED_SPEC_KEYS.mixins(Constructor, spec.mixins);
392
- }
393
-
394
378
for (var name in spec) {
395
379
if (!spec.hasOwnProperty(name)) {
396
380
continue;
397
381
}
398
382
399
- if (name === MIXINS_KEY) {
400
- // We have already handled mixins in a special case above.
401
- continue;
402
- }
403
-
404
383
var property = spec[name];
405
384
var isAlreadyDefined = proto.hasOwnProperty(name);
406
385
validateMethodOverride(isAlreadyDefined, name);
0 commit comments