WIP <Compose> Refactor; 1000 tiny edits
This commit is contained in:
		@@ -0,0 +1,138 @@
 | 
			
		||||
//  Package imports.
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import spring from 'react-motion/lib/spring';
 | 
			
		||||
 | 
			
		||||
//  Components.
 | 
			
		||||
import ComposerOptionsDropdownContentItem from './item';
 | 
			
		||||
 | 
			
		||||
//  Utils.
 | 
			
		||||
import { withPassive } from 'flavours/glitch/util/dom_helpers';
 | 
			
		||||
import Motion from 'flavours/glitch/util/optional_motion';
 | 
			
		||||
import { assignHandlers } from 'flavours/glitch/util/react_helpers';
 | 
			
		||||
 | 
			
		||||
//  Handlers.
 | 
			
		||||
const handlers = {
 | 
			
		||||
 | 
			
		||||
  //  When the document is clicked elsewhere, we close the dropdown.
 | 
			
		||||
  handleDocumentClick ({ target }) {
 | 
			
		||||
    const { node } = this;
 | 
			
		||||
    const { onClose } = this.props;
 | 
			
		||||
    if (onClose && node && !node.contains(target)) {
 | 
			
		||||
      onClose();
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  //  Stores our node in `this.node`.
 | 
			
		||||
  handleRef (node) {
 | 
			
		||||
    this.node = node;
 | 
			
		||||
  },
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
//  The spring to use with our motion.
 | 
			
		||||
const springMotion = spring(1, {
 | 
			
		||||
  damping: 35,
 | 
			
		||||
  stiffness: 400,
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
//  The component.
 | 
			
		||||
export default class ComposerOptionsDropdownContent extends React.PureComponent {
 | 
			
		||||
 | 
			
		||||
  //  Constructor.
 | 
			
		||||
  constructor (props) {
 | 
			
		||||
    super(props);
 | 
			
		||||
    assignHandlers(this, handlers);
 | 
			
		||||
 | 
			
		||||
    //  Instance variables.
 | 
			
		||||
    this.node = null;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  //  On mounting, we add our listeners.
 | 
			
		||||
  componentDidMount () {
 | 
			
		||||
    const { handleDocumentClick } = this.handlers;
 | 
			
		||||
    document.addEventListener('click', handleDocumentClick, false);
 | 
			
		||||
    document.addEventListener('touchend', handleDocumentClick, withPassive);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  //  On unmounting, we remove our listeners.
 | 
			
		||||
  componentWillUnmount () {
 | 
			
		||||
    const { handleDocumentClick } = this.handlers;
 | 
			
		||||
    document.removeEventListener('click', handleDocumentClick, false);
 | 
			
		||||
    document.removeEventListener('touchend', handleDocumentClick, withPassive);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  //  Rendering.
 | 
			
		||||
  render () {
 | 
			
		||||
    const { handleRef } = this.handlers;
 | 
			
		||||
    const {
 | 
			
		||||
      items,
 | 
			
		||||
      onChange,
 | 
			
		||||
      onClose,
 | 
			
		||||
      style,
 | 
			
		||||
      value,
 | 
			
		||||
    } = this.props;
 | 
			
		||||
 | 
			
		||||
    //  The result.
 | 
			
		||||
    return (
 | 
			
		||||
      <Motion
 | 
			
		||||
        defaultStyle={{
 | 
			
		||||
          opacity: 0,
 | 
			
		||||
          scaleX: 0.85,
 | 
			
		||||
          scaleY: 0.75,
 | 
			
		||||
        }}
 | 
			
		||||
        style={{
 | 
			
		||||
          opacity: springMotion,
 | 
			
		||||
          scaleX: springMotion,
 | 
			
		||||
          scaleY: springMotion,
 | 
			
		||||
        }}
 | 
			
		||||
      >
 | 
			
		||||
        {({ opacity, scaleX, scaleY }) => (
 | 
			
		||||
          <div
 | 
			
		||||
            className='composer--options--dropdown--content'
 | 
			
		||||
            ref={handleRef}
 | 
			
		||||
            style={{
 | 
			
		||||
              ...style,
 | 
			
		||||
              opacity: opacity,
 | 
			
		||||
              transform: `scale(${scaleX}, ${scaleY})`,
 | 
			
		||||
            }}
 | 
			
		||||
          >
 | 
			
		||||
            {items.map(
 | 
			
		||||
              ({
 | 
			
		||||
                name,
 | 
			
		||||
                ...rest
 | 
			
		||||
              }) => (
 | 
			
		||||
                <ComposerOptionsDropdownContentItem
 | 
			
		||||
                  active={name === value}
 | 
			
		||||
                  key={name}
 | 
			
		||||
                  name={name}
 | 
			
		||||
                  onChange={onChange}
 | 
			
		||||
                  onClose={onClose}
 | 
			
		||||
                  options={rest}
 | 
			
		||||
                />
 | 
			
		||||
              )
 | 
			
		||||
            )}
 | 
			
		||||
          </div>
 | 
			
		||||
        )}
 | 
			
		||||
      </Motion>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
//  Props.
 | 
			
		||||
ComposerOptionsDropdownContent.propTypes = {
 | 
			
		||||
  items: PropTypes.arrayOf(PropTypes.shape({
 | 
			
		||||
    icon: PropTypes.string,
 | 
			
		||||
    meta: PropTypes.node,
 | 
			
		||||
    name: PropTypes.string.isRequired,
 | 
			
		||||
    on: PropTypes.bool,
 | 
			
		||||
    text: PropTypes.node,
 | 
			
		||||
  })).isRequired,
 | 
			
		||||
  onChange: PropTypes.func,
 | 
			
		||||
  onClose: PropTypes.func,
 | 
			
		||||
  style: PropTypes.object,
 | 
			
		||||
  value: PropTypes.string,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
//  Default props.
 | 
			
		||||
ComposerOptionsDropdownContent.defaultProps = { style: {} };
 | 
			
		||||
@@ -0,0 +1,126 @@
 | 
			
		||||
//  Package imports.
 | 
			
		||||
import classNames from 'classnames';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import Toggle from 'react-toggle';
 | 
			
		||||
 | 
			
		||||
//  Components.
 | 
			
		||||
import Icon from 'flavours/glitch/components/icon';
 | 
			
		||||
 | 
			
		||||
//  Utils.
 | 
			
		||||
import { assignHandlers } from 'flavours/glitch/util/react_helpers';
 | 
			
		||||
 | 
			
		||||
//  Handlers.
 | 
			
		||||
const handlers = {
 | 
			
		||||
 | 
			
		||||
  //  This function activates the dropdown item.
 | 
			
		||||
  handleActivate (e) {
 | 
			
		||||
    const {
 | 
			
		||||
      name,
 | 
			
		||||
      onChange,
 | 
			
		||||
      onClose,
 | 
			
		||||
      options: { on },
 | 
			
		||||
    } = this.props;
 | 
			
		||||
 | 
			
		||||
    //  If the escape key was pressed, we close the dropdown.
 | 
			
		||||
    if (e.key === 'Escape' && onClose) {
 | 
			
		||||
      onClose();
 | 
			
		||||
 | 
			
		||||
    //  Otherwise, we both close the dropdown and change the value.
 | 
			
		||||
    } else if (onChange && (!e.key || e.key === 'Enter')) {
 | 
			
		||||
      e.preventDefault();  //  Prevents change in focus on click
 | 
			
		||||
      if ((on === null || typeof on === 'undefined') && onClose) {
 | 
			
		||||
        onClose();
 | 
			
		||||
      }
 | 
			
		||||
      onChange(name);
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
//  The component.
 | 
			
		||||
export default class ComposerOptionsDropdownContentItem extends React.PureComponent {
 | 
			
		||||
 | 
			
		||||
  //  Constructor.
 | 
			
		||||
  constructor (props) {
 | 
			
		||||
    super(props);
 | 
			
		||||
    assignHandlers(this, handlers);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  //  Rendering.
 | 
			
		||||
  render () {
 | 
			
		||||
    const { handleActivate } = this.handlers;
 | 
			
		||||
    const {
 | 
			
		||||
      active,
 | 
			
		||||
      options: {
 | 
			
		||||
        icon,
 | 
			
		||||
        meta,
 | 
			
		||||
        on,
 | 
			
		||||
        text,
 | 
			
		||||
      },
 | 
			
		||||
    } = this.props;
 | 
			
		||||
    const computedClass = classNames('composer--options--dropdown--content--item', {
 | 
			
		||||
      active,
 | 
			
		||||
      lengthy: meta,
 | 
			
		||||
      'toggled-off': !on && on !== null && typeof on !== 'undefined',
 | 
			
		||||
      'toggled-on': on,
 | 
			
		||||
      'with-icon': icon,
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    //  The result.
 | 
			
		||||
    return (
 | 
			
		||||
      <div
 | 
			
		||||
        className={computedClass}
 | 
			
		||||
        onClick={handleActivate}
 | 
			
		||||
        onKeyDown={handleActivate}
 | 
			
		||||
        role='button'
 | 
			
		||||
        tabIndex='0'
 | 
			
		||||
      >
 | 
			
		||||
        {function () {
 | 
			
		||||
 | 
			
		||||
          //  We render a `<Toggle>` if we were provided an `on`
 | 
			
		||||
          //  property, and otherwise show an `<Icon>` if available.
 | 
			
		||||
          switch (true) {
 | 
			
		||||
          case on !== null && typeof on !== 'undefined':
 | 
			
		||||
            return (
 | 
			
		||||
              <Toggle
 | 
			
		||||
                checked={on}
 | 
			
		||||
                onChange={handleActivate}
 | 
			
		||||
              />
 | 
			
		||||
            );
 | 
			
		||||
          case !!icon:
 | 
			
		||||
            return (
 | 
			
		||||
              <Icon
 | 
			
		||||
                className='icon'
 | 
			
		||||
                fullwidth
 | 
			
		||||
                icon={icon}
 | 
			
		||||
              />
 | 
			
		||||
            );
 | 
			
		||||
          default:
 | 
			
		||||
            return null;
 | 
			
		||||
          }
 | 
			
		||||
        }()}
 | 
			
		||||
        {meta ? (
 | 
			
		||||
          <div className='content'>
 | 
			
		||||
            <strong>{text}</strong>
 | 
			
		||||
            {meta}
 | 
			
		||||
          </div>
 | 
			
		||||
        ) : <div className='content'>{text}</div>}
 | 
			
		||||
      </div>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
//  Props.
 | 
			
		||||
ComposerOptionsDropdownContentItem.propTypes = {
 | 
			
		||||
  active: PropTypes.bool,
 | 
			
		||||
  name: PropTypes.string,
 | 
			
		||||
  onChange: PropTypes.func,
 | 
			
		||||
  onClose: PropTypes.func,
 | 
			
		||||
  options: PropTypes.shape({
 | 
			
		||||
    icon: PropTypes.string,
 | 
			
		||||
    meta: PropTypes.node,
 | 
			
		||||
    on: PropTypes.bool,
 | 
			
		||||
    text: PropTypes.node,
 | 
			
		||||
  }),
 | 
			
		||||
};
 | 
			
		||||
		Reference in New Issue
	
	Block a user