Sfoglia il codice sorgente

WIP: refactor searching related components

fix HeaderSearchBox
Yuki Takei 7 anni fa
parent
commit
4c06bee0c2
1 ha cambiato i file con 6 aggiunte e 10 eliminazioni
  1. 6 10
      src/client/js/components/HeaderSearchBox.jsx

+ 6 - 10
src/client/js/components/HeaderSearchBox.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import FormGroup from 'react-bootstrap/es/FormGroup';
 import Button from 'react-bootstrap/es/Button';
@@ -6,11 +7,10 @@ import DropdownButton from 'react-bootstrap/es/DropdownButton';
 import MenuItem from 'react-bootstrap/es/MenuItem';
 import InputGroup from 'react-bootstrap/es/InputGroup';
 
-import SearchForm from '../SearchForm';
+import SearchForm from './SearchForm';
 
 
-// Header.SearchForm
-export default class HeaderSearchForm extends React.Component {
+export default class HeaderSearchBox extends React.Component {
 
   constructor(props) {
     super(props);
@@ -19,8 +19,6 @@ export default class HeaderSearchForm extends React.Component {
       isScopeChildren: false,
     };
 
-    this.crowi = window.crowi; // FIXME
-
     this.onClickAllPages = this.onClickAllPages.bind(this);
     this.onClickChildren = this.onClickChildren.bind(this);
     this.onSubmit = this.onSubmit.bind(this);
@@ -63,7 +61,7 @@ export default class HeaderSearchForm extends React.Component {
             </DropdownButton>
           </InputGroup.Button>
             <SearchForm
-              crowi={this.crowi}
+              crowi={this.props.crowi}
               onSubmit={this.onSubmit}
               placeholder="Search ..."
             />
@@ -81,8 +79,6 @@ export default class HeaderSearchForm extends React.Component {
   }
 }
 
-HeaderSearchForm.propTypes = {
-};
-
-HeaderSearchForm.defaultProps = {
+HeaderSearchBox.propTypes = {
+  crowi: PropTypes.object.isRequired,
 };