mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-26 06:14:18 +00:00
Merge remote-tracking branch 'origin/unstable' into unstable
This commit is contained in:
commit
1fef3f8a05
@ -37,10 +37,7 @@ class Character extends React.PureComponent<IProps> {
|
|||||||
const characterName = nameSwitch[id] ?? name;
|
const characterName = nameSwitch[id] ?? name;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div className={"Character"} onClick={this.props.onClick}>
|
||||||
className={"Character"}
|
|
||||||
onClick={this.props.onClick}
|
|
||||||
>
|
|
||||||
<img
|
<img
|
||||||
className={"Character_Icon"}
|
className={"Character_Icon"}
|
||||||
alt={name}
|
alt={name}
|
||||||
|
@ -28,8 +28,7 @@ class HomeButton extends React.PureComponent<IProps> {
|
|||||||
* Checks if this component should be showed.
|
* Checks if this component should be showed.
|
||||||
*/
|
*/
|
||||||
private shouldShow(): boolean {
|
private shouldShow(): boolean {
|
||||||
return !(((window as any).hide) as string[])
|
return !((window as any).hide as string[]).includes(this.props.anchor.toLowerCase());
|
||||||
.includes(this.props.anchor.toLowerCase());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
@ -28,8 +28,7 @@ class SideBarButton extends React.PureComponent<IProps> {
|
|||||||
* Checks if this component should be showed.
|
* Checks if this component should be showed.
|
||||||
*/
|
*/
|
||||||
private shouldShow(): boolean {
|
private shouldShow(): boolean {
|
||||||
return !(((window as any).hide) as string[])
|
return !((window as any).hide as string[]).includes(this.props.anchor.toLowerCase());
|
||||||
.includes(this.props.anchor.toLowerCase());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
Loading…
Reference in New Issue
Block a user