custom-electron-titlebar 3.2.5 → 3.2.9

package/{lib → build}/titlebar.js

@@ -14,20 +14,21 @@ const platform_1 = require("./common/platform");
 const color_1 = require("./common/color");
 const dom_1 = require("./common/dom");
 const menubar_1 = require("./menubar");
-const electron_1 = require("electron");
+const remote = require("@electron/remote");
 const themebar_1 = require("./themebar");
 const INACTIVE_FOREGROUND_DARK = color_1.Color.fromHex('#222222');
 const ACTIVE_FOREGROUND_DARK = color_1.Color.fromHex('#333333');
 const INACTIVE_FOREGROUND = color_1.Color.fromHex('#EEEEEE');
 const ACTIVE_FOREGROUND = color_1.Color.fromHex('#FFFFFF');
+const IS_MAC_BIGSUR_OR_LATER = platform_1.isMacintosh && parseInt(process.getSystemVersion().split(".")[0]) >= 11;
 const BOTTOM_TITLEBAR_HEIGHT = '60px';
-const TOP_TITLEBAR_HEIGHT_MAC = '22px';
+const TOP_TITLEBAR_HEIGHT_MAC = IS_MAC_BIGSUR_OR_LATER ? '28px' : '22px';
 const TOP_TITLEBAR_HEIGHT_WIN = '30px';
 const defaultOptions = {
     backgroundColor: color_1.Color.fromHex('#444444'),
     iconsTheme: themebar_1.Themebar.win,
     shadow: false,
-    menu: electron_1.remote.Menu.getApplicationMenu(),
+    menu: remote.Menu.getApplicationMenu(),
     minimizable: true,
     maximizable: true,
     closeable: true,
@@ -44,7 +45,7 @@ class Titlebar extends themebar_1.Themebar {
                 this.menubar.blur();
             }
         };
-        this.currentWindow = electron_1.remote.getCurrentWindow();
+        this.currentWindow = remote.getCurrentWindow();
         this._options = Object.assign(Object.assign({}, defaultOptions), options);
         this.registerListeners();
         this.createTitlebar();
