@pushwoosh/dumb-components 1.1.237 → 2.0.0

package/Calendar/CalendarDropdown/helpers.js

@@ -1,4 +1,4 @@
-import { formatTimezoneShort } from '../helpers-tz';
+import { formatTimezoneShort } from '../../helpers/timezones';
 export function formatDate(val, withTime = true) {
   const date = new Date(val.year, val.month - 1, val.day, 'hour' in val ? val.hour : 0, 'minute' in val ? val.minute : 0);
   if (withTime) {

package/Calendar/CalendarSuperForm/components/CalendarTimeAndTimezoneSection/CalendarTimeAndTimezoneSection.js

@@ -5,8 +5,8 @@ import { Columns, Horizontal, Vertical } from '@pushwoosh/kit-helpers';
 import { TimeIcon } from '@pushwoosh/kit-icons';
 import { H5, Text } from '@pushwoosh/kit-typography';
 import { Button } from '../../../../Button';
+import { formatTimezoneShort } from '../../../../helpers/timezones';
 import { extendPeriodStruct, formatTwoDigitNumber } from '../../../helpers';
-import { formatTimezoneShort } from '../../../helpers-tz';
 import { Lang } from '../../../polyglot';
 import { CalendarTimeInput } from '../CalendarTimeInput';
 import { CalendarTimezoneSelect } from '../CalendarTimezoneSelect';

package/helpers/__tests__/timezones.test.js

@@ -1,23 +1,38 @@
-import { canonicalizeTimezone, findTimezoneOption, formatTimezoneLabel, formatTimezoneOffset, getTimezoneOffsetSafe, listTimezones, resolveTimezoneOption } from '../timezones';
+import { canonicalizeTimezone, findTimezoneOption, formatTimezoneLabel, formatTimezoneOffset, formatTimezoneShort, getTimezoneOffsetSafe, listTimezones, resolveTimezoneOption } from '../timezones';
 const winter = new Date('2026-01-15T12:00:00Z');
 const melbourneDst = new Date('2026-10-10T12:00:00Z');
+const melbourneStandard = new Date('2026-06-15T12:00:00Z');
 describe('formatTimezoneOffset', () => {
   it('renders sign, hours and minutes', () => {
-    expect(formatTimezoneOffset(300)).toBe('GMT+05:00');
-    expect(formatTimezoneOffset(330)).toBe('GMT+05:30');
-    expect(formatTimezoneOffset(-210)).toBe('GMT-03:30');
-    expect(formatTimezoneOffset(0)).toBe('GMT+00:00');
+    expect(formatTimezoneOffset(300)).toBe('UTC+05:00');
+    expect(formatTimezoneOffset(330)).toBe('UTC+05:30');
+    expect(formatTimezoneOffset(-210)).toBe('UTC-03:30');
+    expect(formatTimezoneOffset(0)).toBe('UTC+00:00');
+  });
+});
+describe('formatTimezoneShort', () => {
+  it('renders the bare offset the calendar badge shows', () => {
+    expect(formatTimezoneShort('Asia/Almaty', winter)).toBe('UTC+05:00');
+    expect(formatTimezoneShort('Asia/Kolkata', winter)).toBe('UTC+05:30');
+    expect(formatTimezoneShort('UTC', winter)).toBe('UTC+00:00');
+  });
+  it('follows DST at the given instant', () => {
+    expect(formatTimezoneShort('Australia/Melbourne', melbourneStandard)).toBe('UTC+10:00');
+    expect(formatTimezoneShort('Australia/Melbourne', melbourneDst)).toBe('UTC+11:00');
+  });
+  it('keeps an unknown zone readable', () => {
+    expect(formatTimezoneShort('Not/AZone', winter)).toBe('Not/AZone');
   });
 });
 describe('formatTimezoneLabel', () => {
   it('uses the current tzdata: Kazakhstan is UTC+5 since 2024', () => {
-    expect(formatTimezoneLabel('Asia/Almaty', winter)).toBe('(GMT+05:00) Asia/Almaty');
-    expect(formatTimezoneLabel('Asia/Qostanay', winter)).toBe('(GMT+05:00) Asia/Qostanay');
+    expect(formatTimezoneLabel('Asia/Almaty', winter)).toBe('(UTC+05:00) Asia/Almaty');
+    expect(formatTimezoneLabel('Asia/Qostanay', winter)).toBe('(UTC+05:00) Asia/Qostanay');
   });
   it('keeps half-hour zones east of UTC exact', () => {
-    expect(formatTimezoneLabel('Asia/Kolkata', winter)).toBe('(GMT+05:30) Asia/Kolkata');
-    expect(formatTimezoneLabel('Asia/Kathmandu', winter)).toBe('(GMT+05:45) Asia/Kathmandu');
-    expect(formatTimezoneLabel('America/St_Johns', winter)).toBe('(GMT-03:30) America/St_Johns');
+    expect(formatTimezoneLabel('Asia/Kolkata', winter)).toBe('(UTC+05:30) Asia/Kolkata');
+    expect(formatTimezoneLabel('Asia/Kathmandu', winter)).toBe('(UTC+05:45) Asia/Kathmandu');
+    expect(formatTimezoneLabel('America/St_Johns', winter)).toBe('(UTC-03:30) America/St_Johns');
   });
   it('resolves the offset at the given instant, not today', () => {
     expect(getTimezoneOffsetSafe('Australia/Melbourne', winter)).toBe(660);
@@ -25,9 +40,9 @@ describe('formatTimezoneLabel', () => {
     expect(getTimezoneOffsetSafe('Australia/Melbourne', melbourneDst)).toBe(660);
   });
   it('labels Etc and POSIX names the backend accepts but the picker does not list', () => {
-    expect(formatTimezoneLabel('Etc/GMT+3', winter)).toBe('(GMT-03:00) Etc/GMT+3');
-    expect(formatTimezoneLabel('Etc/GMT-0', winter)).toBe('(GMT+00:00) Etc/GMT-0');
-    expect(formatTimezoneLabel('EST', winter)).toBe('(GMT-05:00) EST');
+    expect(formatTimezoneLabel('Etc/GMT+3', winter)).toBe('(UTC-03:00) Etc/GMT+3');
+    expect(formatTimezoneLabel('Etc/GMT-0', winter)).toBe('(UTC+00:00) Etc/GMT-0');
+    expect(formatTimezoneLabel('EST', winter)).toBe('(UTC-05:00) EST');
   });
   it('falls back to the bare name for a zone the engine does not know', () => {
     expect(getTimezoneOffsetSafe('Not/A_Zone')).toBeNull();
@@ -115,7 +130,7 @@ describe('resolveTimezoneOption', () => {
   it('never rewrites the stored value', () => {
     expect(resolveTimezoneOption('Europe/Kiev', winter)).toEqual({
       value: 'Europe/Kiev',
-      label: '(GMT+02:00) Europe/Kiev'
+      label: '(UTC+02:00) Europe/Kiev'
     });
     expect(resolveTimezoneOption('Not/A_Zone', winter)).toEqual({
       value: 'Not/A_Zone',

package/helpers/timezones.d.ts

@@ -9,10 +9,12 @@ export declare function getBrowserTimezone(): string;
 export declare function canonicalizeTimezone(timezone: string): string | null;
 /** Offset of `timezone` in minutes east of UTC at instant `at`, or `null` for a zone the engine doesn't know. */
 export declare function getTimezoneOffsetSafe(timezone: string, at?: Date): number | null;
-/** Minutes east of UTC rendered as `GMT+05:00` / `GMT-03:30`. */
+/** Minutes east of UTC rendered as `UTC+05:00` / `UTC-03:30`. */
 export declare function formatTimezoneOffset(minutes: number): string;
-/** The shared picker label, `(GMT+05:00) Asia/Almaty` at instant `at`; a zone the engine doesn't know is labelled by its bare name. */
+/** The shared picker label, `(UTC+05:00) Asia/Almaty` at instant `at`; a zone the engine doesn't know is labelled by its bare name. */
 export declare function formatTimezoneLabel(timezone: string, at?: Date): string;
+/** Compact badge for a zone, `UTC+05:00`; a zone the engine doesn't know is shown by its bare name. */
+export declare function formatTimezoneShort(timezone: string, at?: Date): string;
 /** Option for any stored zone name — aliases, `Etc/GMT±N`, POSIX abbreviations — kept verbatim as the value. */
 export declare function resolveTimezoneOption(timezone: string, at?: Date): TimezoneOption;
 /** Zones the browser knows plus `UTC` and every non-empty `include` value, sorted by offset at `at` then by name. Pass the stored value as `include` so an old alias stays selectable and is re-saved unchanged. */

package/helpers/timezones.js

@@ -22,19 +22,24 @@ export function getTimezoneOffsetSafe(timezone, at = new Date()) {
     return null;
   }
 }
-/** Minutes east of UTC rendered as `GMT+05:00` / `GMT-03:30`. */
+/** Minutes east of UTC rendered as `UTC+05:00` / `UTC-03:30`. */
 export function formatTimezoneOffset(minutes) {
   const sign = minutes < 0 ? '-' : '+';
   const absolute = Math.abs(minutes);
   const hours = String(Math.floor(absolute / 60)).padStart(2, '0');
   const mins = String(absolute % 60).padStart(2, '0');
-  return `GMT${sign}${hours}:${mins}`;
+  return `UTC${sign}${hours}:${mins}`;
 }
-/** The shared picker label, `(GMT+05:00) Asia/Almaty` at instant `at`; a zone the engine doesn't know is labelled by its bare name. */
+/** The shared picker label, `(UTC+05:00) Asia/Almaty` at instant `at`; a zone the engine doesn't know is labelled by its bare name. */
 export function formatTimezoneLabel(timezone, at = new Date()) {
   const offset = getTimezoneOffsetSafe(timezone, at);
   return offset === null ? timezone : `(${formatTimezoneOffset(offset)}) ${timezone}`;
 }
+/** Compact badge for a zone, `UTC+05:00`; a zone the engine doesn't know is shown by its bare name. */
+export function formatTimezoneShort(timezone, at = new Date()) {
+  const offset = getTimezoneOffsetSafe(timezone, at);
+  return offset === null ? timezone : formatTimezoneOffset(offset);
+}
 /** Option for any stored zone name — aliases, `Etc/GMT±N`, POSIX abbreviations — kept verbatim as the value. */
 export function resolveTimezoneOption(timezone, at = new Date()) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/dumb-components",
-  "version": "1.1.237",
+  "version": "2.0.0",
   "description": "React components to build Pushwoosh products",
   "main": "index.js",
   "module": "index.js",
@@ -65,7 +65,6 @@
     "styled-components": "^5.3.3 || ^6.0.0"
   },
   "scripts": {
-    "start": "pnpm --dir storybook start",
     "build": "pushwoosh-engine lib:build",
     "check": "pnpm run check:lint && pnpm run check:types",
     "check:lint": "echo \"Run check:lint\" && eslint src",

package/Calendar/helpers-tz.d.ts

@@ -1,2 +0,0 @@
-export declare function groupTimezonesByOffset(at?: Date): [number, string[]][];
-export declare function formatTimezoneShort(timezone: string): string;

package/Calendar/helpers-tz.js

@@ -1,47 +0,0 @@
-import { formatTwoDigitNumber, getTimezoneOffset } from './helpers';
-function getAllTimeZones() {
-  return Intl.supportedValuesOf('timeZone');
-}
-function formatTimezoneOffset(minutes) {
-  const minutesAbs = Math.abs(minutes);
-  const hours = Math.floor(minutesAbs / 60);
-  const mins = minutesAbs % 60;
-  const sign = minutes < 0 ? '-' : '+';
-  if (mins === 0) {
-    return `UTC${sign}${hours}`;
-  } else {
-    return `UTC${sign}${hours}:${formatTwoDigitNumber(mins)}`;
-  }
-}
-export function groupTimezonesByOffset(at = new Date()) {
-  const zones = getAllTimeZones();
-  const groups = new Map();
-  for (const tz of zones) {
-    try {
-      const diff = getTimezoneOffset(tz, at);
-      const arr = groups.get(diff);
-      if (arr) {
-        arr.push(tz);
-      } else {
-        groups.set(diff, [tz]);
-      }
-    } catch (e) {
-      console.warn(`Cannot get timezone info for "${tz}"`, e);
-    }
-  }
-  const result = [];
-  for (const [diff, list] of groups) {
-    list.sort((a, b) => a.localeCompare(b));
-    result.push([diff, list]);
-  }
-  result.sort((a, b) => a[0] - b[0]);
-  return result;
-}
-export function formatTimezoneShort(timezone) {
-  const offsetMinutes = getTimezoneOffset(timezone, new Date());
-  const formattedOffset = formatTimezoneOffset(offsetMinutes);
-  if (formattedOffset === 'UTC+0' || formattedOffset === 'UTC-0') {
-    return 'UTC';
-  }
-  return formattedOffset;
-}