Merge branch 'master' into qt/fix_scroll

Author: mpcen

src/components/Navigation/Pages/PageBrowse/PageBrowse.js

@@ -34,7 +34,8 @@ class PageBrowse extends SystemManagedList {
     this.state = {
       activeSort: 'releaseDate-desc',
       searchFocused: false,
-      selectedProvider: providers[0]
+      selectedProvider: providers[0],
+      searchTerm: ''
     }
     this.onFilter = this.onFilter.bind(this)
     this.onSort = this.onSort.bind(this)
@@ -63,13 +64,19 @@ class PageBrowse extends SystemManagedList {
   }
 
   onBrowse = value => {
-    this.setState({ activeName: value }, () => this.updateData())
+    this.setState({ activeName: value, searchTerm: '' }, () => this.updateData())
   }
 
   onFocusChange = value => {
     this.setState({ searchFocused: value })
   }
 
+  onSearch = value => {
+    this.setState({ searchTerm: value })
+    const provider = this.state.selectedProvider.value
+    super.onSearch(provider + '/' + value)
+  }
+
   tableTitle() {
     return 'Browse'
   }
@@ -163,6 +170,7 @@ class PageBrowse extends SystemManagedList {
 
   onProviderChange(item) {
     this.setState({ selectedProvider: item })
+    this.state.searchTerm && super.onSearch(item.value + '/' + this.state.searchTerm)
   }
 
   // Overrides the default onFilter method

src/components/Navigation/Pages/PageDefinitions/ButtonsBar.js

@@ -5,6 +5,11 @@ import ButtonWithTooltip from '../../Ui/ButtonWithTooltip'
 import ShareButton from '../../Ui/ShareButton'
 
 export default class ButtonsBar extends Component {
+  constructor(props) {
+    super(props)
+    this.onSelect = this.onSelect.bind(this)
+  }
+
   static propTypes = {
     components: PropTypes.object,
     hasChanges: PropTypes.bool,

src/components/Navigation/Ui/ShareButton.js

@@ -13,18 +13,18 @@ export default class ShareButton extends Component {
     const disabled = !components || components.list.length === 0
     return (
       <DropdownButton disabled={disabled} id={'sharedropdown'} title="Share" bsStyle="success">
-        <MenuItem eventKey="1" onSelect={() => onSelect('url')}>
+        <MenuItem eventKey="1" className="dropdown-item" onSelect={() => onSelect('url')}>
           URL
         </MenuItem>
-        <MenuItem eventKey="2" onSelect={() => onSelect('file')}>
+        <MenuItem eventKey="2" className="dropdown-item" onSelect={() => onSelect('file')}>
           Coordinate list (JSON)
         </MenuItem>
-        <MenuItem eventKey="2" onSelect={() => onSelect('notice')}>
+        <MenuItem eventKey="2" className="dropdown-item" onSelect={() => onSelect('notice')}>
           Notice file
         </MenuItem>
-        <MenuItem divider />
+        {/* <MenuItem divider />
         <MenuItem disabled>Definitions (Not implemented)</MenuItem>
-        <MenuItem disabled>SPDX (Not implemented)</MenuItem>
+        <MenuItem disabled>SPDX (Not implemented)</MenuItem> */}
       </DropdownButton>
     )
   }

src/styles/_ShareButton.scss

@@ -0,0 +1,11 @@
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown.btn-group {
+  display: inline-block;
+}
+
+.dropdown-item > a {
+  display: block;
+}

src/styles/index.scss

@@ -75,5 +75,6 @@ main {
 @import './GetInvolved.scss';
 @import './PageAbout.scss';
 @import './charter.scss';
+@import './ShareButton.scss';
 
 @import './utils.scss';