From 6b685f5183175183445716b923bd3c7ed484d121 Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Fri, 19 Jan 2018 16:03:49 -0800
Subject: [PATCH] removed PublishMetadataInputs' internal state and removed
 unnecessary event.preventDefault s

---
 react/actions/publish.js                      |  7 ++++
 react/components/ExpandingTextArea.jsx        | 21 ++++------
 react/constants/action_types.js               |  1 +
 react/containers/ChannelCreateForm/view.jsx   |  2 -
 react/containers/ChannelLoginForm/view.jsx    |  1 -
 .../containers/PublishMetadataInputs/index.js | 12 ++++--
 .../containers/PublishMetadataInputs/view.jsx | 40 +++++++------------
 .../containers/PublishThumbnailInput/view.jsx |  1 -
 react/containers/PublishTitleInput/view.jsx   |  1 -
 react/containers/PublishUrlInput/view.jsx     |  1 -
 react/reducers/publish.js                     | 11 +++--
 11 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/react/actions/publish.js b/react/actions/publish.js
index f2cb6dea..40dad4ed 100644
--- a/react/actions/publish.js
+++ b/react/actions/publish.js
@@ -58,3 +58,10 @@ export function updateSelectedChannel (value) {
     value,
   };
 };
+
+export function toggleMetadataInputs (value) {
+  return {
+    type: actions.TOGGLE_METADATA_INPUTS,
+    value,
+  };
+};
diff --git a/react/components/ExpandingTextArea.jsx b/react/components/ExpandingTextArea.jsx
index d628b8de..c6a3fdaf 100644
--- a/react/components/ExpandingTextArea.jsx
+++ b/react/components/ExpandingTextArea.jsx
@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 
 class ExpandingTextarea extends Component {
   componentDidMount () {
-    this._adjustTextarea({});
+    this.adjustTextarea({});
   }
 
   render () {
-    const { onChange, maxHeight, ...rest } = this.props;
+    const { onChange, ...rest } = this.props;
     return (
       <textarea
         { ...rest }
@@ -17,25 +17,20 @@ class ExpandingTextarea extends Component {
     );
   }
 
-  _handleChange (e) {
+  _handleChange (event) {
     const { onChange } = this.props;
-    if (onChange) onChange(e);
-    this._adjustTextarea(e);
+    if (onChange) onChange(event);
+    this.adjustTextarea(event);
   }
 
-  _adjustTextarea ({ target = this.el }) {
+  adjustTextarea ({ target = this.el }) {
     target.style.height = 0;
-    if (this.props.maxHeight) {
-      target.style.height = `${Math.min(target.scrollHeight, this.props.maxHeight)}px`;
-    } else {
-      target.style.height = `${target.scrollHeight}px`;
-    }
+    target.style.height = `${target.scrollHeight}px`;
   }
 }
 
 ExpandingTextarea.propTypes = {
-  onChange : PropTypes.func,
-  maxHeight: PropTypes.number,
+  onChange: PropTypes.func,
 };
 
 export default ExpandingTextarea;
diff --git a/react/constants/action_types.js b/react/constants/action_types.js
index 64dbb8bd..55f872e5 100644
--- a/react/constants/action_types.js
+++ b/react/constants/action_types.js
@@ -10,3 +10,4 @@ export const SET_PUBLISH_IN_CHANNEL = 'SET_PUBLISH_IN_CHANNEL';
 export const PUBLISH_STATUS_UPDATE = 'PUBLISH_STATUS_UPDATE';
 export const ERROR_UPDATE = 'ERROR_UPDATE';
 export const SELECTED_CHANNEL_UPDATE = 'SELECTED_CHANNEL_UPDATE';
+export const TOGGLE_METADATA_INPUTS = 'TOGGLE_METADATA_INPUTS';
diff --git a/react/containers/ChannelCreateForm/view.jsx b/react/containers/ChannelCreateForm/view.jsx
index 967c6443..42eef305 100644
--- a/react/containers/ChannelCreateForm/view.jsx
+++ b/react/containers/ChannelCreateForm/view.jsx
@@ -26,7 +26,6 @@ class ChannelCreateForm extends React.Component {
     return input;
   }
   handleChannelInput (event) {
-    event.preventDefault();
     let value = event.target.value;
     value = this.cleanseChannelInput(value);
     this.setState({channel: value});
@@ -38,7 +37,6 @@ class ChannelCreateForm extends React.Component {
     console.log('end of handlechannelinput');
   }
   handleInput (event) {
-    event.preventDefault();
     const name = event.target.name;
     const value = event.target.value;
     this.setState({[name]: value});
diff --git a/react/containers/ChannelLoginForm/view.jsx b/react/containers/ChannelLoginForm/view.jsx
index 1867da1a..a6d5e3c1 100644
--- a/react/containers/ChannelLoginForm/view.jsx
+++ b/react/containers/ChannelLoginForm/view.jsx
@@ -14,7 +14,6 @@ class ChannelLoginForm extends React.Component {
     this.loginToChannel = this.loginToChannel.bind(this);
   }
   handleInput (event) {
-    event.preventDefault();
     const name = event.target.name;
     const value = event.target.value;
     this.setState({[name]: value});
diff --git a/react/containers/PublishMetadataInputs/index.js b/react/containers/PublishMetadataInputs/index.js
index 56df932a..c35cda3e 100644
--- a/react/containers/PublishMetadataInputs/index.js
+++ b/react/containers/PublishMetadataInputs/index.js
@@ -1,12 +1,13 @@
 import {connect} from 'react-redux';
-import {updateMetadata} from 'actions/publish';
+import {updateMetadata, toggleMetadataInputs} from 'actions/publish';
 import View from './view';
 
 const mapStateToProps = ({ publish }) => {
   return {
-    description: publish.metadata.description,
-    license    : publish.metadata.license,
-    nsfw       : publish.metadata.nsfw,
+    showMetadataInputs: publish.showMetadataInputs,
+    description       : publish.metadata.description,
+    license           : publish.metadata.license,
+    nsfw              : publish.metadata.nsfw,
   };
 };
 
@@ -15,6 +16,9 @@ const mapDispatchToProps = dispatch => {
     onMetadataChange: (name, value) => {
       dispatch(updateMetadata(name, value));
     },
+    onToggleMetadataInputs: (value) => {
+      dispatch(toggleMetadataInputs(value));
+    },
   };
 };
 
diff --git a/react/containers/PublishMetadataInputs/view.jsx b/react/containers/PublishMetadataInputs/view.jsx
index 616d608b..181e1c34 100644
--- a/react/containers/PublishMetadataInputs/view.jsx
+++ b/react/containers/PublishMetadataInputs/view.jsx
@@ -4,31 +4,20 @@ import ExpandingTextArea from 'components/ExpandingTextArea';
 class PublishMetadataInputs extends React.Component {
   constructor (props) {
     super(props);
-    this.state = {
-      showInputs: false,
-    };
     this.toggleShowInputs = this.toggleShowInputs.bind(this);
-    this.handleDescriptionInput = this.handleDescriptionInput.bind(this);
-    this.handleNsfwCheck = this.handleNsfwCheck.bind(this);
-    this.handleLicenseSelection = this.handleLicenseSelection.bind(this);
+    this.handleInput = this.handleInput.bind(this);
+    this.handleSelect = this.handleSelect.bind(this);
   }
   toggleShowInputs () {
-    this.setState({'showInputs': !this.state.showInputs});
+    this.props.onToggleMetadataInputs(!this.props.showMetadataInputs);
   }
-  handleDescriptionInput (event) {
-    event.preventDefault();
-    const name = event.target.name;
-    const value = event.target.value;
+  handleInput (event) {
+    const target = event.target;
+    const value = target.type === 'checkbox' ? target.checked : target.value;
+    const name = target.name;
     this.props.onMetadataChange(name, value);
   }
-  handleNsfwCheck (event) {
-    console.log('handle input', event);
-    event.preventDefault();
-    const name = event.target.name;
-    const value = event.target.checked;
-    this.props.onMetadataChange(name, value);
-  }
-  handleLicenseSelection (event) {
+  handleSelect (event) {
     const name = event.target.name;
     const selectedOption = event.target.selectedOptions[0].value;
     this.props.onMetadataChange(name, selectedOption);
@@ -36,8 +25,8 @@ class PublishMetadataInputs extends React.Component {
   render () {
     return (
       <div id="publish-details" className="row row--padded row--no-top row--wide">
-        <a className="label link--primary" id="publish-details-toggle" href="#" onClick={this.toggleShowInputs}>{this.state.showInputs ? '[less]' : '[more]'}</a>
-      {this.state.showInputs && (
+        <a className="label link--primary" id="publish-details-toggle" href="#" onClick={this.toggleShowInputs}>{this.props.showMetadataInputs ? '[less]' : '[more]'}</a>
+      {this.props.showMetadataInputs && (
         <div>
           <div className="row row--no-top">
             <div className="column column--3 column--med-10 align-content-top">
@@ -48,12 +37,11 @@ class PublishMetadataInputs extends React.Component {
                 className="textarea textarea--primary textarea--full-width"
                 rows={1}
                 maxLength={2000}
-                maxHeight={150}
+                style={{ maxHeight: 200 }}
                 name="description"
                 placeholder="Optional description"
                 value={this.props.description}
-                style={{height: this.state.descriptionHeight}}
-                onChange={this.handleDescriptionInput} />
+                onChange={this.handleInput} />
             </div>
           </div>
 
@@ -61,7 +49,7 @@ class PublishMetadataInputs extends React.Component {
             <div className="column column--3 column--med-10">
               <label htmlFor="publish-license" className="label">License:</label>
             </div><div className="column column--7 column--sml-10">
-              <select type="text" name="license" id="publish-license" className="select select--primary" onChange={this.handleLicenseSelection}>
+              <select type="text" name="license" id="publish-license" className="select select--primary" onChange={this.handleSelect}>
                 <option value=" ">Unspecified</option>
                 <option value="Public Domain">Public Domain</option>
                 <option value="Creative Commons">Creative Commons</option>
@@ -73,7 +61,7 @@ class PublishMetadataInputs extends React.Component {
             <div className="column column--3">
               <label htmlFor="publish-nsfw" className="label">Mature:</label>
             </div><div className="column column--7">
-              <input className="input-checkbox" type="checkbox" id="publish-nsfw" name="nsfw" checked={this.props.nsfw} onChange={this.handleNsfwCheck} />
+              <input className="input-checkbox" type="checkbox" id="publish-nsfw" name="nsfw" value={this.props.nsfw} onChange={this.handleInput} />
             </div>
           </div>
         </div>
diff --git a/react/containers/PublishThumbnailInput/view.jsx b/react/containers/PublishThumbnailInput/view.jsx
index 9dc0968b..2ddddb6e 100644
--- a/react/containers/PublishThumbnailInput/view.jsx
+++ b/react/containers/PublishThumbnailInput/view.jsx
@@ -14,7 +14,6 @@ class PublishThumbnailInput extends React.Component {
     this.updateVideoThumb = this.updateVideoThumb.bind(this);
   }
   handleInput (event) {
-    event.preventDefault();
     const value = event.target.value;
     this.setState({thumbnailInput: value});
   }
diff --git a/react/containers/PublishTitleInput/view.jsx b/react/containers/PublishTitleInput/view.jsx
index 044ef209..b01bc7f2 100644
--- a/react/containers/PublishTitleInput/view.jsx
+++ b/react/containers/PublishTitleInput/view.jsx
@@ -6,7 +6,6 @@ class PublishTitleInput extends React.Component {
     this.handleInput = this.handleInput.bind(this);
   }
   handleInput (e) {
-    e.preventDefault();
     const name = e.target.name;
     const value = e.target.value;
     this.props.onMetadataChange(name, value);
diff --git a/react/containers/PublishUrlInput/view.jsx b/react/containers/PublishUrlInput/view.jsx
index f9730ce3..75a0e6d1 100644
--- a/react/containers/PublishUrlInput/view.jsx
+++ b/react/containers/PublishUrlInput/view.jsx
@@ -27,7 +27,6 @@ class PublishUrlInput extends React.Component {
     }
   }
   handleInput (event) {
-    event.preventDefault();
     let value = event.target.value;
     value = this.cleanseInput(value);
     // update the state
diff --git a/react/reducers/publish.js b/react/reducers/publish.js
index 77d70c94..dea786c9 100644
--- a/react/reducers/publish.js
+++ b/react/reducers/publish.js
@@ -2,9 +2,10 @@ import * as actions from 'constants/action_types';
 import * as channelSelectStates from 'constants/channel_select_states';
 
 const initialState = {
-  publishInChannel: false,
-  selectedChannel : channelSelectStates.LOGIN,
-  status          : {
+  publishInChannel  : false,
+  selectedChannel   : channelSelectStates.LOGIN,
+  showMetadataInputs: false,
+  status            : {
     status : null,
     message: null,
   },
@@ -67,6 +68,10 @@ export default function (state = initialState, action) {
       return Object.assign({}, state, {
         selectedChannel: action.value,
       });
+    case actions.TOGGLE_METADATA_INPUTS:
+      return Object.assign({}, state, {
+        showMetadataInputs: action.value,
+      });
     default:
       return state;
   }