From 77dccd31b32ee0a9a53b2186bae231069c5ab152 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Sat, 6 Jan 2018 12:11:19 +0100
Subject: Revert "Move to typescript"

This reverts commit f0c8cf0e79f003514fd65a70def5820205955a77.
---
 src/client/react/components/container/Results.js  |  35 ++++++
 src/client/react/components/container/Results.tsx |  26 -----
 src/client/react/components/container/Search.js   | 106 +++++++++++++++++
 src/client/react/components/container/Search.tsx  | 131 ----------------------
 4 files changed, 141 insertions(+), 157 deletions(-)
 create mode 100644 src/client/react/components/container/Results.js
 delete mode 100644 src/client/react/components/container/Results.tsx
 create mode 100644 src/client/react/components/container/Search.js
 delete mode 100644 src/client/react/components/container/Search.tsx

(limited to 'src/client/react/components/container')

diff --git a/src/client/react/components/container/Results.js b/src/client/react/components/container/Results.js
new file mode 100644
index 0000000..911ea27
--- /dev/null
+++ b/src/client/react/components/container/Results.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import classnames from 'classnames';
+import Result from '../presentational/Result';
+
+const Results = (({ results, isExactMatch, selectedResult }) => (
+  <div
+    className={classnames('search__results', {
+      'search__results--has-results': !isExactMatch && results.length > 0,
+    })}
+  >
+    {!isExactMatch && results.map(userId => (
+      <Result key={userId} userId={userId} isSelected={userId === selectedResult} />
+    ))}
+  </div>
+));
+
+Results.propTypes = {
+  results: PropTypes.arrayOf(PropTypes.string).isRequired,
+  isExactMatch: PropTypes.bool.isRequired,
+  selectedResult: PropTypes.string,
+};
+
+Results.defaultProps = {
+  selectedResult: null,
+};
+
+const mapStateToProps = state => ({
+  results: state.search.results,
+  isExactMatch: state.search.isExactMatch,
+  selectedResult: state.search.selectedResult,
+});
+
+export default connect(mapStateToProps)(Results);
diff --git a/src/client/react/components/container/Results.tsx b/src/client/react/components/container/Results.tsx
deleted file mode 100644
index 21d3378..0000000
--- a/src/client/react/components/container/Results.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as React from 'react';
-import { connect } from 'react-redux';
-import * as classnames from 'classnames';
-import Result from '../presentational/Result';
-import { User } from '../../users';
-import { State } from '../../reducers';
-
-const Results: React.StatelessComponent<{ results: string[], isExactMatch: boolean, selectedResult: string }> = (props) => (
-  <div
-    className={classnames('search__results', {
-      'search__results--has-results': !props.isExactMatch && props.results.length > 0,
-    })}
-  >
-    {!props.isExactMatch && props.results.map(userId => (
-      <Result key={userId} userId={userId} isSelected={userId === props.selectedResult} />
-    ))}
-  </div>
-);
-
-const mapStateToProps = (state: State) => ({
-  results: state.search.results,
-  isExactMatch: state.search.isExactMatch,
-  selectedResult: state.search.selectedResult,
-});
-
-export default connect(mapStateToProps)(Results);
diff --git a/src/client/react/components/container/Search.js b/src/client/react/components/container/Search.js
new file mode 100644
index 0000000..e49e6a7
--- /dev/null
+++ b/src/client/react/components/container/Search.js
@@ -0,0 +1,106 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import classnames from 'classnames';
+
+import SearchIcon from 'react-icons/lib/md/search';
+
+import { inputChange, changeSelectedResult } from '../../actions/search';
+
+import users from '../../users';
+import Results from './Results';
+import IconFromUserType from '../presentational/IconFromUserType';
+
+class Search extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      hasFocus: false,
+    };
+
+    this.onFocus = this.onFocus.bind(this);
+    this.onBlur = this.onBlur.bind(this);
+    this.onKeyDown = this.onKeyDown.bind(this);
+  }
+
+  onFocus() {
+    this.setState({
+      hasFocus: true,
+    });
+  }
+
+  onBlur() {
+    this.setState({
+      hasFocus: false,
+    });
+  }
+
+  onKeyDown(event) {
+    if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
+      event.preventDefault();
+      switch (event.key) {
+        case 'ArrowUp':
+          this.props.dispatch(changeSelectedResult(-1));
+          break;
+        case 'ArrowDown':
+          this.props.dispatch(changeSelectedResult(+1));
+          break;
+        default:
+          throw new Error('This should never happen... pls?');
+      }
+    }
+  }
+
+  render() {
+    const {
+      selectedResult,
+      isExactMatch,
+      dispatch,
+    } = this.props;
+
+    const {
+      hasFocus,
+    } = this.state;
+
+    return (
+      <div className={classnames('search', { 'search--has-focus': hasFocus })}>
+        <div className="search__input-wrapper">
+          <div className="search__icon-wrapper">
+            <IconFromUserType
+              userType={isExactMatch ? users.byId[selectedResult].type : null}
+              defaultIcon={<SearchIcon />}
+            />
+          </div>
+          <input
+            id="search__input"
+            onChange={event => dispatch(inputChange(event.target.value))}
+            onKeyDown={this.onKeyDown}
+            placeholder="Zoeken"
+            onFocus={this.onFocus}
+            onBlur={this.onBlur}
+          />
+        </div>
+        <Results />
+      </div>
+    );
+  }
+}
+
+Search.propTypes = {
+  selectedResult: PropTypes.string,
+  isExactMatch: PropTypes.bool.isRequired,
+  dispatch: PropTypes.func.isRequired,
+};
+
+Search.defaultProps = {
+  selectedResult: null,
+};
+
+const mapStateToProps = state => ({
+  results: state.search.results,
+  selectedResult: state.search.selectedResult,
+  isExactMatch: state.search.isExactMatch,
+});
+
+export default connect(mapStateToProps)(Search);
diff --git a/src/client/react/components/container/Search.tsx b/src/client/react/components/container/Search.tsx
deleted file mode 100644
index fdd6c83..0000000
--- a/src/client/react/components/container/Search.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import * as React from 'react';
-import { Dispatch } from 'redux';
-import { connect } from 'react-redux';
-import * as classnames from 'classnames';
-
-import SearchIcon = require('react-icons/lib/md/search');
-
-import { inputChange, changeSelectedResult } from '../../actions/search';
-import { Action } from '../../reducers/search';
-import { State } from '../../reducers';
-
-import users from '../../users';
-import Results from './Results';
-import IconFromUserType from '../presentational/IconFromUserType';
-
-interface SearchStatehProps {
-  selectedResult: string,
-  isExactMatch: boolean,
-}
-
-interface SearchDispatchProps {
-  changeSelectedResult(relativeChange: 1 | -1): void,
-  inputChange(typedValue: string): void,
-}
-
-class Search extends React.Component<SearchStatehProps & SearchDispatchProps, any> {
-  constructor(props: SearchStatehProps & SearchDispatchProps) {
-    super(props);
-
-    this.state = {
-      hasFocus: false,
-    };
-
-    this.onFocus = this.onFocus.bind(this);
-    this.onBlur = this.onBlur.bind(this);
-    this.onKeyDown = this.onKeyDown.bind(this);
-  }
-
-  onFocus() {
-    this.setState({
-      hasFocus: true,
-    });
-  }
-
-  onBlur() {
-    this.setState({
-      hasFocus: false,
-    });
-  }
-
-  onKeyDown(event: React.KeyboardEvent<any>) {
-    if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
-      event.preventDefault();
-      switch (event.key) {
-        case 'ArrowUp':
-          this.props.changeSelectedResult(-1);
-          break;
-        case 'ArrowDown':
-          this.props.changeSelectedResult(+1);
-          break;
-        default:
-          throw new Error('This should never happen... pls?');
-      }
-    }
-  }
-
-  render() {
-    const {
-      selectedResult,
-      isExactMatch,
-      inputChange,
-    } = this.props;
-
-    const {
-      hasFocus,
-    } = this.state;
-
-    return (
-      <div className={classnames('search', { 'search--has-focus': hasFocus })}>
-        <div className="search__input-wrapper">
-          <div className="search__icon-wrapper">
-            <IconFromUserType
-              userType={isExactMatch ? users.byId[selectedResult].type : null}
-              defaultIcon={<SearchIcon />}
-            />
-          </div>
-          <input
-            id="search__input"
-            onChange={event => inputChange(event.target.value)}
-            onKeyDown={this.onKeyDown}
-            placeholder="Zoeken"
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-          />
-        </div>
-        <Results />
-      </div>
-    );
-  }
-}
-
-// Search.propTypes = {
-//   selectedResult: PropTypes.string,
-//   isExactMatch: PropTypes.bool.isRequired,
-//   dispatch: PropTypes.func.isRequired,
-// };
-
-// Search.defaultProps = {
-//   selectedResult: null,
-// };
-
-const mapStateToProps = (state: State):SearchStatehProps => ({
-  selectedResult: state.search.selectedResult,
-  isExactMatch: state.search.isExactMatch,
-});
-
-// const mapDispatchToProps = {
-//   inputChange,
-//   changeSelectedResult,
-// };
-
-const mapDispatchToProps = (dispatch: any): SearchDispatchProps => ({
-  inputChange(typedValue) {
-    dispatch(inputChange(typedValue));
-  },
-  changeSelectedResult(relativeChange) {
-    dispatch(changeSelectedResult(relativeChange))
-  }
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Search);
-- 
cgit v1.1