From c2aba4584760ae8d646d5575abf757ebf40c8ea9 Mon Sep 17 00:00:00 2001 From: panther711 Date: Thu, 15 Aug 2019 10:30:29 +0300 Subject: [PATCH] refactoring due to facebook/react/pull/15047 --- src/views/edit-account-view.jsx | 14 +- src/views/info-view.jsx | 10 +- src/views/messages-view.jsx | 14 +- src/views/new-topic-view.jsx | 6 +- src/widgets/attachment.jsx | 3 +- src/widgets/avatar-upload.jsx | 7 +- src/widgets/chat-message.jsx | 2 +- src/widgets/chip-input.jsx | 16 --- src/widgets/chip.jsx | 5 +- src/widgets/contact.jsx | 2 +- src/widgets/error-panel.jsx | 2 +- src/widgets/file-progress.jsx | 2 +- src/widgets/image-preview.jsx | 2 +- src/widgets/menu-cancel.jsx | 6 +- src/widgets/menu-contacts.jsx | 4 +- src/widgets/menu-start.jsx | 4 +- src/widgets/search-contacts.jsx | 5 +- src/widgets/send-message.jsx | 9 +- src/widgets/tag-manager.jsx | 7 +- umd/index.dev.js | 227 ++++++++++++++++++++------------ umd/index.dev.js.map | 2 +- umd/index.prod.js | 2 +- umd/index.prod.js.map | 2 +- 23 files changed, 192 insertions(+), 161 deletions(-) diff --git a/src/views/edit-account-view.jsx b/src/views/edit-account-view.jsx index 3f7684c5..85cd6209 100644 --- a/src/views/edit-account-view.jsx +++ b/src/views/edit-account-view.jsx @@ -39,7 +39,6 @@ export default class EditAccountView extends React.Component { this.handlePasswordUpdate = this.handlePasswordUpdate.bind(this); this.handleImageChanged = this.handleImageChanged.bind(this); this.handleCheckboxClick = this.handleCheckboxClick.bind(this); - this.handleStartAddCred = this.handleStartAddCred.bind(this); this.handleCredChange = this.handleCredChange.bind(this); this.handleCredKeyDown = this.handleCredKeyDown.bind(this); this.handleCredEntered = this.handleCredEntered.bind(this); @@ -92,10 +91,6 @@ export default class EditAccountView extends React.Component { } } - handleStartAddCred() { - this.setState({addCredActive: true}); - } - handleCredChange(e) { this.setState({newCred: e.target.value, addCredInvalid: false}); } @@ -169,12 +164,11 @@ export default class EditAccountView extends React.Component { this.state.credentials.map((cred) => { credentials.push(
{cred.meth}: {cred.val} {!cred.done ? - + {e.preventDefault(); this.props.onCredConfirm(cred.meth, cred.val);}}> - : null} {e.preventDefault(); this.props.onCredDelete(cred.meth, cred.val);}}>delete_outline
); }); @@ -270,7 +264,7 @@ export default class EditAccountView extends React.Component { placeholder="Phone number or email" required="required" autoFocus onChange={this.handleCredChange} onKeyDown={this.handleCredKeyDown} onBlur={this.handleCredEntered} /> : null} -
+ Add another
+
{e.preventDefault(); this.setState({addCredActive: true});}}>+ Add another
@@ -295,7 +289,7 @@ export default class EditAccountView extends React.Component {
- + {e.preventDefault(); this.props.onLogout();}}> exit_to_app diff --git a/src/views/info-view.jsx b/src/views/info-view.jsx index 9187088b..b62c23bd 100644 --- a/src/views/info-view.jsx +++ b/src/views/info-view.jsx @@ -339,7 +339,8 @@ class InfoView extends React.Component { this.setState({showPermissionEditorFor: undefined}); } - handleShowAddMembers() { + handleShowAddMembers(e) { + e.preventDefault(); this.props.onInitFind(); this.setState({showMemberPanel: true}); } @@ -354,6 +355,7 @@ class InfoView extends React.Component { } handleLeave() { + e.preventDefault(); this.props.onLeaveTopic(this.props.topic); } @@ -594,13 +596,13 @@ class InfoView extends React.Component {
{this.state.sharer ? - + person_add : null} {!this.state.owner ? - + exit_to_app @@ -624,7 +626,7 @@ class InfoView extends React.Component {
:
- + exit_to_app diff --git a/src/views/messages-view.jsx b/src/views/messages-view.jsx index b941e1fa..c4e7ea3b 100644 --- a/src/views/messages-view.jsx +++ b/src/views/messages-view.jsx @@ -73,7 +73,6 @@ class MessagesView extends React.Component { this.handleFormResponse = this.handleFormResponse.bind(this); this.handleContextClick = this.handleContextClick.bind(this); this.handleShowContextMenuMessage = this.handleShowContextMenuMessage.bind(this); - this.handleBackNavigation = this.handleBackNavigation.bind(this); this.handleNewChatAcceptance = this.handleNewChatAcceptance.bind(this); this.handleEnablePeer = this.handleEnablePeer.bind(this); } @@ -486,15 +485,12 @@ class MessagesView extends React.Component { this.props.showContextMenu(params, menuItems); } - handleBackNavigation() { - this.props.onHideMessagesView(); - } - handleNewChatAcceptance(action) { this.props.onNewChat(this.state.topic, action); } - handleEnablePeer() { + handleEnablePeer(e) { + e.preventDefault(); this.props.onChangePermissions(this.state.topic, DEFAULT_ACCESS_MODE, this.state.topic); } @@ -579,7 +575,7 @@ class MessagesView extends React.Component {
{this.props.displayMobile ? - + {e.preventDefault(); this.props.onHideMessagesView();}}> arrow_back : @@ -605,7 +601,7 @@ class MessagesView extends React.Component {
} @@ -638,7 +634,7 @@ class MessagesView extends React.Component {
block .
: null} diff --git a/src/views/new-topic-view.jsx b/src/views/new-topic-view.jsx index 05bded71..b3da9931 100644 --- a/src/views/new-topic-view.jsx +++ b/src/views/new-topic-view.jsx @@ -56,19 +56,19 @@ export default class NewTopicView extends React.Component {
  • - +
  • - +
  • - + diff --git a/src/widgets/attachment.jsx b/src/widgets/attachment.jsx index 278c9657..559da8a5 100644 --- a/src/widgets/attachment.jsx +++ b/src/widgets/attachment.jsx @@ -56,8 +56,9 @@ export default class Attachment extends React.Component { if (!this.props.uploader && !this.state.downloader && !(/^(?:(?:[a-z]+:)?\/\/)/i.test(this.props.downloadUrl))) { // Relative URL. Use download helper. - url = "javascript:;"; + url = '#'; helperFunc = (e) => { + e.preventDefault(); this.downloadFile(this.props.downloadUrl, this.props.filename, this.props.mimetype); }; } else { diff --git a/src/widgets/avatar-upload.jsx b/src/widgets/avatar-upload.jsx index 0c4c2675..68fbcd89 100644 --- a/src/widgets/avatar-upload.jsx +++ b/src/widgets/avatar-upload.jsx @@ -14,7 +14,6 @@ export default class AvatarUpload extends React.Component { }; this.handleFileUpload = this.handleFileUpload.bind(this); - this.handleClear = this.handleClear.bind(this); } componentDidUpdate(prevProps) { @@ -39,10 +38,6 @@ export default class AvatarUpload extends React.Component { e.target.value = ''; } - handleClear() { - this.props.onImageChanged(null); - } - render() { // Randomize id value in case more than one AvatarUpload is shown // at the same time. @@ -51,7 +46,7 @@ export default class AvatarUpload extends React.Component {
    {this.props.readOnly || !this.state.dataUrl ? null : - + {e.preventDefault(); this.props.onImageChanged(null);}}> clear } {this.state.dataUrl ? diff --git a/src/widgets/chat-message.jsx b/src/widgets/chat-message.jsx index 3c47c47a..e3359d15 100644 --- a/src/widgets/chat-message.jsx +++ b/src/widgets/chat-message.jsx @@ -125,7 +125,7 @@ export default class ChatMessage extends React.Component { received={this.props.received} />
    - + expand_more diff --git a/src/widgets/chip-input.jsx b/src/widgets/chip-input.jsx index 0c2b1014..dc167eb1 100644 --- a/src/widgets/chip-input.jsx +++ b/src/widgets/chip-input.jsx @@ -39,23 +39,7 @@ export default class ChipInput extends React.Component { this.setState({input: ''}); } } - /* - static getDerivedStateFromProps(nextProps, prevState) { - const state = { - placeholder: nextProps.chips ? '' : nextProps.prompt, - sortedChips: ChipInput.sortChips(nextProps.chips, nextProps.required), - chipIndex: ChipInput.indexChips(nextProps.chips), - focused: prevState && prevState.focused - }; - - if (!prevState || nextProps.chips.length > prevState.sortedChips.length) { - // Chip added: clear input. - state.input = ''; - } - return state; - } - */ // Map chip index to user name static indexChips(chips) { const index = {}; diff --git a/src/widgets/chip.jsx b/src/widgets/chip.jsx index a80f858c..8182120c 100644 --- a/src/widgets/chip.jsx +++ b/src/widgets/chip.jsx @@ -9,7 +9,8 @@ export default class Chip extends React.PureComponent { this.handleCancel = this.handleCancel.bind(this); } - handleCancel() { + handleCancel(e) { + e.preventDefault(); this.props.onCancel(this.props.topic, this.props.index); } @@ -29,7 +30,7 @@ export default class Chip extends React.PureComponent { } {title} {this.props.onCancel && !this.props.required ? - × + × : }
); diff --git a/src/widgets/contact.jsx b/src/widgets/contact.jsx index be030029..ba7dd8b8 100644 --- a/src/widgets/contact.jsx +++ b/src/widgets/contact.jsx @@ -74,7 +74,7 @@ export default class Contact extends React.Component {
{this.props.showContextMenu ? - + expand_more : null} diff --git a/src/widgets/error-panel.jsx b/src/widgets/error-panel.jsx index b168029b..9e47121c 100644 --- a/src/widgets/error-panel.jsx +++ b/src/widgets/error-panel.jsx @@ -38,7 +38,7 @@ export default class ErrorPanel extends React.PureComponent { {this.props.action ? - + {e.preventDefault(); this.props.action();}}> {this.props.actionText} : null} diff --git a/src/widgets/file-progress.jsx b/src/widgets/file-progress.jsx index 03ce7d6a..6393b6c7 100644 --- a/src/widgets/file-progress.jsx +++ b/src/widgets/file-progress.jsx @@ -8,7 +8,7 @@ export default class FileProgress extends React.PureComponent {
{this.props.progress < 0.999 ? - + {e.preventDefault(); this.props.onCancel();}}> close diff --git a/src/widgets/image-preview.jsx b/src/widgets/image-preview.jsx index ff6c5c85..6e28caa4 100644 --- a/src/widgets/image-preview.jsx +++ b/src/widgets/image-preview.jsx @@ -45,7 +45,7 @@ export default class ImagePreview extends React.PureComponent { file_download - close + {e.preventDefault(); this.props.onClose();}}>close
diff --git a/src/widgets/menu-cancel.jsx b/src/widgets/menu-cancel.jsx index 22bc0429..1066008f 100644 --- a/src/widgets/menu-cancel.jsx +++ b/src/widgets/menu-cancel.jsx @@ -2,13 +2,9 @@ import React from 'react'; export default class MenuCancel extends React.PureComponent { - constructor(props) { - super(props); - } - render() { return ( - close + {e.preventDefault(); this.props.onCancel();}}>close ); } } diff --git a/src/widgets/menu-contacts.jsx b/src/widgets/menu-contacts.jsx index 4f371cf3..b1d7ea26 100644 --- a/src/widgets/menu-contacts.jsx +++ b/src/widgets/menu-contacts.jsx @@ -4,9 +4,9 @@ export default class MenuContacts extends React.PureComponent { render() { return ( ); } diff --git a/src/widgets/menu-start.jsx b/src/widgets/menu-start.jsx index f5b13833..419ce31f 100644 --- a/src/widgets/menu-start.jsx +++ b/src/widgets/menu-start.jsx @@ -4,9 +4,9 @@ export default class MenuStart extends React.PureComponent { render() { return ( ); } diff --git a/src/widgets/search-contacts.jsx b/src/widgets/search-contacts.jsx index 8751b5bc..1739b1f9 100644 --- a/src/widgets/search-contacts.jsx +++ b/src/widgets/search-contacts.jsx @@ -36,7 +36,8 @@ export default class SearchContacts extends React.PureComponent { this.props.onSearchContacts(query.length > 0 ? query : Tinode.DEL_CHAR); } - handleClear() { + handleClear(e) { + e.preventDefault(); if (this.state.edited) { this.props.onSearchContacts(Tinode.DEL_CHAR); } @@ -63,7 +64,7 @@ export default class SearchContacts extends React.PureComponent { value={this.state.search} onChange={this.handleSearchChange} onKeyDown={this.handleKeyDown} required autoFocus /> } - + close
diff --git a/src/widgets/send-message.jsx b/src/widgets/send-message.jsx index fbc069fd..ee5ee901 100644 --- a/src/widgets/send-message.jsx +++ b/src/widgets/send-message.jsx @@ -149,7 +149,8 @@ class SendMessage extends React.PureComponent { e.target.value = ''; } - handleSend() { + handleSend(e) { + e.preventDefault(); const message = this.state.message.trim(); if (message) { this.props.sendMessage(this.state.message.trim()); @@ -193,12 +194,12 @@ class SendMessage extends React.PureComponent {
{this.props.disabled ? photo : - {this.attachImage.click();}} title="Add image"> + {e.preventDefault(); this.attachImage.click();}} title="Add image"> photo } {this.props.disabled ? attach_file : - {this.attachFile.click();}} title="Attach file"> + {e.preventDefault(); this.attachFile.click();}} title="Attach file"> attach_file }