Add: #91 アカウントのおすすめタグを投稿フォームからクリックで挿入可能にする (#668)

app/javascript/mastodon/actions/compose.js

@@ -64,6 +64,7 @@ export const COMPOSE_LANGUAGE_CHANGE     = 'COMPOSE_LANGUAGE_CHANGE';
 
 export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
 export const COMPOSE_EXPIRATION_INSERT = 'COMPOSE_EXPIRATION_INSERT';
+export const COMPOSE_FEATURED_TAG_INSERT = 'COMPOSE_FEATURED_TAG_INSERT';
 export const COMPOSE_REFERENCE_INSERT = 'COMPOSE_REFERENCE_INSERT';
 
 export const COMPOSE_UPLOAD_CHANGE_REQUEST     = 'COMPOSE_UPLOAD_UPDATE_REQUEST';
@@ -808,6 +809,14 @@ export function insertExpirationCompose(position, data) {
   };
 }
 
+export function insertFeaturedTagCompose(position, data) {
+  return {
+    type: COMPOSE_FEATURED_TAG_INSERT,
+    position,
+    data,
+  };
+}
+
 export function insertReferenceCompose(position, url, attributeType) {
   return {
     type: COMPOSE_REFERENCE_INSERT,

app/javascript/mastodon/features/compose/components/compose_form.jsx

@@ -19,6 +19,7 @@ import { Button } from '../../../components/button';
 import CircleDropdownContainer from '../containers/circle_dropdown_container';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import ExpirationDropdownContainer from '../containers/expiration_dropdown_container';
+import FeaturedTagsDropdownContainer from '../containers/featured_tags_dropdown_container';
 import LanguageDropdown from '../containers/language_dropdown_container';
 import MarkdownButtonContainer from '../containers/markdown_button_container';
 import PollButtonContainer from '../containers/poll_button_container';
@@ -71,6 +72,7 @@ class ComposeForm extends ImmutablePureComponent {
     onPaste: PropTypes.func.isRequired,
     onPickEmoji: PropTypes.func.isRequired,
     onPickExpiration: PropTypes.func.isRequired,
+    onPickFeaturedTag: PropTypes.func.isRequired,
     autoFocus: PropTypes.bool,
     withoutNavigation: PropTypes.bool,
     anyMedia: PropTypes.bool,
@@ -238,6 +240,12 @@ class ComposeForm extends ImmutablePureComponent {
     this.props.onPickExpiration(position, data);
   };
 
+  handleFeaturedTagPick = (data) => {
+    const position     = this.textareaRef.current.selectionStart;
+
+    this.props.onPickExpiration(position, data);
+  };
+
   render () {
     const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
     const { highlighted } = this.state;
@@ -311,6 +319,7 @@ class ComposeForm extends ImmutablePureComponent {
             <div className='compose-form__dropdowns compose-form__dropdowns__second'>
               <SearchabilityDropdownContainer disabled={this.props.isEditing} />
               <ExpirationDropdownContainer onPickExpiration={this.handleExpirationPick} />
+              <FeaturedTagsDropdownContainer onPickTag={this.handleFeaturedTagPick} />
             </div>
 
             <div className='compose-form__actions'>

app/javascript/mastodon/features/compose/components/featured_tags_dropdown.jsx

@@ -0,0 +1,266 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+import Overlay from 'react-overlays/Overlay';
+
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+import { featuredTags } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  add_tag: { id: 'status.featured_tags.add', defaultMessage: 'Add your featured tag' },
+});
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+class FeaturedTagsDropdownMenu extends PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    items: PropTypes.array.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+      e.stopPropagation();
+    }
+  };
+
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      this.props.onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1] || this.node.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1] || this.node.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.node.childNodes[index - 1] || this.node.lastChild;
+      } else {
+        element = this.node.childNodes[index + 1] || this.node.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      this.props.onChange(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  };
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  };
+
+  setFocusRef = c => {
+    this.focusedItem = c;
+  };
+
+  render () {
+    const { style, items } = this.props;
+
+    return (
+      <div style={{ ...style }} role='listbox' ref={this.setRef}>
+        {items.map(item => (
+          <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option')} aria-selected={false} ref={null}>
+            <div className='privacy-dropdown__option__content'>
+              <strong>{item.text}</strong>
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+}
+
+class FeaturedTagsDropdown extends PureComponent {
+
+  static propTypes = {
+    isUserTouching: PropTypes.func,
+    onModalOpen: PropTypes.func,
+    onModalClose: PropTypes.func,
+    onChange: PropTypes.func.isRequired,
+    noDirect: PropTypes.bool,
+    container: PropTypes.func,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    open: false,
+    placement: 'bottom',
+  };
+
+  handleToggle = () => {
+    if (this.props.isUserTouching && this.props.isUserTouching()) {
+      if (this.state.open) {
+        this.props.onModalClose();
+      } else {
+        this.props.onModalOpen({
+          actions: this.options.map(option => ({ ...option, active: false })),
+          onClick: this.handleModalActionClick,
+        });
+      }
+    } else {
+      if (this.state.open && this.activeElement) {
+        this.activeElement.focus({ preventScroll: true });
+      }
+      this.setState({ open: !this.state.open });
+    }
+  };
+
+  handleModalActionClick = (e) => {
+    e.preventDefault();
+
+    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
+
+    this.props.onModalClose();
+    this.props.onChange(value);
+  };
+
+  handleKeyDown = e => {
+    switch(e.key) {
+    case 'Escape':
+      this.handleClose();
+      break;
+    }
+  };
+
+  handleMouseDown = () => {
+    if (!this.state.open) {
+      this.activeElement = document.activeElement;
+    }
+  };
+
+  handleButtonKeyDown = (e) => {
+    switch(e.key) {
+    case ' ':
+    case 'Enter':
+      this.handleMouseDown();
+      break;
+    }
+  };
+
+  handleClose = () => {
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+    this.setState({ open: false });
+  };
+
+  handleChange = value => {
+    this.props.onChange(value);
+  };
+
+  componentWillMount () {
+    this.options = featuredTags.map((tag) => {
+      return { value: `#${tag}`, text: `#${tag}` };
+    });
+  }
+
+  setTargetRef = c => {
+    this.target = c;
+  };
+
+  findTarget = () => {
+    return this.target;
+  };
+
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
+  render () {
+    const { container, disabled, intl } = this.props;
+    const { open, placement } = this.state;
+
+    if (!this.options || this.options.length === 0) {
+      return null;
+    }
+
+    return (
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.add_tag)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          disabled={disabled}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id='clock-o' icon={TagIcon} />
+        </button>
+
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+          {({ props, placement }) => (
+            <div {...props}>
+              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+                <FeaturedTagsDropdownMenu
+                  items={this.options}
+                  onClose={this.handleClose}
+                  onChange={this.handleChange}
+                />
+              </div>
+            </div>
+          )}
+        </Overlay>
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(FeaturedTagsDropdown);

app/javascript/mastodon/features/compose/containers/compose_form_container.js

@@ -9,6 +9,7 @@ import {
   changeComposeSpoilerText,
   insertEmojiCompose,
   insertExpirationCompose,
+  insertFeaturedTagCompose,
   uploadCompose,
 } from '../../../actions/compose';
 import ComposeForm from '../components/compose_form';
@@ -72,6 +73,10 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(insertExpirationCompose(position, data));
   },
 
+  onPickFeaturedTag (position, data) {
+    dispatch(insertFeaturedTagCompose(position, data));
+  },
+
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);

app/javascript/mastodon/features/compose/containers/featured_tags_dropdown_container.js

@@ -0,0 +1,30 @@
+import { connect } from 'react-redux';
+
+import { openModal, closeModal } from '../../../actions/modal';
+import { isUserTouching } from '../../../is_mobile';
+import FeaturedTagsDropdown from '../components/featured_tags_dropdown';
+
+const mapStateToProps = () => ({
+});
+
+const mapDispatchToProps = (dispatch, { onPickTag }) => ({
+
+  onChange (value) {
+    if (onPickTag) {
+      onPickTag(value);
+    }
+  },
+
+  isUserTouching,
+  onModalOpen: props => dispatch(openModal({
+    modalType: 'ACTIONS',
+    modalProps: props,
+  })),
+  onModalClose: () => dispatch(closeModal({
+    modalType: undefined,
+    ignoreFocus: false,
+  })),
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(FeaturedTagsDropdown);

app/javascript/mastodon/initial_state.js

@@ -41,6 +41,7 @@
  * @property {boolean} enable_dtl_menu
  * @property {boolean} enable_public_privacy
  * @property {boolean=} expand_spoilers
+ * @property {string[]} featured_tags
  * @property {HideItemsDefinition[]} hide_items
  * @property {boolean} limited_federation_mode
  * @property {string} locale
@@ -128,6 +129,7 @@ export const enableLocalTimeline = getMeta('enable_local_timeline');
 export const enableLoginPrivacy = getMeta('enable_login_privacy');
 export const enableDtlMenu = getMeta('enable_dtl_menu');
 export const expandSpoilers = getMeta('expand_spoilers');
+export const featuredTags = getMeta('featured_tags') || [];
 export const forceSingleColumn = !getMeta('advanced_layout');
 export const limitedFederationMode = getMeta('limited_federation_mode');
 export const mascot = getMeta('mascot');

app/javascript/mastodon/locales/en.json

@@ -869,6 +869,7 @@
   "status.emoji_reactions": "{count, plural, one {reaction} other {reactions}}",
   "status.favourite": "Favorite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
+  "status.featured_tags.add": "Add your featured tag",
   "status.filter": "Filter this post",
   "status.filtered": "Filtered",
   "status.hide": "Hide post",

app/javascript/mastodon/locales/ja.json

@@ -831,6 +831,7 @@
   "status.expiration.7_days": "7 日後に削除",
   "status.expiration.add": "時限投稿を設定",
   "status.favourite": "お気に入り",
+  "status.featured_tags.add": "おすすめハッシュタグを追加",
   "status.filter": "この投稿をフィルターする",
   "status.filtered": "フィルターされました",
   "status.hide": "投稿を非表示",

app/javascript/mastodon/reducers/compose.js

@@ -36,6 +36,7 @@ import {
   COMPOSE_COMPOSING_CHANGE,
   COMPOSE_EMOJI_INSERT,
   COMPOSE_EXPIRATION_INSERT,
+  COMPOSE_FEATURED_TAG_INSERT,
   COMPOSE_REFERENCE_INSERT,
   COMPOSE_UPLOAD_CHANGE_REQUEST,
   COMPOSE_UPLOAD_CHANGE_SUCCESS,
@@ -265,6 +266,8 @@ const insertExpiration = (state, position, data) => {
   });
 };
 
+const insertFeaturedTag = insertExpiration;
+
 const insertReference = (state, url, attributeType) => {
   const oldText = state.get('text');
   const attribute = attributeType || 'BT';
@@ -561,6 +564,8 @@ export default function compose(state = initialState, action) {
     return insertEmoji(state, action.position, action.emoji, action.needsSpace);
   case COMPOSE_EXPIRATION_INSERT:
     return insertExpiration(state, action.position, action.data);
+  case COMPOSE_FEATURED_TAG_INSERT:
+    return insertFeaturedTag(state, action.position, action.data);
   case COMPOSE_REFERENCE_INSERT:
     return insertReference(state, action.url, action.attributeType);
   case COMPOSE_UPLOAD_CHANGE_SUCCESS:

app/serializers/initial_state_serializer.rb

@@ -47,6 +47,7 @@ class InitialStateSerializer < ActiveModel::Serializer
         object_account_user.setting_show_quote_in_public ? nil : 'quote_in_public',
         object_account_user.setting_show_relationships ? nil : 'relationships',
       ].compact
+      store[:featured_tags] = object.current_account.featured_tags.pluck(:name)
     else
       store[:auto_play_gif] = Setting.auto_play_gif
       store[:display_media] = Setting.display_media