feat(devices) scroll overflow devices texts on hover (#12974)

This commit is contained in:
Avram Tudor 2023-03-01 09:38:26 +02:00 committed by GitHub
parent 29b6ce7721
commit baf5aa14e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 100 additions and 9 deletions

View File

@ -22,11 +22,7 @@
} }
&-entry-text { &-entry-text {
display: inline-block;
text-overflow: ellipsis;
max-width: 213px; max-width: 213px;
overflow: hidden;
white-space: nowrap;
&.left-margin { &.left-margin {
margin-left: 36px; margin-left: 36px;

View File

@ -5,6 +5,9 @@ import { makeStyles } from 'tss-react/mui';
import { showOverflowDrawer } from '../../../../toolbox/functions.web'; import { showOverflowDrawer } from '../../../../toolbox/functions.web';
import Icon from '../../../icons/components/Icon'; import Icon from '../../../icons/components/Icon';
import { withPixelLineHeight } from '../../../styles/functions.web'; import { withPixelLineHeight } from '../../../styles/functions.web';
import { TEXT_OVERFLOW_TYPES } from '../../constants.any';
import TextWithOverflow from './TextWithOverflow';
export interface IProps { export interface IProps {
@ -59,6 +62,11 @@ export interface IProps {
*/ */
onKeyPress?: (e?: React.KeyboardEvent) => void; onKeyPress?: (e?: React.KeyboardEvent) => void;
/**
* Overflow type for item text.
*/
overflowType?: TEXT_OVERFLOW_TYPES;
/** /**
* Whether the item is marked as selected. * Whether the item is marked as selected.
*/ */
@ -149,6 +157,7 @@ const ContextMenuItem = ({
onClick, onClick,
onKeyDown, onKeyDown,
onKeyPress, onKeyPress,
overflowType,
selected, selected,
testId, testId,
text, text,
@ -180,12 +189,13 @@ const ContextMenuItem = ({
size = { 20 } size = { 20 }
src = { icon } />} src = { icon } />}
{text && ( {text && (
<span <TextWithOverflow
className = { cx(styles.text, className = { cx(styles.text,
_overflowDrawer && styles.drawerText, _overflowDrawer && styles.drawerText,
textClassName) }> textClassName) }
overflowType = { overflowType } >
{text} {text}
</span> </TextWithOverflow>
)} )}
{children} {children}
</div> </div>

View File

@ -0,0 +1,74 @@
import React, { ReactNode, useRef } from 'react';
import { keyframes } from 'styled-components';
import { makeStyles } from 'tss-react/mui';
import { TEXT_OVERFLOW_TYPES } from '../../constants.web';
interface ITextWithOverflowProps {
children: ReactNode;
className?: string;
overflowType?: TEXT_OVERFLOW_TYPES;
}
const useStyles = makeStyles<{ translateDiff: number; }>()((_, { translateDiff }) => {
return {
animation: {
'&:hover': {
animation: `${keyframes`
0%, 20% {
transform: translateX(0%);
left: 0%;
}
80%, 100% {
transform: translateX(-${translateDiff}px);
left: 100%;
}
`} ${Math.max(translateDiff * 50, 2000)}ms infinite alternate linear;`
}
},
textContainer: {
overflow: 'hidden'
},
[TEXT_OVERFLOW_TYPES.ELLIPSIS]: {
display: 'block',
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap'
},
[TEXT_OVERFLOW_TYPES.SCROLL_ON_HOVER]: {
display: 'inline-block',
overflow: 'visible',
whiteSpace: 'nowrap'
}
};
});
const TextWithOverflow = ({
className,
overflowType = TEXT_OVERFLOW_TYPES.ELLIPSIS,
children
}: ITextWithOverflowProps) => {
const containerRef = useRef<HTMLDivElement>(null);
const contentRef = useRef<HTMLSpanElement>(null);
const shouldAnimateOnHover = overflowType === TEXT_OVERFLOW_TYPES.SCROLL_ON_HOVER
&& containerRef.current
&& contentRef.current
&& containerRef.current.clientWidth < contentRef.current.clientWidth;
const translateDiff = shouldAnimateOnHover ? contentRef.current.clientWidth - containerRef.current.clientWidth : 0;
const { classes: styles, cx } = useStyles({ translateDiff });
return (
<div
className = { cx(className, styles.textContainer) }
ref = { containerRef }>
<span
className = { cx(styles[overflowType], shouldAnimateOnHover && styles.animation) }
ref = { contentRef }>
{children}
</span>
</div>
);
};
export default TextWithOverflow;

View File

@ -8,6 +8,14 @@ export enum BUTTON_TYPES {
TERTIARY = 'tertiary' TERTIARY = 'tertiary'
} }
/**
* Behaviour types for showing overflow text content.
*/
export enum TEXT_OVERFLOW_TYPES {
ELLIPSIS = 'ellipsis',
SCROLL_ON_HOVER = 'scroll-on-hover'
}
/** /**
* The modes of the buttons. * The modes of the buttons.
*/ */

View File

@ -7,6 +7,7 @@ import { IconCheck, IconExclamationSolid } from '../../../../base/icons/svg';
// @ts-ignore // @ts-ignore
import JitsiMeetJS from '../../../../base/lib-jitsi-meet/_'; import JitsiMeetJS from '../../../../base/lib-jitsi-meet/_';
import ContextMenuItem from '../../../../base/ui/components/web/ContextMenuItem'; import ContextMenuItem from '../../../../base/ui/components/web/ContextMenuItem';
import { TEXT_OVERFLOW_TYPES } from '../../../../base/ui/constants.any';
import Meter from './Meter'; import Meter from './Meter';
@ -231,6 +232,7 @@ export default class MicrophoneEntry extends Component<Props, State> {
<ContextMenuItem <ContextMenuItem
accessibilityLabel = '' accessibilityLabel = ''
icon = { isSelected ? IconCheck : undefined } icon = { isSelected ? IconCheck : undefined }
overflowType = { TEXT_OVERFLOW_TYPES.SCROLL_ON_HOVER }
selected = { isSelected } selected = { isSelected }
text = { children } text = { children }
textClassName = { clsx('audio-preview-entry-text', !isSelected && 'left-margin') }> textClassName = { clsx('audio-preview-entry-text', !isSelected && 'left-margin') }>

View File

@ -4,7 +4,7 @@ import React, { useRef } from 'react';
import { IconCheck } from '../../../../base/icons/svg'; import { IconCheck } from '../../../../base/icons/svg';
import Button from '../../../../base/ui/components/web/Button'; import Button from '../../../../base/ui/components/web/Button';
import ContextMenuItem from '../../../../base/ui/components/web/ContextMenuItem'; import ContextMenuItem from '../../../../base/ui/components/web/ContextMenuItem';
import { BUTTON_TYPES } from '../../../../base/ui/constants.any'; import { BUTTON_TYPES, TEXT_OVERFLOW_TYPES } from '../../../../base/ui/constants.any';
import logger from '../../../logger'; import logger from '../../../logger';
const TEST_SOUND_PATH = 'sounds/ring.mp3'; const TEST_SOUND_PATH = 'sounds/ring.mp3';
@ -118,6 +118,7 @@ const SpeakerEntry = (props: IProps) => {
<ContextMenuItem <ContextMenuItem
accessibilityLabel = '' accessibilityLabel = ''
icon = { isSelected ? IconCheck : undefined } icon = { isSelected ? IconCheck : undefined }
overflowType = { TEXT_OVERFLOW_TYPES.SCROLL_ON_HOVER }
selected = { isSelected } selected = { isSelected }
text = { children } text = { children }
textClassName = { clsx('audio-preview-entry-text', !isSelected && 'left-margin') }> textClassName = { clsx('audio-preview-entry-text', !isSelected && 'left-margin') }>