electron-screenshots 0.5.9 → 0.5.12

package/lib/screenshots.js

@@ -16,7 +16,11 @@ var __extends = (this && this.__extends) || (function () {
 })();
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -149,7 +153,6 @@ var Screenshots = /** @class */ (function (_super) {
                         }
                         // 先清除 Kiosk 模式，然后取消全屏才有效
                         this.$win.setKiosk(false);
-                        this.$win.setFullScreen(false);
                         this.$win.setSimpleFullScreen(false);
                         this.$win.blur();
                         this.$win.blurWebView();
@@ -234,14 +237,17 @@ var Screenshots = /** @class */ (function (_super) {
                                 show: false,
                                 autoHideMenuBar: true,
                                 transparent: true,
-                                // resizable 设置为 false 会导致页面崩溃
-                                // resizable: false,
+                                // mac resizable 设置为 false 会导致页面崩溃
+                                resizable: process.platform !== 'darwin',
                                 movable: false,
                                 // focusable: true, 否则窗口不能及时响应esc按键，输入框也不能输入
                                 focusable: true,
-                                // linux 下必须设置为false，否则不能全屏显示在最上层
-                                // mac 下设置为true，鼠标移动到屏幕上方菜单栏处，才不会唤出菜单栏
-                                fullscreen: process.platform === 'darwin',
+                                /**
+                                 * linux 下必须设置为false，否则不能全屏显示在最上层
+                                 * mac 下设置为false，否则可能会导致程序坞不恢复问题
+                                 * https://github.com/nashaofu/screenshots/issues/148
+                                 */
+                                // fullscreen: process.platform === 'darwin',
                                 // 设为true 防止mac新开一个桌面，影响效果
                                 simpleFullscreen: process.platform === 'darwin',
                                 backgroundColor: '#00000000',
@@ -256,9 +262,11 @@ var Screenshots = /** @class */ (function (_super) {
                             this.$win.on('show', function () {
                                 var _a, _b;
                                 (_a = _this.$win) === null || _a === void 0 ? void 0 : _a.focus();
-                                // 在窗口显示时设置，防止与 fullscreen、x、y、width、height 等冲突
-                                // 导致显示效果不符合预期
-                                (_b = _this.$win) === null || _b === void 0 ? void 0 : _b.setKiosk(true);
+                                /**
+                                 * 在窗口显示时设置，防止与 fullscreen、x、y、width、height 等冲突, 导致显示效果不符合预期
+                                 * mac 下不设置 kiosk 模式，https://github.com/nashaofu/screenshots/issues/148
+                                 */
+                                (_b = _this.$win) === null || _b === void 0 ? void 0 : _b.setKiosk(process.platform !== 'darwin');
                             });
                             this.$win.on('closed', function () {
                                 _this.$win = null;
@@ -277,8 +285,9 @@ var Screenshots = /** @class */ (function (_super) {
                         }
                         this.$win.blur();
                         this.$win.setKiosk(false);
-                        this.$win.setFullScreen(process.platform === 'darwin');
-                        this.$win.setSimpleFullScreen(process.platform === 'darwin');
+                        if (process.platform === 'darwin') {
+                            this.$win.setSimpleFullScreen(true);
+                        }
                         this.$win.setBounds(display);
                         this.$view.setBounds({
                             x: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.5.9",
+  "version": "0.5.12",
   "description": "electron 截图插件",
   "types": "lib/screenshots.d.ts",
   "main": "lib/screenshots.js",
@@ -37,8 +37,8 @@
   "dependencies": {
     "debug": "^4.3.3",
     "fs-extra": "^10.1.0",
-    "node-screenshots": "^0.0.9",
-    "react-screenshots": "^0.5.9"
+    "node-screenshots": "^0.0.11",
+    "react-screenshots": "^0.5.10"
   },
   "peerDependencies": {
     "electron": ">=14"
@@ -58,5 +58,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "9ecc9c6db0e6cf2929525ced3e6f3c60555ab051"
+  "gitHead": "9e8c448e2255ac3c10cfc98af4306ad952cf2e64"
 }