From 3c6ff8d3bb9b46d64e48474b56be6688d51bcbbe Mon Sep 17 00:00:00 2001 From: Pete Cook Date: Tue, 28 Apr 2020 11:05:16 +0100 Subject: [PATCH] Rename refs to references `refs` is used internally by React Closes https://github.com/CookPete/react-player/pull/868 Closes https://github.com/CookPete/react-player/pull/866 Fixes https://github.com/CookPete/react-player/issues/867 Fixes https://github.com/CookPete/react-player/issues/861 --- src/ReactPlayer.js | 7 ++++--- test/ReactPlayer/instanceMethods.js | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ReactPlayer.js b/src/ReactPlayer.js index 923e04fa..acdd62a2 100644 --- a/src/ReactPlayer.js +++ b/src/ReactPlayer.js @@ -42,7 +42,8 @@ export default class ReactPlayer extends Component { showPreview: !!this.props.light } - refs = { + // Use references, as refs is used by React + references = { wrapper: wrapper => { this.wrapper = wrapper }, player: player => { this.player = player } } @@ -143,7 +144,7 @@ export default class ReactPlayer extends Component { + {showPreview ? this.renderPreview(url) diff --git a/test/ReactPlayer/instanceMethods.js b/test/ReactPlayer/instanceMethods.js index e0e6ea86..c84c12d7 100644 --- a/test/ReactPlayer/instanceMethods.js +++ b/test/ReactPlayer/instanceMethods.js @@ -12,7 +12,7 @@ const COMMON_METHODS = ['getDuration', 'getCurrentTime', 'getSecondsLoaded', 'ge for (const method of COMMON_METHODS) { test(`${method}()`, t => { const instance = shallow().instance() - instance.refs.player({ [method]: () => 123 }) + instance.references.player({ [method]: () => 123 }) t.true(instance[method]() === 123) }) @@ -25,14 +25,14 @@ for (const method of COMMON_METHODS) { test('getInternalPlayer() - default', t => { const instance = shallow().instance() const getInternalPlayer = sinon.fake.returns('abc') - instance.refs.player({ getInternalPlayer }) + instance.references.player({ getInternalPlayer }) t.true(instance.getInternalPlayer() === 'abc') t.true(getInternalPlayer.calledOnceWith('player')) }) test('seekTo()', t => { const instance = shallow().instance() - instance.refs.player({ seekTo: sinon.fake() }) + instance.references.player({ seekTo: sinon.fake() }) instance.seekTo(5) t.true(instance.player.seekTo.calledOnce) t.true(instance.player.seekTo.calledWith(5)) @@ -52,8 +52,8 @@ test('onReady()', t => { test('refs', t => { const instance = shallow().instance() - instance.refs.player('abc') - instance.refs.wrapper('def') + instance.references.player('abc') + instance.references.wrapper('def') t.true(instance.player === 'abc') t.true(instance.wrapper === 'def') })