Skip to content

Commit eb3f37a

Browse files
authored
Fix menubar tray can be nullable (#191)
* Fix: Menubar tray can be possibly null * Build electron plugin dist folder
1 parent 149789c commit eb3f37a

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,28 @@ import { fileURLToPath } from 'url';
88
import { enable } from "@electron/remote/main/index.js";
99
const router = express.Router();
1010
router.post("/label", (req, res) => {
11+
var _a;
1112
res.sendStatus(200);
1213
const { label } = req.body;
13-
state.tray.setTitle(label);
14+
(_a = state.tray) === null || _a === void 0 ? void 0 : _a.setTitle(label);
1415
});
1516
router.post("/tooltip", (req, res) => {
17+
var _a;
1618
res.sendStatus(200);
1719
const { tooltip } = req.body;
18-
state.tray.setToolTip(tooltip);
20+
(_a = state.tray) === null || _a === void 0 ? void 0 : _a.setToolTip(tooltip);
1921
});
2022
router.post("/icon", (req, res) => {
23+
var _a;
2124
res.sendStatus(200);
2225
const { icon } = req.body;
23-
state.tray.setImage(icon);
26+
(_a = state.tray) === null || _a === void 0 ? void 0 : _a.setImage(icon);
2427
});
2528
router.post("/context-menu", (req, res) => {
29+
var _a;
2630
res.sendStatus(200);
2731
const { contextMenu } = req.body;
28-
state.tray.setContextMenu(buildMenu(contextMenu));
32+
(_a = state.tray) === null || _a === void 0 ? void 0 : _a.setContextMenu(buildMenu(contextMenu));
2933
});
3034
router.post("/show", (req, res) => {
3135
res.sendStatus(200);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ router.post("/label", (req, res) => {
1414

1515
const { label } = req.body;
1616

17-
state.tray.setTitle(label);
17+
state.tray?.setTitle(label);
1818
});
1919

2020
router.post("/tooltip", (req, res) => {
2121
res.sendStatus(200);
2222

2323
const { tooltip } = req.body;
2424

25-
state.tray.setToolTip(tooltip);
25+
state.tray?.setToolTip(tooltip);
2626
});
2727

2828
router.post("/icon", (req, res) => {
2929
res.sendStatus(200);
3030

3131
const { icon } = req.body;
3232

33-
state.tray.setImage(icon);
33+
state.tray?.setImage(icon);
3434
});
3535

3636
router.post("/context-menu", (req, res) => {
3737
res.sendStatus(200);
3838

3939
const { contextMenu } = req.body;
4040

41-
state.tray.setContextMenu(buildMenu(contextMenu));
41+
state.tray?.setContextMenu(buildMenu(contextMenu));
4242
});
4343

4444
router.post("/show", (req, res) => {

0 commit comments

Comments
 (0)