New group/channel fixes

peng841201 · Apr 20, 2020 · c50127f · c50127f
1 parent dfe827b
commit c50127f
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 37 deletions.
diff --git a/src/Components/ColumnLeft/AddParticipants.css b/src/Components/ColumnLeft/AddParticipants.css
@@ -0,0 +1,7 @@
+/*
+ *  Copyright (c) 2018-present, Evgeny Nadymov
+ *
+ * This source code is licensed under the GPL v.3.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
diff --git a/src/Components/ColumnLeft/AddParticipants.js b/src/Components/ColumnLeft/AddParticipants.js
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2018-present, Evgeny Nadymov
+ *
+ * This source code is licensed under the GPL v.3.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+
+class AddParticipants extends React.Component {
+
+    render() {
+
+    }
+
+}
+
+AddParticipants.propTypes = {};
+
+export default AddParticipants;
diff --git a/src/Components/ColumnLeft/NewChannel.js b/src/Components/ColumnLeft/NewChannel.js
@@ -88,27 +88,29 @@ class NewChannel extends React.Component {
                         <span className='header-status-content'>{t('NewChannel')}</span>
                     </div>
                 </div>
-                <div className='sidebar-page-content new-chat-content'>
-                    <NewChatPhoto onChoose={this.handleChoosePhoto}/>
-                    <div className='new-chat-title'>
-                        <TextField
-                            inputRef={this.titleRef}
-                            error={error}
-                            className='new-chat-input'
-                            variant='outlined'
-                            fullWidth
-                            label={t('EnterChannelName')}
-                            defaultValue={''}
-                        />
-                        <TextField
-                            inputRef={this.descriptionRef}
-                            className='new-chat-input'
-                            variant='outlined'
-                            fullWidth
-                            label={t('DescriptionOptionalPlaceholder')}
-                            defaultValue={''}
-                        />
-                        <div className='edit-profile-hint'>{t('DescriptionInfo')}</div>
+                <div className='sidebar-page-content'>
+                    <div className='new-chat-content'>
+                        <NewChatPhoto onChoose={this.handleChoosePhoto}/>
+                        <div className='new-chat-title'>
+                            <TextField
+                                inputRef={this.titleRef}
+                                error={error}
+                                className='new-chat-input'
+                                variant='outlined'
+                                fullWidth
+                                label={t('EnterChannelName')}
+                                defaultValue={''}
+                            />
+                            <TextField
+                                inputRef={this.descriptionRef}
+                                className='new-chat-input'
+                                variant='outlined'
+                                fullWidth
+                                label={t('DescriptionOptionalPlaceholder')}
+                                defaultValue={''}
+                            />
+                            <div className='edit-profile-hint'>{t('DescriptionInfo')}</div>
+                        </div>
                     </div>
                 </div>
 

diff --git a/src/Components/ColumnLeft/NewGroup.js b/src/Components/ColumnLeft/NewGroup.js
@@ -126,23 +126,25 @@ class NewGroup extends React.Component {
                         <span className='header-status-content'>{t('NewGroup')}</span>
                     </div>
                 </div>
-                <div className='sidebar-page-content new-chat-content'>
-                    <NewChatPhoto onChoose={this.handleChoosePhoto}/>
-                    <div className='new-chat-title'>
-                        <TextField
-                            inputRef={this.titleRef}
-                            error={error}
-                            className='new-chat-input'
-                            variant='outlined'
-                            fullWidth
-                            label={t('GroupName')}
-                            defaultValue={''}
-                        />
-                    </div>
-                    {/*<div className='sidebar-page-section'>*/}
+                <div className='sidebar-page-content'>
+                    <div className='new-chat-content'>
+                        <NewChatPhoto onChoose={this.handleChoosePhoto}/>
+                        <div className='new-chat-title'>
+                            <TextField
+                                inputRef={this.titleRef}
+                                error={error}
+                                className='new-chat-input'
+                                variant='outlined'
+                                fullWidth
+                                label={t('GroupName')}
+                                defaultValue={''}
+                            />
+                        </div>
+                        {/*<div className='sidebar-page-section'>*/}
                         <SectionHeader>{itemsCaption}</SectionHeader>
                         {items}
-                    {/*</div>*/}
+                        {/*</div>*/}
+                    </div>
                 </div>
 
                 <div className='new-chat-bottom-button' onClick={this.handleDone}>

diff --git a/src/Components/Popup/SidebarDialog.js b/src/Components/Popup/SidebarDialog.js
@@ -213,7 +213,7 @@ class SidebarDialog extends React.Component {
                         <DialogsHeader
                             ref={this.headerRef}
                             openSearch={true}
-                            timeout={0}
+                            timeout={false}
                             onClick={this.handleHeaderClick}
                             onSearch={this.handleSearch}
                             onSearchTextChange={this.handleSearchTextChange}