Skip to content
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

Jump to bottom

Fix/no ref/selected message shadow #2807

Merged
merged 3 commits into from
Jul 10, 2023
Merged

Fix/no ref/selected message shadow #2807

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
01ae43d
feat: moved H5AudioPlayer SASS to styled components
yougotwill Jul 6, 2023
d888999
fix: use StyledMessageHighlighter in MessageAttachment only when it i…
yougotwill Jul 6, 2023
e232ead
fix: message spacing after fixing audio message shadow
yougotwill Jul 6, 2023
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
3 changes: 3 additions & 0 deletions stylesheets/_modules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,6 +1048,9 @@
}

// Module H5AudioPlayer
$rhap_background-color: var(--transparent-color) !default;
$rhap_font-family: inherit !default;

.module-message__container--outgoing {
.rhap_container {
background-color: var(--message-bubbles-sent-background-color);
Expand Down
132 changes: 0 additions & 132 deletions stylesheets/_session_conversation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,135 +254,3 @@
}
}
}

/* ************ */
/* AUDIO PLAYER */
/* ************ */
$rhap_background-color: var(--transparent-color) !default;
$rhap_font-family: inherit !default;

.rhap_container,
.rhap_container button,
.rhap_progress-container {
outline: none;
}

.rhap_progress-container {
margin: 0 0 0 calc(10px + 1%);
}

.rhap_container {
min-width: 220px;
padding: 0px;
background-color: transparent;
box-shadow: none;
padding: var(--padding-message-content);
border-radius: var(--border-radius-message-box);

svg {
transition: fill var(--default-duration);
}
}

.rhap_total-time {
display: none;
}

.rhap_current-time {
margin: 0 5px 0 4px;
flex-shrink: 0;
}

.rhap_play-pause-button {
display: flex;
justify-content: center;
align-items: center;
}

.rhap_volume-bar {
display: none;
}

.rhap_volume-button {
.module-message__container--incoming & {
color: var(--message-bubbles-received-text-color);
}
.module-message__container--outgoing & {
color: var(--message-bubbles-sent-text-color);
}
}

.rhap_volume-container div[role='progressbar'] {
display: none;
}

.rhap_time {
.module-message__container--incoming & {
color: var(--message-bubbles-received-text-color);
}
.module-message__container--outgoing & {
color: var(--message-bubbles-sent-text-color);
}

font-size: 12px;
}

.rhap_progress-bar {
box-sizing: border-box;
position: relative;
z-index: 0;
width: 100%;
height: 5px;
border-radius: 2px;
}

.rhap_progress-filled {
padding-left: 5px;
}

.rhap_download-progress {
height: 100%;
position: absolute;
z-index: 1;
border-radius: 2px;
}

.rhap_progress-indicator {
z-index: 3;
width: 15px;
height: 15px;
top: -5px;
margin-left: -10px;
box-shadow: rgba(0, 0, 0, 0.5) 0 0 5px !important;
}

.rhap_controls-section {
display: flex;
justify-content: space-between;
align-items: center;
}

.rhap_additional-controls {
display: none;
}

.rhap_play-pause-button {
width: unset;
height: unset;
}

.rhap_controls-section {
flex: unset;
justify-content: flex-start;
}

.rhap_volume-button {
font-size: 20px;
width: 20px;
height: 20px;
margin-right: 0px;
}

/* **************** */
/* END AUDIO PLAYER */
/* **************** */
124 changes: 123 additions & 1 deletion ts/components/conversation/H5AudioPlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,128 @@ const StyledSpeedButton = styled.div`
}
`;

export const StyledH5AudioPlayer = styled(H5AudioPlayer)`
&.rhap_container {
min-width: 220px;
padding: 0px;
outline: none;
padding: var(--padding-message-content);
border-radius: var(--border-radius-message-box);

svg {
transition: fill var(--default-duration);
}

button {
outline: none;
}
}

.rhap_progress-container {
margin: 0 0 0 calc(10px + 1%);
outline: none;
}

.rhap_total-time {
display: none;
}

.rhap_current-time {
margin: 0 5px 0 4px;
flex-shrink: 0;
}

.rhap_play-pause-button {
display: flex;
justify-content: center;
align-items: center;
}

.rhap_volume-bar {
display: none;
}

.rhap_volume-button {
.module-message__container--incoming & {
color: var(--message-bubbles-received-text-color);
}
.module-message__container--outgoing & {
color: var(--message-bubbles-sent-text-color);
}
}

.rhap_volume-container div[role='progressbar'] {
display: none;
}

.rhap_time {
.module-message__container--incoming & {
color: var(--message-bubbles-received-text-color);
}
.module-message__container--outgoing & {
color: var(--message-bubbles-sent-text-color);
}

font-size: 12px;
}

.rhap_progress-bar {
box-sizing: border-box;
position: relative;
z-index: 0;
width: 100%;
height: 5px;
border-radius: 2px;
}

.rhap_progress-filled {
padding-left: 5px;
}

.rhap_download-progress {
height: 100%;
position: absolute;
z-index: 1;
border-radius: 2px;
}

.rhap_progress-indicator {
z-index: 3;
width: 15px;
height: 15px;
top: -5px;
margin-left: -10px;
box-shadow: rgba(0, 0, 0, 0.5) 0 0 5px !important;
}

.rhap_controls-section {
display: flex;
justify-content: space-between;
align-items: center;
}

.rhap_additional-controls {
display: none;
}

.rhap_play-pause-button {
width: unset;
height: unset;
}

.rhap_controls-section {
flex: unset;
justify-content: flex-start;
}

.rhap_volume-button {
font-size: 20px;
width: 20px;
height: 20px;
margin-right: 0px;
}
`;