@@ -75,7 +76,7 @@ class Titlebar extends themebar_1.Themebar {
     }
     createTitlebar() {
         // Content container
-        this.container = dom_1.$('div.container-after-titlebar');
+        this.container = (0, dom_1.$)('div.container-after-titlebar');
         if (this._options.menuPosition === 'bottom') {
             this.container.style.top = BOTTOM_TITLEBAR_HEIGHT;
             this.container.style.bottom = '0px';
@@ -89,72 +90,77 @@ class Titlebar extends themebar_1.Themebar {
         this.container.style.position = 'absolute';
         this.container.style.overflow = this._options.overflow;
         while (document.body.firstChild) {
-            dom_1.append(this.container, document.body.firstChild);
+            (0, dom_1.append)(this.container, document.body.firstChild);
         }
-        dom_1.append(document.body, this.container);
+        (0, dom_1.append)(document.body, this.container);
         document.body.style.overflow = 'hidden';
         document.body.style.margin = '0';
         // Titlebar
-        this.titlebar = dom_1.$('div.titlebar');
-        dom_1.addClass(this.titlebar, platform_1.isWindows ? 'cet-windows' : platform_1.isLinux ? 'cet-linux' : 'cet-mac');
+        this.titlebar = (0, dom_1.$)('div.titlebar');
+        (0, dom_1.addClass)(this.titlebar, platform_1.isWindows ? 'cet-windows' : platform_1.isLinux ? 'cet-linux' : 'cet-mac');
         if (this._options.order) {
-            dom_1.addClass(this.titlebar, this._options.order);
+            (0, dom_1.addClass)(this.titlebar, this._options.order);
         }
         if (this._options.shadow) {
             this.titlebar.style.boxShadow = `0 2px 1px -1px rgba(0, 0, 0, .2), 0 1px 1px 0 rgba(0, 0, 0, .14), 0 1px 3px 0 rgba(0, 0, 0, .12)`;
         }
-        this.dragRegion = dom_1.append(this.titlebar, dom_1.$('div.titlebar-drag-region'));
+        this.dragRegion = (0, dom_1.append)(this.titlebar, (0, dom_1.$)('div.titlebar-drag-region'));
         // App Icon (Windows/Linux)
         if (!platform_1.isMacintosh && this._options.icon) {
-            this.appIcon = dom_1.append(this.titlebar, dom_1.$('div.window-appicon'));
+            this.appIcon = (0, dom_1.append)(this.titlebar, (0, dom_1.$)('div.window-appicon'));
             this.updateIcon(this._options.icon);
         }
         // Menubar
-        this.menubarContainer = dom_1.append(this.titlebar, dom_1.$('div.menubar'));
+        this.menubarContainer = (0, dom_1.append)(this.titlebar, (0, dom_1.$)('div.menubar'));
         this.menubarContainer.setAttribute('role', 'menubar');
         if (this._options.menu) {
             this.updateMenu(this._options.menu);
             this.updateMenuPosition(this._options.menuPosition);
         }
         // Title
-        this.title = dom_1.append(this.titlebar, dom_1.$('div.window-title'));
+        this.title = (0, dom_1.append)(this.titlebar, (0, dom_1.$)('div.window-title'));
         if (!platform_1.isMacintosh) {
             this.title.style.cursor = 'default';
         }
+        if (IS_MAC_BIGSUR_OR_LATER) {
+            this.title.style.fontWeight = "600";
+            this.title.style.fontSize = "13px";
+        }
         this.updateTitle();
         this.setHorizontalAlignment(this._options.titleHorizontalAlignment);
         // Maximize/Restore on doubleclick
         if (platform_1.isMacintosh) {
             let isMaximized = this.currentWindow.isMaximized();
-            this._register(dom_1.addDisposableListener(this.titlebar, dom_1.EventType.DBLCLICK, () => {
+            this._register((0, dom_1.addDisposableListener)(this.titlebar, dom_1.EventType.DBLCLICK, () => {
                 isMaximized = !isMaximized;
                 this.onDidChangeMaximized(isMaximized);
             }));
         }
         // Window Controls (Windows/Linux)
         if (!platform_1.isMacintosh) {
-            this.windowControls = dom_1.append(this.titlebar, dom_1.$('div.window-controls-container'));
+            this.windowControls = (0, dom_1.append)(this.titlebar, (0, dom_1.$)('div.window-controls-container'));
             // Minimize
-            const minimizeIconContainer = dom_1.append(this.windowControls, dom_1.$('div.window-icon-bg'));
-            const minimizeIcon = dom_1.append(minimizeIconContainer, dom_1.$('div.window-icon'));
-            dom_1.addClass(minimizeIcon, 'window-minimize');
+            const minimizeIconContainer = (0, dom_1.append)(this.windowControls, (0, dom_1.$)('div.window-icon-bg'));
+            minimizeIconContainer.title = "Minimize";
+            const minimizeIcon = (0, dom_1.append)(minimizeIconContainer, (0, dom_1.$)('div.window-icon'));
+            (0, dom_1.addClass)(minimizeIcon, 'window-minimize');
             if (!this._options.minimizable) {
-                dom_1.addClass(minimizeIconContainer, 'inactive');
+                (0, dom_1.addClass)(minimizeIconContainer, 'inactive');
             }
             else {
-                this._register(dom_1.addDisposableListener(minimizeIcon, dom_1.EventType.CLICK, e => {
+                this._register((0, dom_1.addDisposableListener)(minimizeIcon, dom_1.EventType.CLICK, e => {
                     this.currentWindow.minimize();
                 }));
             }
             // Restore
-            const restoreIconContainer = dom_1.append(this.windowControls, dom_1.$('div.window-icon-bg'));
-            this.maxRestoreControl = dom_1.append(restoreIconContainer, dom_1.$('div.window-icon'));
-            dom_1.addClass(this.maxRestoreControl, 'window-max-restore');
+            const restoreIconContainer = (0, dom_1.append)(this.windowControls, (0, dom_1.$)('div.window-icon-bg'));
+            this.maxRestoreControl = (0, dom_1.append)(restoreIconContainer, (0, dom_1.$)('div.window-icon'));
+            (0, dom_1.addClass)(this.maxRestoreControl, 'window-max-restore');
             if (!this._options.maximizable) {
-                dom_1.addClass(restoreIconContainer, 'inactive');
+                (0, dom_1.addClass)(restoreIconContainer, 'inactive');
             }
             else {
-                this._register(dom_1.addDisposableListener(this.maxRestoreControl, dom_1.EventType.CLICK, e => {
+                this._register((0, dom_1.addDisposableListener)(this.maxRestoreControl, dom_1.EventType.CLICK, e => {
                     if (this.currentWindow.isMaximized()) {
                         this.currentWindow.unmaximize();
                         this.onDidChangeMaximized(false);
@@ -166,15 +172,16 @@ class Titlebar extends themebar_1.Themebar {
                 }));
             }
             // Close
-            const closeIconContainer = dom_1.append(this.windowControls, dom_1.$('div.window-icon-bg'));
-            dom_1.addClass(closeIconContainer, 'window-close-bg');
-            const closeIcon = dom_1.append(closeIconContainer, dom_1.$('div.window-icon'));
-            dom_1.addClass(closeIcon, 'window-close');
+            const closeIconContainer = (0, dom_1.append)(this.windowControls, (0, dom_1.$)('div.window-icon-bg'));
+            closeIconContainer.title = "Close";
+            (0, dom_1.addClass)(closeIconContainer, 'window-close-bg');
+            const closeIcon = (0, dom_1.append)(closeIconContainer, (0, dom_1.$)('div.window-icon'));
+            (0, dom_1.addClass)(closeIcon, 'window-close');
             if (!this._options.closeable) {
-                dom_1.addClass(closeIconContainer, 'inactive');
+                (0, dom_1.addClass)(closeIconContainer, 'inactive');
             }
             else {
-                this._register(dom_1.addDisposableListener(closeIcon, dom_1.EventType.CLICK, e => {
+                this._register((0, dom_1.addDisposableListener)(closeIcon, dom_1.EventType.CLICK, e => {
                     if (this._options.hideWhenClickingClose) {
                         this.currentWindow.hide();
                     }
@@ -185,12 +192,12 @@ class Titlebar extends themebar_1.Themebar {
             }
             // Resizer
             this.resizer = {
-                top: dom_1.append(this.titlebar, dom_1.$('div.resizer.top')),
-                left: dom_1.append(this.titlebar, dom_1.$('div.resizer.left'))
+                top: (0, dom_1.append)(this.titlebar, (0, dom_1.$)('div.resizer.top')),
+                left: (0, dom_1.append)(this.titlebar, (0, dom_1.$)('div.resizer.left'))
             };
             this.onDidChangeMaximized(this.currentWindow.isMaximized());
         }
-        dom_1.prepend(document.body, this.titlebar);
+        (0, dom_1.prepend)(document.body, this.titlebar);
     }
     onBlur() {
         this.isInactive = true;
@@ -205,29 +212,29 @@ class Titlebar extends themebar_1.Themebar {
             // Hide title when toggling menu bar
             if (visible) {
                 // Hack to fix issue #52522 with layered webkit-app-region elements appearing under cursor
-                dom_1.hide(this.dragRegion);
-                setTimeout(() => dom_1.show(this.dragRegion), 50);
+                (0, dom_1.hide)(this.dragRegion);
+                setTimeout(() => (0, dom_1.show)(this.dragRegion), 50);
             }
         }
     }
     onMenubarFocusChanged(focused) {
         if (platform_1.isWindows || platform_1.isLinux) {
             if (focused) {
-                dom_1.hide(this.dragRegion);
+                (0, dom_1.hide)(this.dragRegion);
             }
             else {
-                dom_1.show(this.dragRegion);
+                (0, dom_1.show)(this.dragRegion);
             }
         }
     }
     onDidChangeWindowFocus(hasFocus) {
         if (this.titlebar) {
             if (hasFocus) {
-                dom_1.removeClass(this.titlebar, 'inactive');
+                (0, dom_1.removeClass)(this.titlebar, 'inactive');
                 this.onFocus();
             }
             else {
-                dom_1.addClass(this.titlebar, 'inactive');
+                (0, dom_1.addClass)(this.titlebar, 'inactive');
                 this.closeMenu();
                 this.onBlur();
             }
@@ -236,40 +243,42 @@ class Titlebar extends themebar_1.Themebar {
     onDidChangeMaximized(maximized) {
         if (this.maxRestoreControl) {
             if (maximized) {
-                dom_1.removeClass(this.maxRestoreControl, 'window-maximize');
-                dom_1.addClass(this.maxRestoreControl, 'window-unmaximize');
+                (0, dom_1.removeClass)(this.maxRestoreControl, 'window-maximize');
+                this.maxRestoreControl.title = "Restore Down";
+                (0, dom_1.addClass)(this.maxRestoreControl, 'window-unmaximize');
             }
             else {
-                dom_1.removeClass(this.maxRestoreControl, 'window-unmaximize');
-                dom_1.addClass(this.maxRestoreControl, 'window-maximize');
+                (0, dom_1.removeClass)(this.maxRestoreControl, 'window-unmaximize');
+                this.maxRestoreControl.title = "Maximize";
+                (0, dom_1.addClass)(this.maxRestoreControl, 'window-maximize');
             }
         }
         if (this.resizer) {
             if (maximized) {
-                dom_1.hide(this.resizer.top, this.resizer.left);
+                (0, dom_1.hide)(this.resizer.top, this.resizer.left);
             }
             else {
-                dom_1.show(this.resizer.top, this.resizer.left);
+                (0, dom_1.show)(this.resizer.top, this.resizer.left);
             }
         }
     }
     onDidChangeFullscreen(fullscreen) {
         if (!platform_1.isMacintosh) {
             if (fullscreen) {
-                dom_1.hide(this.appIcon, this.title, this.windowControls);
+                (0, dom_1.hide)(this.appIcon, this.title, this.windowControls);
             }
             else {
-                dom_1.show(this.appIcon, this.title, this.windowControls);
+                (0, dom_1.show)(this.appIcon, this.title, this.windowControls);
             }
         }
     }
     updateStyles() {
         if (this.titlebar) {
             if (this.isInactive) {
-                dom_1.addClass(this.titlebar, 'inactive');
+                (0, dom_1.addClass)(this.titlebar, 'inactive');
             }
             else {
-                dom_1.removeClass(this.titlebar, 'inactive');
+                (0, dom_1.removeClass)(this.titlebar, 'inactive');
             }
             const titleBackground = this.isInactive && this._options.unfocusEffect
                 ? this._options.backgroundColor.lighten(.45)
@@ -277,13 +286,13 @@ class Titlebar extends themebar_1.Themebar {
             this.titlebar.style.backgroundColor = titleBackground.toString();
             let titleForeground;
             if (titleBackground.isLighter()) {
-                dom_1.addClass(this.titlebar, 'light');
+                (0, dom_1.addClass)(this.titlebar, 'light');
                 titleForeground = this.isInactive && this._options.unfocusEffect
                     ? INACTIVE_FOREGROUND_DARK
                     : ACTIVE_FOREGROUND_DARK;
             }
             else {
-                dom_1.removeClass(this.titlebar, 'light');
+                (0, dom_1.removeClass)(this.titlebar, 'light');
                 titleForeground = this.isInactive && this._options.unfocusEffect
                     ? INACTIVE_FOREGROUND
                     : ACTIVE_FOREGROUND;
@@ -367,6 +376,9 @@ class Titlebar extends themebar_1.Themebar {
         if (!platform_1.isMacintosh) {
             if (this.menubar) {
                 this.menubar.dispose();
+                if (!menu) {
+                    return;
+                }
                 this._options.menu = menu;
             }
             this.menubar = new menubar_1.Menubar(this.menubarContainer, this._options, this.closeMenu);
@@ -376,7 +388,7 @@ class Titlebar extends themebar_1.Themebar {
             this.updateStyles();
         }
         else {
-            electron_1.remote.Menu.setApplicationMenu(menu);
+            remote.Menu.setApplicationMenu(menu);
         }
     }
     /**
@@ -395,10 +407,10 @@ class Titlebar extends themebar_1.Themebar {
         }
         this.titlebar.style.webkitFlexWrap = this._options.menuPosition && this._options.menuPosition === 'bottom' ? 'wrap' : null;
         if (this._options.menuPosition === 'bottom') {
-            dom_1.addClass(this.menubarContainer, 'bottom');
+            (0, dom_1.addClass)(this.menubarContainer, 'bottom');
         }
         else {
-            dom_1.removeClass(this.menubarContainer, 'bottom');
+            (0, dom_1.removeClass)(this.menubarContainer, 'bottom');
         }
     }
     /**
@@ -428,13 +440,14 @@ class Titlebar extends themebar_1.Themebar {
     dispose() {
         if (this.menubar)
             this.menubar.dispose();
-        dom_1.removeNode(this.titlebar);
+        (0, dom_1.removeNode)(this.titlebar);
         while (this.container.firstChild) {
-            dom_1.append(document.body, this.container.firstChild);
+            (0, dom_1.append)(document.body, this.container.firstChild);
         }
-        dom_1.removeNode(this.container);
+        (0, dom_1.removeNode)(this.container);
         this.removeListeners();
         super.dispose();
     }
 }
 exports.Titlebar = Titlebar;
+//# sourceMappingURL=titlebar.js.map

package/build/titlebar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"titlebar.js","sourceRoot":"","sources":["../src/titlebar.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "custom-electron-titlebar",
-  "version": "3.2.5",
+  "version": "3.2.9",
   "description": "Custom Electron Titlebar is a library for electron that allows you to configure a fully customizable title bar.",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
   "scripts": {
     "build": "tsc",
     "dev": "electron example/main.js",
@@ -29,11 +29,17 @@
   "homepage": "https://github.com/AlexTorresSk/custom-electron-titlebar#readme",
   "directories": {
     "example": "example",
-    "lib": "lib"
+    "build": "build"
+  },
+  "peerDependencies": {
+    "electron": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0"
+  },
+  "dependencies": {
+    "@electron/remote": "^1.1.0",
+    "@types/node": "^17.0.0"
   },
-  "dependencies": {},
   "devDependencies": {
-    "electron": "^10.1.3",
-    "typescript": "^4.0.3"
+    "electron": "^10.4.0",
+    "typescript": "^4.2.3"
   }
 }

package/lib/base/browser/browser.d.ts

@@ -1,25 +0,0 @@
-import { Event } from '../common/event';
-import { IDisposable } from '../common/lifecycle';
-/** A zoom index, e.g. 1, 2, 3 */
-export declare function setZoomLevel(zoomLevel: number, isTrusted: boolean): void;
-export declare function getZoomLevel(): number;
-/** Returns the time (in ms) since the zoom level was changed */
-export declare function getTimeSinceLastZoomLevelChanged(): number;
-export declare function onDidChangeZoomLevel(callback: (zoomLevel: number) => void): IDisposable;
-/** The zoom scale for an index, e.g. 1, 1.2, 1.4 */
-export declare function getZoomFactor(): number;
-export declare function setZoomFactor(zoomFactor: number): void;
-export declare function getPixelRatio(): number;
-export declare function setFullscreen(fullscreen: boolean): void;
-export declare function isFullscreen(): boolean;
-export declare const onDidChangeFullscreen: Event<void>;
-export declare const isEdge: boolean;
-export declare const isOpera: boolean;
-export declare const isFirefox: boolean;
-export declare const isWebKit: boolean;
-export declare const isChrome: boolean;
-export declare const isSafari: boolean;
-export declare const isWebkitWebView: boolean;
-export declare const isIPad: boolean;
-export declare const isEdgeWebView: boolean;
-export declare const isStandalone: boolean;

package/lib/base/browser/browser.js

@@ -1,117 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStandalone = exports.isEdgeWebView = exports.isIPad = exports.isWebkitWebView = exports.isSafari = exports.isChrome = exports.isWebKit = exports.isFirefox = exports.isOpera = exports.isEdge = exports.onDidChangeFullscreen = exports.isFullscreen = exports.setFullscreen = exports.getPixelRatio = exports.setZoomFactor = exports.getZoomFactor = exports.onDidChangeZoomLevel = exports.getTimeSinceLastZoomLevelChanged = exports.getZoomLevel = exports.setZoomLevel = void 0;
-const event_1 = require("../common/event");
-class WindowManager {
-    constructor() {
-        // --- Zoom Level
-        this._zoomLevel = 0;
-        this._lastZoomLevelChangeTime = 0;
-        this._onDidChangeZoomLevel = new event_1.Emitter();
-        this.onDidChangeZoomLevel = this._onDidChangeZoomLevel.event;
-        // --- Zoom Factor
-        this._zoomFactor = 1;
-        // --- Fullscreen
-        this._fullscreen = false;
-        this._onDidChangeFullscreen = new event_1.Emitter();
-        this.onDidChangeFullscreen = this._onDidChangeFullscreen.event;
-    }
-    getZoomLevel() {
-        return this._zoomLevel;
-    }
-    getTimeSinceLastZoomLevelChanged() {
-        return Date.now() - this._lastZoomLevelChangeTime;
-    }
-    setZoomLevel(zoomLevel, isTrusted) {
-        if (this._zoomLevel === zoomLevel) {
-            return;
-        }
-        this._zoomLevel = zoomLevel;
-        // See https://github.com/Microsoft/vscode/issues/26151
-        this._lastZoomLevelChangeTime = isTrusted ? 0 : Date.now();
-        this._onDidChangeZoomLevel.fire(this._zoomLevel);
-    }
-    getZoomFactor() {
-        return this._zoomFactor;
-    }
-    setZoomFactor(zoomFactor) {
-        this._zoomFactor = zoomFactor;
-    }
-    // --- Pixel Ratio
-    getPixelRatio() {
-        let ctx = document.createElement('canvas').getContext('2d');
-        let dpr = window.devicePixelRatio || 1;
-        let bsr = ctx.webkitBackingStorePixelRatio ||
-            ctx.mozBackingStorePixelRatio ||
-            ctx.msBackingStorePixelRatio ||
-            ctx.oBackingStorePixelRatio ||
-            ctx.backingStorePixelRatio || 1;
-        return dpr / bsr;
-    }
-    setFullscreen(fullscreen) {
-        if (this._fullscreen === fullscreen) {
-            return;
-        }
-        this._fullscreen = fullscreen;
-        this._onDidChangeFullscreen.fire();
-    }
-    isFullscreen() {
-        return this._fullscreen;
-    }
-}
-WindowManager.INSTANCE = new WindowManager();
-/** A zoom index, e.g. 1, 2, 3 */
-function setZoomLevel(zoomLevel, isTrusted) {
-    WindowManager.INSTANCE.setZoomLevel(zoomLevel, isTrusted);
-}
-exports.setZoomLevel = setZoomLevel;
-function getZoomLevel() {
-    return WindowManager.INSTANCE.getZoomLevel();
-}
-exports.getZoomLevel = getZoomLevel;
-/** Returns the time (in ms) since the zoom level was changed */
-function getTimeSinceLastZoomLevelChanged() {
-    return WindowManager.INSTANCE.getTimeSinceLastZoomLevelChanged();
-}
-exports.getTimeSinceLastZoomLevelChanged = getTimeSinceLastZoomLevelChanged;
-function onDidChangeZoomLevel(callback) {
-    return WindowManager.INSTANCE.onDidChangeZoomLevel(callback);
-}
-exports.onDidChangeZoomLevel = onDidChangeZoomLevel;
-/** The zoom scale for an index, e.g. 1, 1.2, 1.4 */
-function getZoomFactor() {
-    return WindowManager.INSTANCE.getZoomFactor();
-}
-exports.getZoomFactor = getZoomFactor;
-function setZoomFactor(zoomFactor) {
-    WindowManager.INSTANCE.setZoomFactor(zoomFactor);
-}
-exports.setZoomFactor = setZoomFactor;
-function getPixelRatio() {
-    return WindowManager.INSTANCE.getPixelRatio();
-}
-exports.getPixelRatio = getPixelRatio;
-function setFullscreen(fullscreen) {
-    WindowManager.INSTANCE.setFullscreen(fullscreen);
-}
-exports.setFullscreen = setFullscreen;
-function isFullscreen() {
-    return WindowManager.INSTANCE.isFullscreen();
-}
-exports.isFullscreen = isFullscreen;
-exports.onDidChangeFullscreen = WindowManager.INSTANCE.onDidChangeFullscreen;
-const userAgent = navigator.userAgent;
-exports.isEdge = (userAgent.indexOf('Edge/') >= 0);
-exports.isOpera = (userAgent.indexOf('Opera') >= 0);
-exports.isFirefox = (userAgent.indexOf('Firefox') >= 0);
-exports.isWebKit = (userAgent.indexOf('AppleWebKit') >= 0);
-exports.isChrome = (userAgent.indexOf('Chrome') >= 0);
-exports.isSafari = (!exports.isChrome && (userAgent.indexOf('Safari') >= 0));
-exports.isWebkitWebView = (!exports.isChrome && !exports.isSafari && exports.isWebKit);
-exports.isIPad = (userAgent.indexOf('iPad') >= 0 || (exports.isSafari && navigator.maxTouchPoints > 0));
-exports.isEdgeWebView = exports.isEdge && (userAgent.indexOf('WebView/') >= 0);
-exports.isStandalone = (window.matchMedia && window.matchMedia('(display-mode: standalone)').matches);

package/lib/base/browser/canIUse.d.ts

@@ -1,18 +0,0 @@
-export declare const enum KeyboardSupport {
-    Always = 0,
-    FullScreen = 1,
-    None = 2
-}
-/**
- * Browser feature we can support in current platform, browser and environment.
- */
-export declare const BrowserFeatures: {
-    clipboard: {
-        writeText: boolean;
-        readText: boolean;
-        richText: boolean;
-    };
-    keyboard: KeyboardSupport;
-    touch: boolean;
-    pointerEvents: boolean;
-};

package/lib/base/browser/canIUse.js

@@ -1,63 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowserFeatures = void 0;
-const browser = __importStar(require("./browser"));
-const platform = __importStar(require("../common/platform"));
-/**
- * Browser feature we can support in current platform, browser and environment.
- */
-exports.BrowserFeatures = {
-    clipboard: {
-        writeText: (platform.isNative
-            || (document.queryCommandSupported && document.queryCommandSupported('copy'))
-            || !!(navigator && navigator.clipboard && navigator.clipboard.writeText)),
-        readText: (platform.isNative
-            || !!(navigator && navigator.clipboard && navigator.clipboard.readText)),
-        richText: (() => {
-            if (browser.isEdge) {
-                let index = navigator.userAgent.indexOf('Edge/');
-                let version = parseInt(navigator.userAgent.substring(index + 5, navigator.userAgent.indexOf('.', index)), 10);
-                if (!version || (version >= 12 && version <= 16)) {
-                    return false;
-                }
-            }
-            return true;
-        })()
-    },
-    keyboard: (() => {
-        if (platform.isNative || browser.isStandalone) {
-            return 0 /* Always */;
-        }
-        if (navigator.keyboard || browser.isSafari) {
-            return 1 /* FullScreen */;
-        }
-        return 2 /* None */;
-    })(),
-    // 'ontouchstart' in window always evaluates to true with typescript's modern typings. This causes `window` to be
-    // `never` later in `window.navigator`. That's why we need the explicit `window as Window` cast
-    touch: 'ontouchstart' in window || navigator.maxTouchPoints > 0 || window.navigator.msMaxTouchPoints > 0,
-    pointerEvents: window.PointerEvent && ('ontouchstart' in window || window.navigator.maxTouchPoints > 0 || navigator.maxTouchPoints > 0 || window.navigator.msMaxTouchPoints > 0)
-};