Skip to content

Commit

Permalink
[Glitch] Change dropdown menu icon to not be replaced by close icon w…
Browse files Browse the repository at this point in the history
…hen open in web UI

Port 2347ea8 to glitch-soc

Signed-off-by: Claire <[email protected]>
  • Loading branch information
Gargron authored and ClearlyClaire committed Mar 11, 2024
1 parent 777510a commit efbc8cb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions app/javascript/flavours/glitch/components/dropdown_menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { supportsPassiveEvents } from 'detect-passive-events';
import Overlay from 'react-overlays/Overlay';

import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { CircularProgress } from 'flavours/glitch/components/circular_progress';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';

Expand Down Expand Up @@ -298,7 +297,7 @@ class Dropdown extends PureComponent {
}) : (
<IconButton
icon={!open ? icon : 'close'}
iconComponent={!open ? iconComponent : CloseIcon}
iconComponent={iconComponent}
title={title}
active={open}
disabled={disabled}
Expand Down
6 changes: 2 additions & 4 deletions app/javascript/flavours/glitch/features/ui/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ const mapStateToProps = state => ({
hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
isWide: state.getIn(['local_settings', 'stretch']),
dropdownMenuIsOpen: state.dropdownMenu.openId !== null,
unreadNotifications: state.getIn(['notifications', 'unread']),
showFaviconBadge: state.getIn(['local_settings', 'notifications', 'favicon_badge']),
hicolorPrivacyIcons: state.getIn(['local_settings', 'hicolor_privacy_icons']),
Expand Down Expand Up @@ -274,7 +273,6 @@ class UI extends PureComponent {
hasMediaAttachments: PropTypes.bool,
canUploadMore: PropTypes.bool,
intl: PropTypes.object.isRequired,
dropdownMenuIsOpen: PropTypes.bool,
unreadNotifications: PropTypes.number,
showFaviconBadge: PropTypes.bool,
hicolorPrivacyIcons: PropTypes.bool,
Expand Down Expand Up @@ -600,7 +598,7 @@ class UI extends PureComponent {

render () {
const { draggingOver } = this.state;
const { children, isWide, location, dropdownMenuIsOpen, layout, moved } = this.props;
const { children, isWide, location, layout, moved } = this.props;

const className = classNames('ui', {
'wide': isWide,
Expand Down Expand Up @@ -632,7 +630,7 @@ class UI extends PureComponent {

return (
<HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
<div className={className} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
<div className={className} ref={this.setRef}>
{moved && (<div className='flash-message alert'>
<FormattedMessage
id='moved_to_warning'
Expand Down

0 comments on commit efbc8cb

Please sign in to comment.