Sotaro KARASAWA 10 tahun lalu
induk
melakukan
8e5919af11

+ 5 - 0
resource/js/components/Header/SearchBox.js

@@ -16,11 +16,15 @@ export default class SearchBox extends React.Component {
       searchedPages: [],
       searchError: null,
       searching: false,
+      focused: false,
     }
 
     this.search = this.search.bind(this);
   }
 
+  focusToggle(focused) {
+  }
+
   search(data) {
     const keyword = data.keyword;
     if (keyword === '') {
@@ -65,6 +69,7 @@ export default class SearchBox extends React.Component {
           searchedPages={this.state.searchedPages}
           searchError={this.state.searchError}
           searching={this.state.searching}
+          focused={this.state.focused}
           />
       </div>
     );

+ 5 - 0
resource/js/components/Header/SearchSuggest.js

@@ -5,6 +5,10 @@ import ListView from '../PageList/ListView';
 export default class SearchSuggest extends React.Component {
 
   render() {
+    if (!this.props.focused) {
+      return <div></div>;
+    }
+
     if (this.props.searching) {
       return (
         <div className="search-suggest" id="search-suggest">
@@ -44,4 +48,5 @@ SearchSuggest.defaultProps = {
   searchingKeyword: '',
   searchError: null,
   searching: false,
+  focused: false,
 };

+ 5 - 2
resource/js/components/Page/PageBody.js

@@ -58,7 +58,8 @@ export default class PageBody extends React.Component {
       langPrefix: 'lang-'
     });
     console.log('parsing', 'いくぜ');
-    const parsed = marked(body);
+    //const parsed = marked(body);
+    const parsed = '<b>hoge</b>';
     console.log('parsed', parsed);
     } catch (e) { console.log(e); }
 
@@ -67,11 +68,13 @@ export default class PageBody extends React.Component {
 
   render() {
     console.log('Render!');
+    const parsedBody = this.getMarkupHTML();
+    console.log('parse completed', parsedBody);
 
     return (
       <div
         className="content"
-        dangerouslySetInnerHTML={this.getMarkupHTML()}
+        dangerouslySetInnerHTML={parsedBody}
         />
     );
   }

+ 1 - 1
resource/js/components/Search/SearchResult.js

@@ -11,7 +11,7 @@ export default class SearchResult extends React.Component {
     const listView = this.props.pages.map((page) => {
       const pageId = "#" + page._id;
       return (
-        <Page page={page} linkTo={pageId}>
+        <Page page={page} linkTo={pageId} key={page_.id}>
           <div className="page-list-option">
             <a href={page.path}><i className="fa fa-arrow-circle-right" /></a>
           </div>

+ 1 - 1
resource/js/components/Search/SearchResultList.js

@@ -28,7 +28,7 @@ export default class SearchResultList extends React.Component {
       //console.log('resultList.page.path', page.path);
       //console.log('resultList.pageBody', pageBody);
       return (
-        <div id={page._id}>
+        <div id={page._id} key={page._id}>
           <h2>{page.path}</h2>
           <div>
             <PageBody page={page} pageBody={pageBody} />