@applicaster/zapp-react-native-utils 16.0.0-alpha.7343517668 → 16.0.0-alpha.7845362739
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/actionsExecutor/ActionExecutor.ts +8 -10
- package/actionsExecutor/ActionExecutorContext.tsx +41 -325
- package/actionsExecutor/actions/appRestart.ts +24 -0
- package/actionsExecutor/actions/confirmDialog.ts +53 -0
- package/actionsExecutor/actions/index.ts +30 -0
- package/actionsExecutor/actions/localStorageRemove.ts +27 -0
- package/actionsExecutor/actions/localStorageSet.ts +28 -0
- package/actionsExecutor/actions/localStorageToggleFlag.ts +28 -0
- package/actionsExecutor/actions/navigateToScreen.ts +123 -0
- package/actionsExecutor/actions/refreshComponent.ts +79 -0
- package/actionsExecutor/actions/screenSetVariable.ts +35 -0
- package/actionsExecutor/actions/screenToggleFlag.ts +38 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +88 -0
- package/actionsExecutor/actions/sessionStorageRemove.ts +19 -0
- package/actionsExecutor/actions/sessionStorageSet.ts +20 -0
- package/actionsExecutor/actions/sessionStorageToggleFlag.ts +15 -0
- package/actionsExecutor/actions/showToast.ts +31 -0
- package/actionsExecutor/actions/switchLayout.ts +40 -0
- package/actionsExecutor/types.ts +59 -0
- package/appUtils/contextKeysManager/__tests__/getKey/failure.test.ts +1 -1
- package/appUtils/contextKeysManager/__tests__/removeKey/failure.test.ts +1 -1
- package/appUtils/contextKeysManager/__tests__/setKey/failure/invalidKey.test.ts +4 -4
- package/appUtils/contextKeysManager/index.ts +1 -1
- package/arrayUtils/__tests__/{anyThruthy.test.ts → anyTruthy.test.ts} +8 -0
- package/arrayUtils/__tests__/arrayUtils.test.ts +165 -108
- package/arrayUtils/__tests__/isEmptyArray.test.ts +11 -0
- package/arrayUtils/__tests__/isFilledArray.test.ts +12 -0
- package/arrayUtils/__tests__/isFirst.test.ts +17 -0
- package/arrayUtils/__tests__/isIndexInRange.test.ts +14 -0
- package/arrayUtils/__tests__/isLast.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOf.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOfIndexes.test.ts +20 -0
- package/arrayUtils/__tests__/sample.test.ts +61 -0
- package/arrayUtils/index.ts +57 -20
- package/bottomSheet/__tests__/scrollContext.test.tsx +35 -0
- package/bottomSheet/index.ts +17 -0
- package/manifestUtils/_internals/index.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +19 -19
- package/manifestUtils/fieldUtils/__tests__/fieldUtils.test.js +84 -0
- package/manifestUtils/fieldUtils/index.js +125 -0
- package/manifestUtils/keys.js +9 -0
- package/manifestUtils/mobileAction/button/index.js +16 -0
- package/manifestUtils/mobileAction/container/index.js +3 -1
- package/manifestUtils/mobileAction/groups/defaults.js +3 -1
- package/manifestUtils/platformIsTV.js +1 -0
- package/numberUtils/__tests__/isMinusZero.test.ts +20 -0
- package/numberUtils/__tests__/isZero.test.ts +27 -0
- package/numberUtils/__tests__/requireNumber.test.ts +50 -0
- package/numberUtils/__tests__/toNumber.test.ts +27 -0
- package/numberUtils/__tests__/toNumberWithDefault.test.ts +64 -0
- package/numberUtils/__tests__/toNumberWithDefaultZero.test.ts +48 -0
- package/numberUtils/index.ts +27 -8
- package/package.json +2 -2
- package/reactHooks/actions/index.ts +51 -1
- package/reactHooks/cell-click/index.ts +3 -3
- package/reactHooks/feed/__tests__/useInflatedUrl.test.tsx +25 -0
- package/reactHooks/navigation/__mocks__/index.ts +4 -0
- package/reactHooks/navigation/__tests__/useIsScreenActive.test.ts +42 -0
- package/reactHooks/navigation/index.ts +1 -1
- package/reactHooks/navigation/useIsScreenActive.ts +29 -8
- package/reactHooks/state/useComponentScreenState.ts +1 -1
- package/riverComponetsMeasurementProvider/index.tsx +5 -1
- package/stringUtils/__tests__/stringUtils.test.js +42 -0
- package/stringUtils/index.ts +2 -2
- package/uiActionsRegistrator/index.ts +203 -0
- package/zappFrameworkUtils/__tests__/localStorageHelper.test.ts +146 -0
- package/zappFrameworkUtils/localStorageHelper.ts +9 -13
package/arrayUtils/index.ts
CHANGED
|
@@ -3,17 +3,16 @@ import * as R from "ramda";
|
|
|
3
3
|
import { invariant } from "@applicaster/zapp-react-native-utils/errorUtils";
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
* @returns {Array<T>}
|
|
6
|
+
* Shifts an array by the given offset and returns a new array (does not mutate).
|
|
7
|
+
* A positive offset moves items from the head to the tail;
|
|
8
|
+
* a negative offset moves items from the tail to the head.
|
|
9
|
+
* An offset of `0` leaves the order unchanged.
|
|
10
|
+
*
|
|
11
|
+
* Curried (Ramda): `shiftArray(offset)(array)` or `shiftArray(offset, array)`.
|
|
12
|
+
*
|
|
13
|
+
* @example
|
|
14
|
+
* shiftArray(-1, [1, 2, 3, 4]) // => [4, 1, 2, 3]
|
|
15
|
+
* shiftArray(1, [1, 2, 3, 4]) // => [2, 3, 4, 1]
|
|
17
16
|
*/
|
|
18
17
|
export const shiftArray = R.curry(
|
|
19
18
|
<T extends unknown>(offset: number, array: T[]): T[] => {
|
|
@@ -25,10 +24,9 @@ export const shiftArray = R.curry(
|
|
|
25
24
|
);
|
|
26
25
|
|
|
27
26
|
/**
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
* @returns {Array<any>}
|
|
27
|
+
* Removes the first item equal to `item` from `list` (Ramda `equals` / deep equality).
|
|
28
|
+
* If the item is not found, returns the same list reference; otherwise returns a new
|
|
29
|
+
* array without that element.
|
|
32
30
|
*/
|
|
33
31
|
export function removeItemFromList<T extends unknown>(item: T, list: T[]): T[] {
|
|
34
32
|
return R.compose(
|
|
@@ -37,6 +35,12 @@ export function removeItemFromList<T extends unknown>(item: T, list: T[]): T[] {
|
|
|
37
35
|
)(list);
|
|
38
36
|
}
|
|
39
37
|
|
|
38
|
+
/**
|
|
39
|
+
* Maps each value to a promise and resolves them all in parallel via `Promise.all`.
|
|
40
|
+
* The mapper receives `(value, index)`.
|
|
41
|
+
*
|
|
42
|
+
* Curried (Ramda): `mapPromises(fn)(values)` or `mapPromises(fn, values)`.
|
|
43
|
+
*/
|
|
40
44
|
export const mapPromises = R.curry(
|
|
41
45
|
<T extends unknown, S extends unknown>(
|
|
42
46
|
fn: (value: T, index?: number) => Promise<S>,
|
|
@@ -44,6 +48,10 @@ export const mapPromises = R.curry(
|
|
|
44
48
|
): Promise<S[]> => Promise.all(R.addIndex(R.map)(R.nAry(2, fn), values))
|
|
45
49
|
);
|
|
46
50
|
|
|
51
|
+
/**
|
|
52
|
+
* Awaits `previousPromise`, then runs `fn(currentValue, previousValue, index)`.
|
|
53
|
+
* Used internally by `reducePromises` as a Ramda-indexed reducer step.
|
|
54
|
+
*/
|
|
47
55
|
const waitForPromiseAndRun = R.curryN(
|
|
48
56
|
3,
|
|
49
57
|
async <T extends unknown, S extends unknown>(
|
|
@@ -58,6 +66,14 @@ const waitForPromiseAndRun = R.curryN(
|
|
|
58
66
|
}
|
|
59
67
|
);
|
|
60
68
|
|
|
69
|
+
/**
|
|
70
|
+
* Reduces a list by applying an async function sequentially.
|
|
71
|
+
* Each step awaits the previous result, then calls `fn(current, previous, index)`.
|
|
72
|
+
* An empty list resolves to `initialValue` without calling `fn`.
|
|
73
|
+
*
|
|
74
|
+
* Curried (Ramda): `reducePromises(fn)(initialValue)(values)` or
|
|
75
|
+
* `reducePromises(fn, initialValue, values)`.
|
|
76
|
+
*/
|
|
61
77
|
export const reducePromises = R.curry(
|
|
62
78
|
<T extends unknown, S extends unknown>(
|
|
63
79
|
fn: (current: T, previous: S, index?: number) => Promise<S>,
|
|
@@ -71,18 +87,32 @@ export const reducePromises = R.curry(
|
|
|
71
87
|
)
|
|
72
88
|
);
|
|
73
89
|
|
|
90
|
+
/**
|
|
91
|
+
* Returns a function that maps a list with `mapperFn`, then splits the result
|
|
92
|
+
* into chunks of size `chunks` (`R.splitEvery`).
|
|
93
|
+
*
|
|
94
|
+
* Curried (Ramda): `mapAndSplit(mapperFn, chunks)(values)`.
|
|
95
|
+
*/
|
|
74
96
|
export const mapAndSplit = R.curry(
|
|
75
97
|
<T extends unknown, S extends unknown>(
|
|
76
|
-
mapperFn: (T) => S,
|
|
98
|
+
mapperFn: (value: T) => S,
|
|
77
99
|
chunks: number
|
|
78
|
-
): S[][] =>
|
|
100
|
+
): ((values: T[]) => S[][]) =>
|
|
101
|
+
(values: T[]) =>
|
|
102
|
+
R.splitEvery(chunks, R.map(mapperFn, values))
|
|
79
103
|
);
|
|
80
104
|
|
|
105
|
+
/** Returns `true` when `index` is at or past the last position (`length - 1`). */
|
|
81
106
|
export const isLast = (index: number, length: number): boolean =>
|
|
82
107
|
index >= length - 1;
|
|
83
108
|
|
|
109
|
+
/** Returns `true` when `index` is `0` or negative. */
|
|
84
110
|
export const isFirst = (index: number): boolean => index <= 0;
|
|
85
111
|
|
|
112
|
+
/**
|
|
113
|
+
* Returns `true` when `index` is a valid zero-based index for a list of the
|
|
114
|
+
* given `length`. Returns `false` for empty/negative lengths or negative indexes.
|
|
115
|
+
*/
|
|
86
116
|
export const isIndexInRange = (index: number, length: number): boolean => {
|
|
87
117
|
if (length <= 0) return false;
|
|
88
118
|
if (index < 0) return false;
|
|
@@ -90,24 +120,29 @@ export const isIndexInRange = (index: number, length: number): boolean => {
|
|
|
90
120
|
return index + 1 <= length;
|
|
91
121
|
};
|
|
92
122
|
|
|
123
|
+
/** Builds `[0, 1, ..., size - 1]`. Negative or zero `size` yields `[]`. */
|
|
93
124
|
export const makeListOfIndexes = (size: number): number[] =>
|
|
94
125
|
Array.from({ length: size }, (_, index) => index);
|
|
95
126
|
|
|
127
|
+
/** Builds an array of the given `size` filled with `value`. */
|
|
96
128
|
export const makeListOf = <T>(value: T, size: number): T[] => {
|
|
97
129
|
return Array(size).fill(value);
|
|
98
130
|
};
|
|
99
131
|
|
|
100
|
-
/** Checks if a value is a non-empty array */
|
|
132
|
+
/** Checks if a value is a non-empty array. */
|
|
101
133
|
export function isFilledArray(value: unknown): boolean {
|
|
102
134
|
return Array.isArray(value) && value.length > 0;
|
|
103
135
|
}
|
|
104
136
|
|
|
105
|
-
/** Checks if a value is
|
|
137
|
+
/** Checks if a value is an empty array. */
|
|
106
138
|
export function isEmptyArray(value: unknown): boolean {
|
|
107
139
|
return Array.isArray(value) && value.length === 0;
|
|
108
140
|
}
|
|
109
141
|
|
|
110
|
-
|
|
142
|
+
/**
|
|
143
|
+
* Returns a random item from a non-empty array.
|
|
144
|
+
* Throws (in development via `invariant`) if the input is not an array or is empty.
|
|
145
|
+
*/
|
|
111
146
|
export const sample = (xs: unknown[]): unknown => {
|
|
112
147
|
invariant(Array.isArray(xs), `input value is not an array: ${xs}`);
|
|
113
148
|
invariant(isFilledArray(xs), `input array is empty: ${xs}`);
|
|
@@ -117,7 +152,9 @@ export const sample = (xs: unknown[]): unknown => {
|
|
|
117
152
|
return xs[index];
|
|
118
153
|
};
|
|
119
154
|
|
|
155
|
+
/** Returns `true` when `xs` is non-empty and every value is truthy. */
|
|
120
156
|
export const allTruthy = (xs: boolean[]) =>
|
|
121
157
|
isFilledArray(xs) && xs.every(Boolean);
|
|
122
158
|
|
|
159
|
+
/** Returns `true` when at least one value in `xs` is truthy. */
|
|
123
160
|
export const anyTruthy = (xs: boolean[]) => xs.some(Boolean);
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { Text } from "react-native";
|
|
3
|
+
import { render, screen } from "@testing-library/react-native";
|
|
4
|
+
import { BottomSheetContext, useBottomSheet } from "../index";
|
|
5
|
+
|
|
6
|
+
const Probe = () => {
|
|
7
|
+
const ctx = useBottomSheet();
|
|
8
|
+
|
|
9
|
+
return <Text testID="probe">{ctx ? "has-context" : "no-context"}</Text>;
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
describe("useBottomSheet", () => {
|
|
13
|
+
it("returns null when no provider is present", () => {
|
|
14
|
+
render(<Probe />);
|
|
15
|
+
expect(screen.getByTestId("probe")).toHaveTextContent("no-context");
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it("returns the provided value inside a provider", () => {
|
|
19
|
+
const value = {
|
|
20
|
+
scrollRef: React.createRef<any>(),
|
|
21
|
+
masterDrawerRef: React.createRef<any>(),
|
|
22
|
+
setBodyDragEnabled: jest.fn(),
|
|
23
|
+
onDragGestureEvent: jest.fn(),
|
|
24
|
+
onDragStateChange: jest.fn(),
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
render(
|
|
28
|
+
<BottomSheetContext.Provider value={value}>
|
|
29
|
+
<Probe />
|
|
30
|
+
</BottomSheetContext.Provider>
|
|
31
|
+
);
|
|
32
|
+
|
|
33
|
+
expect(screen.getByTestId("probe")).toHaveTextContent("has-context");
|
|
34
|
+
});
|
|
35
|
+
});
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { createContext, useContext, RefObject } from "react";
|
|
2
|
+
|
|
3
|
+
export type BottomSheetContextValue = {
|
|
4
|
+
/** The sheet's master TapGestureHandler ref — the scrollable waits for it. */
|
|
5
|
+
masterDrawerRef: RefObject<any>;
|
|
6
|
+
/** Header drag-zone wiring: the sheet's pan gesture event handler. */
|
|
7
|
+
onDragGestureEvent: (...args: any[]) => void;
|
|
8
|
+
/** Header drag-zone wiring: the sheet's pan state-change handler. */
|
|
9
|
+
onDragStateChange: (event: { nativeEvent: any }) => void;
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
export const BottomSheetContext = createContext<BottomSheetContextValue | null>(
|
|
13
|
+
null
|
|
14
|
+
);
|
|
15
|
+
|
|
16
|
+
export const useBottomSheet = (): BottomSheetContextValue | null =>
|
|
17
|
+
useContext(BottomSheetContext);
|
|
@@ -157,6 +157,10 @@ function generateFieldsFromDefaultsWithoutPrefixedLabel(
|
|
|
157
157
|
|
|
158
158
|
if (conditions) {
|
|
159
159
|
generatedField.conditional_fields = conditions.map((condition) => {
|
|
160
|
+
if (condition.section === null) {
|
|
161
|
+
return { key: condition.key, condition_value: condition.value };
|
|
162
|
+
}
|
|
163
|
+
|
|
160
164
|
const section = condition.section ? `${condition.section}/` : "";
|
|
161
165
|
|
|
162
166
|
return {
|
|
@@ -164,6 +168,8 @@ function generateFieldsFromDefaultsWithoutPrefixedLabel(
|
|
|
164
168
|
condition_value: condition.value,
|
|
165
169
|
};
|
|
166
170
|
});
|
|
171
|
+
|
|
172
|
+
generatedField.rules = "all_conditions";
|
|
167
173
|
}
|
|
168
174
|
|
|
169
175
|
return generatedField;
|
|
@@ -781,21 +781,6 @@ function getPlayerConfiguration({ platform, version }) {
|
|
|
781
781
|
}
|
|
782
782
|
);
|
|
783
783
|
|
|
784
|
-
if (
|
|
785
|
-
platform.includes("android") ||
|
|
786
|
-
platform.includes("amazon") ||
|
|
787
|
-
platform.includes("ios") ||
|
|
788
|
-
platform.includes("tvos")
|
|
789
|
-
) {
|
|
790
|
-
general.fields.push({
|
|
791
|
-
key: "user_agent",
|
|
792
|
-
label: "User agent",
|
|
793
|
-
initial_value: "",
|
|
794
|
-
type: "text_input",
|
|
795
|
-
label_tooltip: "Override default user agent string",
|
|
796
|
-
});
|
|
797
|
-
}
|
|
798
|
-
|
|
799
784
|
if (platform === "android_for_quickbrick") {
|
|
800
785
|
general.fields.push({
|
|
801
786
|
key: "stop_playback_on_task_removal",
|
|
@@ -2415,6 +2400,21 @@ function getPlayerConfiguration({ platform, version }) {
|
|
|
2415
2400
|
);
|
|
2416
2401
|
}
|
|
2417
2402
|
|
|
2403
|
+
if (
|
|
2404
|
+
platform.includes("android") ||
|
|
2405
|
+
platform.includes("amazon") ||
|
|
2406
|
+
platform.includes("ios") ||
|
|
2407
|
+
platform.includes("tvos")
|
|
2408
|
+
) {
|
|
2409
|
+
general.fields.push({
|
|
2410
|
+
key: "user_agent",
|
|
2411
|
+
label: "User agent",
|
|
2412
|
+
initial_value: "",
|
|
2413
|
+
type: "text_input",
|
|
2414
|
+
label_tooltip: "Override default user agent string",
|
|
2415
|
+
});
|
|
2416
|
+
}
|
|
2417
|
+
|
|
2418
2418
|
compact([
|
|
2419
2419
|
{
|
|
2420
2420
|
key: "liveCatchUpEnabled",
|
|
@@ -3522,13 +3522,13 @@ function getPlayerConfiguration({ platform, version }) {
|
|
|
3522
3522
|
label: "Advanced Player Styles",
|
|
3523
3523
|
type: "text_input",
|
|
3524
3524
|
multiline: true,
|
|
3525
|
-
initial_value: `.vjs-text-track-cue {
|
|
3526
|
-
|
|
3527
|
-
top: 94% !important;
|
|
3525
|
+
initial_value: `.vjs-text-track-cue {
|
|
3526
|
+
top: auto !important;
|
|
3528
3527
|
bottom: 0 !important;
|
|
3529
3528
|
left: 0 !important;
|
|
3530
|
-
right:
|
|
3529
|
+
right: auto !important;
|
|
3531
3530
|
width: 100% !important;
|
|
3531
|
+
height: auto !important;
|
|
3532
3532
|
}`,
|
|
3533
3533
|
label_tooltip:
|
|
3534
3534
|
"This field allows you to inject custom CSS styles to override default player styles. The styles will be injected into the document head and can be used to customize the appearance of the player. Leave empty to use only default styles.",
|
|
@@ -1,9 +1,93 @@
|
|
|
1
1
|
const {
|
|
2
|
+
parseShorthand,
|
|
3
|
+
margin,
|
|
4
|
+
padding,
|
|
2
5
|
withConditional,
|
|
3
6
|
getConditionalKey,
|
|
4
7
|
createConditionalField,
|
|
5
8
|
} = require("..");
|
|
6
9
|
|
|
10
|
+
describe("parseShorthand", () => {
|
|
11
|
+
it("1 value → all four sides equal", () => {
|
|
12
|
+
expect(parseShorthand("8")).toEqual([8, 8, 8, 8]);
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
it("2 values → top/bottom, right/left", () => {
|
|
16
|
+
expect(parseShorthand("0 20")).toEqual([0, 20, 0, 20]);
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
it("3 values → top, right/left, bottom", () => {
|
|
20
|
+
expect(parseShorthand("0 0 20")).toEqual([0, 0, 20, 0]);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
it("4 values → top right bottom left", () => {
|
|
24
|
+
expect(parseShorthand("1 2 3 4")).toEqual([1, 2, 3, 4]);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it("throws on invalid count", () => {
|
|
28
|
+
expect(() => parseShorthand("1 2 3 4 5")).toThrow();
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
describe("margin", () => {
|
|
33
|
+
it("returns 4 field descriptors with correct suffixes", () => {
|
|
34
|
+
const fields = margin("margin", { mobile: "0" });
|
|
35
|
+
|
|
36
|
+
expect(fields.map((f) => f.suffix)).toEqual([
|
|
37
|
+
"margin top",
|
|
38
|
+
"margin right",
|
|
39
|
+
"margin bottom",
|
|
40
|
+
"margin left",
|
|
41
|
+
]);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it("sets type to number_input", () => {
|
|
45
|
+
margin("margin", { mobile: "0" }).forEach((f) => {
|
|
46
|
+
expect(f.type).toBe("number_input");
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it("expands shorthand per platform", () => {
|
|
51
|
+
const fields = margin("margin", { mobile: "0 0 20", tv: "0 0 90" });
|
|
52
|
+
const byKey = Object.fromEntries(fields.map((f) => [f.suffix, f]));
|
|
53
|
+
expect(byKey["margin top"].initialValue).toEqual({ mobile: 0, tv: 0 });
|
|
54
|
+
expect(byKey["margin bottom"].initialValue).toEqual({ mobile: 20, tv: 90 });
|
|
55
|
+
expect(byKey["margin left"].initialValue).toEqual({ mobile: 0, tv: 0 });
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it("supports a custom suffix prefix", () => {
|
|
59
|
+
const fields = margin("input margin", { mobile: "4" });
|
|
60
|
+
expect(fields[0].suffix).toBe("input margin top");
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
describe("padding", () => {
|
|
65
|
+
it("returns 4 field descriptors with correct suffixes", () => {
|
|
66
|
+
const fields = padding("padding", { mobile: "0" });
|
|
67
|
+
|
|
68
|
+
expect(fields.map((f) => f.suffix)).toEqual([
|
|
69
|
+
"padding top",
|
|
70
|
+
"padding right",
|
|
71
|
+
"padding bottom",
|
|
72
|
+
"padding left",
|
|
73
|
+
]);
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
it("expands 2-value shorthand symmetrically", () => {
|
|
77
|
+
const fields = padding("padding", { mobile: "0 20", tv: "0 124" });
|
|
78
|
+
const byKey = Object.fromEntries(fields.map((f) => [f.suffix, f]));
|
|
79
|
+
|
|
80
|
+
expect(byKey["padding right"].initialValue).toEqual({
|
|
81
|
+
mobile: 20,
|
|
82
|
+
tv: 124,
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
expect(byKey["padding left"].initialValue).toEqual({ mobile: 20, tv: 124 });
|
|
86
|
+
expect(byKey["padding top"].initialValue).toEqual({ mobile: 0, tv: 0 });
|
|
87
|
+
expect(byKey["padding bottom"].initialValue).toEqual({ mobile: 0, tv: 0 });
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
|
|
7
91
|
describe("manifestUtils/fieldUtils", () => {
|
|
8
92
|
it("appends conditions and adds all_conditions when there is more than one condition", () => {
|
|
9
93
|
const config = {
|
|
@@ -1,3 +1,121 @@
|
|
|
1
|
+
const { ZAPPIFEST_FIELDS } = require("../keys");
|
|
2
|
+
const { toCamelCase } = require("../_internals");
|
|
3
|
+
|
|
4
|
+
const SIDES = ["top", "right", "bottom", "left"];
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Parses a CSS margin/padding shorthand string into [top, right, bottom, left].
|
|
8
|
+
*
|
|
9
|
+
* 1 value → all four sides
|
|
10
|
+
* 2 values → top/bottom, right/left
|
|
11
|
+
* 3 values → top, right/left, bottom
|
|
12
|
+
* 4 values → top, right, bottom, left
|
|
13
|
+
*
|
|
14
|
+
* @param {string} str
|
|
15
|
+
* @returns {[number, number, number, number]}
|
|
16
|
+
*/
|
|
17
|
+
function parseShorthand(str) {
|
|
18
|
+
const parts = String(str).trim().split(/\s+/).map(Number);
|
|
19
|
+
|
|
20
|
+
switch (parts.length) {
|
|
21
|
+
case 1:
|
|
22
|
+
return [parts[0], parts[0], parts[0], parts[0]];
|
|
23
|
+
case 2:
|
|
24
|
+
return [parts[0], parts[1], parts[0], parts[1]];
|
|
25
|
+
case 3:
|
|
26
|
+
return [parts[0], parts[1], parts[2], parts[1]];
|
|
27
|
+
case 4:
|
|
28
|
+
return parts;
|
|
29
|
+
default:
|
|
30
|
+
throw new Error(
|
|
31
|
+
`Shorthand expects 1–4 space-separated values, got ${parts.length}: "${str}"`
|
|
32
|
+
);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function spacingFields(prefix, initialValues) {
|
|
37
|
+
const platforms = Object.keys(initialValues);
|
|
38
|
+
|
|
39
|
+
const parsed = Object.fromEntries(
|
|
40
|
+
platforms.map((p) => [p, parseShorthand(initialValues[p])])
|
|
41
|
+
);
|
|
42
|
+
|
|
43
|
+
return SIDES.map((side, i) => ({
|
|
44
|
+
suffix: `${prefix} ${side}`,
|
|
45
|
+
type: ZAPPIFEST_FIELDS.number_input,
|
|
46
|
+
initialValue: Object.fromEntries(platforms.map((p) => [p, parsed[p][i]])),
|
|
47
|
+
}));
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Generates four margin field descriptors (top/right/bottom/left) from a
|
|
52
|
+
* per-platform CSS shorthand string.
|
|
53
|
+
*
|
|
54
|
+
* @param {string} suffix - prefix word for generated field names, e.g. "margin"
|
|
55
|
+
* @param {Record<string, string>} initialValues - e.g. { mobile: "0 0 20", tv: "0 0 90" }
|
|
56
|
+
* @returns {object[]}
|
|
57
|
+
*/
|
|
58
|
+
function margin(suffix, initialValues) {
|
|
59
|
+
return spacingFields(suffix, initialValues);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Generates four padding field descriptors (top/right/bottom/left) from a
|
|
64
|
+
* per-platform CSS shorthand string.
|
|
65
|
+
*
|
|
66
|
+
* @param {string} suffix - prefix word for generated field names, e.g. "padding"
|
|
67
|
+
* @param {Record<string, string>} initialValues - e.g. { mobile: "0 20", tv: "0 124" }
|
|
68
|
+
* @returns {object[]}
|
|
69
|
+
*/
|
|
70
|
+
function padding(suffix, initialValues) {
|
|
71
|
+
return spacingFields(suffix, initialValues);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* Returns a flat camelCase defaults object for a spacing shorthand.
|
|
76
|
+
* e.g. marginDefaults("margin", "0 0 20") → { marginTop: 0, marginRight: 0, marginBottom: 20, marginLeft: 0 }
|
|
77
|
+
*
|
|
78
|
+
* @param {string} suffix - e.g. "margin" or "padding"
|
|
79
|
+
* @param {string} shorthand - CSS-like shorthand string
|
|
80
|
+
* @returns {Record<string, number>}
|
|
81
|
+
*/
|
|
82
|
+
function spacingDefaults(suffix, shorthand) {
|
|
83
|
+
const values = parseShorthand(shorthand);
|
|
84
|
+
|
|
85
|
+
return Object.fromEntries(
|
|
86
|
+
SIDES.map((side, i) => [toCamelCase(`${suffix} ${side}`), values[i]])
|
|
87
|
+
);
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
function marginDefaults(suffix, shorthand) {
|
|
91
|
+
return spacingDefaults(suffix, shorthand);
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function paddingDefaults(suffix, shorthand) {
|
|
95
|
+
return spacingDefaults(suffix, shorthand);
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Returns four field descriptors (top/right/bottom/left) with only suffix and type — no initialValue.
|
|
100
|
+
* Used when defaults are stored separately in the subgroup spec.
|
|
101
|
+
*
|
|
102
|
+
* @param {string} prefix - e.g. "margin" or "padding"
|
|
103
|
+
* @returns {object[]}
|
|
104
|
+
*/
|
|
105
|
+
function marginFields(prefix) {
|
|
106
|
+
return SIDES.map((side) => ({
|
|
107
|
+
suffix: `${prefix} ${side}`,
|
|
108
|
+
type: ZAPPIFEST_FIELDS.number_input,
|
|
109
|
+
}));
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function paddingFields(prefix) {
|
|
113
|
+
return SIDES.map((side) => ({
|
|
114
|
+
suffix: `${prefix} ${side}`,
|
|
115
|
+
type: ZAPPIFEST_FIELDS.number_input,
|
|
116
|
+
}));
|
|
117
|
+
}
|
|
118
|
+
|
|
1
119
|
/**
|
|
2
120
|
* Appends new conditional_fields from conditions array
|
|
3
121
|
* to config.conditional_fields
|
|
@@ -48,6 +166,13 @@ function createConditionalField(key, condition_value, category = "styles") {
|
|
|
48
166
|
}
|
|
49
167
|
|
|
50
168
|
module.exports = {
|
|
169
|
+
parseShorthand,
|
|
170
|
+
margin,
|
|
171
|
+
padding,
|
|
172
|
+
marginDefaults,
|
|
173
|
+
paddingDefaults,
|
|
174
|
+
marginFields,
|
|
175
|
+
paddingFields,
|
|
51
176
|
withConditional,
|
|
52
177
|
getConditionalKey,
|
|
53
178
|
createConditionalField,
|
package/manifestUtils/keys.js
CHANGED
|
@@ -43,6 +43,7 @@ const TV_PLATFORMS = [
|
|
|
43
43
|
"tvos_for_quickbrick",
|
|
44
44
|
"samsung_tv",
|
|
45
45
|
"lg_tv",
|
|
46
|
+
"vidaa",
|
|
46
47
|
"vizio",
|
|
47
48
|
];
|
|
48
49
|
|
|
@@ -630,6 +631,14 @@ const MOBILE_ACTION_BUTTON_FIELDS = [
|
|
|
630
631
|
type: ZAPPIFEST_FIELDS.number_input,
|
|
631
632
|
suffix: "margin left",
|
|
632
633
|
},
|
|
634
|
+
{
|
|
635
|
+
type: ZAPPIFEST_FIELDS.number_input,
|
|
636
|
+
suffix: "horizontal gutter",
|
|
637
|
+
},
|
|
638
|
+
{
|
|
639
|
+
type: ZAPPIFEST_FIELDS.number_input,
|
|
640
|
+
suffix: "vertical gutter",
|
|
641
|
+
},
|
|
633
642
|
];
|
|
634
643
|
|
|
635
644
|
const TV_MENU_LABEL_FIELDS = [
|
|
@@ -129,6 +129,22 @@ function mobileActionButton({ label, description, defaults, isFirstButton }) {
|
|
|
129
129
|
conditions.push(createConditionalField(labelEnabledKey, true));
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
+
const assetAlignmentKey = keyPrefixGenerator("asset_alignment");
|
|
133
|
+
|
|
134
|
+
// horizontal_gutter fields depends on [asset_alignment: left or asset_alignment: right]
|
|
135
|
+
if (isKeyHasSuffix("horizontal_gutter", key)) {
|
|
136
|
+
conditions.push(
|
|
137
|
+
createConditionalField(assetAlignmentKey, ["left", "right"])
|
|
138
|
+
);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
// vertical_gutter fields depends on [asset_alignment: above or asset_alignment: below]
|
|
142
|
+
if (isKeyHasSuffix("vertical_gutter", key)) {
|
|
143
|
+
conditions.push(
|
|
144
|
+
createConditionalField(assetAlignmentKey, ["above", "below"])
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
|
|
132
148
|
return withConditional(conditions)(field);
|
|
133
149
|
});
|
|
134
150
|
|
|
@@ -49,7 +49,9 @@ function mobileActionButtonsContainer({ label, description, defaults }) {
|
|
|
49
49
|
|
|
50
50
|
// over_image_position depends on [positionKey: over_image]
|
|
51
51
|
if (isKeyHasSuffix("over_image_position", key)) {
|
|
52
|
-
conditions.push(
|
|
52
|
+
conditions.push(
|
|
53
|
+
createConditionalField(positionKey, defaults.position[0])
|
|
54
|
+
);
|
|
53
55
|
}
|
|
54
56
|
|
|
55
57
|
// horizontal_gutter depends on [stackingKey: horizontal]
|
|
@@ -33,7 +33,7 @@ const DEFAULT_MOBILE_ACTION_BUTTON_SHARED_DEFAULTS = {
|
|
|
33
33
|
assetHeight: 24,
|
|
34
34
|
assetWidth: 24,
|
|
35
35
|
assetMarginTop: 0,
|
|
36
|
-
assetMarginRight:
|
|
36
|
+
assetMarginRight: 0,
|
|
37
37
|
assetMarginBottom: 0,
|
|
38
38
|
assetMarginLeft: 0,
|
|
39
39
|
labelEnabled: true,
|
|
@@ -50,6 +50,8 @@ const DEFAULT_MOBILE_ACTION_BUTTON_SHARED_DEFAULTS = {
|
|
|
50
50
|
marginRight: 0,
|
|
51
51
|
marginBottom: 0,
|
|
52
52
|
marginLeft: 0,
|
|
53
|
+
horizontalGutter: 8,
|
|
54
|
+
verticalGutter: 8,
|
|
53
55
|
};
|
|
54
56
|
|
|
55
57
|
const DEFAULT_MOBILE_ACTION_BUTTON_PRESETS = {
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { isMinusZero } from "..";
|
|
2
|
+
|
|
3
|
+
describe("isMinusZero", () => {
|
|
4
|
+
it("return true for minus zero", () => {
|
|
5
|
+
expect(isMinusZero(-0)).toBe(true);
|
|
6
|
+
});
|
|
7
|
+
|
|
8
|
+
it("return false for positive zero", () => {
|
|
9
|
+
expect(isMinusZero(0)).toBe(false);
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it("return false for non-zero numbers", () => {
|
|
13
|
+
const inputs = [-1, 1, 100, 0.1, -0.1, Infinity, -Infinity];
|
|
14
|
+
expect.assertions(inputs.length);
|
|
15
|
+
|
|
16
|
+
inputs.forEach((input) => {
|
|
17
|
+
expect(isMinusZero(input)).toBe(false);
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
});
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { isZero } from "..";
|
|
2
|
+
|
|
3
|
+
describe("isZero", () => {
|
|
4
|
+
it("return true for zero and minus zero", () => {
|
|
5
|
+
expect(isZero(0)).toBe(true);
|
|
6
|
+
expect(isZero(-0)).toBe(true);
|
|
7
|
+
});
|
|
8
|
+
|
|
9
|
+
it("return false for non-zero numbers", () => {
|
|
10
|
+
const inputs = [-1, 1, 100, 0.1, -0.1, Infinity, -Infinity, NaN];
|
|
11
|
+
expect.assertions(inputs.length);
|
|
12
|
+
|
|
13
|
+
inputs.forEach((input) => {
|
|
14
|
+
expect(isZero(input)).toBe(false);
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it("return false for non-number values", () => {
|
|
19
|
+
const inputs = ["0", "-0", null, undefined, "", {}, [], false, true];
|
|
20
|
+
|
|
21
|
+
expect.assertions(inputs.length);
|
|
22
|
+
|
|
23
|
+
inputs.forEach((input) => {
|
|
24
|
+
expect(isZero(input)).toBe(false);
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
});
|