export const AudioPlayerWithEncryptedFile = (props: {
src: string;
contentType: string;
Expand Down Expand Up @@ -98,7 +220,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
};

return (
<H5AudioPlayer
<StyledH5AudioPlayer
src={urlToLoad}
preload="metadata"
style={{ pointerEvents: multiSelectMode ? 'none' : 'inherit' }}
Expand Down
37 changes: 23 additions & 14 deletions ts/components/conversation/message/message-content/MessageAttachment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { LightBoxOptions } from '../../SessionConversation';
import { ClickToTrustSender } from './ClickToTrustSender';
import styled from 'styled-components';
import classNames from 'classnames';
import { StyledMessageHighlighter } from './MessageContent';

export type MessageAttachmentSelectorProps = Pick<
MessageRenderingProps,
Expand All @@ -48,10 +49,13 @@ type Props = {
messageId: string;
imageBroken: boolean;
handleImageError: () => void;
highlight?: boolean;
};
// tslint:disable: use-simple-attributes

const StyledAttachmentContainer = styled.div<{ messageDirection: MessageModelType }>`
const StyledAttachmentContainer = styled.div<{
messageDirection: MessageModelType;
}>`
text-align: center;
position: relative;
overflow: hidden;
Expand All @@ -61,10 +65,11 @@ const StyledAttachmentContainer = styled.div<{ messageDirection: MessageModelTyp

// tslint:disable-next-line max-func-body-length cyclomatic-complexity
export const MessageAttachment = (props: Props) => {
const { messageId, imageBroken, handleImageError } = props;
const { messageId, imageBroken, handleImageError, highlight = false } = props;

const dispatch = useDispatch();
const attachmentProps = useSelector(state => getMessageAttachmentProps(state as any, messageId));

const multiSelectMode = useSelector(isMessageSelectionMode);
const onClickOnImageGrid = useCallback(
(attachment: AttachmentTypeWithPath | AttachmentType) => {
Expand Down Expand Up @@ -116,6 +121,7 @@ export const MessageAttachment = (props: Props) => {
if (!attachments || !attachments[0]) {
return null;
}

const firstAttachment = attachments[0];
const displayImage = canDisplayImage(attachments);

Expand All @@ -130,18 +136,22 @@ export const MessageAttachment = (props: Props) => {
(isVideo(attachments) && hasVideoScreenshot(attachments)))
) {
return (
<StyledAttachmentContainer messageDirection={direction}>
<ImageGrid
attachments={attachments}
onError={handleImageError}
onClickAttachment={onClickOnImageGrid}
/>
</StyledAttachmentContainer>
<StyledMessageHighlighter highlight={highlight}>
<StyledAttachmentContainer messageDirection={direction}>
<ImageGrid
attachments={attachments}
onError={handleImageError}
onClickAttachment={onClickOnImageGrid}
/>
</StyledAttachmentContainer>
</StyledMessageHighlighter>
);
}

if (!firstAttachment.pending && !firstAttachment.error && isAudio(attachments)) {
return (
<div
<StyledMessageHighlighter
highlight={highlight}
role="main"
onClick={(e: any) => {
if (multiSelectMode) {
Expand All @@ -150,21 +160,20 @@ export const MessageAttachment = (props: Props) => {
e.stopPropagation();
e.preventDefault();
}}
style={{ padding: 'var(--margins-xs) 0px' }}
>
<AudioPlayerWithEncryptedFile
src={firstAttachment.url}
contentType={firstAttachment.contentType}
messageId={messageId}
/>
</div>
</StyledMessageHighlighter>
);
}
const { pending, fileName, fileSize, contentType } = firstAttachment;
const extension = getExtensionForDisplay({ contentType, fileName });

return (
<div className="module-message__generic-attachment">
<StyledMessageHighlighter highlight={highlight} className="module-message__generic-attachment">
{pending ? (
<div className="module-message__generic-attachment__spinner-container">
<Spinner size="small" />
Expand Down Expand Up @@ -200,7 +209,7 @@ export const MessageAttachment = (props: Props) => {
{fileSize}
</div>
</div>
</div>
</StyledMessageHighlighter>
);
};

Expand Down
Loading