@tonconnect/ui 2.0.0-beta.7 → 2.0.0-beta.9

package/lib/index.cjs

@@ -42,7 +42,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var _a;
+var _a, _b, _c, _d, _e, _f, _g, _h;
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const sdk = require("@tonconnect/sdk");
 const UAParser = require("ua-parser-js");
@@ -1777,13 +1777,19 @@ try {
 } catch (e2) {
 }
 let tmaPlatform = "unknown";
-if (initParams.tgWebAppPlatform) {
-  tmaPlatform = initParams.tgWebAppPlatform;
+if (initParams == null ? void 0 : initParams.tgWebAppPlatform) {
+  tmaPlatform = (_a = initParams.tgWebAppPlatform) != null ? _a : "unknown";
+}
+if (tmaPlatform === "unknown") {
+  tmaPlatform = (_d = (_c = (_b = window == null ? void 0 : window.Telegram) == null ? void 0 : _b.WebApp) == null ? void 0 : _c.platform) != null ? _d : "unknown";
 }
 let webAppVersion = "6.0";
-if (initParams.tgWebAppVersion) {
+if (initParams == null ? void 0 : initParams.tgWebAppVersion) {
   webAppVersion = initParams.tgWebAppVersion;
 }
+if (!webAppVersion) {
+  webAppVersion = (_g = (_f = (_e = window == null ? void 0 : window.Telegram) == null ? void 0 : _e.WebApp) == null ? void 0 : _f.version) != null ? _g : "6.0";
+}
 function isTmaPlatform(...platforms) {
   return platforms.includes(tmaPlatform);
 }
@@ -2012,7 +2018,7 @@ function isNodeJs() {
   return typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 }
 function getUserAgent() {
-  var _a2, _b;
+  var _a2, _b2;
   const results = new UAParser__default.default().getResult();
   const osName = (_a2 = results.os.name) == null ? void 0 : _a2.toLowerCase();
   let os;
@@ -2033,7 +2039,7 @@ function getUserAgent() {
       os = "windows";
       break;
   }
-  const browserName = (_b = results.browser.name) == null ? void 0 : _b.toLowerCase();
+  const browserName = (_b2 = results.browser.name) == null ? void 0 : _b2.toLowerCase();
   let browser;
   switch (true) {
     case browserName === "chrome":
@@ -2063,18 +2069,15 @@ function redirectToTelegram(universalLink, options) {
   }
   if (isInTMA()) {
     if (isTmaPlatform("ios", "android")) {
-      options.returnStrategy = "none";
+      options.returnStrategy = "back";
       options.twaReturnUrl = void 0;
       sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
     } else if (isTmaPlatform("macos", "tdesktop")) {
-      if (!options.twaReturnUrl) {
-        throw new TonConnectUIError("`twaReturnUrl` is required for this platform");
-      }
       sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
     } else if (isTmaPlatform("weba")) {
       sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
     } else if (isTmaPlatform("web")) {
-      options.returnStrategy = "none";
+      options.returnStrategy = "back";
       options.twaReturnUrl = void 0;
       sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
     } else {
@@ -2082,7 +2085,7 @@ function redirectToTelegram(universalLink, options) {
     }
   } else {
     if (isOS("ios", "android")) {
-      options.returnStrategy = "back";
+      options.returnStrategy = "none";
       openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options.returnStrategy));
     } else if (isOS("macos", "windows", "linux")) {
       options.returnStrategy = "none";
@@ -3266,10 +3269,10 @@ function clickOutside$1(el, accessor) {
 }
 function escPressed(_, accessor) {
   const onKeyPress = (e2) => {
-    var _a2, _b;
+    var _a2, _b2;
     if (e2.key === "Escape") {
       (_a2 = document.activeElement) == null ? void 0 : _a2.blur();
-      (_b = accessor()) == null ? void 0 : _b();
+      (_b2 = accessor()) == null ? void 0 : _b2();
     }
   };
   document.body.addEventListener("keydown", onKeyPress);
@@ -6575,7 +6578,7 @@ const ScrollDivider = styled.div`
         margin: 0;
     }
 `;
-const [windowHeight, setWindowHeight] = createSignal(((_a = getWindow$1()) == null ? void 0 : _a.innerHeight) || 0);
+const [windowHeight, setWindowHeight] = createSignal(((_h = getWindow$1()) == null ? void 0 : _h.innerHeight) || 0);
 if (getWindow$1()) {
   window.addEventListener("resize", () => setWindowHeight(window.innerHeight));
 }
@@ -8015,8 +8018,8 @@ const AccountButton = () => {
                       }), null);
                       insert(_el$, createComponent(NotificationsStyled, {}), null);
                       createRenderEffect((_p$) => {
-                        var _a2, _b;
-                        const _v$ = position.strategy, _v$2 = `${(_a2 = position.y) != null ? _a2 : 0}px`, _v$3 = `${(_b = position.x) != null ? _b : 0}px`;
+                        var _a2, _b2;
+                        const _v$ = position.strategy, _v$2 = `${(_a2 = position.y) != null ? _a2 : 0}px`, _v$3 = `${(_b2 = position.x) != null ? _b2 : 0}px`;
                         _v$ !== _p$._v$ && _el$.style.setProperty("position", _p$._v$ = _v$);
                         _v$2 !== _p$._v$2 && _el$.style.setProperty("top", _p$._v$2 = _v$2);
                         _v$3 !== _p$._v$3 && _el$.style.setProperty("left", _p$._v$3 = _v$3);
@@ -10189,12 +10192,12 @@ class TonConnectUI {
     return __spreadValues(__spreadValues({}, this.connector.wallet), this.walletInfo);
   }
   set uiOptions(options) {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b2, _c2, _d2, _e2;
     this.checkButtonRootExist(options.buttonRootId);
     this.actionsConfiguration = options.actionsConfiguration;
     if ((_a2 = options.uiPreferences) == null ? void 0 : _a2.theme) {
-      if (((_b = options.uiPreferences) == null ? void 0 : _b.theme) !== "SYSTEM") {
-        (_c = this.systemThemeChangeUnsubscribe) == null ? void 0 : _c.call(this);
+      if (((_b2 = options.uiPreferences) == null ? void 0 : _b2.theme) !== "SYSTEM") {
+        (_c2 = this.systemThemeChangeUnsubscribe) == null ? void 0 : _c2.call(this);
         setTheme(options.uiPreferences.theme, options.uiPreferences.colorsSet);
       } else {
         setTheme(getSystemTheme(), options.uiPreferences.colorsSet);
@@ -10203,19 +10206,19 @@ class TonConnectUI {
         }
       }
     } else {
-      if ((_d = options.uiPreferences) == null ? void 0 : _d.colorsSet) {
+      if ((_d2 = options.uiPreferences) == null ? void 0 : _d2.colorsSet) {
         setColors(options.uiPreferences.colorsSet);
       }
     }
-    if ((_e = options.uiPreferences) == null ? void 0 : _e.borderRadius) {
+    if ((_e2 = options.uiPreferences) == null ? void 0 : _e2.borderRadius) {
       setBorderRadius(options.uiPreferences.borderRadius);
     }
     setAppState((state) => {
-      var _a3, _b2;
+      var _a3, _b3;
       const merged = mergeOptions(
         __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, options.language && { language: options.language }), !!((_a3 = options.actionsConfiguration) == null ? void 0 : _a3.returnStrategy) && {
           returnStrategy: options.actionsConfiguration.returnStrategy
-        }), !!((_b2 = options.actionsConfiguration) == null ? void 0 : _b2.twaReturnUrl) && {
+        }), !!((_b3 = options.actionsConfiguration) == null ? void 0 : _b3.twaReturnUrl) && {
           twaReturnUrl: options.actionsConfiguration.twaReturnUrl
         }), !!options.walletsListConfiguration && {
           walletsListConfiguration: options.walletsListConfiguration
@@ -10529,14 +10532,14 @@ class TonConnectUI {
     }
   }
   getModalsAndNotificationsConfiguration(options) {
-    var _a2, _b, _c, _d, _e, _f;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     const allActions = [
       "before",
       "success",
       "error"
     ];
     let notifications2 = allActions;
-    if (((_a2 = this.actionsConfiguration) == null ? void 0 : _a2.notifications) && ((_b = this.actionsConfiguration) == null ? void 0 : _b.notifications) !== "all") {
+    if (((_a2 = this.actionsConfiguration) == null ? void 0 : _a2.notifications) && ((_b2 = this.actionsConfiguration) == null ? void 0 : _b2.notifications) !== "all") {
       notifications2 = this.actionsConfiguration.notifications;
     }
     if (options == null ? void 0 : options.notifications) {
@@ -10547,7 +10550,7 @@ class TonConnectUI {
       }
     }
     let modals = ["before"];
-    if ((_c = this.actionsConfiguration) == null ? void 0 : _c.modals) {
+    if ((_c2 = this.actionsConfiguration) == null ? void 0 : _c2.modals) {
       if (this.actionsConfiguration.modals === "all") {
         modals = allActions;
       } else {
@@ -10561,9 +10564,9 @@ class TonConnectUI {
         modals = options.modals;
       }
     }
-    const returnStrategy = (options == null ? void 0 : options.returnStrategy) || ((_d = this.actionsConfiguration) == null ? void 0 : _d.returnStrategy) || "back";
-    const twaReturnUrl = (options == null ? void 0 : options.twaReturnUrl) || ((_e = this.actionsConfiguration) == null ? void 0 : _e.twaReturnUrl);
-    let skipRedirectToWallet = (options == null ? void 0 : options.skipRedirectToWallet) || ((_f = this.actionsConfiguration) == null ? void 0 : _f.skipRedirectToWallet) || "ios";
+    const returnStrategy = (options == null ? void 0 : options.returnStrategy) || ((_d2 = this.actionsConfiguration) == null ? void 0 : _d2.returnStrategy) || "back";
+    const twaReturnUrl = (options == null ? void 0 : options.twaReturnUrl) || ((_e2 = this.actionsConfiguration) == null ? void 0 : _e2.twaReturnUrl);
+    let skipRedirectToWallet = (options == null ? void 0 : options.skipRedirectToWallet) || ((_f2 = this.actionsConfiguration) == null ? void 0 : _f2.skipRedirectToWallet) || "ios";
     if (isInTMA()) {
       skipRedirectToWallet = "never";
     }