decentraland-ui2 0.42.4 → 0.42.5
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.js +28 -15
- package/dist/components/DownloadButton/DownloadButton.js.map +1 -1
- package/dist/components/DownloadButton/DownloadButton.types.d.ts +1 -0
- package/dist/components/DownloadButton/DownloadButton.types.js.map +1 -1
- package/package.json +2 -2
|
@@ -35,7 +35,7 @@ const createDownloadOption = (links, userAgentData) => {
|
|
|
35
35
|
};
|
|
36
36
|
};
|
|
37
37
|
const DownloadButton = React.memo((props) => {
|
|
38
|
-
const { onClick, label = "Download", trackingId, href, startIcon, endIcon, loadingCdnLinks = false, cdnLinks, getIdentityId, onRedirect, } = props;
|
|
38
|
+
const { onClick, label = "Download", trackingId, href, startIcon, endIcon, loadingCdnLinks = false, cdnLinks, getIdentityId, onRedirect, shouldDownloadBeforeRedirect = true, } = props;
|
|
39
39
|
const [isDownloading, setIsDownloading] = useState(false);
|
|
40
40
|
const [isLoadingUserAgentData, userAgentData] = useAdvancedUserAgentData();
|
|
41
41
|
const windowSearchParams = typeof window !== "undefined"
|
|
@@ -82,26 +82,38 @@ const DownloadButton = React.memo((props) => {
|
|
|
82
82
|
}
|
|
83
83
|
// Calculate download option with current links
|
|
84
84
|
const currentDownloadOption = createDownloadOption(currentLinks, userAgentData);
|
|
85
|
-
// If we have user agent data and a download option,
|
|
85
|
+
// If we have user agent data and a download option, handle download/redirect
|
|
86
86
|
if (userAgentData && currentDownloadOption) {
|
|
87
87
|
const redirectUrl = updateUrlWithLastValue(config.get("DOWNLOAD_SUCCESS_URL"), "os", userAgentData.os.name);
|
|
88
88
|
const finalUrl = addQueryParamsToUrlString(redirectUrl, {
|
|
89
89
|
arch: userAgentData.cpu.architecture,
|
|
90
90
|
});
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
if (shouldDownloadBeforeRedirect) {
|
|
92
|
+
// Initiate download immediately, then redirect
|
|
93
|
+
triggerFileDownload(currentDownloadOption.link).then(() => {
|
|
94
|
+
setIsDownloading(false);
|
|
95
|
+
// Wait additional time before redirect to ensure download has started
|
|
96
|
+
setTimeout(() => {
|
|
97
|
+
if (onRedirect) {
|
|
98
|
+
onRedirect(finalUrl);
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
// Use window.open instead of window.location.href to avoid canceling download
|
|
102
|
+
window.open(finalUrl, "_blank", "noopener");
|
|
103
|
+
}
|
|
104
|
+
}, 1000); // Wait 1 second after download initiation before redirect
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
// Only redirect without downloading
|
|
93
109
|
setIsDownloading(false);
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
window.open(finalUrl, "_blank", "noopener");
|
|
102
|
-
}
|
|
103
|
-
}, 1000); // Wait 1 second after download initiation before redirect
|
|
104
|
-
});
|
|
110
|
+
if (onRedirect) {
|
|
111
|
+
onRedirect(finalUrl);
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
window.open(finalUrl, "_blank", "noopener");
|
|
115
|
+
}
|
|
116
|
+
}
|
|
105
117
|
return;
|
|
106
118
|
}
|
|
107
119
|
setIsDownloading(false);
|
|
@@ -124,6 +136,7 @@ const DownloadButton = React.memo((props) => {
|
|
|
124
136
|
userAgentData,
|
|
125
137
|
onClick,
|
|
126
138
|
onRedirect,
|
|
139
|
+
shouldDownloadBeforeRedirect,
|
|
127
140
|
trackingId,
|
|
128
141
|
setIsDownloading,
|
|
129
142
|
]);
|
|
@@ -1 +1 @@
|
|
|
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,QAAQ,EAAE,MAAM,OAAO,CAAA;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAErD,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;AAIhC,2EAA2E;AAC3E,MAAM,oBAAoB,GAAG,CAC3B,KAAgB,EAChB,aAAuC,EAChB,EAAE;IACzB,IACE,CAAC,aAAa;QACd,CAAC,KAAK;QACN,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC;QAC7B,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAC7D,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACzE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,aAAa,CAAC,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,KAAK,EAAE,CAAC;QACpD,OAAO;YACL,IAAI,EAAE,KAAC,uBAAuB,KAAG;YACjC,IAAI;YACJ,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY;SACrC,CAAA;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,KAAC,yBAAyB,KAAG;QACnC,IAAI;QACJ,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY;KACrC,CAAA;AACH,CAAC,CAAA;AAED,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,EACP,eAAe,GAAG,KAAK,EACvB,QAAQ,EACR,aAAa,EACb,UAAU,
|
|
1
|
+
{"version":3,"file":"DownloadButton.js","sourceRoot":"","sources":["../../../src/components/DownloadButton/DownloadButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ type DownloadButtonProps = {
|
|
|
22
22
|
cdnLinks?: Record<string, Record<string, string>>;
|
|
23
23
|
getIdentityId?: () => Promise<string | undefined>;
|
|
24
24
|
onRedirect?: (url: string) => void;
|
|
25
|
+
shouldDownloadBeforeRedirect?: boolean;
|
|
25
26
|
};
|
|
26
27
|
export type { DownloadButtonProps, DownloadOption };
|
|
27
28
|
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;AA0BD,OAAO,EAAE,eAAe,EAAE,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-ui2",
|
|
3
|
-
"version": "0.42.
|
|
3
|
+
"version": "0.42.5",
|
|
4
4
|
"description": "Decentraland's UI components and styles",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
"files": [
|
|
101
101
|
"dist"
|
|
102
102
|
],
|
|
103
|
-
"commit": "
|
|
103
|
+
"commit": "46d56d77dc6d8ed1b9e7be54cd1e41509b8498f3"
|
|
104
104
|
}
|