sou 7 лет назад
Родитель
Сommit
078fdc2fc1

+ 25 - 0
resource/js/components/HeaderSearchBox/SearchForm.js

@@ -44,6 +44,30 @@ export default class SearchForm extends React.Component {
     }
   }
 
+  getHelpElement() {
+    return <table className="table table-borderd search-help">
+              <caption>Search Help</caption>
+              <tbody>
+                <tr>
+                  <td>keyword</td>
+                  <th>記事名 or カテゴリ or 本文にkeywordを含む</th>
+                </tr>
+                <tr>
+                  <td>title:keyword</td>
+                  <th>記事名にkeywordを含む</th>
+                </tr>
+                <tr>
+                  <td>a b</td>
+                  <th>文字列aとbを含む(スペース区切り)</th>
+                </tr>
+                <tr>
+                  <td>-keyword</td>
+                  <th>文字列keywordを含まない</th>
+                </tr>
+              </tbody>
+            </table>;
+  }
+
   render() {
     const emptyLabel = (this.state.searchError !== null)
       ? 'Error on searching.'
@@ -61,6 +85,7 @@ export default class SearchForm extends React.Component {
               onChange={this.onChange}
               emptyLabel={emptyLabel}
               placeholder="Search ..."
+              promptText={this.getHelpElement()}
             />
             <InputGroup.Button>
               <Button type="submit" bsStyle="link">

+ 2 - 24
resource/js/components/SearchTypeahead.js

@@ -145,7 +145,6 @@ export default class SearchTypeahead extends React.Component {
     const defaultSelected = (this.props.keywordOnInit != '')
       ? [{path: this.props.keywordOnInit}]
       : [];
-    const help = this.getHelpElement();
 
     return (
       <div className="search-typeahead">
@@ -165,34 +164,12 @@ export default class SearchTypeahead extends React.Component {
           renderMenuItemChildren={this.renderMenuItemChildren}
           caseSensitive={false}
           defaultSelected={defaultSelected}
-          promptText={help}
+          promptText={this.props.promptText}
         />
         {restoreFormButton}
       </div>
     );
   }
-
-  getHelpElement() {
-    return <table className="table table-borderd search-help">
-              <caption>Search Help</caption>
-              <tr>
-                <td>keyword</td>
-                <th>記事名 or カテゴリ or 本文にkeywordを含む</th>
-              </tr>
-              <tr>
-                <td>title:keyword</td>
-                <th>記事名にkeywordを含む</th>
-              </tr>
-              <tr>
-                <td>a b</td>
-                <th>文字列aとbを含む(スペース区切り)</th>
-              </tr>
-              <tr>
-                <td>-keyword</td>
-                <th>文字列keywordを含まない</th>
-              </tr>
-            </table>;
-  }
 }
 
 /**
@@ -206,6 +183,7 @@ SearchTypeahead.propTypes = {
   emptyLabel:      PropTypes.string,
   placeholder:     PropTypes.string,
   keywordOnInit:   PropTypes.string,
+  promptText:      PropTypes.object,
 };
 
 /**