Fix dropdown menus. Now are fully clickable

domapic · Feb 23, 2019 · a095d46 · a095d46
1 parent 58a41ab
commit a095d46
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/src/modules/menu/components/about/AboutMenuDropdown.js b/src/modules/menu/components/about/AboutMenuDropdown.js
@@ -20,15 +20,11 @@ export class AboutMenuDropdown extends Component {
         <Dropdown.Menu>
           <Dropdown.Header>About</Dropdown.Header>
           <Dropdown.Divider />
-          <Dropdown.Item>
-            <Link to={this.context.about}>
-              <Icon name="info circle" /> Package info
-            </Link>
+          <Dropdown.Item as={Link} to={this.context.about}>
+            <Icon name="info circle" /> Package info
           </Dropdown.Item>
-          <Dropdown.Item>
-            <Link to={this.context.swagger} target="_blank">
-              <Icon name="power cord" /> Api Swagger
-            </Link>
+          <Dropdown.Item as={Link} to={this.context.swagger} target="_blank">
+            <Icon name="power cord" /> Api Swagger
           </Dropdown.Item>
         </Dropdown.Menu>
       </Dropdown>

diff --git a/src/modules/menu/components/settings/SettingsMenuDropdown.js b/src/modules/menu/components/settings/SettingsMenuDropdown.js
@@ -22,15 +22,11 @@ export class SettingsMenuDropdown extends Component {
         <Dropdown.Menu>
           <Dropdown.Header>Settings</Dropdown.Header>
           <Dropdown.Divider />
-          <Dropdown.Item>
-            <Link to={this.context.configuration}>
-              <Icon name="configure" /> Configuration
-            </Link>
+          <Dropdown.Item as={Link} to={this.context.configuration}>
+            <Icon name="configure" /> Configuration
           </Dropdown.Item>
-          <Dropdown.Item>
-            <Link to={this.context.users}>
-              <Icon name="users" /> Users
-            </Link>
+          <Dropdown.Item as={Link} to={this.context.users}>
+            <Icon name="users" /> Users
           </Dropdown.Item>
         </Dropdown.Menu>
       </Dropdown>

diff --git a/src/modules/menu/components/user/UserMenuDropdown.js b/src/modules/menu/components/user/UserMenuDropdown.js
@@ -29,15 +29,11 @@ export class UserMenuDropdown extends Component {
         <Dropdown.Menu>
           <Dropdown.Header>User</Dropdown.Header>
           <Dropdown.Divider />
-          <Dropdown.Item>
-            <Link to={this.context.account}>
-              <Icon name="user" /> Account
-            </Link>
+          <Dropdown.Item as={Link} to={this.context.account}>
+            <Icon name="user" /> Account
           </Dropdown.Item>
-          <Dropdown.Item>
-            <Link to="" onClick={this.props.logoutHandler}>
-              <Icon name="shutdown" /> Logout
-            </Link>
+          <Dropdown.Item as={Link} to="" onClick={this.props.logoutHandler}>
+            <Icon name="shutdown" /> Logout
           </Dropdown.Item>
         </Dropdown.Menu>
       </Dropdown>