From 25111f9de4b7959cdd97b51bfdd2f1c2a7124e48 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Mon, 29 Apr 2019 10:31:58 +0900
Subject: Declare component prop types on console

---
 src/console/components/Console.jsx                 | 152 +++++++++++++++++++++
 src/console/components/console.jsx                 | 141 -------------------
 src/console/components/console/Completion.jsx      |  86 ++++++++++++
 src/console/components/console/CompletionItem.jsx  |  28 ++++
 src/console/components/console/CompletionTitle.jsx |  14 ++
 src/console/components/console/Input.jsx           |  43 ++++++
 src/console/components/console/Message.jsx         |  25 ++++
 src/console/components/console/completion.jsx      |  89 ------------
 src/console/components/console/input.jsx           |  32 -----
 src/console/components/console/message.jsx         |  18 ---
 src/console/index.jsx                              |   2 +-
 11 files changed, 349 insertions(+), 281 deletions(-)
 create mode 100644 src/console/components/Console.jsx
 delete mode 100644 src/console/components/console.jsx
 create mode 100644 src/console/components/console/Completion.jsx
 create mode 100644 src/console/components/console/CompletionItem.jsx
 create mode 100644 src/console/components/console/CompletionTitle.jsx
 create mode 100644 src/console/components/console/Input.jsx
 create mode 100644 src/console/components/console/Message.jsx
 delete mode 100644 src/console/components/console/completion.jsx
 delete mode 100644 src/console/components/console/input.jsx
 delete mode 100644 src/console/components/console/message.jsx

(limited to 'src/console')

