Framework: Remove react-tap-event-plugin

client/blocks/comment-button/index.jsx

@@ -28,14 +28,6 @@ const CommentButton = React.createClass( {
 		};
 	},
 
-	onClick( event ) {
-		event.preventDefault();
-	},
-
-	onTap() {
-		this.props.onClick();
-	},
-
 	render() {
 		let label;
 		const containerTag = this.props.tagName,
@@ -70,8 +62,7 @@ const CommentButton = React.createClass( {
 		return React.createElement(
 			containerTag, {
 				className: 'comment-button',
-				onTouchTap: this.onTap,
-				onClick: this.onClick
+				onClick: this.props.onClick
 			},
 			<Gridicon icon="comment" size={ this.props.size } className="comment-button__icon" />, labelElement
 		);

client/blocks/daily-post-button/index.jsx

@@ -37,10 +37,6 @@ function getPingbackAttributes( post ) {
 	};
 }
 
-function preventDefault( event ) {
-	event.preventDefault();
-}
-
 function preloadEditor() {
 	preload( 'post-editor' );
 }
@@ -107,7 +103,7 @@ class DailyPostButton extends React.Component {
 	}
 
 	toggle = ( event ) => {
-		preventDefault( event );
+		event.preventDefault();
 		if ( ! this.state.showingMenu ) {
 			recordAction( 'open_daily_post_challenge' );
 			recordGaEvent( 'Opened Daily Post Challenge' );
@@ -161,8 +157,7 @@ class DailyPostButton extends React.Component {
 
 		return React.createElement( this.props.tagName, {
 			className: 'daily-post-button',
-			onTouchTap: this.toggle,
-			onClick: preventDefault,
+			onClick: this.toggle,
 			onTouchStart: preloadEditor,
 			onMouseEnter: preloadEditor
 		}, [

client/blocks/daily-post-button/test/index.jsx

@@ -85,13 +85,13 @@ describe( 'DailyPostButton', () => {
 
 		it( 'rediects to primary site if the user only has one site', () => {
 			sitesListMock.data = sitesListMock.data.slice( 0, 1 );
-			dailyPostButton.simulate( 'touchTap', { preventDefault: noop } );
+			dailyPostButton.simulate( 'click', { preventDefault: noop } );
 			assert.isTrue( pageSpy.calledWithMatch( /post\/apps.wordpress.com?/ ) );
 		} );
 
 		it( 'shows the site selector if the user has more than one site', ( done ) => {
 			dailyPostButton.instance().renderSitesPopover = done;
-			dailyPostButton.simulate( 'touchTap', { preventDefault: noop } );
+			dailyPostButton.simulate( 'click', { preventDefault: noop } );
 		} );
 	} );
 

client/blocks/like-button/button.jsx

@@ -88,7 +88,7 @@ const LikeButton = React.createClass( {
 				containerTag,
 				{
 					className: classNames( containerClasses ),
-					onTouchTap: this.toggleLiked
+					onClick: this.toggleLiked
 				},
 				<LikeIcons size={ this.props.iconSize } />, labelElement
 			)

client/blocks/site/index.jsx

@@ -19,7 +19,6 @@ export default React.createClass( {
 		return {
 			// onSelect callback
 			onSelect: noop,
-			onClick: noop,
 			// mouse event callbacks
 			onMouseEnter: noop,
 			onMouseLeave: noop,
@@ -48,7 +47,6 @@ export default React.createClass( {
 		isSelected: React.PropTypes.bool,
 		isHighlighted: React.PropTypes.bool,
 		site: React.PropTypes.object.isRequired,
-		onClick: React.PropTypes.func,
 		homeLink: React.PropTypes.bool,
 		showHomeIcon: React.PropTypes.bool
 	},
@@ -98,8 +96,7 @@ export default React.createClass( {
 						? this.translate( 'View this site' )
 						: this.translate( 'Select this site' )
 					}
-					onTouchTap={ this.onSelect }
-					onClick={ this.props.onClick }
+					onClick={ this.onSelect }
 					onMouseEnter={ this.onMouseEnter }
 					onMouseLeave={ this.onMouseLeave }
 					aria-label={ this.props.homeLink && site.is_previewable

client/boot/index.js

@@ -17,7 +17,6 @@ var React = require( 'react' ),
 	page = require( 'page' ),
 	url = require( 'url' ),
 	qs = require( 'querystring' ),
-	injectTapEventPlugin = require( 'react-tap-event-plugin' ),
 	i18n = require( 'i18n-calypso' ),
 	includes = require( 'lodash/includes' );
 
@@ -80,9 +79,6 @@ function init() {
 		document.documentElement.classList.add( 'notouch' );
 	}
 
-	// Initialize touch
-	injectTapEventPlugin();
-
 	// Add accessible-focus listener
 	accessibleFocus();
 }

client/components/accordion/index.jsx

@@ -44,7 +44,7 @@ export default class Accordion extends Component {
 		return (
 			<div className={ classes }>
 				<header className="accordion__header">
-					<button type="button" onTouchTap={ this.toggleExpanded } className="accordion__toggle">
+					<button type="button" onClick={ this.toggleExpanded } className="accordion__toggle">
 						{ icon && <span className="accordion__icon">{ icon }</span> }
 						<span className="accordion__title">{ title }</span>
 						{ subtitle && <span className="accordion__subtitle">{ subtitle }</span> }

client/components/accordion/test/index.jsx

@@ -2,25 +2,16 @@
  * External dependencies
  */
 import { expect } from 'chai';
-import ReactDom from 'react-dom';
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
-import { shallow, mount } from 'enzyme';
-import createReactTapEventPlugin from 'react-tap-event-plugin';
+import { shallow } from 'enzyme';
 
 /**
  * Internal dependencies
  */
-import useFakeDom from 'test/helpers/use-fake-dom';
 import Gridicon from 'components/gridicon';
 import Accordion from '../';
 
 describe( 'Accordion', function() {
-	before( () => {
-		// Unfortunately, there is no corresponding teardown for this plugin
-		createReactTapEventPlugin();
-	} );
-
 	it( 'should render as expected with a title and content', function() {
 		const wrapper = shallow( <Accordion title="Section">Content</Accordion> );
 
@@ -50,24 +41,22 @@ describe( 'Accordion', function() {
 	} );
 
 	context( 'events', () => {
-		useFakeDom();
-
-		function simulateTouchTap( wrapper ) {
-			TestUtils.Simulate.touchTap( ReactDom.findDOMNode( wrapper.find( '.accordion__toggle' ).node ) );
+		function simulateClick( wrapper ) {
+			wrapper.find( '.accordion__toggle' ).simulate( 'click' );
 		}
 
 		it( 'should toggle when clicked', function() {
-			const wrapper = mount( <Accordion title="Section">Content</Accordion> );
+			const wrapper = shallow( <Accordion title="Section">Content</Accordion> );
 
-			simulateTouchTap( wrapper );
+			simulateClick( wrapper );
 
 			expect( wrapper ).to.have.state( 'isExpanded' ).be.true;
 		} );
 
 		it( 'should accept an onToggle function handler to be invoked when toggled', function( done ) {
-			const wrapper = mount( <Accordion title="Section" onToggle={ finishTest }>Content</Accordion> );
+			const wrapper = shallow( <Accordion title="Section" onToggle={ finishTest }>Content</Accordion> );
 
-			simulateTouchTap( wrapper );
+			simulateClick( wrapper );
 
 			function finishTest( isExpanded ) {
 				expect( isExpanded ).to.be.true;
@@ -80,11 +69,11 @@ describe( 'Accordion', function() {
 		} );
 
 		it( 'should always use the initialExpanded prop, if specified', function( done ) {
-			const wrapper = mount(
+			const wrapper = shallow(
 				<Accordion initialExpanded={ true } title="Section" onToggle={ finishTest }>Content</Accordion>
 			);
 
-			simulateTouchTap( wrapper );
+			simulateClick( wrapper );
 
 			function finishTest( isExpanded ) {
 				expect( isExpanded ).to.be.false;

client/components/mobile-back-to-sidebar/index.jsx

@@ -18,7 +18,7 @@ const MobileBackToSidebar = React.createClass( {
 
 	render: function() {
 		return (
-			<div className="mobile-back-to-sidebar" onTouchTap={ this.toggleSidebar }>
+			<div className="mobile-back-to-sidebar" onClick={ this.toggleSidebar }>
 				<svg className="gridicon gridicon-back-arrow mobile-back-to-sidebar__icon" height="24" width="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g><path d="M8.886 4L7 5.886 13.114 12 7 18.114 8.886 20l8-8"/></g></svg>
 				<span className="mobile-back-to-sidebar__content">
 					{ this.props.children }

client/components/search/index.jsx

@@ -333,7 +333,7 @@ const Search = React.createClass( {
 				<div
 					className="search__icon-navigation"
 					ref="openIcon"
-					onTouchTap={ enableOpenIcon ? this.openSearch : this.focus }
+					onClick={ enableOpenIcon ? this.openSearch : this.focus }
 					tabIndex={ enableOpenIcon ? '0' : null }
 					onKeyDown={ enableOpenIcon
 						? this.openListener
@@ -385,7 +385,7 @@ const Search = React.createClass( {
 			return (
 				<div
 					className="search__icon-navigation"
-					onTouchTap={ this.closeSearch }
+					onClick={ this.closeSearch }
 					tabIndex="0"
 					onKeyDown={ this.closeListener }
 					aria-controls={ 'search-component-' + this.state.instanceId }

client/components/section-nav/index.jsx

@@ -82,7 +82,7 @@ var SectionNav = React.createClass( {
 			<div className={ className }>
 				<div
 					className="section-nav__mobile-header"
-					onTouchTap={ this.toggleMobileOpenState }
+					onClick={ this.toggleMobileOpenState }
 				>
 					<span className="section-nav__mobile-header-text">
 						{ this.props.selectedText }

client/components/section-nav/item.jsx

@@ -57,7 +57,7 @@ var NavItem = React.createClass( {
 					href={ this.props.path }
 					target={ target }
 					className={ 'section-nav-' + itemClassPrefix + '__link' }
-					onTouchTap={ onClick }
+					onClick={ onClick }
 					tabIndex={ this.props.tabIndex || 0 }
 					aria-selected={ this.props.selected }
 					disabled={ this.props.disabled }

client/components/section-nav/test/index.jsx

@@ -29,7 +29,6 @@ describe( 'section-nav', function() {
 		ReactDom = require( 'react-dom' );
 		React = require( 'react' );
 		TestUtils = require( 'react-addons-test-utils' );
-		require( 'react-tap-event-plugin' )();
 
 		const EMPTY_COMPONENT = require( 'test/helpers/react/empty-component' );
 
@@ -85,7 +84,7 @@ describe( 'section-nav', function() {
 			}, ( <p>placeholder</p> ) );
 			const tree = TestUtils.renderIntoDocument( elem );
 			assert( ! tree.state.mobileOpen );
-			TestUtils.Simulate.touchTap( ReactDom.findDOMNode(
+			TestUtils.Simulate.click( ReactDom.findDOMNode(
 				TestUtils.findRenderedDOMComponentWithClass( tree, 'section-nav__mobile-header' )
 			) );
 			assert( tree.state.mobileOpen );
@@ -100,15 +99,15 @@ describe( 'section-nav', function() {
 			const tree = TestUtils.renderIntoDocument( elem );
 
 			assert( ! tree.state.mobileOpen );
-			TestUtils.Simulate.touchTap( ReactDom.findDOMNode(
+			TestUtils.Simulate.click( ReactDom.findDOMNode(
 				TestUtils.findRenderedDOMComponentWithClass( tree, 'section-nav__mobile-header' )
 			) );
 			assert( tree.state.mobileOpen );
-			TestUtils.Simulate.touchTap( ReactDom.findDOMNode(
+			TestUtils.Simulate.click( ReactDom.findDOMNode(
 				TestUtils.findRenderedDOMComponentWithClass( tree, 'section-nav__mobile-header' )
 			) );
 			assert( ! tree.state.mobileOpen );
-			TestUtils.Simulate.touchTap( ReactDom.findDOMNode(
+			TestUtils.Simulate.click( ReactDom.findDOMNode(
 				TestUtils.findRenderedDOMComponentWithClass( tree, 'section-nav__mobile-header' )
 			) );
 			assert( tree.state.mobileOpen );

client/components/segmented-control/item.jsx

@@ -30,7 +30,7 @@ var SegmentedControlItem = React.createClass( {
 		} );
 
 		const linkClassName = classNames( 'segmented-control__link', {
-			[ `item-index-${this.props.index}` ]: this.props.index != null,
+			[ `item-index-${ this.props.index }` ]: this.props.index != null,
 		} );
 
 		return (
@@ -39,7 +39,7 @@ var SegmentedControlItem = React.createClass( {
 					href={ this.props.path }
 					className={ linkClassName }
 					ref="itemLink"
-					onTouchTap={ this.props.onClick }
+					onClick={ this.props.onClick }
 					title={ this.props.title }
 					role="radio"
 					tabIndex={ 0 }

client/components/sidebar-navigation/index.jsx

@@ -25,7 +25,7 @@ class SidebarNavigation extends React.Component {
 	render() {
 		return (
 			<header className="current-section">
-				<a onTouchTap={ this.toggleSidebar } className={ this.props.linkClassName }>
+				<a onClick={ this.toggleSidebar } className={ this.props.linkClassName }>
 					<Gridicon icon="chevron-left" />
 					{ this.props.children }
 					<div>

client/my-sites/all-sites/index.jsx

@@ -66,7 +66,7 @@ export default React.createClass( {
 					href={ this.props.href }
 					onMouseEnter={ this.props.onMouseEnter }
 					onMouseLeave={ this.props.onMouseLeave }
-					onTouchTap={ this.onSelect }>
+					onClick={ this.onSelect }>
 					{ this.props.showCount && this.renderSiteCount() }
 					<div className="site__info">
 						<span className="site__title">{ title }</span>

client/my-sites/current-site/index.jsx

@@ -149,7 +149,6 @@ const CurrentSite = React.createClass( {
 						site={ selectedSite }
 						homeLink={ true }
 						externalLink={ true }
-						onClick={ this.previewSite }
 						onSelect={ this.previewSite }
 						tipTarget="site-card-preview" />
 					: <AllSites sites={ this.props.sites.get() } />

client/my-sites/menus/menu-name.jsx

@@ -63,7 +63,7 @@ var MenuName = React.createClass( {
 			);
 		} else {
 			menuEditable = (
-				<span className={ this.props.className } onTouchTap={ this.toggleEdit }>
+				<span className={ this.props.className } onClick={ this.toggleEdit }>
 					<span>{ this.state.value }</span>
 					<a className="edit" />
 				</span>

client/reader/list-gap/index.jsx

@@ -30,7 +30,7 @@ var Gap = React.createClass( {
 		} );
 
 		return (
-			<div className={ classes } onTouchTap={ this.handleClick } >
+			<div className={ classes } onClick={ this.handleClick } >
 				<button type="button" className="button reader-list-gap__button">{ this.translate( 'Load More Posts' ) }</button>
 			</div>
 		);

client/reader/share/index.jsx

@@ -119,10 +119,6 @@ const ReaderShare = React.createClass( {
 		this._deferMenuChange( ! this.state.showingMenu );
 	},
 
-	killClick( event ) {
-		event.preventDefault();
-	},
-
 	closeMenu() {
 		// have to defer this to let the mouseup / click escape.
 		// If we don't defer and remove the DOM node on this turn of the event loop,
@@ -167,8 +163,7 @@ const ReaderShare = React.createClass( {
 
 		return React.createElement( this.props.tagName, {
 			className: 'reader-share',
-			onClick: this.killClick,
-			onTouchTap: this.toggle,
+			onClick: this.toggle,
 			onTouchStart: this.preloadEditor,
 			onMouseEnter: this.preloadEditor,
 			ref: 'shareButton' },

client/reader/update-notice/index.jsx

@@ -35,7 +35,7 @@ const UpdateNotice = React.createClass( {
 		} );
 
 		return (
-			<div className={ counterClasses } onTouchTap={ this.handleClick } >
+			<div className={ counterClasses } onClick={ this.handleClick } >
 				<DocumentHead unreadCount={ this.props.count } />
 				<Gridicon icon="arrow-up" size={ 18 } />
 				{ this.translate( '%s new post', '%s new posts', { args: [ this.props.cappedUnreadCount ], count: this.props.count } ) }

docs/react-component-unit-testing.md

@@ -52,9 +52,12 @@ When a user for example clicks an element does the component react like it shoul
 Example test from `client/components/Accordion`
 
 ```javascript
-var tree = TestUtils.renderIntoDocument( <Accordion title="Section" onToggle={ finishTest }>Content</Accordion> );
+import { shallow } from 'enzyme';
 
-TestUtils.Simulate.touchTap( ReactDom.findDOMNode( TestUtils.findRenderedDOMComponentWithClass( tree, 'accordion__toggle' ) ) );
+const wrapper = shallow( <Accordion title="Section" onToggle={ finishTest }>Content</Accordion> );
+
+wrapper.find( '.accordion__toggle' ).simulate( 'click' );
+);
 
 function finishTest( isExpanded ) {
 	expect( isExpanded ).to.be.ok;