@dvrd/dvr-controls 1.0.2 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "Custom web controls",
   "main": "index.ts",
   "scripts": {},

package/src/js/link/link.tsx

@@ -13,24 +13,25 @@ interface Props {
     className?: string;
     disabled?: boolean;
     underline?: boolean;
+    target?: string;
 }
 
 export default function Link(props: React.PropsWithChildren<Props>) {
-    const onClick = (evt: React.MouseEvent) => {
+    const {className, disabled, route, children, underline, target, onClick} = props;
+
+    function _onClick(evt: React.MouseEvent) {
         evt.preventDefault();
-        const {disabled, route, onClick} = props;
         if (!disabled) {
             if (route) {
-                if (route.startsWith('http')) window.open(route);
+                if (/^(www|http).+/.test(route)) window.open(route, target);
                 else navigate(route);
             }
             if (onClick) onClick(evt);
         }
-    };
+    }
 
-    const {className, disabled, route, children, underline} = props;
     return (
-        <a href={route} onClick={onClick}
+        <a href={route} onClick={_onClick} target={target}
            className={classNames('app-link', className, disabled && 'disabled',
                underline && 'underline')}>{children}</a>
     );

package/src/js/sidebarMenu/sidebarMenu.tsx

@@ -7,7 +7,7 @@ import React, {MouseEventHandler, ReactNode, useContext, useEffect, useRef, useS
 import {useLocation} from 'react-router';
 import {SidebarItem, SideMenuMode} from "../util/interfaces";
 import classNames from 'classnames';
-import {AwesomeIcon, generateComponentId} from "../../../index";
+import {AwesomeIcon, generateComponentId, isAbsoluteLink} from "../../../index";
 import {ControlContext} from "../util/controlContext";
 import {defer} from 'lodash';
 
@@ -67,7 +67,14 @@ export default function SidebarMenu(props: Props) {
     function _onClickItem(item: SidebarItem) {
         return function (evt: React.MouseEvent) {
             evt.stopPropagation();
-            setActiveItem(item.id);
+            const {route} = item;
+            let _route: string | null = null;
+            if (route) {
+                if (Array.isArray(route) && route.length) _route = route[0];
+                else _route = route as string;
+            }
+            if (_route && !isAbsoluteLink(_route))
+                setActiveItem(item.id);
             onClickItem(item)(evt);
         }
     }

package/src/js/util/miscUtil.ts

@@ -163,4 +163,8 @@ export function webpSupported(): boolean {
     } catch {
         return false;
     }
+}
+
+export function isAbsoluteLink(link: string): boolean {
+    return /^(https?|www).*/.test(link);
 }