@@ -9,10 +9,8 @@ Please see LICENSE files in the repository root for full details.
9
9
import classNames from "classnames" ;
10
10
import { EventType } from "matrix-js-sdk/src/matrix" ;
11
11
import React , { useContext , useRef , useState , type MouseEvent , type ReactNode } from "react" ;
12
- import { Tooltip } from "@vector-im/compound-web" ;
13
12
14
13
import MatrixClientContext from "../../../contexts/MatrixClientContext" ;
15
- import { useTimeout } from "../../../hooks/useTimeout" ;
16
14
import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds" ;
17
15
import AccessibleButton from "./AccessibleButton" ;
18
16
import Spinner from "./Spinner" ;
@@ -42,15 +40,6 @@ const MiniAvatarUploader: React.FC<IProps> = ({
42
40
} ) => {
43
41
const cli = useContext ( MatrixClientContext ) ;
44
42
const [ busy , setBusy ] = useState ( false ) ;
45
- const [ hover , setHover ] = useState ( false ) ;
46
- const [ show , setShow ] = useState ( false ) ;
47
-
48
- useTimeout ( ( ) => {
49
- setShow ( true ) ;
50
- } , 3000 ) ; // show after 3 seconds
51
- useTimeout ( ( ) => {
52
- setShow ( false ) ;
53
- } , 13000 ) ; // hide after being shown for 10 seconds
54
43
55
44
const uploadRef = useRef < HTMLInputElement > ( null ) ;
56
45
@@ -61,7 +50,6 @@ const MiniAvatarUploader: React.FC<IProps> = ({
61
50
isUserAvatar || room ?. currentState ?. maySendStateEvent ( EventType . RoomAvatar , cli . getSafeUserId ( ) ) ;
62
51
if ( ! canSetAvatar ) return < React . Fragment > { children } </ React . Fragment > ;
63
52
64
- const visible = ! ! label && ( hover || show ) ;
65
53
return (
66
54
< React . Fragment >
67
55
< input
@@ -84,24 +72,23 @@ const MiniAvatarUploader: React.FC<IProps> = ({
84
72
accept = "image/*"
85
73
/>
86
74
87
- < Tooltip label = { label ! } open = { visible } onOpenChange = { setHover } >
88
- < AccessibleButton
89
- className = { classNames ( "mx_MiniAvatarUploader" , {
90
- mx_MiniAvatarUploader_busy : busy ,
91
- mx_MiniAvatarUploader_hasAvatar : hasAvatar ,
92
- } ) }
93
- disabled = { busy }
94
- onClick = { ( ) => {
95
- uploadRef . current ?. click ( ) ;
96
- } }
97
- >
98
- { children }
75
+ < AccessibleButton
76
+ className = { classNames ( "mx_MiniAvatarUploader" , {
77
+ mx_MiniAvatarUploader_busy : busy ,
78
+ mx_MiniAvatarUploader_hasAvatar : hasAvatar ,
79
+ } ) }
80
+ disabled = { busy }
81
+ onClick = { ( ) => {
82
+ uploadRef . current ?. click ( ) ;
83
+ } }
84
+ aria-label = { label }
85
+ >
86
+ { children }
99
87
100
- < div className = "mx_MiniAvatarUploader_indicator" >
101
- { busy ? < Spinner w = { 20 } h = { 20 } /> : < div className = "mx_MiniAvatarUploader_cameraIcon" /> }
102
- </ div >
103
- </ AccessibleButton >
104
- </ Tooltip >
88
+ < div className = "mx_MiniAvatarUploader_indicator" >
89
+ { busy ? < Spinner w = { 20 } h = { 20 } /> : < div className = "mx_MiniAvatarUploader_cameraIcon" /> }
90
+ </ div >
91
+ </ AccessibleButton >
105
92
</ React . Fragment >
106
93
) ;
107
94
} ;
0 commit comments