@tma.js/sdk 1.0.1 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tma.js/sdk",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "TypeScript Source Development Kit for Telegram Mini Apps client application.",
   "author": "Vladislav Kibenko <wolfram.deus@gmail.com>",
   "homepage": "https://github.com/Telegram-Mini-Apps/tma.js#readme",

package/src/cloud-storage/CloudStorage.ts

@@ -24,8 +24,6 @@ interface Methods {
   saveStorageValue: { key: string; value: string };
 }
 
-const stringArray = array().of(string());
-
 function objectFromKeys<K extends string, V>(keys: K[], value: V): Record<K, V> {
   return keys.reduce<Record<K, V>>((acc, key) => {
     acc[key] = value;
@@ -93,7 +91,7 @@ export class CloudStorage {
   async getKeys(options?: WiredRequestOptions): Promise<string[]> {
     const result = await this.invokeCustomMethod('getStorageKeys', {}, options);
 
-    return stringArray.parse(result);
+    return array().of(string()).parse(result);
   }
 
   /**

package/src/index.ts

@@ -134,6 +134,12 @@ export {
   type QRScannerEventName,
   type QRScannerEvents,
 } from './qr-scanner/index.js';
+export {
+  SettingsButton,
+  type SettingsButtonEventName,
+  type SettingsButtonEventListener,
+  type SettingsButtonEvents,
+} from './settings-button/index.js';
 export { supports } from './supports/index.js';
 export {
   parseThemeParams,

package/src/init/creators/createSettingsButton.ts

@@ -0,0 +1,25 @@
+import { SettingsButton } from '~/settings-button/index.js';
+import { getStorageValue, saveStorageValue } from '~/storage.js';
+import type { PostEvent } from '~/bridge/index.js';
+
+/**
+ * Creates SettingsButton instance using last locally saved data also saving each state in
+ * the storage.
+ * @param isPageReload - was current page reloaded.
+ * @param version - platform version.
+ * @param postEvent - Bridge postEvent function
+ */
+export function createSettingsButton(
+  isPageReload: boolean,
+  version: string,
+  postEvent: PostEvent,
+): SettingsButton {
+  const { isVisible = false } = isPageReload ? getStorageValue('settings-button') || {} : {};
+  const component = new SettingsButton(isVisible, version, postEvent);
+
+  component.on('change', () => {
+    saveStorageValue('settings-button', { isVisible: component.isVisible });
+  });
+
+  return component;
+}

package/src/init/creators/createViewport.ts

@@ -3,6 +3,15 @@ import { requestViewport, Viewport } from '~/viewport/index.js';
 import type { PostEvent } from '~/bridge/index.js';
 import type { Platform } from '~/types/index.js';
 
+/**
+ * Returns true in case, specified platform supports calling Mini Apps
+ * "web_app_request_viewport" method.
+ * @param platform - platform identifier.
+ */
+function isRequestSupportedPlatform(platform: Platform): boolean {
+  return !['macos', 'web', 'weba'].includes(platform);
+}
+
 /**
  * Attempts to create Viewport instance using known parameters and local storage.
  * @param isPageReload - was page reloaded.
@@ -14,7 +23,7 @@ function tryCreate(
   platform: Platform,
   postEvent: PostEvent,
 ): Viewport | null {
-  if (isPageReload || platform === 'macos' || platform === 'web' || platform === 'weba') {
+  if (isPageReload || !isRequestSupportedPlatform(platform)) {
     return new Viewport({
       height: window.innerHeight,
       isExpanded: true,
@@ -73,10 +82,12 @@ export function createViewportSync(
     }),
   );
 
-  viewport.sync({ postEvent, timeout: 100 }).catch((e) => {
-    // eslint-disable-next-line no-console
-    console.error('Unable to actualize viewport state', e);
-  });
+  if (isRequestSupportedPlatform(platform)) {
+    viewport.sync({ postEvent, timeout: 100 }).catch((e) => {
+      // eslint-disable-next-line no-console
+      console.error('Unable to actualize viewport state', e);
+    });
+  }
 
   return viewport;
 }

package/src/init/creators/index.ts

@@ -3,5 +3,6 @@ export * from './createClosingBehavior.js';
 export * from './createMainButton.js';
 export * from './createMiniApp.js';
 export * from './createRequestIdGenerator.js';
+export * from './createSettingsButton.js';
 export * from './createThemeParams.js';
 export * from './createViewport.js';

package/src/init/init.ts

@@ -7,7 +7,7 @@ import {
   createClosingBehavior,
   createMainButton,
   createMiniApp,
-  createRequestIdGenerator,
+  createRequestIdGenerator, createSettingsButton,
   createThemeParams, createViewportAsync,
   createViewportSync,
 } from '~/init/creators/index.js';
@@ -23,7 +23,9 @@ import type { InitOptions, InitResult } from './types.js';
 
 type ComputedInitResult<O> = O extends { async: true } ? Promise<InitResult> : InitResult;
 
-export function init<O extends InitOptions>(options: O): ComputedInitResult<O> {
+export function init(): InitResult;
+export function init<O extends InitOptions>(options: O): ComputedInitResult<O>;
+export function init(options: InitOptions = {}): InitResult | Promise<InitResult> {
   const {
     async = false,
     cssVars = false,
@@ -84,6 +86,7 @@ export function init<O extends InitOptions>(options: O): ComputedInitResult<O> {
       popup: new Popup(version, postEvent),
       postEvent,
       qrScanner: new QRScanner(version, postEvent),
+      settingsButton: createSettingsButton(isPageReload, version, postEvent),
       themeParams: createThemeParams(themeParams),
       utils: new Utils(version, createRequestId, postEvent),
       ...(initData
@@ -112,7 +115,7 @@ export function init<O extends InitOptions>(options: O): ComputedInitResult<O> {
           ...result,
           viewport: vp,
         };
-      }) as ComputedInitResult<O>;
+      });
     }
 
     processCSSVars(
@@ -122,10 +125,10 @@ export function init<O extends InitOptions>(options: O): ComputedInitResult<O> {
       viewport,
     );
 
-    return { ...result, viewport } as ComputedInitResult<O>;
+    return { ...result, viewport };
   } catch (e) {
     if (async) {
-      return Promise.reject(e) as unknown as ComputedInitResult<O>;
+      return Promise.reject(e);
     }
     throw e;
   }

package/src/init/types.ts

@@ -9,6 +9,7 @@ import type { MainButton } from '~/main-button/index.js';
 import type { MiniApp } from '~/mini-app/index.js';
 import type { Popup } from '~/popup/index.js';
 import type { QRScanner } from '~/qr-scanner/index.js';
+import type { SettingsButton } from '~/settings-button/index.js';
 import type { ThemeParams } from '~/theme-params/index.js';
 import type { CreateRequestIdFunc } from '~/types/index.js';
 import type { Utils } from '~/utils/index.js';
@@ -28,6 +29,7 @@ export interface InitResult {
   popup: Popup;
   postEvent: PostEvent;
   qrScanner: QRScanner;
+  settingsButton: SettingsButton;
   themeParams: ThemeParams;
   utils: Utils;
   viewport: Viewport;

package/src/parsing/parsers/date.ts

@@ -1,13 +1,11 @@
 import { number } from './number.js';
 import { createValueParserGenerator } from '../createValueParserGenerator.js';
 
-const num = number();
-
 /**
  * Returns parser to parse value as Date.
  */
 export const date = createValueParserGenerator<Date>((value) => (
   value instanceof Date
     ? value
-    : new Date(num.parse(value) * 1000)
+    : new Date(number().parse(value) * 1000)
 ), 'Date');

package/src/parsing/parsers/rgb.ts

@@ -4,9 +4,7 @@ import type { RGB } from '~/colors/index.js';
 import { string } from './string.js';
 import { createValueParserGenerator } from '../createValueParserGenerator.js';
 
-const str = string();
-
 /**
  * Returns parser to parse value as RGB color.
  */
-export const rgb = createValueParserGenerator<RGB>((value) => toRGB(str.parse(value)), 'rgb');
+export const rgb = createValueParserGenerator<RGB>((value) => toRGB(string().parse(value)), 'rgb');

package/src/settings-button/SettingsButton.ts

@@ -0,0 +1,85 @@
+import {
+  off,
+  on,
+  type PostEvent,
+  postEvent as defaultPostEvent,
+} from '~/bridge/index.js';
+import { EventEmitter } from '~/event-emitter/index.js';
+import { State } from '~/state/index.js';
+import { createSupportsFunc, type SupportsFunc } from '~/supports/index.js';
+import type { Version } from '~/version/index.js';
+
+import type { SettingsButtonEvents, SettingsButtonState } from './types.js';
+
+type Emitter = EventEmitter<SettingsButtonEvents>;
+
+export class SettingsButton {
+  private readonly ee: Emitter = new EventEmitter();
+
+  private readonly state: State<SettingsButtonState>;
+
+  constructor(
+    isVisible: boolean,
+    version: Version,
+    private readonly postEvent: PostEvent = defaultPostEvent,
+  ) {
+    this.state = new State({ isVisible }, this.ee);
+    this.supports = createSupportsFunc(version, {
+      show: 'web_app_setup_settings_button',
+      hide: 'web_app_setup_settings_button',
+    });
+  }
+
+  private set isVisible(visible: boolean) {
+    this.state.set('isVisible', visible);
+    this.postEvent('web_app_setup_settings_button', { is_visible: visible });
+  }
+
+  /**
+   * True if SettingsButton is currently visible.
+   */
+  get isVisible(): boolean {
+    return this.state.get('isVisible');
+  }
+
+  /**
+   * Hides the SettingsButton.
+   */
+  hide(): void {
+    this.isVisible = false;
+  }
+
+  /**
+   * Adds event listener.
+   * @param event - event name.
+   * @param listener - event listener.
+   */
+  on: Emitter['on'] = (event, listener) => (
+    event === 'click'
+      ? on('settings_button_pressed', listener)
+      : this.ee.on(event, listener)
+  );
+
+  /**
+   * Removes event listener.
+   * @param event - event name.
+   * @param listener - event listener.
+   */
+  off: Emitter['off'] = (event, listener) => (
+    event === 'click'
+      ? off('settings_button_pressed', listener)
+      : this.ee.off(event, listener)
+  );
+
+  /**
+   * Shows the SettingsButton.
+   */
+  show(): void {
+    this.isVisible = true;
+  }
+
+  /**
+   * Checks if specified method is supported by current component.
+   */
+  supports: SupportsFunc<'show' | 'hide'>;
+}

package/src/settings-button/index.ts

@@ -0,0 +1,2 @@
+export * from './SettingsButton.js';
+export * from './types.js';

package/src/settings-button/types.ts

@@ -0,0 +1,15 @@
+import type { MiniAppsEventListener } from '~/bridge/index.js';
+import type { StateEvents } from '~/state/index.js';
+
+export interface SettingsButtonState {
+  isVisible: boolean;
+}
+
+export interface SettingsButtonEvents extends StateEvents<SettingsButtonState> {
+  click: MiniAppsEventListener<'settings_button_pressed'>;
+}
+
+export type SettingsButtonEventName = keyof SettingsButtonEvents;
+
+export type SettingsButtonEventListener<E extends SettingsButtonEventName> =
+  SettingsButtonEvents[E];

package/src/storage.ts

@@ -21,6 +21,9 @@ interface StorageParams {
     text: string;
     textColor: RGB;
   };
+  'settings-button': {
+    isVisible: boolean
+  };
   viewport: {
     height: number;
     isExpanded: boolean;

package/src/theme-params/themeParamsParser.ts

@@ -7,14 +7,16 @@ import {
 import { keyToLocal } from './keys.js';
 import type { ThemeParamsParsed } from './types.js';
 
-const rgbOptional = rgb().optional();
-
 export const themeParamsParser = createValueParserGenerator<ThemeParamsParsed>(
-  (value) => Object
-    .entries(toRecord(value))
-    .reduce<ThemeParamsParsed>((acc, [k, v]) => {
-    acc[keyToLocal(k)] = rgbOptional.parse(v);
-    return acc;
-  }, {}),
+  (value) => {
+    const rgbOptional = rgb().optional();
+
+    return Object
+      .entries(toRecord(value))
+      .reduce<ThemeParamsParsed>((acc, [k, v]) => {
+        acc[keyToLocal(k)] = rgbOptional.parse(v);
+        return acc;
+      }, {});
+  },
   'ThemeParams',
 );