fix: Remove touch-tap plugin

Incompatible with newer react and probably unnecessary. See: zilverline/react-tap-event-plugin#121
entur · Aug 7, 2019 · 9d2c58e · 9d2c58e
1 parent f1bf28c
commit 9d2c58e
Show file tree

Hide file tree

Showing 35 changed files with 66 additions and 70 deletions.
diff --git a/components/Dialogs/AddAdjacentStopsDialog.js b/components/Dialogs/AddAdjacentStopsDialog.js
@@ -68,7 +68,7 @@ class AddAdjacentStopDialog extends React.Component {
       <FlatButton
         label={formatMessage({ id: 'cancel' })}
         primary={true}
-        onTouchTap={handleClose}
+        onClick={handleClose}
       />,
       <FlatButton
         label={formatMessage({ id: 'confirm' })}

diff --git a/components/Dialogs/AddMemberToGroup.js b/components/Dialogs/AddMemberToGroup.js
@@ -76,14 +76,14 @@ class AddMemberToGroup extends Component {
       <FlatButton
         label={formatMessage({ id: 'change_coordinates_cancel' })}
         primary={true}
-        onTouchTap={handleClose}
+        onClick={handleClose}
       />,
       <FlatButton
         label={formatMessage({ id: 'add' })}
         primary={true}
         keyboardFocused={true}
         disabled={!canSave}
-        onTouchTap={() => handleConfirm(checkedItems)}
+        onClick={() => handleConfirm(checkedItems)}
       />
     ];
 

diff --git a/components/Dialogs/AddStopPlaceToParent.js b/components/Dialogs/AddStopPlaceToParent.js
@@ -76,7 +76,7 @@ class AddStopPlaceToParent extends Component {
       <FlatButton
         label={formatMessage({ id: 'change_coordinates_cancel' })}
         primary={true}
-        onTouchTap={handleClose}
+        onClick={handleClose}
       />,
       <FlatButton
         label={formatMessage({ id: 'add' })}

diff --git a/components/Dialogs/AltNamesDialog.js b/components/Dialogs/AltNamesDialog.js
@@ -255,15 +255,15 @@ class AltNamesDialog extends React.Component {
                 {!disabled
                   ? <div style={{display: 'flex'}}>
                     <IconButton
-                      onTouchTap={() => {
+                      onClick={() => {
                         this.handleEdit(i);
                       }}
                     >
                       <MdEdit color={getPrimaryColor()}
                       />
                     </IconButton>
                     <IconButton
-                      onTouchTap={() => {
+                      onClick={() => {
                         this.handleRemoveName(i);
                       }}
                     >

diff --git a/components/Dialogs/CompassBearingDialog.js b/components/Dialogs/CompassBearingDialog.js
@@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from 'react';
+
+import React from 'react';
 import PropTypes from 'prop-types';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
@@ -103,15 +104,15 @@ class CompassBearingDialog extends React.Component {
           label={compassBearingTranslation.cancel}
           primary={false}
           keyboardFocused={true}
-          onTouchTap={() => this.handleClose()}
+          onClick={() => this.handleClose()}
           style={{ marginRight: 5 }}
         />
         <FlatButton
           label={compassBearingTranslation.confirm}
           primary={true}
           disabled={!this.state.compassBearing}
           keyboardFocused={true}
-          onTouchTap={() => this.handleConfirm()}
+          onClick={() => this.handleConfirm()}
         />
       </div>,
     ];

diff --git a/components/Dialogs/ConfirmDialog.js b/components/Dialogs/ConfirmDialog.js
@@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from 'react';
+
+import React from 'react';
 import PropTypes from 'prop-types';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
@@ -41,13 +42,13 @@ class ConfirmDialog extends React.Component {
       <FlatButton
         label={confirmDialogTranslation.cancel}
         primary={true}
-        onTouchTap={handleClose}
+        onClick={handleClose}
       />,
       <FlatButton
         label={confirmDialogTranslation.confirm}
         primary={true}
         keyboardFocused={true}
-        onTouchTap={handleConfirm}
+        onClick={handleConfirm}
       />,
     ];
 

diff --git a/components/Dialogs/CoordinatesDialog.js b/components/Dialogs/CoordinatesDialog.js
@@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from 'react';
+
+import React from 'react';
 import PropTypes from 'prop-types';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
@@ -108,14 +109,14 @@ class CoordinatesDialog extends React.Component {
           label={confirmDialogTranslation.cancel}
           primary={false}
           keyboardFocused={true}
-          onTouchTap={() => this.handleClose()}
+          onClick={() => this.handleClose()}
           style={{ marginRight: 5 }}
         />
         <FlatButton
           label={confirmDialogTranslation.confirm}
           primary={true}
           keyboardFocused={true}
-          onTouchTap={() => this.handleConfirm()}
+          onClick={() => this.handleConfirm()}
         />
       </div>,
     ];

diff --git a/components/Dialogs/DeleteQuayDialog.js b/components/Dialogs/DeleteQuayDialog.js
@@ -130,7 +130,7 @@ class DeleteQuayDialog extends React.Component {
     const actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />,
       <FlatButton

diff --git a/components/Dialogs/DialogHeader.js b/components/Dialogs/DialogHeader.js
@@ -43,7 +43,7 @@ class DialogHeader extends Component {
         </div>
         <IconButton
           style={{ marginRight: 5 }}
-          onTouchTap={handleClose}
+          onClick={handleClose}
         >
           <MdClose />
         </IconButton>

diff --git a/components/Dialogs/FavoriteNameDialog.js b/components/Dialogs/FavoriteNameDialog.js
@@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from 'react';
+
+import React from 'react';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import TextField from 'material-ui/TextField';
@@ -70,13 +71,13 @@ class FavoriteNameDialog extends React.Component {
       <FlatButton
         label={labelTexts.cancel}
         primary={true}
-        onTouchTap={this.handleClose.bind(this)}
+        onClick={this.handleClose.bind(this)}
       />,
       <FlatButton
         label={labelTexts.use}
         primary={true}
         keyboardFocused={true}
-        onTouchTap={this.handleSubmit.bind(this)}
+        onClick={this.handleSubmit.bind(this)}
       />,
     ];
 

diff --git a/components/Dialogs/MergeQuaysDialog.js b/components/Dialogs/MergeQuaysDialog.js
@@ -135,7 +135,7 @@ class MergeQuaysDialog extends React.Component {
     const actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />,
       <FlatButton

diff --git a/components/Dialogs/MergeStopDialog.js b/components/Dialogs/MergeStopDialog.js
@@ -108,7 +108,7 @@ class MergeStopDialog extends React.Component {
     const actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />
     ];
@@ -118,7 +118,7 @@ class MergeStopDialog extends React.Component {
         <FlatButton
           label={translations.confirm}
           disabled={!enableConfirm || isLoading || isFetchingQuays}
-          onTouchTap={() => {
+          onClick={() => {
             handleConfirm(fromVersionComment, toVersionComment);
           }}
           primary={true}

diff --git a/components/Dialogs/MoveQuayDialog.js b/components/Dialogs/MoveQuayDialog.js
@@ -69,13 +69,13 @@ class MoveQuayDialog extends React.Component {
     const actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />,
       <FlatButton
         label={translations.confirm}
         disabled={!enableConfirm || isLoading}
-        onTouchTap={() => { handleConfirm(fromVersionComment,toVersionComment) }}
+        onClick={() => { handleConfirm(fromVersionComment,toVersionComment) }}
         primary={true}
         keyboardFocused={true}
         icon={isLoading ? <Spinner/> : <MdMerge />}

diff --git a/components/Dialogs/MoveQuayNewStopDialog.js b/components/Dialogs/MoveQuayNewStopDialog.js
@@ -97,13 +97,13 @@ class MoveQuayNewStopDialog extends React.Component {
     const actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />,
       <FlatButton
         label={translations.confirm}
         disabled={!enableConfirm || isLoading || !quayIds.length}
-        onTouchTap={() => {
+        onClick={() => {
           handleConfirm(quayIds, fromVersionComment, toVersionComment);
         }}
         primary={true}

diff --git a/components/Dialogs/NewAltName.js b/components/Dialogs/NewAltName.js
@@ -91,7 +91,7 @@ class NewAltName extends Component {
           style={{ marginTop: 10, width: '100%', textAlign: 'center' }}
           disabled={!value}
           primary={true}
-          onTouchTap={() => {
+          onClick={() => {
             handleAddAltName();
           }}
         >

diff --git a/components/Dialogs/RemoveStopFromParentDialog.js b/components/Dialogs/RemoveStopFromParentDialog.js
@@ -81,7 +81,7 @@ class RemoveStopFromParentDialog extends React.Component {
     let actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />,
       <FlatButton

diff --git a/components/Dialogs/SaveDialog.js b/components/Dialogs/SaveDialog.js
@@ -194,7 +194,7 @@ class SaveDialog extends React.Component {
     const actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />,
       <FlatButton
@@ -203,7 +203,7 @@ class SaveDialog extends React.Component {
         keyboardFocused={true}
         icon={isSaving && !errorMessage.length ? <MdSpinner /> : <MdSave />}
         disabled={!timeLegal || !dateLegal || isSaving}
-        onTouchTap={() => this.handleSave()}
+        onClick={() => this.handleSave()}
       />
     ];
 

diff --git a/components/Dialogs/TerminateStopPlaceDialog.js b/components/Dialogs/TerminateStopPlaceDialog.js
@@ -186,7 +186,7 @@ class TerminateStopPlaceDialog extends React.Component {
     const actions = [
       <FlatButton
         label={translations.cancel}
-        onTouchTap={handleClose}
+        onClick={handleClose}
         icon={<MdCancel />}
       />,
       <FlatButton

diff --git a/components/Dialogs/WalkingDistanceDialog.js b/components/Dialogs/WalkingDistanceDialog.js
@@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React  from 'react';
+
+import React  from 'react';
 import PropTypes from 'prop-types';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
@@ -111,14 +112,14 @@ class WalkingDistanceDialog extends React.Component {
           label={translation.cancel}
           primary={false}
           keyboardFocused={true}
-          onTouchTap={() => this.handleClose()}
+          onClick={() => this.handleClose()}
           style={{ marginRight: 5 }}
         />
         <FlatButton
           label={translation.confirm}
           primary={true}
           keyboardFocused={true}
-          onTouchTap={() => this.handleConfirm()}
+          onClick={() => this.handleConfirm()}
         />
       </div>,
     ];

diff --git a/components/EditStopPage/ColumnFilterPopover.js b/components/EditStopPage/ColumnFilterPopover.js
@@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from 'react';
+
+import React from 'react';
 import Popover, { PopoverAnimationVertical } from 'material-ui/Popover';
 import RaisedButton from 'material-ui/RaisedButton';
 import Menu from 'material-ui/Menu';
@@ -48,7 +49,7 @@ class ColumnFilterPopover extends React.Component {
         <RaisedButton
           label={buttonLabel}
           labelStyle={{fontSize: 12}}
-          onTouchTap={this.handleTouchTap.bind(this)}
+          onClick={this.handleTouchTap.bind(this)}
         />
         <Popover
           open={this.state.open}

diff --git a/components/EditStopPage/MakeExpandable.js b/components/EditStopPage/MakeExpandable.js
@@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the Licence for the specific language governing permissions and
 limitations under the Licence. */
 
-import React from 'react';
+
+import React from 'react';
 import MdExpand from 'material-ui/svg-icons/navigation/expand-more';
 import MdCollapse from 'material-ui/svg-icons/navigation/expand-less';
 import IconButton from 'material-ui/IconButton';
@@ -58,7 +59,7 @@ class MakeExpandable extends React.PureComponent {
         <div style={style}>
           {this.props.children}
           <div style={iconButtonStyle}>
-            <IconButton onTouchTap={this.handleToggle.bind(this)}>
+            <IconButton onClick={this.handleToggle.bind(this)}>
               {this.state.expanded ? <MdCollapse /> : <MdExpand />}
             </IconButton>
           </div>

diff --git a/components/EditStopPage/ModalitiesMenuItems.js b/components/EditStopPage/ModalitiesMenuItems.js
@@ -72,7 +72,7 @@ class ModalitiesMenuItems extends React.Component {
                   {type.name}
                 </span>
               }
-              onTouchTap={() => {
+              onClick={() => {
                 !type.submodes && handleStopTypeChange(type.value);
               }}
               insetChildren={true}

diff --git a/components/EditStopPage/StopPlaceDetails.js b/components/EditStopPage/StopPlaceDetails.js
@@ -453,7 +453,7 @@ class StopPlaceDetails extends React.Component {
                       borderBottom: disabled ? 'none' : '1px dotted grey',
                       marginLeft: 5
                     }}
-                    onTouchTap={e => {
+                    onClick={e => {
                       this.handleOpenStopPlaceTypePopover(e);
                     }}
                   >
@@ -556,7 +556,7 @@ class StopPlaceDetails extends React.Component {
             style={{ marginLeft: 6, borderBottom: '1px dotted', marginTop: -3 }}
           >
             <IconButton
-              onTouchTap={e => {
+              onClick={e => {
                 this.handleOpenWeightPopover(e);
               }}
             >

diff --git a/components/EditStopPage/TagsDialog.js b/components/EditStopPage/TagsDialog.js
@@ -89,7 +89,7 @@ class TagsDialog extends Component {
           </div>
           <IconButton
             style={{ marginRight: 5 }}
-            onTouchTap={() => {
+            onClick={() => {
               handleClose();
             }}
           >