From 03ae0a906b8cf168361113a2afe56f482fe4de66 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Sun, 16 Nov 2014 01:54:51 -0800 Subject: [PATCH] Drop ReactOwner.Mixin This is not used anywhere else. To avoid overabstraction we should just inline this. --- src/core/ReactCompositeComponent.js | 33 ++++++++++++++++++++--- src/core/ReactOwner.js | 41 ----------------------------- 2 files changed, 29 insertions(+), 45 deletions(-) diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js index 7d5e66e5fe..58bc4475b4 100644 --- a/src/core/ReactCompositeComponent.js +++ b/src/core/ReactCompositeComponent.js @@ -16,12 +16,12 @@ var ReactContext = require('ReactContext'); var ReactCurrentOwner = require('ReactCurrentOwner'); var ReactElement = require('ReactElement'); var ReactInstanceMap = require('ReactInstanceMap'); -var ReactOwner = require('ReactOwner'); var ReactPerf = require('ReactPerf'); var ReactPropTypeLocations = require('ReactPropTypeLocations'); var ReactUpdates = require('ReactUpdates'); var assign = require('Object.assign'); +var emptyObject = require('emptyObject'); var invariant = require('invariant'); var keyMirror = require('keyMirror'); var shouldUpdateReactComponent = require('shouldUpdateReactComponent'); @@ -100,8 +100,7 @@ var CompositeLifeCycle = keyMirror({ * @lends {ReactCompositeComponent.prototype} */ var ReactCompositeComponentMixin = assign({}, - ReactComponent.Mixin, - ReactOwner.Mixin, { + ReactComponent.Mixin, { /** * Base constructor for all composite component. @@ -114,13 +113,13 @@ var ReactCompositeComponentMixin = assign({}, this._instance.props = element.props; this._instance.state = null; this._instance.context = null; + this._instance.refs = emptyObject; this._pendingState = null; this._compositeLifeCycleState = null; // Children can be either an array or more than one argument ReactComponent.Mixin.construct.apply(this, arguments); - ReactOwner.Mixin.construct.apply(this, arguments); }, /** @@ -699,6 +698,32 @@ var ReactCompositeComponentMixin = assign({}, } ), + /** + * Lazily allocates the refs object and stores `component` as `ref`. + * + * @param {string} ref Reference name. + * @param {component} component Component to store as `ref`. + * @final + * @private + */ + attachRef: function(ref, component) { + var inst = this.getPublicInstance(); + var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs; + refs[ref] = component.getPublicInstance(); + }, + + /** + * Detaches a reference name. + * + * @param {string} ref Name to dereference. + * @final + * @private + */ + detachRef: function(ref) { + var refs = this.getPublicInstance().refs; + delete refs[ref]; + }, + /** * Get the publicly accessible representation of this component - i.e. what * is exposed by refs and renderComponent. Can be null for stateless diff --git a/src/core/ReactOwner.js b/src/core/ReactOwner.js index 45f85b17bb..29da2705a9 100644 --- a/src/core/ReactOwner.js +++ b/src/core/ReactOwner.js @@ -11,7 +11,6 @@ "use strict"; -var emptyObject = require('emptyObject'); var invariant = require('invariant'); /** @@ -103,46 +102,6 @@ var ReactOwner = { if (owner.getPublicInstance().refs[ref] === component.getPublicInstance()) { owner.detachRef(ref); } - }, - - /** - * A ReactComponent must mix this in to have refs. - * - * @lends {ReactOwner.prototype} - */ - Mixin: { - - construct: function() { - var inst = this.getPublicInstance(); - inst.refs = emptyObject; - }, - - /** - * Lazily allocates the refs object and stores `component` as `ref`. - * - * @param {string} ref Reference name. - * @param {component} component Component to store as `ref`. - * @final - * @private - */ - attachRef: function(ref, component) { - var inst = this.getPublicInstance(); - var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs; - refs[ref] = component.getPublicInstance(); - }, - - /** - * Detaches a reference name. - * - * @param {string} ref Name to dereference. - * @final - * @private - */ - detachRef: function(ref) { - var refs = this.getPublicInstance().refs; - delete refs[ref]; - } - } };