decentraland-ui2 0.12.2-14060841382.commit-a86a8f5 → 0.13.1-14200224071.commit-16c92fc
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/dist/components/DownloadButton/DownloadButton.d.ts +1 -1
- package/dist/components/DownloadButton/DownloadButton.js +75 -4
- package/dist/components/DownloadButton/DownloadButton.js.map +1 -1
- package/dist/components/DownloadButton/DownloadButton.types.d.ts +13 -3
- package/dist/components/DownloadButton/DownloadButton.types.js.map +1 -1
- package/dist/components/UserMenu/UserMenu.js +4 -78
- package/dist/components/UserMenu/UserMenu.js.map +1 -1
- package/dist/modules/userAgent.d.ts +2 -2
- package/dist/modules/userAgent.js +2 -2
- package/package.json +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { DownloadButtonProps } from "./DownloadButton.types";
|
|
3
|
-
declare const DownloadButton: React.MemoExoticComponent<(props: DownloadButtonProps) => import("react/jsx-runtime").JSX.Element>;
|
|
3
|
+
declare const DownloadButton: React.MemoExoticComponent<(props: DownloadButtonProps) => import("react/jsx-runtime").JSX.Element | null>;
|
|
4
4
|
export { DownloadButton };
|
|
@@ -1,9 +1,80 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import React from "react";
|
|
3
|
-
import {
|
|
2
|
+
import React, { useCallback, useEffect, useMemo } from "react";
|
|
3
|
+
import { useAdvancedUserAgentData } from "@dcl/hooks";
|
|
4
|
+
import Download from "@mui/icons-material/Download";
|
|
5
|
+
import { config } from "../../config";
|
|
6
|
+
import { CDNSource, getCDNRelease } from "../../modules/cdnReleases";
|
|
7
|
+
import { triggerFileDownload } from "../../modules/file";
|
|
8
|
+
import { addQueryParamsToUrlString, updateUrlWithLastValue, } from "../../modules/url";
|
|
9
|
+
import { setUserAgentArchitectureDefaultByOs } from "../../modules/userAgent";
|
|
10
|
+
import { OperativeSystem, } from "./DownloadButton.types";
|
|
11
|
+
import { DownloadButtonAppleIcon, DownloadButtonLabelContainer, DownloadButtonStyled, DownloadButtonWindowsIcon, } from "./DownloadButton.styled";
|
|
4
12
|
const DownloadButton = React.memo((props) => {
|
|
5
|
-
const {
|
|
6
|
-
|
|
13
|
+
const { onClick, label = "Download", trackingId, href, startIcon, endIcon, } = props;
|
|
14
|
+
const [isLoadingUserAgentData, userAgentData] = useAdvancedUserAgentData();
|
|
15
|
+
const windowSearchParams = typeof window !== "undefined"
|
|
16
|
+
? new URLSearchParams(window.location.search)
|
|
17
|
+
: undefined;
|
|
18
|
+
const searchParams = new URLSearchParams(windowSearchParams);
|
|
19
|
+
const os = searchParams.get("os");
|
|
20
|
+
useEffect(() => {
|
|
21
|
+
if (userAgentData && os) {
|
|
22
|
+
setUserAgentArchitectureDefaultByOs(userAgentData, os);
|
|
23
|
+
}
|
|
24
|
+
}, [userAgentData, os]);
|
|
25
|
+
const links = getCDNRelease(CDNSource.LAUNCHER);
|
|
26
|
+
const defaultDownloadOption = useMemo(() => {
|
|
27
|
+
if (!userAgentData ||
|
|
28
|
+
!links ||
|
|
29
|
+
!links[userAgentData.os.name] ||
|
|
30
|
+
!links[userAgentData.os.name][userAgentData.cpu.architecture]) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
if (userAgentData.os.name === OperativeSystem.MACOS &&
|
|
34
|
+
links[userAgentData.os.name][userAgentData.cpu.architecture]) {
|
|
35
|
+
return {
|
|
36
|
+
icon: _jsx(DownloadButtonAppleIcon, {}),
|
|
37
|
+
link: links[userAgentData.os.name][userAgentData.cpu.architecture],
|
|
38
|
+
arch: userAgentData.cpu.architecture,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
return {
|
|
42
|
+
icon: _jsx(DownloadButtonWindowsIcon, {}),
|
|
43
|
+
link: links[userAgentData.os.name][userAgentData.cpu.architecture],
|
|
44
|
+
arch: userAgentData.cpu.architecture,
|
|
45
|
+
};
|
|
46
|
+
}, [userAgentData, links]);
|
|
47
|
+
const handleClick = useCallback((event) => {
|
|
48
|
+
event.preventDefault();
|
|
49
|
+
onClick?.(event, {
|
|
50
|
+
type: "DOWNLOAD",
|
|
51
|
+
track_uuid: trackingId,
|
|
52
|
+
url: config.get("DOWNLOAD_URL"),
|
|
53
|
+
});
|
|
54
|
+
if (!userAgentData || !defaultDownloadOption) {
|
|
55
|
+
setTimeout(() => {
|
|
56
|
+
window.open(config.get("DOWNLOAD_URL"), "_blank", "noopener");
|
|
57
|
+
}, onClick ? 300 : 0);
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
const redirectUrl = updateUrlWithLastValue(config.get("DOWNLOAD_SUCCESS_URL"), "os", userAgentData.os.name);
|
|
61
|
+
const finalUrl = addQueryParamsToUrlString(redirectUrl, {
|
|
62
|
+
arch: userAgentData.cpu.architecture,
|
|
63
|
+
});
|
|
64
|
+
setTimeout(() => {
|
|
65
|
+
triggerFileDownload(defaultDownloadOption.link).then(() => {
|
|
66
|
+
window.location.href = finalUrl;
|
|
67
|
+
});
|
|
68
|
+
}, onClick ? 300 : 0);
|
|
69
|
+
}, [defaultDownloadOption, userAgentData, onClick, trackingId]);
|
|
70
|
+
if ((isLoadingUserAgentData || !defaultDownloadOption) &&
|
|
71
|
+
(userAgentData?.mobile || userAgentData?.tablet)) {
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
if (isLoadingUserAgentData || !defaultDownloadOption) {
|
|
75
|
+
return (_jsx(DownloadButtonStyled, { variant: "contained", href: href || config.get("DOWNLOAD_URL"), onClick: handleClick, startIcon: startIcon || _jsx(Download, {}), endIcon: endIcon, children: _jsx(DownloadButtonLabelContainer, { children: label }) }));
|
|
76
|
+
}
|
|
77
|
+
return (_jsx(DownloadButtonStyled, { variant: "contained", href: href || defaultDownloadOption.link, onClick: handleClick, startIcon: startIcon, endIcon: endIcon || defaultDownloadOption.icon, children: _jsx(DownloadButtonLabelContainer, { children: label }) }));
|
|
7
78
|
});
|
|
8
79
|
export { DownloadButton };
|
|
9
80
|
//# sourceMappingURL=DownloadButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadButton.js","sourceRoot":"","sources":["../../../src/components/DownloadButton/DownloadButton.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"DownloadButton.js","sourceRoot":"","sources":["../../../src/components/DownloadButton/DownloadButton.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,QAAQ,MAAM,8BAA8B,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EACL,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,mCAAmC,EAAE,MAAM,yBAAyB,CAAA;AAC7E,OAAO,EAGL,eAAe,GAChB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAA;AAEhC,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,KAA0B,EAAE,EAAE;IAC/D,MAAM,EACJ,OAAO,EACP,KAAK,GAAG,UAAU,EAClB,UAAU,EACV,IAAI,EACJ,SAAS,EACT,OAAO,GACR,GAAG,KAAK,CAAA;IAET,MAAM,CAAC,sBAAsB,EAAE,aAAa,CAAC,GAAG,wBAAwB,EAAE,CAAA;IAE1E,MAAM,kBAAkB,GACtB,OAAO,MAAM,KAAK,WAAW;QAC3B,CAAC,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC7C,CAAC,CAAC,SAAS,CAAA;IACf,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,kBAAkB,CAAC,CAAA;IAC5D,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;YACxB,mCAAmC,CAAC,aAAa,EAAE,EAAqB,CAAC,CAAA;QAC3E,CAAC;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAA;IAEvB,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAE/C,MAAM,qBAAqB,GAA0B,OAAO,CAAC,GAAG,EAAE;QAChE,IACE,CAAC,aAAa;YACd,CAAC,KAAK;YACN,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC;YAC7B,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAC7D,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IACE,aAAa,CAAC,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,KAAK;YAC/C,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAC5D,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,KAAC,uBAAuB,KAAG;gBACjC,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;gBAClE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY;aACrC,CAAA;QACH,CAAC;QAED,OAAO;YACL,IAAI,EAAE,KAAC,yBAAyB,KAAG;YACnC,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;YAClE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY;SACrC,CAAA;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAA;IAE1B,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,KAAsD,EAAE,EAAE;QACzD,KAAK,CAAC,cAAc,EAAE,CAAA;QAEtB,OAAO,EAAE,CAAC,KAAK,EAAE;YACf,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,UAAU;YACtB,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;SAChC,CAAC,CAAA;QAEF,IAAI,CAAC,aAAa,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7C,UAAU,CACR,GAAG,EAAE;gBACH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;YAC/D,CAAC,EACD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAClB,CAAA;YACD,OAAM;QACR,CAAC;QAED,MAAM,WAAW,GAAG,sBAAsB,CACxC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAClC,IAAI,EACJ,aAAa,CAAC,EAAE,CAAC,IAAI,CACtB,CAAA;QAED,MAAM,QAAQ,GAAG,yBAAyB,CAAC,WAAW,EAAE;YACtD,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY;SACrC,CAAC,CAAA;QAEF,UAAU,CACR,GAAG,EAAE;YACH,mBAAmB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAA;YACjC,CAAC,CAAC,CAAA;QACJ,CAAC,EACD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAClB,CAAA;IACH,CAAC,EACD,CAAC,qBAAqB,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,CAAC,CAC5D,CAAA;IAED,IACE,CAAC,sBAAsB,IAAI,CAAC,qBAAqB,CAAC;QAClD,CAAC,aAAa,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,CAAC,EAChD,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,sBAAsB,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACrD,OAAO,CACL,KAAC,oBAAoB,IACnB,OAAO,EAAC,WAAW,EACnB,IAAI,EAAE,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EACxC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,SAAS,IAAI,KAAC,QAAQ,KAAG,EACpC,OAAO,EAAE,OAAO,YAEhB,KAAC,4BAA4B,cAAE,KAAK,GAAgC,GAC/C,CACxB,CAAA;IACH,CAAC;IAED,OAAO,CACL,KAAC,oBAAoB,IACnB,OAAO,EAAC,WAAW,EACnB,IAAI,EAAE,IAAI,IAAI,qBAAqB,CAAC,IAAI,EACxC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,IAAI,qBAAqB,CAAC,IAAI,YAE9C,KAAC,4BAA4B,cAAE,KAAK,GAAgC,GAC/C,CACxB,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,OAAO,EAAE,cAAc,EAAE,CAAA"}
|
|
@@ -2,12 +2,22 @@ declare enum OperativeSystem {
|
|
|
2
2
|
WINDOWS = "Windows",
|
|
3
3
|
MACOS = "macOS"
|
|
4
4
|
}
|
|
5
|
+
type DownloadOption = {
|
|
6
|
+
icon: React.ReactNode;
|
|
7
|
+
link: string;
|
|
8
|
+
arch: string;
|
|
9
|
+
};
|
|
5
10
|
type DownloadButtonProps = {
|
|
6
|
-
href
|
|
7
|
-
onClick
|
|
11
|
+
href?: string;
|
|
12
|
+
onClick?: (event: React.MouseEvent<HTMLButtonElement>, options: {
|
|
13
|
+
type: string;
|
|
14
|
+
track_uuid?: string;
|
|
15
|
+
url: string;
|
|
16
|
+
}) => void;
|
|
8
17
|
label?: string;
|
|
9
18
|
startIcon?: React.ReactNode;
|
|
10
19
|
endIcon?: React.ReactNode;
|
|
20
|
+
trackingId?: string;
|
|
11
21
|
};
|
|
12
|
-
export type { DownloadButtonProps };
|
|
22
|
+
export type { DownloadButtonProps, DownloadOption };
|
|
13
23
|
export { OperativeSystem };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadButton.types.js","sourceRoot":"","sources":["../../../src/components/DownloadButton/DownloadButton.types.ts"],"names":[],"mappings":"AAAA,IAAK,eAGJ;AAHD,WAAK,eAAe;IAClB,sCAAmB,CAAA;IACnB,kCAAe,CAAA;AACjB,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;
|
|
1
|
+
{"version":3,"file":"DownloadButton.types.js","sourceRoot":"","sources":["../../../src/components/DownloadButton/DownloadButton.types.ts"],"names":[],"mappings":"AAAA,IAAK,eAGJ;AAHD,WAAK,eAAe;IAClB,sCAAmB,CAAA;IACnB,kCAAe,CAAA;AACjB,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAqBD,OAAO,EAAE,eAAe,EAAE,CAAA"}
|
|
@@ -1,55 +1,17 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import React, { useCallback,
|
|
3
|
-
import { useAdvancedUserAgentData } from "@dcl/hooks";
|
|
4
|
-
import Download from "@mui/icons-material/Download";
|
|
2
|
+
import React, { useCallback, useState } from "react";
|
|
5
3
|
import { v4 as uuidv4 } from "uuid";
|
|
6
4
|
import { CircularProgress } from "@mui/material";
|
|
7
5
|
import { i18n as i18nUserMenu } from "./UserMenu.i18n";
|
|
8
6
|
import { UserMenuSignedIn } from "./UserMenuSignedIn/UserMenuSignedIn";
|
|
9
7
|
import { config } from "../../config";
|
|
10
|
-
import {
|
|
11
|
-
import { triggerFileDownload } from "../../modules/file";
|
|
12
|
-
import { addQueryParamsToUrlString, updateUrlWithLastValue, } from "../../modules/url";
|
|
13
|
-
import { setUserAgentArchitectureDefautlByOs } from "../../modules/userAgent";
|
|
14
|
-
import { DownloadButton, OperativeSystem } from "../DownloadButton";
|
|
15
|
-
import { DownloadButtonAppleIcon, DownloadButtonWindowsIcon, } from "../DownloadButton/DownloadButton.styled";
|
|
8
|
+
import { DownloadButton } from "../DownloadButton";
|
|
16
9
|
import { UserMenuEventId } from "./UserMenu.types";
|
|
17
10
|
import { SignInButton, UserMenuContainer, UserMenuLoaderContainer, } from "./UserMenu.styled";
|
|
18
11
|
const UserMenu = React.memo((props) => {
|
|
19
|
-
const { isSignedIn, isSigningIn, isDisconnecting, manaBalances, i18n = i18nUserMenu, hideDownloadButton, onClickSignIn, onClickBalance, onClickOpen,
|
|
12
|
+
const { isSignedIn, isSigningIn, isDisconnecting, manaBalances, i18n = i18nUserMenu, hideDownloadButton, onClickSignIn, onClickBalance, onClickOpen, onClickUserMenuItem, ...signInProps } = props;
|
|
20
13
|
const [isOpen, setIsOpen] = useState(false);
|
|
21
14
|
const [trackingId, setTrackingId] = useState(undefined);
|
|
22
|
-
const [isLoadingUserAgentData, userAgentData] = useAdvancedUserAgentData();
|
|
23
|
-
const windowSearchParams = typeof window !== "undefined"
|
|
24
|
-
? new URLSearchParams(window.location.search)
|
|
25
|
-
: undefined;
|
|
26
|
-
const searchParams = new URLSearchParams(windowSearchParams);
|
|
27
|
-
const os = searchParams.get("os");
|
|
28
|
-
if (userAgentData && os) {
|
|
29
|
-
setUserAgentArchitectureDefautlByOs(userAgentData, os);
|
|
30
|
-
}
|
|
31
|
-
const links = getCDNRelease(CDNSource.LAUNCHER);
|
|
32
|
-
const defaultDownloadOption = useMemo(() => {
|
|
33
|
-
if (!userAgentData ||
|
|
34
|
-
!links ||
|
|
35
|
-
!links[userAgentData.os.name] ||
|
|
36
|
-
!links[userAgentData.os.name][userAgentData.cpu.architecture]) {
|
|
37
|
-
return null;
|
|
38
|
-
}
|
|
39
|
-
if (userAgentData.os.name === OperativeSystem.MACOS &&
|
|
40
|
-
links[userAgentData.os.name][userAgentData.cpu.architecture]) {
|
|
41
|
-
return {
|
|
42
|
-
icon: _jsx(DownloadButtonAppleIcon, {}),
|
|
43
|
-
link: links[userAgentData.os.name][userAgentData.cpu.architecture],
|
|
44
|
-
arch: userAgentData.cpu.architecture,
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
|
-
return {
|
|
48
|
-
icon: _jsx(DownloadButtonWindowsIcon, {}),
|
|
49
|
-
link: links[userAgentData.os.name][userAgentData.cpu.architecture],
|
|
50
|
-
arch: userAgentData.cpu.architecture,
|
|
51
|
-
};
|
|
52
|
-
}, [userAgentData, links]);
|
|
53
15
|
const handleToggle = useCallback((event) => {
|
|
54
16
|
const trackId = uuidv4();
|
|
55
17
|
setIsOpen((prev) => {
|
|
@@ -65,36 +27,6 @@ const UserMenu = React.memo((props) => {
|
|
|
65
27
|
const handleClose = useCallback(() => {
|
|
66
28
|
setIsOpen(false);
|
|
67
29
|
}, [setIsOpen]);
|
|
68
|
-
const handleClickDownload = useCallback((event) => {
|
|
69
|
-
event.preventDefault();
|
|
70
|
-
onClickUserMenuItem &&
|
|
71
|
-
onClickUserMenuItem(event, {
|
|
72
|
-
type: UserMenuEventId.DOWNLOAD,
|
|
73
|
-
track_uuid: trackingId || undefined,
|
|
74
|
-
url: config.get("DOWNLOAD_URL"),
|
|
75
|
-
});
|
|
76
|
-
setTimeout(() => {
|
|
77
|
-
window.open(config.get("DOWNLOAD_URL"), "_blank", "noopener");
|
|
78
|
-
}, onClickUserMenuItem ? 300 : 0);
|
|
79
|
-
}, [onClickDownload, onClickUserMenuItem, trackingId]);
|
|
80
|
-
const onClickDownloadOsHandler = useCallback((event) => {
|
|
81
|
-
event.preventDefault();
|
|
82
|
-
if (!userAgentData || !defaultDownloadOption)
|
|
83
|
-
return;
|
|
84
|
-
onClickDownload &&
|
|
85
|
-
onClickDownload(event, {
|
|
86
|
-
href: defaultDownloadOption.link,
|
|
87
|
-
});
|
|
88
|
-
const redirectUrl = updateUrlWithLastValue(config.get("DOWNLOAD_SUCCESS_URL"), "os", userAgentData.os.name);
|
|
89
|
-
const finalUrl = addQueryParamsToUrlString(redirectUrl, {
|
|
90
|
-
arch: userAgentData.cpu.architecture,
|
|
91
|
-
});
|
|
92
|
-
setTimeout(() => {
|
|
93
|
-
triggerFileDownload(defaultDownloadOption.link).then(() => {
|
|
94
|
-
window.location.href = finalUrl;
|
|
95
|
-
});
|
|
96
|
-
}, onClickDownload ? 300 : 0);
|
|
97
|
-
}, [defaultDownloadOption, userAgentData]);
|
|
98
30
|
const handleClickSignIn = useCallback((event) => {
|
|
99
31
|
event.preventDefault();
|
|
100
32
|
onClickUserMenuItem &&
|
|
@@ -117,13 +49,7 @@ const UserMenu = React.memo((props) => {
|
|
|
117
49
|
: window.open(config.get("ACCOUNT_URL"), "_blank", "noopener");
|
|
118
50
|
}, onClickUserMenuItem ? 300 : 0);
|
|
119
51
|
}, [onClickBalance, onClickUserMenuItem, trackingId]);
|
|
120
|
-
return (_jsx(UserMenuContainer, { children: isDisconnecting ? (_jsx(UserMenuLoaderContainer, { children: _jsx(CircularProgress, { size: 20 }) })) : (_jsxs(_Fragment, { children: [isSignedIn && (_jsx(UserMenuSignedIn, { ...signInProps, manaBalances: manaBalances, trackingId: trackingId, isOpen: isOpen, i18n: i18n, onClickToggle: handleToggle, onClickClose: handleClose, onClickUserMenuItem: onClickUserMenuItem, onClickBalance: handleClickBalance })), !isSignedIn ? (_jsx(SignInButton, { variant: "outlined", color: "inherit", disabled: isSigningIn, onClick: handleClickSignIn, children: isSigningIn ? (_jsx(CircularProgress, { size: 20, color: "inherit" })) : (i18n.signIn) })) : null, (
|
|
121
|
-
userAgentData &&
|
|
122
|
-
!userAgentData.mobile &&
|
|
123
|
-
!userAgentData.tablet &&
|
|
124
|
-
!hideDownloadButton && (_jsx(DownloadButton, { href: config.get("DOWNLOAD_URL"), onClick: handleClickDownload, label: i18n.download, startIcon: _jsx(Download, {}) })), !isLoadingUserAgentData &&
|
|
125
|
-
defaultDownloadOption &&
|
|
126
|
-
!hideDownloadButton && (_jsx(DownloadButton, { href: defaultDownloadOption.link, onClick: onClickDownloadOsHandler, endIcon: defaultDownloadOption.icon, label: i18n.download }))] })) }));
|
|
52
|
+
return (_jsx(UserMenuContainer, { children: isDisconnecting ? (_jsx(UserMenuLoaderContainer, { children: _jsx(CircularProgress, { size: 20 }) })) : (_jsxs(_Fragment, { children: [isSignedIn && (_jsx(UserMenuSignedIn, { ...signInProps, manaBalances: manaBalances, trackingId: trackingId, isOpen: isOpen, i18n: i18n, onClickToggle: handleToggle, onClickClose: handleClose, onClickUserMenuItem: onClickUserMenuItem, onClickBalance: handleClickBalance })), !isSignedIn ? (_jsx(SignInButton, { variant: "outlined", color: "inherit", disabled: isSigningIn, onClick: handleClickSignIn, children: isSigningIn ? (_jsx(CircularProgress, { size: 20, color: "inherit" })) : (i18n.signIn) })) : null, !hideDownloadButton && (_jsx(DownloadButton, { label: i18n.download, onClick: onClickUserMenuItem, trackingId: trackingId }))] })) }));
|
|
127
53
|
});
|
|
128
54
|
export { UserMenu };
|
|
129
55
|
//# sourceMappingURL=UserMenu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/UserMenu/UserMenu.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/UserMenu/UserMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { AdvancedNavigatorUAData } from "@dcl/hooks/cjs/hooks/useAdvancedUserAgentData";
|
|
2
2
|
import { OperativeSystem } from "../components/DownloadButton/DownloadButton.types";
|
|
3
|
-
declare const
|
|
4
|
-
export {
|
|
3
|
+
declare const setUserAgentArchitectureDefaultByOs: (userAgent: AdvancedNavigatorUAData, os: OperativeSystem) => AdvancedNavigatorUAData;
|
|
4
|
+
export { setUserAgentArchitectureDefaultByOs };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OperativeSystem } from "../components/DownloadButton/DownloadButton.types";
|
|
2
|
-
const
|
|
2
|
+
const setUserAgentArchitectureDefaultByOs = (userAgent, os) => {
|
|
3
3
|
if (os === OperativeSystem.MACOS) {
|
|
4
4
|
userAgent.os.name = OperativeSystem.MACOS;
|
|
5
5
|
userAgent.cpu.architecture = "unknown";
|
|
@@ -10,5 +10,5 @@ const setUserAgentArchitectureDefautlByOs = (userAgent, os) => {
|
|
|
10
10
|
}
|
|
11
11
|
return userAgent;
|
|
12
12
|
};
|
|
13
|
-
export {
|
|
13
|
+
export { setUserAgentArchitectureDefaultByOs };
|
|
14
14
|
//# sourceMappingURL=userAgent.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-ui2",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.13.1-14200224071.commit-16c92fc",
|
|
4
4
|
"description": "Decentraland's UI components and styles",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -94,5 +94,5 @@
|
|
|
94
94
|
"files": [
|
|
95
95
|
"dist"
|
|
96
96
|
],
|
|
97
|
-
"commit": "
|
|
97
|
+
"commit": "16c92fc8d11063ec2ead8c9cc64f22de9daf0427"
|
|
98
98
|
}
|