@opensumi/ide-overlay 2.12.1-next-079c1930 → 2.12.1-next-a6199cbc
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/ctx-menu/ctx-menu.view.js +2 -2
- package/lib/browser/ctx-menu/ctx-menu.view.js.map +1 -1
- package/lib/browser/message.service.d.ts +1 -0
- package/lib/browser/message.service.d.ts.map +1 -1
- package/lib/browser/message.service.js +53 -1
- package/lib/browser/message.service.js.map +1 -1
- package/package.json +5 -5
|
@@ -4,7 +4,7 @@ exports.CtxMenu = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const react_1 = (0, tslib_1.__importDefault)(require("react"));
|
|
6
6
|
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
7
|
-
const
|
|
7
|
+
const ide_components_1 = require("@opensumi/ide-components");
|
|
8
8
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
9
9
|
const browser_1 = require("@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/browser");
|
|
10
10
|
const actions_1 = require("@opensumi/ide-core-browser/lib/components/actions");
|
|
@@ -32,7 +32,7 @@ exports.CtxMenu = (0, mobx_react_lite_1.observer)(() => {
|
|
|
32
32
|
adjustY: 1,
|
|
33
33
|
},
|
|
34
34
|
offset: [window.scrollX, window.scrollY],
|
|
35
|
-
}, point: ctxMenuService.point || {}, popupClassName: 'point-popup', builtinPlacements: placements_1.default, popup: (react_1.default.createElement(
|
|
35
|
+
}, point: ctxMenuService.point || {}, popupClassName: 'point-popup', builtinPlacements: placements_1.default, popup: (react_1.default.createElement(ide_components_1.ClickOutside, { mouseEvents: ['click', 'contextmenu'], onOutsideClick: onClickOutSide },
|
|
36
36
|
react_1.default.createElement(actions_1.MenuActionList, { data: ctxMenuService.menuNodes, afterClick: handleClick, context: ctxMenuService.context }))), alignPoint: true }));
|
|
37
37
|
});
|
|
38
38
|
exports.CtxMenu.displayName = 'CtxMenu';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ctx-menu.view.js","sourceRoot":"","sources":["../../../src/browser/ctx-menu/ctx-menu.view.tsx"],"names":[],"mappings":";;;;AAAA,+DAA0B;AAC1B,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"ctx-menu.view.js","sourceRoot":"","sources":["../../../src/browser/ctx-menu/ctx-menu.view.tsx"],"names":[],"mappings":";;;;AAAA,+DAA0B;AAC1B,qDAA2C;AAC3C,6DAAwD;AACxD,iEAA2D;AAC3D,+FAAoG;AACpG,+EAAmF;AACnF,2HAAsF;AACtF,+FAAmD;AACnD,kDAAgD;AAEnC,QAAA,OAAO,GAAG,IAAA,0BAAQ,EAAC,GAAG,EAAE;IACnC,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAkB,yBAAe,CAAC,CAAC;IAEvE,MAAM,WAAW,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACzC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,cAAc,GAAG,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC5C,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAE7B,qCAAqC;IACrC,OAAO,CACL,8BAAC,+BAAc;IACb,iCAAiC;;QAAjC,iCAAiC;QACjC,cAAc,EAAC,YAAY,EAC3B,YAAY,EAAE,cAAc,CAAC,OAAO,EACpC,MAAM,EAAE,CAAC,aAAa,CAAC,EACvB,UAAU,EAAE;YACV,QAAQ,EAAE;gBACR,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;aACX;YACD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;SACzC,EACD,KAAK,EAAE,cAAc,CAAC,KAAK,IAAI,EAAE,EACjC,cAAc,EAAC,aAAa,EAC5B,iBAAiB,EAAE,oBAAU,EAC7B,KAAK,EAAE,CACL,8BAAC,6BAAY,IACX,WAAW,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,EACrC,cAAc,EAAE,cAAc;YAC9B,8BAAC,wBAAc,IACb,IAAI,EAAE,cAAc,CAAC,SAAS,EAC9B,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,cAAc,CAAC,OAAO,GAC/B,CACW,CAChB,EACD,UAAU,SACV,CACH,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAO,CAAC,WAAW,GAAG,SAAS,CAAC"}
|
|
@@ -2,6 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { IMessageService, AbstractMessageService } from '../common';
|
|
3
3
|
import { MessageType } from '@opensumi/ide-core-common';
|
|
4
4
|
export declare class MessageService extends AbstractMessageService implements IMessageService {
|
|
5
|
+
private readonly openerService;
|
|
5
6
|
private preMessage;
|
|
6
7
|
private showTime;
|
|
7
8
|
protected static SAME_MESSAGE_DURATION: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.service.d.ts","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"message.service.d.ts","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAsB,MAAM,WAAW,CAAC;AAExF,OAAO,EAAE,WAAW,EAAkB,MAAM,2BAA2B,CAAC;AAGxE,qBACa,cAAe,SAAQ,sBAAuB,YAAW,eAAe;IAGnF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,UAAU,CAA2B;IAG7C,OAAO,CAAC,QAAQ,CAAa;IAG7B,SAAS,CAAC,MAAM,CAAC,qBAAqB,SAAQ;IAG9C,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAInD;IAEF;;;;;;;OAOG;IACH,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAc,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAkB9J,IAAI,IAAI,IAAI;CAGb"}
|
|
@@ -3,10 +3,13 @@ var MessageService_1;
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.MessageService = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
+
const react_1 = (0, tslib_1.__importStar)(require("react"));
|
|
7
|
+
const marked_1 = (0, tslib_1.__importDefault)(require("marked"));
|
|
6
8
|
const di_1 = require("@opensumi/di");
|
|
7
9
|
const common_1 = require("../common");
|
|
8
10
|
const ide_components_1 = require("@opensumi/ide-components");
|
|
9
11
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
12
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
10
13
|
let MessageService = MessageService_1 = class MessageService extends common_1.AbstractMessageService {
|
|
11
14
|
constructor() {
|
|
12
15
|
super(...arguments);
|
|
@@ -34,7 +37,7 @@ let MessageService = MessageService_1 = class MessageService extends common_1.Ab
|
|
|
34
37
|
}
|
|
35
38
|
const description = from && typeof from === 'string' ? `${(0, ide_core_common_1.localize)('component.message.origin')}: ${from}` : '';
|
|
36
39
|
const key = (0, ide_core_common_1.uuid)();
|
|
37
|
-
const promise = (0, ide_components_1.open)(message, type, closable, key, buttons, description);
|
|
40
|
+
const promise = (0, ide_components_1.open)(toMarkdown(message, this.openerService), type, closable, key, buttons, description);
|
|
38
41
|
return promise || Promise.resolve(undefined);
|
|
39
42
|
}
|
|
40
43
|
hide() {
|
|
@@ -49,8 +52,57 @@ MessageService.DURATION = {
|
|
|
49
52
|
[ide_core_common_1.MessageType.Warning]: 18000,
|
|
50
53
|
[ide_core_common_1.MessageType.Error]: 20000,
|
|
51
54
|
};
|
|
55
|
+
(0, tslib_1.__decorate)([
|
|
56
|
+
(0, di_1.Autowired)(ide_core_browser_1.IOpenerService),
|
|
57
|
+
(0, tslib_1.__metadata)("design:type", Object)
|
|
58
|
+
], MessageService.prototype, "openerService", void 0);
|
|
52
59
|
MessageService = MessageService_1 = (0, tslib_1.__decorate)([
|
|
53
60
|
(0, di_1.Injectable)()
|
|
54
61
|
], MessageService);
|
|
55
62
|
exports.MessageService = MessageService;
|
|
63
|
+
const DATA_SET_COMMAND = 'data-command';
|
|
64
|
+
const RenderWrapper = (props) => {
|
|
65
|
+
const ref = (0, react_1.useRef)();
|
|
66
|
+
const { html, opener } = props;
|
|
67
|
+
(0, react_1.useEffect)(() => {
|
|
68
|
+
if (ref && ref.current) {
|
|
69
|
+
html.addEventListener('click', listenClick);
|
|
70
|
+
ref.current.appendChild(html);
|
|
71
|
+
}
|
|
72
|
+
return () => {
|
|
73
|
+
var _a;
|
|
74
|
+
(_a = ref.current) === null || _a === void 0 ? void 0 : _a.removeChild(html);
|
|
75
|
+
html.removeEventListener('click', listenClick);
|
|
76
|
+
};
|
|
77
|
+
}, []);
|
|
78
|
+
/**
|
|
79
|
+
* 拦截 a 标签的点击事件,触发 commands
|
|
80
|
+
*/
|
|
81
|
+
const listenClick = (event) => {
|
|
82
|
+
const target = event.target;
|
|
83
|
+
if (target.tagName === 'a' && target.hasAttribute(DATA_SET_COMMAND)) {
|
|
84
|
+
const dataCommand = target.getAttribute(DATA_SET_COMMAND);
|
|
85
|
+
if (dataCommand && opener) {
|
|
86
|
+
opener.open(dataCommand);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
return (react_1.default.createElement("div", { ref: ref }));
|
|
91
|
+
};
|
|
92
|
+
const toMarkdown = (message, opener) => {
|
|
93
|
+
const renderer = new marked_1.default.Renderer();
|
|
94
|
+
renderer.link = (href, title, text) => {
|
|
95
|
+
return `<a rel="noopener" ${DATA_SET_COMMAND}="${href}" href="javascript:void(0)" title="${title}">${text}</a>`;
|
|
96
|
+
};
|
|
97
|
+
return typeof message !== 'string' ? message : react_1.default.createElement(RenderWrapper, { opener: opener, html: new DOMParser().parseFromString((0, marked_1.default)(message, {
|
|
98
|
+
gfm: true,
|
|
99
|
+
tables: true,
|
|
100
|
+
breaks: false,
|
|
101
|
+
pedantic: false,
|
|
102
|
+
sanitize: true,
|
|
103
|
+
smartLists: true,
|
|
104
|
+
smartypants: false,
|
|
105
|
+
renderer,
|
|
106
|
+
}), 'text/xml').documentElement });
|
|
107
|
+
};
|
|
56
108
|
//# sourceMappingURL=message.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.service.js","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"message.service.js","sourceRoot":"","sources":["../../src/browser/message.service.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-overlay",
|
|
3
|
-
"version": "2.12.1-next-
|
|
3
|
+
"version": "2.12.1-next-a6199cbc",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-core-common": "2.12.1-next-
|
|
20
|
-
"@opensumi/ide-core-node": "2.12.1-next-
|
|
19
|
+
"@opensumi/ide-core-common": "2.12.1-next-a6199cbc",
|
|
20
|
+
"@opensumi/ide-core-node": "2.12.1-next-a6199cbc"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@opensumi/ide-core-browser": "2.12.1-next-
|
|
23
|
+
"@opensumi/ide-core-browser": "2.12.1-next-a6199cbc",
|
|
24
24
|
"@opensumi/ide-dev-tool": "^1.3.1",
|
|
25
|
-
"@opensumi/ide-components": "2.12.1-next-
|
|
25
|
+
"@opensumi/ide-components": "2.12.1-next-a6199cbc"
|
|
26
26
|
}
|
|
27
27
|
}
|