@keplr-wallet/popup 0.12.119 → 0.12.120-rc.1
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/build/index.d.ts +3 -1
- package/build/index.js +5 -1
- package/build/index.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +9 -2
package/build/index.d.ts
CHANGED
|
@@ -8,7 +8,9 @@ export declare const PopupSize: {
|
|
|
8
8
|
* Finally, try to recover focusing for opened window.
|
|
9
9
|
* @param url
|
|
10
10
|
*/
|
|
11
|
-
export declare function openPopupWindow(url: string, channel?: string, options?: Partial<Parameters<typeof browser.windows.create>[0]>
|
|
11
|
+
export declare function openPopupWindow(url: string, channel?: string, options?: Partial<Parameters<typeof browser.windows.create>[0]> & {
|
|
12
|
+
ignoreURIReplacement?: boolean;
|
|
13
|
+
}): Promise<number>;
|
|
12
14
|
export declare function closePopupWindow(channel: string): void;
|
|
13
15
|
/**
|
|
14
16
|
* window.open() has many options for sizing, but they require different ways to do this per web browser.
|
package/build/index.js
CHANGED
|
@@ -29,8 +29,10 @@ const lastWindowIds = {};
|
|
|
29
29
|
function openPopupWindow(url, channel = "default", options = {}) {
|
|
30
30
|
var _a;
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
+
const ignoreURIReplacement = options.ignoreURIReplacement;
|
|
32
33
|
const windowInfo = yield browser.windows.getCurrent();
|
|
33
34
|
const option = Object.assign({ top: (windowInfo.top || 0) + 80, left: Math.max(0, (windowInfo.left || 0) + (windowInfo.width || 0) - exports.PopupSize.width - 100), width: exports.PopupSize.width, height: exports.PopupSize.height, url: url, type: "popup" }, options);
|
|
35
|
+
delete option.ignoreURIReplacement;
|
|
34
36
|
if (lastWindowIds[channel] !== undefined) {
|
|
35
37
|
try {
|
|
36
38
|
const window = yield browser.windows.get(lastWindowIds[channel], {
|
|
@@ -39,7 +41,9 @@ function openPopupWindow(url, channel = "default", options = {}) {
|
|
|
39
41
|
if ((_a = window === null || window === void 0 ? void 0 : window.tabs) === null || _a === void 0 ? void 0 : _a.length) {
|
|
40
42
|
const tab = window.tabs[0];
|
|
41
43
|
if (tab === null || tab === void 0 ? void 0 : tab.id) {
|
|
42
|
-
|
|
44
|
+
if (!ignoreURIReplacement) {
|
|
45
|
+
yield browser.tabs.update(tab.id, { active: true, url });
|
|
46
|
+
}
|
|
43
47
|
}
|
|
44
48
|
else {
|
|
45
49
|
throw new Error("Null window or tabs");
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAa,QAAA,SAAS,GAAG;IACvB,KAAK,EAAE,GAAG;IACV,yCAAyC;IACzC,wDAAwD;IACxD,6DAA6D;IAC7D,4CAA4C;IAC5C,iGAAiG;IACjG,MAAM,EAAE,GAAG;CACZ,CAAC;AAEF,MAAM,aAAa,GAAuC,EAAE,CAAC;AAE7D;;;;;GAKG;AACH,SAAsB,eAAe,CACnC,GAAW,EACX,UAAkB,SAAS,EAC3B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keplr-wallet/popup",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.120-rc.1",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"author": "chainapsis",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -15,5 +15,5 @@
|
|
|
15
15
|
"lint-test": "eslint \"src/**/*\" && prettier --check \"src/**/*\"",
|
|
16
16
|
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
|
|
17
17
|
},
|
|
18
|
-
"gitHead": "
|
|
18
|
+
"gitHead": "5ff08fe11fc9352243f724e74a7d38421fad3205"
|
|
19
19
|
}
|
package/src/index.ts
CHANGED
|
@@ -19,8 +19,12 @@ const lastWindowIds: Record<string, number | undefined> = {};
|
|
|
19
19
|
export async function openPopupWindow(
|
|
20
20
|
url: string,
|
|
21
21
|
channel: string = "default",
|
|
22
|
-
options:
|
|
22
|
+
options:
|
|
23
|
+
| Partial<Parameters<typeof browser.windows.create>[0]> & {
|
|
24
|
+
ignoreURIReplacement?: boolean;
|
|
25
|
+
} = {}
|
|
23
26
|
): Promise<number> {
|
|
27
|
+
const ignoreURIReplacement = options.ignoreURIReplacement;
|
|
24
28
|
const windowInfo = await browser.windows.getCurrent();
|
|
25
29
|
const option = {
|
|
26
30
|
top: (windowInfo.top || 0) + 80,
|
|
@@ -34,6 +38,7 @@ export async function openPopupWindow(
|
|
|
34
38
|
type: "popup" as const,
|
|
35
39
|
...options,
|
|
36
40
|
};
|
|
41
|
+
delete option.ignoreURIReplacement;
|
|
37
42
|
|
|
38
43
|
if (lastWindowIds[channel] !== undefined) {
|
|
39
44
|
try {
|
|
@@ -46,7 +51,9 @@ export async function openPopupWindow(
|
|
|
46
51
|
if (window?.tabs?.length) {
|
|
47
52
|
const tab = window.tabs[0];
|
|
48
53
|
if (tab?.id) {
|
|
49
|
-
|
|
54
|
+
if (!ignoreURIReplacement) {
|
|
55
|
+
await browser.tabs.update(tab.id, { active: true, url });
|
|
56
|
+
}
|
|
50
57
|
} else {
|
|
51
58
|
throw new Error("Null window or tabs");
|
|
52
59
|
}
|