Fix typings + remove fake href

paul-tavares · paul-tavares · commit ba61dc02ed70 · 2020-03-23T17:07:19.000-04:00
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/components/link_to_app.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/components/link_to_app.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { memo } from 'react';
+import React, { memo, MouseEventHandler } from 'react';
 import { EuiLink } from '@elastic/eui';
 import { EuiLinkProps } from '@elastic/eui';
 import { useNavigateToAppEventHandler } from '../hooks/use_navigate_to_app_event_handler';
@@ -20,13 +20,13 @@ export const LinkToApp = memo<
     /** Any app specic path (route) */
     appPath?: string;
     appState?: any;
+    onClick?: MouseEventHandler<HTMLButtonElement | HTMLAnchorElement>;
   }
 >(({ appId, appPath: path, appState: state, onClick, children, ...otherProps }) => {
   const handleOnClick = useNavigateToAppEventHandler(appId, { path, state, onClick });
   return (
-    // @ts-ignore
     // eslint-disable-next-line @elastic/eui/href-or-on-click
-    <EuiLink {...otherProps} href={'#'} onClick={handleOnClick}>
+    <EuiLink {...otherProps} onClick={handleOnClick}>
       {children}
     </EuiLink>
   );
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/hooks/use_navigate_to_app_event_handler.ts b/x-pack/plugins/endpoint/public/applications/endpoint/hooks/use_navigate_to_app_event_handler.ts
@@ -4,13 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useCallback } from 'react';
+import { MouseEventHandler, useCallback } from 'react';
 import { ApplicationStart } from 'kibana/public';
-import { EuiLinkProps } from '@elastic/eui';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 type NavigateToAppHandlerProps = Parameters<ApplicationStart['navigateToApp']>;
-type EventHandlerCallback = EuiLinkProps['onClick'];
+type EventHandlerCallback = MouseEventHandler<HTMLButtonElement | HTMLAnchorElement>;
 
 /**
  * Provides an event handlers that can be used with (for example) `onClick` to prevent the
@@ -52,6 +51,18 @@ export const useNavigateToAppEventHandler = (
         return;
       }
 
+      if (ev.button !== 0) {
+        return;
+      }
+
+      if (
+        ev.currentTarget instanceof HTMLAnchorElement &&
+        ev.currentTarget.target !== '' &&
+        ev.currentTarget.target !== '_self'
+      ) {
+        return;
+      }
+
       if (ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
         return;
       }
