Skip to content

Commit 48ff97f

Browse files
committed
fix Native helper
1 parent 9f5a131 commit 48ff97f

File tree

4 files changed

+29
-8
lines changed

4 files changed

+29
-8
lines changed

resources/js/electron-plugin/dist/preload/index.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
import { ipcRenderer } from 'electron';
2-
import * as remote from '@electron/remote';
3-
import Native from './native';
1+
const { contextBridge, ipcRenderer } = require('electron');
2+
const remote = require('@electron/remote');
3+
const Native = {
4+
on: (event, callback) => {
5+
ipcRenderer.on('native-event', (_, data) => {
6+
event = event.replace(/^(\\)+/, '');
7+
data.event = data.event.replace(/^(\\)+/, '');
8+
if (event === data.event) {
9+
return callback(data.payload, event);
10+
}
11+
});
12+
}
13+
};
414
window.Native = Native;
515
window.remote = remote;
616
ipcRenderer.on('log', (event, { level, message, context }) => {

resources/js/electron-plugin/dist/server/api/window.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ router.post('/open', (req, res) => {
7676
state.windows[id].focus();
7777
return res.sendStatus(200);
7878
}
79-
let preloadPath = join(__dirname, '../../preload/index.js');
79+
let preloadPath = join(__dirname, '../../electron-plugin/dist/preload/index.js');
8080
let windowState = undefined;
8181
if (req.body.rememberState === true) {
8282
windowState = windowStateKeeper({

resources/js/electron-plugin/src/preload/index.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
import { contextBridge, ipcRenderer } from 'electron'
2-
import * as remote from '@electron/remote'
1+
const { contextBridge, ipcRenderer } = require('electron')
2+
const remote = require('@electron/remote')
3+
const Native = {
4+
on: (event, callback) => {
5+
ipcRenderer.on('native-event', (_, data) => {
6+
// Strip leading slashes
7+
event = event.replace(/^(\\)+/, '');
8+
data.event = data.event.replace(/^(\\)+/, '');
39

4-
import Native from './native';
10+
if(event === data.event) {
11+
return callback(data.payload, event);
12+
}
13+
})
14+
}
15+
};
516

617
// @ts-ignore
718
window.Native = Native;

resources/js/electron-plugin/src/server/api/window.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ router.post('/open', (req, res) => {
126126
return res.sendStatus(200)
127127
}
128128

129-
let preloadPath = join(__dirname, '../../preload/index.js')
129+
let preloadPath = join(__dirname, '../../electron-plugin/dist/preload/index.js')
130130

131131
let windowState: windowStateKeeper.State | undefined = undefined
132132

0 commit comments

Comments
 (0)