Skip to content

Commit 06df352

Browse files
committed
chore(navigation): re-incorporate docsearch and tweak menu position
1 parent 2eb14b8 commit 06df352

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
},
105105
"dependencies": {
106106
"ajv": "^5.5.2",
107+
"docsearch.js": "^2.5.2",
107108
"gitter-sidecar": "^1.2.3",
108109
"preact": "^8.2.7",
109110
"preact-compat": "3.17.0",

src/components/Navigation/Navigation.jsx

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Import External Dependencies
22
import React from 'react';
33
import Banner from 'react-banner';
4+
import DocSearch from 'docsearch.js';
45

56
// Import Utilities/Images
67
import GitHubIcon from '../../styles/icons/github.svg';
@@ -12,33 +13,10 @@ import Logo from '../Logo/Logo';
1213
import Dropdown from '../Dropdown/Dropdown';
1314

1415
// Load Styling
16+
import 'docsearch.js/dist/cdn/docsearch.css';
1517
import './Navigation.scss';
1618
import './Search.scss';
1719

18-
// TODO: Re-incorporate docsearch (see `react-banner` docs and `SearchResults` component/discussion)
19-
// componentDidMount() {
20-
// if (typeof window !== 'undefined') {
21-
// let docsearch = () => {};
22-
23-
// // XXX: hack around docsearch
24-
// if (window.docsearch) {
25-
// docsearch = window.docsearch.default || window.docsearch;
26-
// }
27-
28-
// docsearch({
29-
// apiKey: 'fac401d1a5f68bc41f01fb6261661490',
30-
// indexName: 'webpack-js-org',
31-
// inputSelector: '.navigation__search-input'
32-
// });
33-
34-
// window.addEventListener('keyup', e => {
35-
// if (e.which === 9 && e.target.classList.contains('navigation__search-input')) {
36-
// this._openSearch();
37-
// }
38-
// });
39-
// }
40-
// }
41-
4220
export default class Navigation extends React.Component {
4321
render() {
4422
let { pathname, links, toggleSidebar } = this.props;
@@ -78,4 +56,12 @@ export default class Navigation extends React.Component {
7856
onMenuClick={ toggleSidebar } />
7957
);
8058
}
59+
60+
componentDidMount() {
61+
DocSearch({
62+
apiKey: 'fac401d1a5f68bc41f01fb6261661490',
63+
indexName: 'webpack-js-org',
64+
inputSelector: '.navigation-search__input'
65+
});
66+
}
8167
}

src/components/Navigation/Search.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
.ds-dropdown-menu {
88
box-shadow: none;
9+
margin-top: 19px;
10+
margin-right: -37px;
911

1012
&:before {
1113
content: none;

0 commit comments

Comments
 (0)