@pushwoosh/dumb-components 1.1.205 → 1.1.206

package/FrequencyCapping/FrequencyCappingEdit.js

@@ -3,12 +3,12 @@ import { useCallback } from 'react';
 import { Color } from '@pushwoosh/kit-constants';
 import { Vertical } from '@pushwoosh/kit-helpers';
 import { OpenIcon } from '@pushwoosh/kit-icons';
-import { CountingMode } from './components/CountingMode';
+import { CountingModeControl } from './components/CountingMode/CountingModeControl';
 import { Description } from './components/Description';
 import { EditCappingSettings } from './components/Settings';
 import { getCappingOption } from './helpers/getCappingOption';
 import { getGlobalCappingLinkText } from './helpers/getGlobalCappingLinkText';
-import { CappingCountingMode, CappingTypes } from './types';
+import { CappingTypes } from './types';
 import { FieldBox } from '../FieldBox';
 import { Link } from '../Link';
 import { Select } from '../Select';
@@ -75,18 +75,6 @@ export function FrequencyCappingEdit({
       days
     });
   }, [capping, onChange]);
-  const onCountingModeChange = useCallback(countingMode => {
-    onChange({
-      ...capping,
-      countingMode
-    });
-  }, [capping, onChange]);
-  const onTimezoneChange = useCallback(timezone => {
-    onChange({
-      ...capping,
-      timezone
-    });
-  }, [capping, onChange]);
   return _jsx(Container, {
     "$padding": 16,
     "$bgColor": Color.SOFT_LIGHT,
@@ -126,12 +114,10 @@ export function FrequencyCappingEdit({
         messages: messages,
         days: days,
         onChange: onSettingsChange
-      }), cappingOption === CappingTypes.CUSTOM && !isDisabled && timezoneOptions !== undefined && _jsx(CountingMode, {
-        countingMode: capping.countingMode ?? CappingCountingMode.ROLLING,
-        timezone: capping.timezone ?? '',
+      }), cappingOption === CappingTypes.CUSTOM && !isDisabled && timezoneOptions !== undefined && _jsx(CountingModeControl, {
+        capping: capping,
         timezoneOptions: timezoneOptions,
-        onCountingModeChange: onCountingModeChange,
-        onTimezoneChange: onTimezoneChange
+        onChange: onChange
       })]
     })
   });

package/FrequencyCapping/FrequencyCappingInApps.js

@@ -3,6 +3,7 @@ import { useCallback } from 'react';
 import { Color } from '@pushwoosh/kit-constants';
 import { Vertical } from '@pushwoosh/kit-helpers';
 import { OpenIcon } from '@pushwoosh/kit-icons';
+import { CountingModeControl } from './components/CountingMode/CountingModeControl';
 import { Description } from './components/Description';
 import { EditInAppCappingSettings } from './components/Settings';
 import { getCappingOption } from './helpers/getCappingOption';
@@ -29,7 +30,8 @@ export function FrequencyCappingInApps(props) {
     editGlobalClicked,
     applicationCode,
     isInJourney = false,
-    isDisabled = false
+    isDisabled = false,
+    timezoneOptions
   } = props;
   const lang = useLang();
   const cappingOptions = getCappingOptions(lang);
@@ -105,6 +107,10 @@ export function FrequencyCappingInApps(props) {
       }), cappingOption === CappingTypes.CUSTOM && !isDisabled && _jsx(EditInAppCappingSettings, {
         capping: capping,
         onChange: onSettingsChange
+      }), cappingOption === CappingTypes.CUSTOM && !isDisabled && timezoneOptions !== undefined && _jsx(CountingModeControl, {
+        capping: capping,
+        timezoneOptions: timezoneOptions,
+        onChange: onChange
       })]
     })
   });

package/FrequencyCapping/components/CountingMode/CountingModeControl.d.ts

@@ -0,0 +1,15 @@
+import { type ReactElement } from 'react';
+import type { SelectOption } from '../../../Select';
+import { CappingCountingMode } from '../../types';
+type WindowCapping = {
+    countingMode?: CappingCountingMode;
+    timezone?: string;
+};
+type CountingModeControlProps<T extends WindowCapping> = {
+    capping: T;
+    timezoneOptions: SelectOption[];
+    onChange: (newCappingState: T) => void;
+};
+/** Controlled {@link CountingMode} bound to a capping config with optional window fields. */
+export declare function CountingModeControl<T extends WindowCapping>(props: CountingModeControlProps<T>): ReactElement;
+export {};

package/FrequencyCapping/components/CountingMode/CountingModeControl.js

@@ -0,0 +1,31 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useCallback } from 'react';
+import { CappingCountingMode } from '../../types';
+import { CountingMode } from './index';
+/** Controlled {@link CountingMode} bound to a capping config with optional window fields. */
+export function CountingModeControl(props) {
+  const {
+    capping,
+    timezoneOptions,
+    onChange
+  } = props;
+  const onCountingModeChange = useCallback(countingMode => {
+    onChange({
+      ...capping,
+      countingMode
+    });
+  }, [capping, onChange]);
+  const onTimezoneChange = useCallback(timezone => {
+    onChange({
+      ...capping,
+      timezone
+    });
+  }, [capping, onChange]);
+  return _jsx(CountingMode, {
+    countingMode: capping.countingMode ?? CappingCountingMode.ROLLING,
+    timezone: capping.timezone ?? '',
+    timezoneOptions: timezoneOptions,
+    onCountingModeChange: onCountingModeChange,
+    onTimezoneChange: onTimezoneChange
+  });
+}

package/FrequencyCapping/types.d.ts

@@ -46,6 +46,10 @@ export type CappingInAppBase = {
     enabled: boolean;
     /** Ignore the account-wide global cap. */
     ignoreGlobalCapping: boolean;
+    /** Anchoring of the perDays/leastDays windows; missing means {@link CappingCountingMode.ROLLING}, the lifetime total ignores it. */
+    countingMode?: CappingCountingMode;
+    /** IANA timezone midnight is calculated in, for {@link CappingCountingMode.CALENDAR_DAY}; empty means UTC. */
+    timezone?: string;
     /** Lifetime total limit. */
     total?: {
         count: number;
@@ -120,4 +124,6 @@ export type FrequencyCappingInAppsProps = {
     isInJourney?: boolean;
     /** Disable editing. */
     isDisabled?: boolean;
+    /** IANA timezones for the calendar-day mode; supplying them enables the counting-mode selector. */
+    timezoneOptions?: SelectOption[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/dumb-components",
-  "version": "1.1.205",
+  "version": "1.1.206",
   "description": "React components to build Pushwoosh products",
   "main": "index.js",
   "module": "index.js",