chayns-api 1.1.8 → 1.1.10

package/dist/cjs/components/withCompatMode.js

@@ -55,7 +55,7 @@ const withCompatMode = Component => {
       if (this.root) {
         this.root.unmount();
       } else {
-        _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), this.ref.current);
+        _reactDom.default.render(/*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), this.ref.current);
       }
     }
     render() {

package/dist/cjs/util/deviceHelper.js

@@ -7,7 +7,7 @@ exports.getScreenSize = exports.getClientDeviceInfo = exports.default = void 0;
 var _uaParserJs = require("ua-parser-js");
 var _IChaynsReact = require("../types/IChaynsReact");
 const getDeviceInfo = (userAgent, acceptHeader) => {
-  var _match$groups, _match$groups2, _customMatch$groups, _browser$version$spli, _browser$version, _uaParser$getOS, _uaParser$getOS2;
+  var _match$groups, _match$groups2, _customMatch$groups, _browser$version$spli, _browser$version, _uaParser$getOS, _uaParser$getOS2, _uaParser$getOS3;
   const uaParser = new _uaParserJs.UAParser(userAgent);
   let appName = _IChaynsReact.AppName.Unknown;
   const match = /(?:my)?chayns\/(?<version>\d+).*(?<siteId>\d{5}-\d{5})/i.exec(userAgent);
@@ -47,7 +47,9 @@ const getDeviceInfo = (userAgent, acceptHeader) => {
   };
   result.imei = undefined; // TODO
   result.engine = uaParser.getEngine();
+  // TODO: breaking change on next minor and use object with name and version
   result.os = ((_uaParser$getOS = uaParser.getOS()) === null || _uaParser$getOS === void 0 ? void 0 : _uaParser$getOS.name) === 'Android' ? 'Android OS' : (_uaParser$getOS2 = uaParser.getOS()) === null || _uaParser$getOS2 === void 0 ? void 0 : _uaParser$getOS2.name;
+  result.osVersion = (_uaParser$getOS3 = uaParser.getOS()) === null || _uaParser$getOS3 === void 0 ? void 0 : _uaParser$getOS3.version;
   if (typeof window !== 'undefined') {
     result.screenSize = getScreenSize(window.innerWidth);
     result.isTouch = getClientDeviceInfo().isTouch;

package/dist/cjs/wrapper/AppWrapper.js

@@ -418,6 +418,25 @@ class AppWrapper {
       }
     },
     selectPage: async options => {
+      var _this$values, _this$values2;
+      if ((_this$values = this.values) !== null && _this$values !== void 0 && (_this$values = _this$values.site) !== null && _this$values !== void 0 && _this$values.id && options.siteId && options.siteId !== ((_this$values2 = this.values) === null || _this$values2 === void 0 || (_this$values2 = _this$values2.site) === null || _this$values2 === void 0 ? void 0 : _this$values2.id)) {
+        const url = new URL(`https://chayns.site/${options.siteId}`);
+        if (options.id) {
+          url.pathname += `/tapp/${options.id}`;
+        } else if (options.path) {
+          url.pathname += `/${options.path}`;
+        }
+        if (options.params) {
+          Object.entries(options.params).forEach(([k, v]) => {
+            url.searchParams.set(k, v);
+          });
+        }
+        void this.appCall(9, {
+          url: url.toString(),
+          checkForChaynsSite: true
+        });
+        return;
+      }
       void this.appCall(2, {
         id: options.id,
         showName: options.showName,

package/dist/cjs/wrapper/StaticChaynsApi.js

@@ -5,10 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _moduleWrapper = require("../components/moduleWrapper");
+var _IChaynsReact = require("../types/IChaynsReact");
+var _deviceHelper = _interopRequireDefault(require("../util/deviceHelper"));
+var _AppWrapper = require("./AppWrapper");
 var _FrameWrapper = require("./FrameWrapper");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class StaticChaynsApi {
   constructor() {
-    const wrapper = new _FrameWrapper.FrameWrapper();
+    var _deviceInfo$app$name, _deviceInfo$app;
+    let wrapper;
+    const deviceInfo = (0, _deviceHelper.default)(navigator.userAgent, '');
+    if ([_IChaynsReact.AppName.Chayns, _IChaynsReact.AppName.ChaynsLauncher, _IChaynsReact.AppName.Sidekick, _IChaynsReact.AppName.TobitChat].includes((_deviceInfo$app$name = (_deviceInfo$app = deviceInfo.app) === null || _deviceInfo$app === void 0 ? void 0 : _deviceInfo$app.name) !== null && _deviceInfo$app$name !== void 0 ? _deviceInfo$app$name : _IChaynsReact.AppName.Unknown) && window.self === window.top) {
+      wrapper = new _AppWrapper.AppWrapper();
+    } else {
+      wrapper = new _FrameWrapper.FrameWrapper();
+    }
     _moduleWrapper.moduleWrapper.current = wrapper;
     this._wrapper = wrapper;
     this.ready = wrapper.init();

package/dist/esm/components/withCompatMode.js

@@ -48,7 +48,7 @@ export const withCompatMode = Component => {
       if (this.root) {
         this.root.unmount();
       } else {
-        ReactDOM.render( /*#__PURE__*/React.createElement(React.Fragment, null), this.ref.current);
+        ReactDOM.render(/*#__PURE__*/React.createElement(React.Fragment, null), this.ref.current);
       }
     }
     render() {

package/dist/esm/util/deviceHelper.js

@@ -1,7 +1,7 @@
 import { UAParser } from 'ua-parser-js';
 import { AppName, ScreenSize } from '../types/IChaynsReact';
 const getDeviceInfo = (userAgent, acceptHeader) => {
-  var _match$groups, _match$groups2, _customMatch$groups, _browser$version$spli, _browser$version, _uaParser$getOS, _uaParser$getOS2;
+  var _match$groups, _match$groups2, _customMatch$groups, _browser$version$spli, _browser$version, _uaParser$getOS, _uaParser$getOS2, _uaParser$getOS3;
   const uaParser = new UAParser(userAgent);
   let appName = AppName.Unknown;
   const match = /(?:my)?chayns\/(?<version>\d+).*(?<siteId>\d{5}-\d{5})/i.exec(userAgent);
@@ -41,7 +41,9 @@ const getDeviceInfo = (userAgent, acceptHeader) => {
   };
   result.imei = undefined; // TODO
   result.engine = uaParser.getEngine();
+  // TODO: breaking change on next minor and use object with name and version
   result.os = ((_uaParser$getOS = uaParser.getOS()) === null || _uaParser$getOS === void 0 ? void 0 : _uaParser$getOS.name) === 'Android' ? 'Android OS' : (_uaParser$getOS2 = uaParser.getOS()) === null || _uaParser$getOS2 === void 0 ? void 0 : _uaParser$getOS2.name;
+  result.osVersion = (_uaParser$getOS3 = uaParser.getOS()) === null || _uaParser$getOS3 === void 0 ? void 0 : _uaParser$getOS3.version;
   if (typeof window !== 'undefined') {
     result.screenSize = getScreenSize(window.innerWidth);
     result.isTouch = getClientDeviceInfo().isTouch;

package/dist/esm/wrapper/AppWrapper.js

@@ -381,6 +381,26 @@ export class AppWrapper {
         }
       },
       selectPage: async options => {
+        var _this$values, _this$values2;
+        if ((_this$values = this.values) !== null && _this$values !== void 0 && (_this$values = _this$values.site) !== null && _this$values !== void 0 && _this$values.id && options.siteId && options.siteId !== ((_this$values2 = this.values) === null || _this$values2 === void 0 || (_this$values2 = _this$values2.site) === null || _this$values2 === void 0 ? void 0 : _this$values2.id)) {
+          const url = new URL(`https://chayns.site/${options.siteId}`);
+          if (options.id) {
+            url.pathname += `/tapp/${options.id}`;
+          } else if (options.path) {
+            url.pathname += `/${options.path}`;
+          }
+          if (options.params) {
+            Object.entries(options.params).forEach(_ref2 => {
+              let [k, v] = _ref2;
+              url.searchParams.set(k, v);
+            });
+          }
+          void this.appCall(9, {
+            url: url.toString(),
+            checkForChaynsSite: true
+          });
+          return;
+        }
         void this.appCall(2, {
           id: options.id,
           showName: options.showName,
@@ -593,10 +613,10 @@ export class AppWrapper {
     this.appCall(254, {
       enabled: true
     }, {
-      callback: _ref2 => {
+      callback: _ref3 => {
         let {
           colorMode
-        } = _ref2;
+        } = _ref3;
         this.values.site = {
           ...this.values.site,
           colorMode

package/dist/esm/wrapper/StaticChaynsApi.js

@@ -2,9 +2,13 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { moduleWrapper } from '../components/moduleWrapper';
+import { AppName } from '../types/IChaynsReact';
+import getDeviceInfo from '../util/deviceHelper';
+import { AppWrapper } from './AppWrapper';
 import { FrameWrapper } from './FrameWrapper';
 class StaticChaynsApi {
   constructor() {
+    var _deviceInfo$app$name, _deviceInfo$app;
     _defineProperty(this, "getUser", () => this._wrapper.values.user);
     _defineProperty(this, "getSite", () => this._wrapper.values.site);
     _defineProperty(this, "getCurrentPage", () => this._wrapper.values.currentPage);
@@ -13,7 +17,13 @@ class StaticChaynsApi {
     _defineProperty(this, "getParameters", () => this._wrapper.values.parameters);
     _defineProperty(this, "getPages", () => this._wrapper.values.pages);
     _defineProperty(this, "getEnvironment", () => this._wrapper.values.environment);
-    const wrapper = new FrameWrapper();
+    let wrapper;
+    const deviceInfo = getDeviceInfo(navigator.userAgent, '');
+    if ([AppName.Chayns, AppName.ChaynsLauncher, AppName.Sidekick, AppName.TobitChat].includes((_deviceInfo$app$name = (_deviceInfo$app = deviceInfo.app) === null || _deviceInfo$app === void 0 ? void 0 : _deviceInfo$app.name) !== null && _deviceInfo$app$name !== void 0 ? _deviceInfo$app$name : AppName.Unknown) && window.self === window.top) {
+      wrapper = new AppWrapper();
+    } else {
+      wrapper = new FrameWrapper();
+    }
     moduleWrapper.current = wrapper;
     this._wrapper = wrapper;
     this.ready = wrapper.init();

package/dist/types/calls/index.d.ts

@@ -217,7 +217,10 @@ export declare const getUser: () => import("../types/IChaynsReact").ChaynsApiUse
 export declare const getSite: () => ChaynsApiSite;
 export declare const getCurrentPage: () => {
     id: number;
-    siteId: string;
+    siteId: string; /**
+     * Removes scroll listener.
+     * @category Event listener
+     */
 };
 export declare const getDevice: () => ChaynsApiDevice;
 export declare const getLanguage: () => {

package/dist/types/types/IChaynsReact.d.ts

@@ -185,6 +185,7 @@ export type ChaynsApiDevice = {
     imei?: string;
     accessToken?: string;
     os?: 'AIX' | 'Amiga OS' | 'Android OS' | 'Arch' | 'Bada' | 'BeOS' | 'BlackBerry' | 'CentOS' | 'Chromium OS' | 'Contiki' | 'Fedora' | 'Firefox OS' | 'FreeBSD' | 'Debian' | 'DragonFly' | 'Gentoo' | 'GNU' | 'Haiku' | 'Hurd' | 'iOS' | 'Joli' | 'Linpus' | 'Linux' | 'Mac OS' | 'Mageia' | 'Mandriva' | 'MeeGo' | 'Minix' | 'Mint' | 'Morph OS' | 'NetBSD' | 'Nintendo' | 'OpenBSD' | 'OpenVMS' | 'OS/2' | 'Palm' | 'PCLinuxOS' | 'Plan9' | 'Playstation' | 'QNX' | 'RedHat' | 'RIM Tablet OS' | 'RISC OS' | 'Sailfish' | 'Series40' | 'Slackware' | 'Solaris' | 'SUSE' | 'Symbian' | 'Tizen' | 'Ubuntu' | 'UNIX' | 'VectorLinux' | 'WebOS' | 'Windows' | 'Windows Phone' | 'Windows Mobile' | 'Zenwalk' | null;
+    osVersion?: string;
     isTouch: boolean;
     screenSize: ScreenSize;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chayns-api",
-    "version": "1.1.8",
+    "version": "1.1.10",
     "description": "new chayns api",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",