Skip to content

[QU-294] Storybook sample update #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 26, 2021
Merged

[QU-294] Storybook sample update #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b59949a
Turn on the reply and the image compression feature on the user2
HoonBaek Oct 26, 2021
b681810
Apply scrollToMessage into QuoteMessage component
HoonBaek Oct 26, 2021
c4c50be
Merge branch 'feature/UK-932/Integrate-message-threading' into bugfix…
HoonBaek Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 50 additions & 50 deletions src/smart-components/App/stories/index.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ export const versionInfo = () => {
<>
<div>UIKit: {pkg.version}</div>
<div>Sendbird SDK: {pkg.dependencies.sendbird.version}</div>
<button onClick={() => { setshowAll(!showAll)}}>Show all</button>
<button onClick={() => { setshowAll(!showAll) }}>Show all</button>
{
showAll && (
<div>
{
Object.keys(pkg.dependencies)
.map((p) => (
<div key={p}>{p}: {pkg.dependencies[p].version}</div>
))
}
</div>
<div>
{
Object.keys(pkg.dependencies)
.map((p) => (
<div key={p}>{p}: {pkg.dependencies[p].version}</div>
))
}
</div>
)
}
</>
Expand All @@ -47,7 +47,7 @@ export const basicSDK = () => fitPageSize(
userId={userId}
nickname={userId}
showSearchIcon
/*config={{ logLevel: 'all' }}*/
/*config={{ logLevel: 'all' }}*/
/>
);

Expand Down Expand Up @@ -111,8 +111,8 @@ export const login = () => {
type="button"
value={
messageSearch
? 'Use MessageSearch'
: 'Not use MessageSearch'
? 'Use MessageSearch'
: 'Not use MessageSearch'
}
onClick={() => setMessageSearch(!messageSearch)}
/>
Expand All @@ -121,8 +121,8 @@ export const login = () => {
type="button"
value={
profileEdit
? 'Use ProfileEdit'
: 'Not use ProfileEdit'
? 'Use ProfileEdit'
: 'Not use ProfileEdit'
}
onClick={() => setProfileEdit(!profileEdit)}
/>
Expand Down Expand Up @@ -207,7 +207,12 @@ export const user2 = () => fitPageSize(
showSearchIcon
allowProfileEdit
profileUrl={addProfile}
// config={{ logLevel: 'all' }}
replyType="QUOTE_REPLY"
imageCompression={{
compressionRate: 0.5,
resizingWidth: 100,
resizingHeight: '100px',
}}
/>
);
export const user3 = () => fitPageSize(
Expand All @@ -219,11 +224,6 @@ export const user3 = () => fitPageSize(
showSearchIcon
allowProfileEdit
profileUrl={addProfile}
imageCompression={{
compressionRate: 0.5,
resizingWidth: 100,
resizingHeight: '100px',
}}
replyType="QUOTE_REPLY"
/>
);
Expand Down Expand Up @@ -264,41 +264,41 @@ const CustomApp = () => {
imageCompression={{ compressionRate: 0.5, resizingWidth: 100, resizingHeight: '100px' }}
>
<div style={{ height: '100%', width: '100%', display: 'flex', flexDirection: 'row' }}>
<SBChannelList setChannelUrl={setChannelUrl} />
<div style={{ height: '100%', width: '100%', display: 'inline-flex', flexDirection: 'row' }}>
<SBChannelList setChannelUrl={setChannelUrl} />
<div style={{ height: '100%', width: '100%', display: 'inline-flex', flexDirection: 'row' }}>
<div style={{ width: '100%' }}>
<Conversation
channelUrl={channelUrl}
onChatHeaderActionClick={() => {
setChannelSearch(false);
setChannelSettings(true);
}}
showSearchIcon
onSearchClick={() => {
setChannelSettings(false);
setChannelSearch(true);
}}
/>
</div>
{channelSearch && (
<div style={{ width: '100%' }}>
<Conversation
<MessageSearch
channelUrl={channelUrl}
onChatHeaderActionClick={() => {
setChannelSearch(false);
setChannelSettings(true);
}}
showSearchIcon
onSearchClick={() => {
setChannelSettings(false);
setChannelSearch(true);
}}
searchString="hello"
onResultClick={() => { }}
/>
</div>
{channelSearch && (
<div style={{ width: '100%' }}>
<MessageSearch
channelUrl={channelUrl}
searchString="hello"
onResultClick={() => {}}
/>
</div>
)}
{channelSettings && (
<div style={{ display: 'inline-flex'}}>
<ChannelSettings
channelUrl={channelUrl}
onCloseClick={() => setChannelSettings(false)}
/>
</div>
)}
</div>
)}
{channelSettings && (
<div style={{ display: 'inline-flex' }}>
<ChannelSettings
channelUrl={channelUrl}
onCloseClick={() => setChannelSettings(false)}
/>
</div>
)}
</div>
</div>
</Sendbird>
);
};
Expand Down
12 changes: 10 additions & 2 deletions src/ui/MessageContent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function MessageContent({
chainBottom = false,
useReaction = false,
replyType,
// scrollToMessage,
scrollToMessage,
nicknamesMap,
emojiContainer,
showEdit,
Expand Down Expand Up @@ -185,7 +185,15 @@ export default function MessageContent({
{/* quote message */}
{(useReplying) ? (
<div className={getClassName(['sendbird-message-content__middle__quote-message', isByMe ? 'outgoing' : 'incoming'])}>
<QuoteMessage message={message} isByMe={isByMe} />
<QuoteMessage
message={message}
isByMe={isByMe}
onClick={() => {
if (message?.parentMessage?.createdAt && message?.parentMessageId) {
scrollToMessage(message.parentMessage.createdAt, message.parentMessageId);
}
}}
/>
</div>
) : null}
{/* container: message item body + emoji reactions */}
Expand Down
8 changes: 7 additions & 1 deletion src/ui/QuoteMessage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ interface Props {
message?: UserMessage | FileMessage;
isByMe?: boolean;
className?: string | Array<string>;
onClick?: () => void;
}

export default function QuoteMessage({
message,
isByMe = false,
className,
onClick = () => {},
}: Props): ReactElement {
const { parentMessage } = message;
const parentMessageSender = parentMessage?.sender;
Expand All @@ -43,7 +45,11 @@ export default function QuoteMessage({
const splitUrl = parentMessageUrl.split('/');

return (
<div className={getClassName([className, 'sendbird-quote-message', isByMe ? 'outgoing' : 'incoming'])}>
<div
className={getClassName([className, 'sendbird-quote-message', isByMe ? 'outgoing' : 'incoming'])}
key={parentMessage?.messageId}
onClick={onClick}
>
<div className="sendbird-quote-message__replied-to">
<Icon
className="sendbird-quote-message__replied-to__icon"
Expand Down