namirasoft-site-react 1.4.565 → 1.4.567

package/src/KeyOperation.ts

@@ -1,110 +1,110 @@
-export class KeyOperation
-{
-    private static started: boolean = false;
-    private static readonly pressedCodes: Set<string> = new Set<string>();
-    private static readonly pressedKeys: Set<string> = new Set<string>();
-
-    private static readonly onKeyDown = (event: KeyboardEvent): void =>
-    {
-        KeyOperation.pressedCodes.add(event.code);
-        KeyOperation.pressedKeys.add(event.key.toLowerCase());
-    };
-
-    private static readonly onKeyUp = (event: KeyboardEvent): void =>
-    {
-        KeyOperation.pressedCodes.delete(event.code);
-        KeyOperation.pressedKeys.delete(event.key.toLowerCase());
-    };
-
-    private static readonly onBlur = (): void =>
-    {
-        KeyOperation.pressedCodes.clear();
-        KeyOperation.pressedKeys.clear();
-    };
-
-    static start(): void
-    {
-        if (KeyOperation.started)
-            return;
-        if (typeof window === "undefined")
-            return;
-        window.addEventListener("keydown", KeyOperation.onKeyDown);
-        window.addEventListener("keyup", KeyOperation.onKeyUp);
-        window.addEventListener("blur", KeyOperation.onBlur);
-        KeyOperation.started = true;
-    }
-
-    static stop(): void
-    {
-        if (!KeyOperation.started)
-            return;
-        if (typeof window === "undefined")
-            return;
-        window.removeEventListener("keydown", KeyOperation.onKeyDown);
-        window.removeEventListener("keyup", KeyOperation.onKeyUp);
-        window.removeEventListener("blur", KeyOperation.onBlur);
-        KeyOperation.pressedCodes.clear();
-        KeyOperation.pressedKeys.clear();
-        KeyOperation.started = false;
-    }
-
-    static isCodePressed(code: string): boolean
-    {
-        return KeyOperation.pressedCodes.has(code);
-    }
-
-    static isKeyPressed(key: string): boolean
-    {
-        return KeyOperation.pressedKeys.has(key.toLowerCase());
-    }
-
-    static isAnyCodePressed(...codes: string[]): boolean
-    {
-        return codes.some(code => KeyOperation.pressedCodes.has(code));
-    }
-
-    static areAllCodesPressed(...codes: string[]): boolean
-    {
-        return codes.every(code => KeyOperation.pressedCodes.has(code));
-    }
-
-    static isShiftPressed(): boolean
-    {
-        return KeyOperation.isAnyCodePressed("ShiftLeft", "ShiftRight");
-    }
-
-    static isControlPressed(): boolean
-    {
-        return KeyOperation.isAnyCodePressed("ControlLeft", "ControlRight");
-    }
-
-    static isAltPressed(): boolean
-    {
-        return KeyOperation.isAnyCodePressed("AltLeft", "AltRight");
-    }
-
-    static isMetaPressed(): boolean
-    {
-        return KeyOperation.isAnyCodePressed("MetaLeft", "MetaRight");
-    }
-
-    static isEnterPressed(): boolean
-    {
-        return KeyOperation.isAnyCodePressed("Enter", "NumpadEnter");
-    }
-
-    static isEscapePressed(): boolean
-    {
-        return KeyOperation.isCodePressed("Escape");
-    }
-
-    static isSpacePressed(): boolean
-    {
-        return KeyOperation.isCodePressed("Space");
-    }
-
-    static getPressedCodes(): string[]
-    {
-        return Array.from(KeyOperation.pressedCodes);
-    }
+export class KeyOperation
+{
+    private static started: boolean = false;
+    private static readonly pressedCodes: Set<string> = new Set<string>();
+    private static readonly pressedKeys: Set<string> = new Set<string>();
+
+    private static readonly onKeyDown = (event: KeyboardEvent): void =>
+    {
+        KeyOperation.pressedCodes.add(event.code);
+        KeyOperation.pressedKeys.add(event.key.toLowerCase());
+    };
+
+    private static readonly onKeyUp = (event: KeyboardEvent): void =>
+    {
+        KeyOperation.pressedCodes.delete(event.code);
+        KeyOperation.pressedKeys.delete(event.key.toLowerCase());
+    };
+
+    private static readonly onBlur = (): void =>
+    {
+        KeyOperation.pressedCodes.clear();
+        KeyOperation.pressedKeys.clear();
+    };
+
+    static start(): void
+    {
+        if (KeyOperation.started)
+            return;
+        if (typeof window === "undefined")
+            return;
+        window.addEventListener("keydown", KeyOperation.onKeyDown);
+        window.addEventListener("keyup", KeyOperation.onKeyUp);
+        window.addEventListener("blur", KeyOperation.onBlur);
+        KeyOperation.started = true;
+    }
+
+    static stop(): void
+    {
+        if (!KeyOperation.started)
+            return;
+        if (typeof window === "undefined")
+            return;
+        window.removeEventListener("keydown", KeyOperation.onKeyDown);
+        window.removeEventListener("keyup", KeyOperation.onKeyUp);
+        window.removeEventListener("blur", KeyOperation.onBlur);
+        KeyOperation.pressedCodes.clear();
+        KeyOperation.pressedKeys.clear();
+        KeyOperation.started = false;
+    }
+
+    static isCodePressed(code: string): boolean
+    {
+        return KeyOperation.pressedCodes.has(code);
+    }
+
+    static isKeyPressed(key: string): boolean
+    {
+        return KeyOperation.pressedKeys.has(key.toLowerCase());
+    }
+
+    static isAnyCodePressed(...codes: string[]): boolean
+    {
+        return codes.some(code => KeyOperation.pressedCodes.has(code));
+    }
+
+    static areAllCodesPressed(...codes: string[]): boolean
+    {
+        return codes.every(code => KeyOperation.pressedCodes.has(code));
+    }
+
+    static isShiftPressed(): boolean
+    {
+        return KeyOperation.isAnyCodePressed("ShiftLeft", "ShiftRight");
+    }
+
+    static isControlPressed(): boolean
+    {
+        return KeyOperation.isAnyCodePressed("ControlLeft", "ControlRight");
+    }
+
+    static isAltPressed(): boolean
+    {
+        return KeyOperation.isAnyCodePressed("AltLeft", "AltRight");
+    }
+
+    static isMetaPressed(): boolean
+    {
+        return KeyOperation.isAnyCodePressed("MetaLeft", "MetaRight");
+    }
+
+    static isEnterPressed(): boolean
+    {
+        return KeyOperation.isAnyCodePressed("Enter", "NumpadEnter");
+    }
+
+    static isEscapePressed(): boolean
+    {
+        return KeyOperation.isCodePressed("Escape");
+    }
+
+    static isSpacePressed(): boolean
+    {
+        return KeyOperation.isCodePressed("Space");
+    }
+
+    static getPressedCodes(): string[]
+    {
+        return Array.from(KeyOperation.pressedCodes);
+    }
 }

package/src/LinkOperation.ts

@@ -1,87 +1,102 @@
-import { NavigateFunction, NavigateOptions } from "react-router-dom";
-import { KeyOperation } from "./KeyOperation";
-
-export enum LinkTarget
-{
-    Self = "_self",
-    Blank = "_blank",
-}
-
-export class LinkOperation
-{
-    private static navigate?: NavigateFunction;
-
-    static setNavigate(navigate: NavigateFunction): void
-    {
-        LinkOperation.navigate = navigate;
-    }
-
-    private static resolveTarget(target?: LinkTarget): LinkTarget
-    {
-        if (target)
-            return target;
-        if (KeyOperation.isControlPressed() || KeyOperation.isMetaPressed())
-            return LinkTarget.Blank;
-        return LinkTarget.Self;
-    }
-
-    private static isExternal(url: string): boolean
-    {
-        return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
-    }
-
-    static open(url: string, target?: LinkTarget, options?: NavigateOptions): void
-    {
-        const resolved = LinkOperation.resolveTarget(target);
-        if (resolved === LinkTarget.Blank)
-        {
-            LinkOperation.openBlank(url);
-            return;
-        }
-        if (LinkOperation.isExternal(url) || !LinkOperation.navigate)
-        {
-            window.location.href = url;
-            return;
-        }
-        LinkOperation.navigate(url, options);
-    }
-
-    static openBlank(url: string): void
-    {
-        if (typeof window === "undefined")
-            return;
-        window.open(url, "_blank", "noopener,noreferrer");
-    }
-
-    static openSelf(url: string, options?: NavigateOptions): void
-    {
-        LinkOperation.open(url, LinkTarget.Self, options);
-    }
-
-    static replace(url: string, options?: NavigateOptions): void
-    {
-        LinkOperation.open(url, LinkTarget.Self, { ...options, replace: true });
-    }
-
-    static back(): void
-    {
-        if (LinkOperation.navigate)
-            LinkOperation.navigate(-1);
-        else if (typeof window !== "undefined")
-            window.history.back();
-    }
-
-    static forward(): void
-    {
-        if (LinkOperation.navigate)
-            LinkOperation.navigate(1);
-        else if (typeof window !== "undefined")
-            window.history.forward();
-    }
-
-    static reload(): void
-    {
-        if (typeof window !== "undefined")
-            window.location.reload();
-    }
+import { NavigateFunction, NavigateOptions } from "react-router-dom";
+import { KeyOperation } from "./KeyOperation";
+
+export enum LinkTarget
+{
+    Self = "_self",
+    Blank = "_blank",
+    Window = "_window",
+}
+
+export class LinkOperation
+{
+    private static navigate?: NavigateFunction;
+
+    static setNavigate(navigate: NavigateFunction): void
+    {
+        LinkOperation.navigate = navigate;
+    }
+
+    private static resolveTarget(target?: LinkTarget): LinkTarget
+    {
+        if (target)
+            return target;
+        if (KeyOperation.isShiftPressed())
+            return LinkTarget.Window;
+        if (KeyOperation.isControlPressed() || KeyOperation.isMetaPressed())
+            return LinkTarget.Blank;
+        return LinkTarget.Self;
+    }
+
+    private static isExternal(url: string): boolean
+    {
+        return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
+    }
+
+    static open(url: string, target?: LinkTarget, options?: NavigateOptions): void
+    {
+        const resolved = LinkOperation.resolveTarget(target);
+        if (resolved === LinkTarget.Blank)
+        {
+            LinkOperation.openBlank(url);
+            return;
+        }
+        if (resolved === LinkTarget.Window)
+        {
+            LinkOperation.openWindow(url);
+            return;
+        }
+        if (LinkOperation.isExternal(url) || !LinkOperation.navigate)
+        {
+            window.location.href = url;
+            return;
+        }
+        LinkOperation.navigate(url, options);
+    }
+
+    static openBlank(url: string): void
+    {
+        if (typeof window === "undefined")
+            return;
+        window.open(url, "_blank", "noopener,noreferrer");
+    }
+
+    static openWindow(url: string): void
+    {
+        if (typeof window === "undefined")
+            return;
+        window.open(url, "_blank", "noopener,noreferrer,popup");
+    }
+
+    static openSelf(url: string, options?: NavigateOptions): void
+    {
+        LinkOperation.open(url, LinkTarget.Self, options);
+    }
+
+    static replace(url: string, options?: NavigateOptions): void
+    {
+        LinkOperation.open(url, LinkTarget.Self, { ...options, replace: true });
+    }
+
+    static back(): void
+    {
+        if (LinkOperation.navigate)
+            LinkOperation.navigate(-1);
+        else if (typeof window !== "undefined")
+            window.history.back();
+    }
+
+    static forward(): void
+    {
+        if (LinkOperation.navigate)
+            LinkOperation.navigate(1);
+        else if (typeof window !== "undefined")
+            window.history.forward();
+    }
+
+    static reload(): void
+    {
+        if (typeof window !== "undefined")
+            window.location.reload();
+    }
 }