electron-screenshots 0.4.1 → 0.4.2

package/README.md

@@ -80,14 +80,29 @@ module.exports = {
 
 ## Methods
 
-- `Lang`类型产考`react-screenshots`中的`Lang`类型
-- `Lang`类型产考`react-screenshots`中的`Lang`类型
+- `Debugger`类型产考`debug`中的`Debugger`类型
 
 ```ts
 export type LoggerFn = (...args: unknown[]) => void
 export type Logger = Debugger | LoggerFn
+
+export interface Lang {
+  magnifier_position_label?: string
+  operation_ok_title?: string
+  operation_cancel_title?: string
+  operation_save_title?: string
+  operation_redo_title?: string
+  operation_undo_title?: string
+  operation_mosaic_title?: string
+  operation_text_title?: string
+  operation_brush_title?: string
+  operation_arrow_title?: string
+  operation_ellipse_title?: string
+  operation_rectangle_title?: string
+}
+
 export interface ScreenshotsOpts {
-  lang?: Partial<Lang>
+  lang?: Lang
   // 调用日志，默认值为 debug('electron-screenshots')
   // debug https://www.npmjs.com/package/debug
   logger?: Logger
@@ -99,7 +114,7 @@ export interface ScreenshotsOpts {
 | `constructor(opts: ScreenshotsOpts)` | 调用截图方法截图 | -      |
 | `startCapture()`                     | 调用截图方法截图 | -      |
 | `endCapture() `                      | 手动结束截图     | -      |
-| `setLang(lang: Partial<Lang>)`       | 修改语言         | -      |
+| `setLang(lang: Lang)`                | 修改语言         | -      |
 
 ## Events
 
@@ -167,12 +182,12 @@ const screenshots = new Screenshots({
   }
 })
 
-screenshots.on('save', (e, buffer, bounds) => {
+screenshots.on('save', (e, buffer, data) => {
   // 阻止插件自带的保存功能
   // 用户自己控制保存功能
   e.preventDefault()
   // 用户可在这里自己定义保存功能
-  console.log('capture', buffer, bounds)
+  console.log('capture', buffer, data)
 })
 
 screenshots.startCapture()

package/lib/preload.d.ts

@@ -1,5 +1,10 @@
 import { Display } from './getBoundAndDisplay';
-import { Bounds } from 'react-screenshots';
+export interface Bounds {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
 export interface ScreenshotsData {
     bounds: Bounds;
     display: Display;

package/lib/screenshots.d.ts

@@ -1,15 +1,29 @@
 /// <reference types="node" />
 import { Debugger } from 'debug';
-import { BrowserWindow, BrowserView } from 'electron';
+import { BrowserView, BrowserWindow } from 'electron';
 import Events from 'events';
-import { Bounds, Lang } from 'react-screenshots';
+import { Bounds } from './preload';
 export declare type LoggerFn = (...args: unknown[]) => void;
 export declare type Logger = Debugger | LoggerFn;
+export interface Lang {
+    magnifier_position_label?: string;
+    operation_ok_title?: string;
+    operation_cancel_title?: string;
+    operation_save_title?: string;
+    operation_redo_title?: string;
+    operation_undo_title?: string;
+    operation_mosaic_title?: string;
+    operation_text_title?: string;
+    operation_brush_title?: string;
+    operation_arrow_title?: string;
+    operation_ellipse_title?: string;
+    operation_rectangle_title?: string;
+}
 export interface ScreenshotsOpts {
-    lang?: Partial<Lang>;
+    lang?: Lang;
     logger?: Logger;
 }
-export { Bounds, Lang };
+export { Bounds };
 export default class Screenshots extends Events {
     $win: BrowserWindow | null;
     $view: BrowserView;

package/lib/screenshots.js

@@ -75,11 +75,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var debug_1 = __importDefault(require("debug"));
 var electron_1 = require("electron");
+var events_1 = __importDefault(require("events"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var event_1 = __importDefault(require("./event"));
-var events_1 = __importDefault(require("events"));
-var padStart_1 = __importDefault(require("./padStart"));
 var getBoundAndDisplay_1 = __importDefault(require("./getBoundAndDisplay"));
+var padStart_1 = __importDefault(require("./padStart"));
 var Screenshots = /** @class */ (function (_super) {
     __extends(Screenshots, _super);
     function Screenshots(opts) {
@@ -262,10 +262,10 @@ var Screenshots = /** @class */ (function (_super) {
         /**
          * OK事件
          */
-        electron_1.ipcMain.on('SCREENSHOTS:ok', function (e, buffer, bounds) {
-            _this.logger('SCREENSHOTS:ok', buffer, bounds);
+        electron_1.ipcMain.on('SCREENSHOTS:ok', function (e, buffer, data) {
+            _this.logger('SCREENSHOTS:ok', buffer, data);
             var event = new event_1.default();
-            _this.emit('ok', event, buffer, bounds);
+            _this.emit('ok', event, buffer, data);
             if (event.defaultPrevented) {
                 return;
             }
@@ -287,14 +287,14 @@ var Screenshots = /** @class */ (function (_super) {
         /**
          * SAVE事件
          */
-        electron_1.ipcMain.on('SCREENSHOTS:save', function (e, buffer, bounds) { return __awaiter(_this, void 0, void 0, function () {
+        electron_1.ipcMain.on('SCREENSHOTS:save', function (e, buffer, data) { return __awaiter(_this, void 0, void 0, function () {
             var event, time, year, month, date, hours, minutes, seconds, milliseconds, _a, canceled, filePath;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.logger('SCREENSHOTS:save', buffer, bounds);
+                        this.logger('SCREENSHOTS:save', buffer, data);
                         event = new event_1.default();
-                        this.emit('save', event, buffer, bounds);
+                        this.emit('save', event, buffer, data);
                         if (event.defaultPrevented || !this.$win) {
                             return [2 /*return*/];
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "electron 截图插件",
   "types": "lib/screenshots.d.ts",
   "main": "lib/screenshots.js",
@@ -37,7 +37,7 @@
   "dependencies": {
     "debug": "^4.3.3",
     "fs-extra": "^10.1.0",
-    "node-screenshots": "^0.0.2",
+    "node-screenshots": "^0.0.3",
     "react-screenshots": "^0.4.0"
   },
   "peerDependencies": {
@@ -59,5 +59,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "9329eea5eba41235f44dac8554f1a09bd2c438f8"
+  "gitHead": "a518f3ba2a36ff0e116ebf90d180157b27a39fc3"
 }