diff --git a/src/console/components/Console.jsx b/src/console/components/Console.jsx
new file mode 100644
index 0000000..6a9cebd
--- /dev/null
+++ b/src/console/components/Console.jsx
@@ -0,0 +1,152 @@
+import './console.scss';
+import { connect } from 'react-redux';
+import React from 'react';
+import PropTypes from 'prop-types';
+import Input from './console/Input';
+import Completion from './console/Completion';
+import Message from './console/Message';
+import * as consoleActions from '../../console/actions/console';
+
+const COMPLETION_MAX_ITEMS = 33;
+
+class Console extends React.Component {
+  onBlur() {
+    if (this.props.mode === 'command' || this.props.mode === 'find') {
+      return this.props.dispatch(consoleActions.hideCommand());
+    }
+  }
+
+  doEnter(e) {
+    e.stopPropagation();
+    e.preventDefault();
+
+    let value = e.target.value;
+    if (this.props.mode === 'command') {
+      return this.props.dispatch(consoleActions.enterCommand(value));
+    } else if (this.props.mode === 'find') {
+      return this.props.dispatch(consoleActions.enterFind(value));
+    }
+  }
+
+  selectNext(e) {
+    this.props.dispatch(consoleActions.completionNext());
+    e.stopPropagation();
+    e.preventDefault();
+  }
+
+  selectPrev(e) {
+    this.props.dispatch(consoleActions.completionPrev());
+    e.stopPropagation();
+    e.preventDefault();
+  }
+
+  onKeyDown(e) {
+    if (e.keyCode === KeyboardEvent.DOM_VK_ESCAPE && e.ctrlKey) {
+      this.props.dispatch(consoleActions.hideCommand());
+    }
+    switch (e.keyCode) {
+    case KeyboardEvent.DOM_VK_ESCAPE:
+      return this.props.dispatch(consoleActions.hideCommand());
+    case KeyboardEvent.DOM_VK_RETURN:
+      return this.doEnter(e);
+    case KeyboardEvent.DOM_VK_TAB:
+      if (e.shiftKey) {
+        this.props.dispatch(consoleActions.completionPrev());
+      } else {
+        this.props.dispatch(consoleActions.completionNext());
+      }
+      e.stopPropagation();
+      e.preventDefault();
+      break;
+    case KeyboardEvent.DOM_VK_OPEN_BRACKET:
+      if (e.ctrlKey) {
+        return this.props.dispatch(consoleActions.hideCommand());
+      }
+      break;
+    case KeyboardEvent.DOM_VK_M:
+      if (e.ctrlKey) {
+        return this.doEnter(e);
+      }
+      break;
+    case KeyboardEvent.DOM_VK_N:
+      if (e.ctrlKey) {
+        this.selectNext(e);
+      }
+      break;
+    case KeyboardEvent.DOM_VK_P:
+      if (e.ctrlKey) {
+        this.selectPrev(e);
+      }
+      break;
+    }
+  }
+
+  onInput(e) {
+    let text = e.target.value;
+    this.props.dispatch(consoleActions.setConsoleText(text));
+    if (this.props.mode === 'command') {
+      this.props.dispatch(consoleActions.getCompletions(text));
+    }
+  }
+
+
+  componentDidUpdate(prevProps) {
+    if (!this.input) {
+      return;
+    }
+    if (prevProps.mode !== 'command' && this.props.mode === 'command') {
+      this.props.dispatch(
+        consoleActions.getCompletions(this.props.consoleText));
+      this.focus();
+    } else if (prevProps.mode !== 'find' && this.props.mode === 'find') {
+      this.focus();
+    }
+  }
+
+  render() {
+    switch (this.props.mode) {
+    case 'command':
+    case 'find':
+      return <div className='vimvixen-console-command-wrapper'>
+        <Completion
+          size={COMPLETION_MAX_ITEMS}
+          completions={this.props.completions}
+          select={this.props.select}
+        />
+        <Input
+          ref={(c) => { this.input = c; }}
+          mode={this.props.mode}
+          onBlur={this.onBlur.bind(this)}
+          onKeyDown={this.onKeyDown.bind(this)}
+          onInput={this.onInput.bind(this)}
+          value={this.props.consoleText}
+        />
+      </div>;
+    case 'info':
+    case 'error':
+      return <Message mode={ this.props.mode } >
+        { this.props.messageText }
+      </Message>;
+    default:
+      return null;
+    }
+  }
+
+  focus() {
+    window.focus();
+    this.input.focus();
+  }
+}
+
+Console.propTypes = {
+  mode: PropTypes.string,
+  onBlur: PropTypes.func,
+  onKeyDown: PropTypes.func,
+  onInput: PropTypes.func,
+  consoleText: PropTypes.string,
+  messageText: PropTypes.string,
+  children: PropTypes.string,
+};
+
+const mapStateToProps = state => state;
+export default connect(mapStateToProps)(Console);
diff --git a/src/console/components/console.jsx b/src/console/components/console.jsx
deleted file mode 100644
index b792088..0000000
--- a/src/console/components/console.jsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import './console.scss';
-import { connect } from 'react-redux';
-import React from 'react';
-import Input from './console/input';
-import Completion from './console/completion';
-import Message from './console/message';
-import * as consoleActions from '../../console/actions/console';
-
-const COMPLETION_MAX_ITEMS = 33;
-
-class ConsoleComponent extends React.Component {
-  onBlur() {
-    if (this.props.mode === 'command' || this.props.mode === 'find') {
-      return this.props.dispatch(consoleActions.hideCommand());
-    }
-  }
-
-  doEnter(e) {
-    e.stopPropagation();
-    e.preventDefault();
-
-    let value = e.target.value;
-    if (this.props.mode === 'command') {
-      return this.props.dispatch(consoleActions.enterCommand(value));
-    } else if (this.props.mode === 'find') {
-      return this.props.dispatch(consoleActions.enterFind(value));
-    }
-  }
-
-  selectNext(e) {
-    this.props.dispatch(consoleActions.completionNext());
-    e.stopPropagation();
-    e.preventDefault();
-  }
-
-  selectPrev(e) {
-    this.props.dispatch(consoleActions.completionPrev());
-    e.stopPropagation();
-    e.preventDefault();
-  }
-
-  onKeyDown(e) {
-    if (e.keyCode === KeyboardEvent.DOM_VK_ESCAPE && e.ctrlKey) {
-      this.props.dispatch(consoleActions.hideCommand());
-    }
-    switch (e.keyCode) {
-    case KeyboardEvent.DOM_VK_ESCAPE:
-      return this.props.dispatch(consoleActions.hideCommand());
-    case KeyboardEvent.DOM_VK_RETURN:
-      return this.doEnter(e);
-    case KeyboardEvent.DOM_VK_TAB:
-      if (e.shiftKey) {
-        this.props.dispatch(consoleActions.completionPrev());
-      } else {
-        this.props.dispatch(consoleActions.completionNext());
-      }
-      e.stopPropagation();
-      e.preventDefault();
-      break;
-    case KeyboardEvent.DOM_VK_OPEN_BRACKET:
-      if (e.ctrlKey) {
-        return this.props.dispatch(consoleActions.hideCommand());
-      }
-      break;
-    case KeyboardEvent.DOM_VK_M:
-      if (e.ctrlKey) {
-        return this.doEnter(e);
-      }
-      break;
-    case KeyboardEvent.DOM_VK_N:
-      if (e.ctrlKey) {
-        this.selectNext(e);
-      }
-      break;
-    case KeyboardEvent.DOM_VK_P:
-      if (e.ctrlKey) {
-        this.selectPrev(e);
-      }
-      break;
-    }
-  }
-
-  onInput(e) {
-    let text = e.target.value;
-    this.props.dispatch(consoleActions.setConsoleText(text));
-    if (this.props.mode === 'command') {
-      this.props.dispatch(consoleActions.getCompletions(text));
-    }
-  }
-
-
-  componentDidUpdate(prevProps) {
-    if (!this.input) {
-      return;
-    }
-    if (prevProps.mode !== 'command' && this.props.mode === 'command') {
-      this.props.dispatch(
-        consoleActions.getCompletions(this.props.consoleText));
-      this.focus();
-    } else if (prevProps.mode !== 'find' && this.props.mode === 'find') {
-      this.focus();
-    }
-  }
-
-  render() {
-    switch (this.props.mode) {
-    case 'command':
-    case 'find':
-      return <div className='vimvixen-console-command-wrapper'>
-        <Completion
-          size={COMPLETION_MAX_ITEMS}
-          completions={this.props.completions}
-          select={this.props.select}
-        />
-        <Input
-          ref={(c) => { this.input = c; }}
-          mode={this.props.mode}
-          onBlur={this.onBlur.bind(this)}
-          onKeyDown={this.onKeyDown.bind(this)}
-          onInput={this.onInput.bind(this)}
-          value={this.props.consoleText}
-        />
-      </div>;
-    case 'info':
-    case 'error':
-      return <Message mode={ this.props.mode } >
-        { this.props.messageText }
-      </Message>;
-    default:
-      return null;
-    }
-  }
-
-  focus() {
-    window.focus();
-    this.input.focus();
-  }
-}
-
-const mapStateToProps = state => state;
-export default connect(mapStateToProps)(ConsoleComponent);
diff --git a/src/console/components/console/Completion.jsx b/src/console/components/console/Completion.jsx
new file mode 100644
index 0000000..5477cb6
--- /dev/null
+++ b/src/console/components/console/Completion.jsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import CompletionItem from './CompletionItem';
+import CompletionTitle from './CompletionTitle';
+
+class Completion extends React.Component {
+  constructor() {
+    super();
+    this.state = { viewOffset: 0, select: -1 };
+  }
+
+  static getDerivedStateFromProps(nextProps, prevState) {
+    if (prevState.select === nextProps.select) {
+      return null;
+    }
+
+    let viewSelect = (() => {
+      let index = 0;
+      for (let i = 0; i < nextProps.completions.length; ++i) {
+        ++index;
+        let g = nextProps.completions[i];
+        if (nextProps.select + i + 1 < index + g.items.length) {
+          return nextProps.select + i + 1;
+        }
+        index += g.items.length;
+      }
+    })();
+
+    let viewOffset = 0;
+    if (nextProps.select < 0) {
+      viewOffset = 0;
+    } else if (prevState.select < nextProps.select) {
+      viewOffset = Math.max(prevState.viewOffset,
+        viewSelect - nextProps.size + 1);
+    } else if (prevState.select > nextProps.select) {
+      viewOffset = Math.min(prevState.viewOffset, viewSelect);
+    }
+    return { viewOffset, select: nextProps.select };
+  }
+
+  render() {
+    let eles = [];
+    let index = 0;
+
+    for (let group of this.props.completions) {
+      eles.push(<CompletionTitle
+        key={`group-${index}`}
+        title={ group.name }
+      />);
+      for (let item of group.items) {
+        eles.push(<CompletionItem
+          key={`item-${index}`}
+          icon={item.icon}
+          caption={item.caption}
+          url={item.url}
+          highlight={index === this.props.select}
+        / >);
+        ++index;
+      }
+    }
+
+    let viewOffset = this.state.viewOffset;
+    eles = eles.slice(viewOffset, viewOffset + this.props.size);
+
+    return (
+      <ul className='vimvixen-console-completion'>
+        { eles }
+      </ul>
+    );
+  }
+}
+
+Completion.propTypes = {
+  select: PropTypes.number,
+  size: PropTypes.number,
+  completions: PropTypes.arrayOf(PropTypes.shape({
+    name: PropTypes.string,
+    items: PropTypes.arrayOf(PropTypes.shape({
+      icon: PropTypes.string,
+      caption: PropTypes.string,
+      url: PropTypes.string,
+    })),
+  })),
+};
+
+export default Completion;
diff --git a/src/console/components/console/CompletionItem.jsx b/src/console/components/console/CompletionItem.jsx
new file mode 100644
index 0000000..3dc552b
--- /dev/null
+++ b/src/console/components/console/CompletionItem.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const CompletionItem = (props) => {
+  let className = 'vimvixen-console-completion-item';
+  if (props.highlight) {
+    className += ' vimvixen-completion-selected';
+  }
+  return <li
+    className={className}
+    style={{ backgroundImage: 'url(' + props.icon + ')' }}
+  >
+    <span
+      className='vimvixen-console-completion-item-caption'
+    >{props.caption}</span>
+    <span
+      className='vimvixen-console-completion-item-url'
+    >{props.url}</span>
+  </li>;
+};
+
+CompletionItem.propTypes = {
+  highlight: PropTypes.bool,
+  caption: PropTypes.string,
+  url: PropTypes.string,
+};
+
+export default CompletionItem;
diff --git a/src/console/components/console/CompletionTitle.jsx b/src/console/components/console/CompletionTitle.jsx
new file mode 100644
index 0000000..4fcba3f
--- /dev/null
+++ b/src/console/components/console/CompletionTitle.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const CompletionTitle = (props) => {
+  return <li className='vimvixen-console-completion-title'>
+    {props.title}
+  </li>;
+};
+
+CompletionTitle.propTypes = {
+  title: PropTypes.string,
+};
+
+export default CompletionTitle;
diff --git a/src/console/components/console/Input.jsx b/src/console/components/console/Input.jsx
new file mode 100644
index 0000000..c85d252
--- /dev/null
+++ b/src/console/components/console/Input.jsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+class Input extends React.Component {
+  focus() {
+    this.input.focus();
+  }
+
+  render() {
+    let prompt = '';
+    if (this.props.mode === 'command') {
+      prompt = ':';
+    } else if (this.props.mode === 'find') {
+      prompt = '/';
+    }
+
+    return (
+      <div className='vimvixen-console-command'>
+        <i className='vimvixen-console-command-prompt'>
+          { prompt }
+        </i>
+        <input
+          className='vimvixen-console-command-input'
+          ref={(c) => { this.input = c; }}
+          onBlur={this.props.onBlur}
+          onKeyDown={this.props.onKeyDown}
+          onInput={this.props.onInput}
+          value={this.props.value}
+        />
+      </div>
+    );
+  }
+}
+
+Input.propTypes = {
+  mode: PropTypes.string,
+  value: PropTypes.string,
+  onBlur: PropTypes.func,
+  onKeyDown: PropTypes.func,
+  onInput: PropTypes.func,
+};
+
+export default Input;
diff --git a/src/console/components/console/Message.jsx b/src/console/components/console/Message.jsx
new file mode 100644
index 0000000..dd96248
--- /dev/null
+++ b/src/console/components/console/Message.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Message = (props) => {
+  switch (props.mode) {
+  case 'error':
+    return (
+      <p className='vimvixen-console-message vimvixen-console-error'>
+        { props.children }
+      </p>
+    );
+  case 'info':
+    return (
+      <p className='vimvixen-console-message vimvixen-console-info'>
+        { props.children }
+      </p>
+    );
+  }
+};
+
+Message.propTypes = {
+  children: PropTypes.string,
+};
+
+export default Message;
diff --git a/src/console/components/console/completion.jsx b/src/console/components/console/completion.jsx
deleted file mode 100644
index 5d248a0..0000000
--- a/src/console/components/console/completion.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-
-const CompletionTitle = (props) => {
-  return <li className='vimvixen-console-completion-title' >{props.title}</li>;
-};
-
-const CompletionItem = (props) => {
-  let className = 'vimvixen-console-completion-item';
-  if (props.highlight) {
-    className += ' vimvixen-completion-selected';
-  }
-  return <li
-    className={className}
-    style={{ backgroundImage: 'url(' + props.icon + ')' }}
-  >
-    <span
-      className='vimvixen-console-completion-item-caption'
-    >{props.caption}</span>
-    <span
-      className='vimvixen-console-completion-item-url'
-    >{props.url}</span>
-  </li>;
-};
-
-
-class CompletionComponent extends React.Component {
-  constructor() {
-    super();
-    this.state = { viewOffset: 0, select: -1 };
-  }
-
-  static getDerivedStateFromProps(nextProps, prevState) {
-    if (prevState.select === nextProps.select) {
-      return null;
-    }
-
-    let viewSelect = (() => {
-      let index = 0;
-      for (let i = 0; i < nextProps.completions.length; ++i) {
-        ++index;
-        let g = nextProps.completions[i];
-        if (nextProps.select + i + 1 < index + g.items.length) {
-          return nextProps.select + i + 1;
-        }
-        index += g.items.length;
-      }
-    })();
-
-    let viewOffset = 0;
-    if (nextProps.select < 0) {
-      viewOffset = 0;
-    } else if (prevState.select < nextProps.select) {
-      viewOffset = Math.max(prevState.viewOffset,
-        viewSelect - nextProps.size + 1);
-    } else if (prevState.select > nextProps.select) {
-      viewOffset = Math.min(prevState.viewOffset, viewSelect);
-    }
-    return { viewOffset, select: nextProps.select };
-  }
-
-  render() {
-    let eles = [];
-    let index = 0;
-
-    for (let group of this.props.completions) {
-      eles.push(<CompletionTitle title={ group.name }/>);
-      for (let item of group.items) {
-        eles.push(<CompletionItem
-          icon={item.icon}
-          caption={item.caption}
-          url={item.url}
-          highlight={index === this.props.select}
-        / >);
-        ++index;
-      }
-    }
-
-    let viewOffset = this.state.viewOffset;
-    eles = eles.slice(viewOffset, viewOffset + this.props.size);
-
-    return (
-      <ul className='vimvixen-console-completion'>
-        { eles }
-      </ul>
-    );
-  }
-}
-
-export default CompletionComponent;
diff --git a/src/console/components/console/input.jsx b/src/console/components/console/input.jsx
deleted file mode 100644
index 3ac075e..0000000
--- a/src/console/components/console/input.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-
-export default class InputComponent extends React.Component {
-  focus() {
-    this.input.focus();
-  }
-
-  render() {
-    let prompt = '';
-    if (this.props.mode === 'command') {
-      prompt = ':';
-    } else if (this.props.mode === 'find') {
-      prompt = '/';
-    }
-
-    return (
-      <div className='vimvixen-console-command'>
-        <i className='vimvixen-console-command-prompt'>
-          { prompt }
-        </i>
-        <input
-          className='vimvixen-console-command-input'
-          ref={(c) => { this.input = c; }}
-          onBlur={this.props.onBlur}
-          onKeyDown={this.props.onKeyDown}
-          onInput={this.props.onInput}
-          value={this.props.value}
-        />
-      </div>
-    );
-  }
-}
diff --git a/src/console/components/console/message.jsx b/src/console/components/console/message.jsx
deleted file mode 100644
index 6c8297f..0000000
--- a/src/console/components/console/message.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-
-export default function Message(props) {
-  switch (props.mode) {
-  case 'error':
-    return (
-      <p className='vimvixen-console-message vimvixen-console-error'>
-        { props.children }
-      </p>
-    );
-  case 'info':
-    return (
-      <p className='vimvixen-console-message vimvixen-console-info'>
-        { props.children }
-      </p>
-    );
-  }
-}
diff --git a/src/console/index.jsx b/src/console/index.jsx
index 0d0a8b9..3190a9a 100644
--- a/src/console/index.jsx
+++ b/src/console/index.jsx
@@ -4,7 +4,7 @@ import { createStore, applyMiddleware } from 'redux';
 import promise from 'redux-promise';
 import * as consoleActions from 'console/actions/console';
 import { Provider } from 'react-redux';
-import Console from './components/console';
+import Console from './components/Console';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-- 
cgit v1.2.3