From d8a2381d654dcf1268b855f7ed28e663b083a544 Mon Sep 17 00:00:00 2001 From: Flarnie Marchan Date: Sat, 20 May 2017 11:19:21 -0700 Subject: [PATCH] Run prettier --- .../__tests__/inputValueTracking-test.js | 55 ++++++++----------- .../client/eventPlugins/ChangeEventPlugin.js | 55 ++++++------------- .../__tests__/ChangeEventPlugin-test.js | 28 ++++++---- .../dom/client/inputValueTracking.js | 15 ++--- .../wrappers/__tests__/ReactDOMInput-test.js | 1 - .../__tests__/ReactDOMComponent-test.js | 16 ++++-- 6 files changed, 76 insertions(+), 94 deletions(-) diff --git a/src/renderers/dom/client/__tests__/inputValueTracking-test.js b/src/renderers/dom/client/__tests__/inputValueTracking-test.js index e9f42a1444c99..103964cc1d745 100644 --- a/src/renderers/dom/client/__tests__/inputValueTracking-test.js +++ b/src/renderers/dom/client/__tests__/inputValueTracking-test.js @@ -22,23 +22,21 @@ describe('inputValueTracking', function() { input.type = 'text'; checkbox = document.createElement('input'); checkbox.type = 'checkbox'; - mockComponent = { _hostNode: input, _wrapperState: {} }; + mockComponent = {_hostNode: input, _wrapperState: {}}; }); it('should attach tracker to wrapper state', function() { inputValueTracking.track(mockComponent); - expect( - mockComponent._wrapperState.hasOwnProperty('valueTracker') - ).toBe(true); + expect(mockComponent._wrapperState.hasOwnProperty('valueTracker')).toBe( + true, + ); }); it('should define `value` on the instance node', function() { inputValueTracking.track(mockComponent); - expect( - input.hasOwnProperty('value') - ).toBe(true); + expect(input.hasOwnProperty('value')).toBe(true); }); it('should define `checked` on the instance node', function() { @@ -49,7 +47,7 @@ describe('inputValueTracking', function() { }); it('should initialize with the current value', function() { - input.value ='foo'; + input.value = 'foo'; inputValueTracking.track(mockComponent); @@ -69,13 +67,13 @@ describe('inputValueTracking', function() { }); it('should track value changes', function() { - input.value ='foo'; + input.value = 'foo'; inputValueTracking.track(mockComponent); var tracker = mockComponent._wrapperState.valueTracker; - input.value ='bar'; + input.value = 'bar'; expect(tracker.getValue()).toEqual('bar'); }); @@ -91,7 +89,7 @@ describe('inputValueTracking', function() { }); it('should update value manually', function() { - input.value ='foo'; + input.value = 'foo'; inputValueTracking.track(mockComponent); var tracker = mockComponent._wrapperState.valueTracker; @@ -101,7 +99,7 @@ describe('inputValueTracking', function() { }); it('should coerce value to a string', function() { - input.value ='foo'; + input.value = 'foo'; inputValueTracking.track(mockComponent); var tracker = mockComponent._wrapperState.valueTracker; @@ -112,37 +110,32 @@ describe('inputValueTracking', function() { it('should update value if it changed and return result', function() { inputValueTracking.track(mockComponent); - input.value ='foo'; + input.value = 'foo'; var tracker = mockComponent._wrapperState.valueTracker; - expect( - inputValueTracking.updateValueIfChanged(mockComponent) - ).toBe(false); + expect(inputValueTracking.updateValueIfChanged(mockComponent)).toBe(false); tracker.setValue('bar'); - expect( - inputValueTracking.updateValueIfChanged(mockComponent) - ).toBe(true); + expect(inputValueTracking.updateValueIfChanged(mockComponent)).toBe(true); expect(tracker.getValue()).toEqual('foo'); }); it('should track value and return true when updating untracked instance', function() { - input.value ='foo'; + input.value = 'foo'; - expect( - inputValueTracking.updateValueIfChanged(mockComponent) - ) - .toBe(true); + expect(inputValueTracking.updateValueIfChanged(mockComponent)).toBe(true); var tracker = mockComponent._wrapperState.valueTracker; expect(tracker.getValue()).toEqual('foo'); }); it('should return tracker from node', function() { - var node = ReactTestUtils.renderIntoDocument(); + var node = ReactTestUtils.renderIntoDocument( + , + ); var tracker = inputValueTracking._getTrackerFromNode(node); expect(tracker.getValue()).toEqual('foo'); }); @@ -150,15 +143,15 @@ describe('inputValueTracking', function() { it('should stop tracking', function() { inputValueTracking.track(mockComponent); - expect( - mockComponent._wrapperState.hasOwnProperty('valueTracker') - ).toBe(true); + expect(mockComponent._wrapperState.hasOwnProperty('valueTracker')).toBe( + true, + ); inputValueTracking.stopTracking(mockComponent); - expect( - mockComponent._wrapperState.hasOwnProperty('valueTracker') - ).toBe(false); + expect(mockComponent._wrapperState.hasOwnProperty('valueTracker')).toBe( + false, + ); expect(input.hasOwnProperty('value')).toBe(false); }); diff --git a/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js b/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js index b65ad6b41e4f3..473aef5153562 100644 --- a/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js +++ b/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js @@ -23,7 +23,6 @@ var getEventTarget = require('getEventTarget'); var isEventSupported = require('isEventSupported'); var isTextInputElement = require('isTextInputElement'); - var eventTypes = { change: { phasedRegistrationNames: { @@ -48,7 +47,7 @@ function createAndAccumulateChangeEvent(inst, nativeEvent, target) { eventTypes.change, inst, nativeEvent, - target + target, ); event.type = 'change'; EventPropagators.accumulateTwoPhaseDispatches(event); @@ -60,8 +59,6 @@ function createAndAccumulateChangeEvent(inst, nativeEvent, target) { var activeElement = null; var activeElementInst = null; - - /** * SECTION: handle `change` event */ @@ -121,13 +118,11 @@ function stopWatchingForChangeEventIE8() { activeElementInst = null; } - function getInstIfValueChanged(targetInst, nativeEvent) { var updated = inputValueTracking.updateValueIfChanged(targetInst); - var simulated = ( + var simulated = nativeEvent.simulated === true && - ChangeEventPlugin._allowSimulatedPassThrough - ); + ChangeEventPlugin._allowSimulatedPassThrough; if (updated || simulated) { return targetInst; @@ -135,7 +130,6 @@ function getInstIfValueChanged(targetInst, nativeEvent) { } function getTargetInstForChangeEvent(topLevelType, targetInst) { - if (topLevelType === 'topChange') { return targetInst; } @@ -160,13 +154,11 @@ if (ExecutionEnvironment.canUseDOM) { // IE9 claims to support the input event but fails to trigger it when // deleting text, so we ignore its input events. - isInputEventSupported = isEventSupported('input') && ( - !('documentMode' in document) || document.documentMode > 9 - ); - + isInputEventSupported = + isEventSupported('input') && + (!('documentMode' in document) || document.documentMode > 9); } - /** * (For IE <=9) Starts tracking propertychange events on the passed-in element * and override the value property so that we can distinguish user events from @@ -205,13 +197,7 @@ function handlePropertyChange(nativeEvent) { } } - -function handleEventsForInputEventPolyfill( - topLevelType, - target, - targetInst -) { - +function handleEventsForInputEventPolyfill(topLevelType, target, targetInst) { if (topLevelType === 'topFocus') { // In IE8, we can capture almost all .value changes by adding a // propertychange handler and looking for events with propertyName @@ -237,11 +223,13 @@ function handleEventsForInputEventPolyfill( function getTargetInstForInputEventPolyfill( topLevelType, targetInst, - nativeEvent + nativeEvent, ) { - if (topLevelType === 'topSelectionChange' || - topLevelType === 'topKeyUp' || - topLevelType === 'topKeyDown') { + if ( + topLevelType === 'topSelectionChange' || + topLevelType === 'topKeyUp' || + topLevelType === 'topKeyDown' + ) { // On the selectionchange event, the target is just document which isn't // helpful for us so just check activeElement instead. // @@ -265,17 +253,13 @@ function shouldUseClickEvent(elem) { // until `blur` in IE8. var nodeName = elem.nodeName; return ( - (nodeName && nodeName.toLowerCase() === 'input') && + nodeName && + nodeName.toLowerCase() === 'input' && (elem.type === 'checkbox' || elem.type === 'radio') ); } -function getTargetInstForClickEvent( - topLevelType, - targetInst, - nativeEvent -) { - +function getTargetInstForClickEvent(topLevelType, targetInst, nativeEvent) { if (topLevelType === 'topClick') { return getInstIfValueChanged(targetInst, nativeEvent); } @@ -284,12 +268,9 @@ function getTargetInstForClickEvent( function getTargetInstForInputOrChangeEvent( topLevelType, targetInst, - nativeEvent + nativeEvent, ) { - if ( - topLevelType === 'topInput' || - topLevelType === 'topChange' - ) { + if (topLevelType === 'topInput' || topLevelType === 'topChange') { return getInstIfValueChanged(targetInst, nativeEvent); } } diff --git a/src/renderers/dom/client/eventPlugins/__tests__/ChangeEventPlugin-test.js b/src/renderers/dom/client/eventPlugins/__tests__/ChangeEventPlugin-test.js index 066a66ef548b6..d85970cec56ae 100644 --- a/src/renderers/dom/client/eventPlugins/__tests__/ChangeEventPlugin-test.js +++ b/src/renderers/dom/client/eventPlugins/__tests__/ChangeEventPlugin-test.js @@ -56,7 +56,9 @@ describe('ChangeEventPlugin', () => { expect(e.type).toBe('change'); } - var input = ReactTestUtils.renderIntoDocument(); + var input = ReactTestUtils.renderIntoDocument( + , + ); setUntrackedValue(input, true); ReactTestUtils.SimulateNative.click(input); @@ -66,7 +68,7 @@ describe('ChangeEventPlugin', () => { it('should catch setting the value programmatically', function() { var input = ReactTestUtils.renderIntoDocument( - + , ); input.value = 'bar'; @@ -82,7 +84,7 @@ describe('ChangeEventPlugin', () => { } var input = ReactTestUtils.renderIntoDocument( - + , ); input.value = 'bar'; @@ -104,7 +106,7 @@ describe('ChangeEventPlugin', () => { } var input = ReactTestUtils.renderIntoDocument( - + , ); input.checked = true; @@ -132,7 +134,9 @@ describe('ChangeEventPlugin', () => { called += 1; } - var input = ReactTestUtils.renderIntoDocument(); + var input = ReactTestUtils.renderIntoDocument( + , + ); setUntrackedValue(input, true); ReactTestUtils.SimulateNative.click(input); ReactTestUtils.SimulateNative.click(input); @@ -149,9 +153,9 @@ describe('ChangeEventPlugin', () => { } [ - , - , - , + , + , + , ].forEach(function(element) { called = 0; input = ReactTestUtils.renderIntoDocument(element); @@ -189,7 +193,9 @@ describe('ChangeEventPlugin', () => { return; } - var input = ReactTestUtils.renderIntoDocument(); + var input = ReactTestUtils.renderIntoDocument( + , + ); setUntrackedValue(input, 'bar'); ReactTestUtils.SimulateNative.input(input); @@ -209,7 +215,9 @@ describe('ChangeEventPlugin', () => { expect(e.type).toBe('change'); } - var input = ReactTestUtils.renderIntoDocument(); + var input = ReactTestUtils.renderIntoDocument( + , + ); setUntrackedValue(input, '40'); ReactTestUtils.SimulateNative.input(input); ReactTestUtils.SimulateNative.change(input); diff --git a/src/renderers/dom/client/inputValueTracking.js b/src/renderers/dom/client/inputValueTracking.js index 3b877be63ec73..f5fa806e39b70 100644 --- a/src/renderers/dom/client/inputValueTracking.js +++ b/src/renderers/dom/client/inputValueTracking.js @@ -16,7 +16,8 @@ function isCheckable(elem) { var type = elem.type; var nodeName = elem.nodeName; return ( - (nodeName && nodeName.toLowerCase() === 'input') && + nodeName && + nodeName.toLowerCase() === 'input' && (type === 'checkbox' || type === 'radio') ); } @@ -36,9 +37,7 @@ function detachTracker(inst) { function getValueFromNode(node) { var value; if (node) { - value = isCheckable(node) - ? '' + node.checked - : node.value; + value = isCheckable(node) ? '' + node.checked : node.value; } return value; } @@ -46,9 +45,7 @@ function getValueFromNode(node) { var inputValueTracking = { // exposed for testing _getTrackerFromNode(node) { - return getTracker( - ReactDOMComponentTree.getInstanceFromNode(node) - ); + return getTracker(ReactDOMComponentTree.getInstanceFromNode(node)); }, track: function(inst) { @@ -60,7 +57,7 @@ var inputValueTracking = { var valueField = isCheckable(node) ? 'checked' : 'value'; var descriptor = Object.getOwnPropertyDescriptor( node.constructor.prototype, - valueField + valueField, ); var currentValue = '' + node[valueField]; @@ -111,7 +108,7 @@ var inputValueTracking = { var lastValue = tracker.getValue(); var nextValue = getValueFromNode( - ReactDOMComponentTree.getNodeFromInstance(inst) + ReactDOMComponentTree.getNodeFromInstance(inst), ); if (nextValue !== lastValue) { diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js index 0e13423b3db76..59eaec42bfc66 100644 --- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js +++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js @@ -21,7 +21,6 @@ describe('ReactDOMInput', () => { var ReactLink; var ReactTestUtils; - beforeEach(() => { jest.resetModuleRegistry(); React = require('React'); diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index c685d06a0d85f..1cf818de21ed5 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -916,10 +916,12 @@ describe('ReactDOMComponent', () => { ); }); - it('should track input values', function() { var container = document.createElement('div'); - var inst = ReactDOM.render(, container); + var inst = ReactDOM.render( + , + container, + ); var tracker = inputValueTracking._getTrackerFromNode(inst); @@ -928,7 +930,7 @@ describe('ReactDOMComponent', () => { it('should track textarea values', function() { var container = document.createElement('div'); - var inst = ReactDOM.render(