mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-09 16:29:04 +01:00
fd33bcb3b2
* Update react-overlays to latest version * Fix breaking changes in dropdown menus * Use react-overlays built-in arrow positioning feature * Re-implemented `.dropdown-menu__arrow` to have a defined width and height to improve positioning * Moved wrapping div (`.dropdown-menu` from `DropdownMenu` to `Dropdown`) * Wrap button in a span to solve issue with ref * Temporarily remove animations * Fix breaking changes in emoji picker * Wrap EmojiPickerMenu in a div where react-overlays’ ref is added * Fix breaking changes in language dropdown * Fix breaking changes in privacy dropdown * Fix breaking changes in search form * Add animations back using `@keyframes` * Fix arrow color in light theme * Fix linting issue * Remove unused `mounted` state * Remove `placement` state from components and redux And remove the placement state from props of the menu components. * Remove abolution position to fix flip issue * Remove z-index to fix modals and overlay positions * Fix lint issues * Set placement in privacy and language components Copy the placement state into the `PrivacyDropdown` and `LanguageDropdown` components, to apply correct styling to the buttons depending on which placement the Overlay has. * Move `placement` state to correct component
147 lines
4.7 KiB
JavaScript
147 lines
4.7 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
|
import Overlay from 'react-overlays/Overlay';
|
|
import { searchEnabled } from '../../../initial_state';
|
|
import Icon from 'mastodon/components/icon';
|
|
|
|
const messages = defineMessages({
|
|
placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
|
|
placeholderSignedIn: { id: 'search.search_or_paste', defaultMessage: 'Search or paste URL' },
|
|
});
|
|
|
|
class SearchPopout extends React.PureComponent {
|
|
|
|
render () {
|
|
const extraInformation = searchEnabled ? <FormattedMessage id='search_popout.tips.full_text' defaultMessage='Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.' /> : <FormattedMessage id='search_popout.tips.text' defaultMessage='Simple text returns matching display names, usernames and hashtags' />;
|
|
return (
|
|
<div className='search-popout'>
|
|
<h4><FormattedMessage id='search_popout.search_format' defaultMessage='Advanced search format' /></h4>
|
|
|
|
<ul>
|
|
<li><em>#example</em> <FormattedMessage id='search_popout.tips.hashtag' defaultMessage='hashtag' /></li>
|
|
<li><em>@username@domain</em> <FormattedMessage id='search_popout.tips.user' defaultMessage='user' /></li>
|
|
<li><em>URL</em> <FormattedMessage id='search_popout.tips.user' defaultMessage='user' /></li>
|
|
<li><em>URL</em> <FormattedMessage id='search_popout.tips.status' defaultMessage='status' /></li>
|
|
</ul>
|
|
|
|
{extraInformation}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
export default @injectIntl
|
|
class Search extends React.PureComponent {
|
|
|
|
static contextTypes = {
|
|
router: PropTypes.object.isRequired,
|
|
identity: PropTypes.object.isRequired,
|
|
};
|
|
|
|
static propTypes = {
|
|
value: PropTypes.string.isRequired,
|
|
submitted: PropTypes.bool,
|
|
onChange: PropTypes.func.isRequired,
|
|
onSubmit: PropTypes.func.isRequired,
|
|
onClear: PropTypes.func.isRequired,
|
|
onShow: PropTypes.func.isRequired,
|
|
openInRoute: PropTypes.bool,
|
|
intl: PropTypes.object.isRequired,
|
|
singleColumn: PropTypes.bool,
|
|
};
|
|
|
|
state = {
|
|
expanded: false,
|
|
};
|
|
|
|
setRef = c => {
|
|
this.searchForm = c;
|
|
}
|
|
|
|
handleChange = (e) => {
|
|
this.props.onChange(e.target.value);
|
|
}
|
|
|
|
handleClear = (e) => {
|
|
e.preventDefault();
|
|
|
|
if (this.props.value.length > 0 || this.props.submitted) {
|
|
this.props.onClear();
|
|
}
|
|
}
|
|
|
|
handleKeyUp = (e) => {
|
|
if (e.key === 'Enter') {
|
|
e.preventDefault();
|
|
|
|
this.props.onSubmit();
|
|
|
|
if (this.props.openInRoute) {
|
|
this.context.router.history.push('/search');
|
|
}
|
|
} else if (e.key === 'Escape') {
|
|
document.querySelector('.ui').parentElement.focus();
|
|
}
|
|
}
|
|
|
|
handleFocus = () => {
|
|
this.setState({ expanded: true });
|
|
this.props.onShow();
|
|
|
|
if (this.searchForm && !this.props.singleColumn) {
|
|
const { left, right } = this.searchForm.getBoundingClientRect();
|
|
if (left < 0 || right > (window.innerWidth || document.documentElement.clientWidth)) {
|
|
this.searchForm.scrollIntoView();
|
|
}
|
|
}
|
|
}
|
|
|
|
handleBlur = () => {
|
|
this.setState({ expanded: false });
|
|
}
|
|
|
|
findTarget = () => {
|
|
return this.searchForm;
|
|
}
|
|
|
|
render () {
|
|
const { intl, value, submitted } = this.props;
|
|
const { expanded } = this.state;
|
|
const { signedIn } = this.context.identity;
|
|
const hasValue = value.length > 0 || submitted;
|
|
|
|
return (
|
|
<div className='search'>
|
|
<input
|
|
ref={this.setRef}
|
|
className='search__input'
|
|
type='text'
|
|
placeholder={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
|
|
aria-label={intl.formatMessage(signedIn ? messages.placeholderSignedIn : messages.placeholder)}
|
|
value={value}
|
|
onChange={this.handleChange}
|
|
onKeyUp={this.handleKeyUp}
|
|
onFocus={this.handleFocus}
|
|
onBlur={this.handleBlur}
|
|
/>
|
|
|
|
<div role='button' tabIndex='0' className='search__icon' onClick={this.handleClear}>
|
|
<Icon id='search' className={hasValue ? '' : 'active'} />
|
|
<Icon id='times-circle' className={hasValue ? 'active' : ''} aria-label={intl.formatMessage(messages.placeholder)} />
|
|
</div>
|
|
<Overlay show={expanded && !hasValue} placement='bottom' target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
|
|
{({ props, placement }) => (
|
|
<div {...props} style={{ ...props.style, width: 285, zIndex: 2 }}>
|
|
<div className={`dropdown-animation ${placement}`}>
|
|
<SearchPopout />
|
|
</div>
|
|
</div>
|
|
)}
|
|
</Overlay>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|