[Glitch] [Proposal] Make able to write React in Typescript (#2190)
Port 4520e6473a
to glitch-soc
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
local
parent
678480d4d3
commit
1565af1caf
16 changed files with 105 additions and 92 deletions
@ -1,79 +0,0 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||
import { autoPlayGif } from 'flavours/glitch/initial_state'; |
||||
import classNames from 'classnames'; |
||||
|
||||
export default class Avatar extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
account: ImmutablePropTypes.map, |
||||
className: PropTypes.string, |
||||
size: PropTypes.number.isRequired, |
||||
style: PropTypes.object, |
||||
inline: PropTypes.bool, |
||||
animate: PropTypes.bool, |
||||
}; |
||||
|
||||
static defaultProps = { |
||||
animate: autoPlayGif, |
||||
size: 20, |
||||
inline: false, |
||||
}; |
||||
|
||||
state = { |
||||
hovering: false, |
||||
}; |
||||
|
||||
handleMouseEnter = () => { |
||||
if (this.props.animate) return; |
||||
this.setState({ hovering: true }); |
||||
}; |
||||
|
||||
handleMouseLeave = () => { |
||||
if (this.props.animate) return; |
||||
this.setState({ hovering: false }); |
||||
}; |
||||
|
||||
render () { |
||||
const { |
||||
account, |
||||
animate, |
||||
className, |
||||
inline, |
||||
size, |
||||
} = this.props; |
||||
const { hovering } = this.state; |
||||
|
||||
const style = { |
||||
...this.props.style, |
||||
width: `${size}px`, |
||||
height: `${size}px`, |
||||
backgroundSize: `${size}px ${size}px`, |
||||
}; |
||||
|
||||
if (account) { |
||||
const src = account.get('avatar'); |
||||
const staticSrc = account.get('avatar_static'); |
||||
|
||||
if (hovering || animate) { |
||||
style.backgroundImage = `url(${src})`; |
||||
} else { |
||||
style.backgroundImage = `url(${staticSrc})`; |
||||
} |
||||
} |
||||
|
||||
return ( |
||||
<div |
||||
className={classNames('account__avatar', { 'account__avatar-inline': inline }, className)} |
||||
onMouseEnter={this.handleMouseEnter} |
||||
onMouseLeave={this.handleMouseLeave} |
||||
style={style} |
||||
data-avatar-of={account && `@${account.get('acct')}`} |
||||
role='img' |
||||
aria-label={account?.get('acct')} |
||||
/> |
||||
); |
||||
} |
||||
|
||||
} |
@ -0,0 +1,48 @@ |
||||
import * as React from 'react'; |
||||
import classNames from 'classnames'; |
||||
import { autoPlayGif } from 'flavours/glitch/initial_state'; |
||||
import { useHovering } from 'hooks/useHovering'; |
||||
import type { Account } from 'types/resources'; |
||||
|
||||
type Props = { |
||||
account: Account | undefined; |
||||
className?: string; |
||||
size: number; |
||||
style?: React.CSSProperties; |
||||
inline?: boolean; |
||||
} |
||||
|
||||
export const Avatar: React.FC<Props> = ({ |
||||
account, |
||||
className, |
||||
size = 20, |
||||
inline = false, |
||||
style: styleFromParent, |
||||
}) => { |
||||
const { hovering, handleMouseEnter, handleMouseLeave } = useHovering(autoPlayGif); |
||||
|
||||
const style = { |
||||
...styleFromParent, |
||||
width: `${size}px`, |
||||
height: `${size}px`, |
||||
backgroundSize: `${size}px ${size}px`, |
||||
}; |
||||
|
||||
if (account) { |
||||
style.backgroundImage = `url(${account.get(hovering ? 'avatar' : 'avatar_static')})`; |
||||
} |
||||
|
||||
return ( |
||||
<div |
||||
className={classNames('account__avatar', { 'account__avatar-inline': inline }, className)} |
||||
onMouseEnter={handleMouseEnter} |
||||
onMouseLeave={handleMouseLeave} |
||||
style={style} |
||||
data-avatar-of={account && `@${account.get('acct')}`} |
||||
role='img' |
||||
aria-label={account?.get('acct')} |
||||
/> |
||||
); |
||||
}; |
||||
|
||||
export default Avatar; |
@ -1,3 +0,0 @@ |
||||
export default function uuid(a) { |
||||
return a ? (a^Math.random() * 16 >> a / 4).toString(16) : ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, uuid); |
||||
} |
@ -0,0 +1,3 @@ |
||||
export default function uuid(a?: string): string { |
||||
return a ? ((a as any as number) ^ Math.random() * 16 >> (a as any as number) / 4).toString(16) : ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid); |
||||
} |
Loading…
Reference in new issue