Skip to content

Commit c02bbd6

Browse files
authored
feat: add conversation actions to channel chat (#2721)
1 parent 9f7344b commit c02bbd6

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

src/apps/feed/components/feed-chat/index.tsx

+6-11
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ import { Panel, PanelBody, PanelHeader, PanelTitle } from '../../../../component
1515
import { InvertedScroll } from '../../../../components/inverted-scroll';
1616
import { getOtherMembersTypingDisplayJSX } from '../../../../components/messenger/lib/utils';
1717
import { rawChannelSelector } from '../../../../store/channels/saga';
18-
import { IconButton } from '@zero-tech/zui/components/IconButton';
19-
import { IconChevronLeft, IconChevronRight } from '@zero-tech/zui/icons';
2018
import { toggleSecondarySidekick } from '../../../../store/group-management';
2119
import { MembersSidekick } from '../../../../components/sidekick/variants/members-sidekick';
2220
import { Spinner } from '@zero-tech/zui/components/LoadingIndicator';
21+
import { ConversationActionsContainer } from '../../../../components/messenger/conversation-actions/container';
2322

2423
import classNames from 'classnames';
2524
import styles from './styles.module.scss';
@@ -142,15 +141,11 @@ export class Container extends React.Component<Properties> {
142141

143142
renderHeader = () => {
144143
return (
145-
<PanelHeader className={styles.PanelHeader} toggleSidekick={this.toggleSidekick}>
146-
<PanelTitle>Chat</PanelTitle>
147-
<IconButton
148-
className={classNames(styles.GroupButton, this.props.isSecondarySidekickOpen && 'is-active')}
149-
Icon={this.props.isSecondarySidekickOpen ? IconChevronRight : IconChevronLeft}
150-
size={32}
151-
onClick={this.toggleSidekick}
152-
isFilled
153-
/>
144+
<PanelHeader className={styles.PanelHeader}>
145+
<PanelTitle className={styles.PanelTitle} toggleSidekick={this.toggleSidekick}>
146+
Chat
147+
</PanelTitle>
148+
<ConversationActionsContainer />
154149
</PanelHeader>
155150
);
156151
};

src/apps/feed/components/feed-chat/styles.module.scss

+7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@
4343
}
4444

4545
.PanelHeader {
46+
display: flex;
47+
justify-content: space-between;
48+
align-items: center;
49+
}
50+
51+
.PanelTitle {
4652
cursor: pointer;
53+
width: 100%;
4754
}
4855

4956
.GroupButton {

src/components/layout/panel/index.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ export const PanelBody = ({ children, className }: PanelProps) => {
2828
return <div className={cn(styles.Body, className)}>{children}</div>;
2929
};
3030

31-
export const PanelHeader = ({ children, className, toggleSidekick }: PanelProps) => {
31+
export const PanelHeader = ({ children, className }: PanelProps) => {
32+
return <div className={cn(styles.Header, className)}>{children}</div>;
33+
};
34+
35+
export const PanelTitle = ({ children, className, toggleSidekick }: PanelProps) => {
3236
return (
33-
<div className={cn(styles.Header, className)} onClick={toggleSidekick}>
37+
<div className={cn(styles.Title, className)} onClick={toggleSidekick}>
3438
{children}
3539
</div>
3640
);
3741
};
38-
39-
export const PanelTitle = ({ children, className }: PanelProps) => {
40-
return <div className={cn(styles.Title, className)}>{children}</div>;
41-
};

0 commit comments

Comments
 (0)