@applicaster/zapp-react-native-ui-components 16.0.0-alpha.2024822855 → 16.0.0-alpha.2105365027

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.
Files changed (95) hide show
  1. package/Components/Cell/Cell.tsx +3 -6
  2. package/Components/Cell/TvOSCellComponent.tsx +0 -1
  3. package/Components/FocusableList/index.tsx +7 -0
  4. package/Components/GeneralContentScreen/GeneralContentScreen.tsx +7 -0
  5. package/Components/GeneralContentScreen/GeneralContentScreenHookAdapter.tsx +15 -0
  6. package/Components/GeneralContentScreen/hookAdapter/__tests__/skipExpression.test.ts +294 -0
  7. package/Components/GeneralContentScreen/hookAdapter/__tests__/validationHelper.test.ts +64 -0
  8. package/Components/GeneralContentScreen/hookAdapter/skipExpression.ts +252 -0
  9. package/Components/GeneralContentScreen/hookAdapter/validationHelper.ts +18 -0
  10. package/Components/LinkHandler/LinkHandler.tsx +2 -7
  11. package/Components/MasterCell/DefaultComponents/ActionButton.tsx +5 -1
  12. package/Components/MasterCell/DefaultComponents/ActionButtonsCore/components/ActionButtonController.tsx +19 -4
  13. package/Components/MasterCell/DefaultComponents/ActionButtonsCore/components/__tests__/ActionButtonController.test.tsx +43 -1
  14. package/Components/MasterCell/DefaultComponents/Button.tsx +1 -0
  15. package/Components/MasterCell/DefaultComponents/LiveImage/executePreloadHooks.ts +2 -4
  16. package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +14 -6
  17. package/Components/MasterCell/DefaultComponents/Toggle.tsx +1 -8
  18. package/Components/MasterCell/DefaultComponents/__tests__/Toggle.test.tsx +10 -6
  19. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/ActionButton.tsx +1 -1
  20. package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/PressableView.test.tsx +4 -2
  21. package/Components/MasterCell/SharedUI/CollapsibleTextContainer/__tests__/factory.test.ts +32 -0
  22. package/Components/MasterCell/__tests__/masterCell.test.js +60 -0
  23. package/Components/MasterCell/index.tsx +60 -11
  24. package/Components/MasterCell/utils/__tests__/withoutFocusedState.test.js +20 -0
  25. package/Components/MasterCell/utils/index.ts +18 -0
  26. package/Components/ModalComponent/ActionsBottomSheet/ActionButton.tsx +56 -0
  27. package/Components/ModalComponent/ActionsBottomSheet/__tests__/openActionsBottomSheet.test.ts +38 -0
  28. package/Components/ModalComponent/ActionsBottomSheet/boundActionButton.tsx +24 -0
  29. package/Components/ModalComponent/ActionsBottomSheet/index.ts +9 -0
  30. package/Components/ModalComponent/ActionsBottomSheet/openActionsBottomSheet.ts +61 -0
  31. package/Components/ModalComponent/AudioPlayer/Components/Button.tsx +70 -73
  32. package/Components/ModalComponent/AudioPlayer/Components/Header.tsx +65 -56
  33. package/Components/ModalComponent/AudioPlayer/Components/Input.tsx +140 -65
  34. package/Components/ModalComponent/AudioPlayer/Components/Item.tsx +202 -48
  35. package/Components/ModalComponent/AudioPlayer/Components/NowPlayingHeaderSection.tsx +148 -32
  36. package/Components/ModalComponent/AudioPlayer/Components/__tests__/Item.test.tsx +164 -0
  37. package/Components/ModalComponent/AudioPlayer/Components/__tests__/NowPlayingHeaderSection.test.tsx +36 -0
  38. package/Components/ModalComponent/AudioPlayer/Components/index.ts +0 -2
  39. package/Components/ModalComponent/AudioPlayer/utils/__tests__/mergeStyles.test.ts +433 -0
  40. package/Components/ModalComponent/AudioPlayer/utils/mergeStyles.ts +389 -25
  41. package/Components/ModalComponent/BottomSheetModalContent.tsx +126 -77
  42. package/Components/ModalComponent/Header/CloseButton.tsx +12 -0
  43. package/Components/ModalComponent/Header/__tests__/CloseButton.test.tsx +72 -0
  44. package/Components/ModalComponent/SortableList.tsx +36 -22
  45. package/Components/ModalComponent/SortableList.web.tsx +2 -70
  46. package/Components/ModalComponent/TextInputContent.tsx +42 -7
  47. package/Components/ModalComponent/__tests__/BottomSheetModalContent.test.tsx +111 -6
  48. package/Components/ModalComponent/__tests__/SortableList.web.test.tsx +16 -0
  49. package/Components/ModalComponent/__tests__/TextInputContent.test.tsx +50 -1
  50. package/Components/ModalComponent/__tests__/showTextInput.test.ts +25 -0
  51. package/Components/ModalComponent/index.tsx +7 -9
  52. package/Components/ModalComponent/presets/__tests__/getCell.test.ts +24 -0
  53. package/Components/ModalComponent/presets/dynamicCollectionCell.tsx +1 -1
  54. package/Components/ModalComponent/presets/selectableCell.tsx +1 -1
  55. package/Components/ModalComponent/showTextInput.ts +13 -2
  56. package/Components/ModalComponent/utils.ts +6 -1
  57. package/Components/OfflineHandler/__tests__/index.test.tsx +109 -0
  58. package/Components/OfflineHandler/hooks.ts +0 -12
  59. package/Components/OfflineHandler/index.tsx +42 -4
  60. package/Components/PlayerContainer/PlayerContainer.tsx +8 -1
  61. package/Components/River/ComponentsMap/ComponentsMap.tsx +89 -60
  62. package/Components/River/River.tsx +4 -0
  63. package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +140 -75
  64. package/Components/River/__tests__/componentsMap.test.js +8 -3
  65. package/Components/River/__tests__/resultCallback.test.tsx +47 -0
  66. package/Components/Screen/__tests__/Screen.test.tsx +24 -0
  67. package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +2 -0
  68. package/Components/Screen/index.tsx +5 -0
  69. package/Components/Screen/navigationHandler.ts +8 -8
  70. package/Components/ScreenRevealManager/ScreenRevealManager.ts +18 -2
  71. package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +36 -0
  72. package/Components/ScreenRevealManager/__tests__/withScreenRevealManager.test.tsx +56 -0
  73. package/Components/ScreenRevealManager/withScreenRevealManager.tsx +21 -4
  74. package/Components/Transitioner/AnimationManager.js +1 -1
  75. package/Components/Transitioner/Scene.tsx +4 -3
  76. package/Components/Transitioner/Transitioner.tsx +71 -33
  77. package/Components/Transitioner/__tests__/transitioner.test.js +372 -3
  78. package/Components/VideoLive/LiveImageManager.ts +8 -2
  79. package/Components/VideoLive/__tests__/LiveImageManager.test.ts +59 -0
  80. package/Components/VideoModal/PlayerWrapper.tsx +4 -1
  81. package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +1 -0
  82. package/Components/VideoModal/__tests__/playerWrapperStyle.test.ts +58 -0
  83. package/Components/VideoModal/__tests__/playerWrapperUtils.test.ts +16 -0
  84. package/Components/VideoModal/playerWrapperStyle.ts +21 -3
  85. package/Components/VideoModal/playerWrapperUtils.ts +7 -1
  86. package/Contexts/ModalNavigationContext/__tests__/index.test.tsx +15 -0
  87. package/Contexts/ModalNavigationContext/index.tsx +2 -2
  88. package/Decorators/ZappPipesDataConnector/__tests__/screenToolbox.test.ts +347 -0
  89. package/Decorators/ZappPipesDataConnector/__tests__/screenToolboxUnavailable.test.ts +53 -0
  90. package/Decorators/ZappPipesDataConnector/index.tsx +19 -4
  91. package/Decorators/ZappPipesDataConnector/screenToolbox.ts +384 -0
  92. package/Hooks/useEntryActionsExpander.ts +63 -0
  93. package/assets/empty-Info.png +0 -0
  94. package/package.json +5 -5
  95. package/Components/ModalComponent/AudioPlayer/Components/Action.tsx +0 -314
@@ -3,10 +3,13 @@ import {
3
3
  ImageConfiguration as ItemImageConfiguration,
4
4
  LabelConfiguration as ItemLabelConfiguration,
5
5
  NowPlayingAssetConfiguration as ItemNowPlayingAssetConfiguration,
6
+ CheckboxAssetsConfiguration as ItemCheckboxAssetsConfiguration,
7
+ ActionButtonAssetsConfiguration as ItemActionButtonAssetsConfiguration,
6
8
  ItemConfiguration,
7
9
  } from "../Components/Item";
8
10
  import {
9
11
  TitleConfiguration as HeaderTitleConfiguration,
12
+ ActionButtonsStyleConfiguration as HeaderActionButtonsStyleConfiguration,
10
13
  HeaderConfiguration,
11
14
  } from "../Components/Header";
12
15
  import {
@@ -21,20 +24,27 @@ import {
21
24
 
22
25
  function mergeItemBackground(
23
26
  base: ItemBackgroundConfiguration,
24
- override?: Record<string, any>
27
+ defaultOverride?: Record<string, any>,
28
+ focusedOverride?: Record<string, any>
25
29
  ): ItemBackgroundConfiguration {
26
- if (!override) return base;
30
+ if (!defaultOverride && !focusedOverride) return base;
31
+
32
+ // Only take focused color from the focused/pressed bucket (or legacy
33
+ // mis-parsed focus* aliases). Never fall back to default background —
34
+ // that would overwrite base.focusedColor whenever Studio only sets default.
35
+ const focusedColor =
36
+ focusedOverride?.backgroundColor ??
37
+ defaultOverride?.focusColor ??
38
+ defaultOverride?.focusBackgroundColor;
27
39
 
28
40
  return {
29
41
  ...base,
30
- ...(override.backgroundColor
31
- ? { defaultColor: override.backgroundColor }
32
- : {}),
33
- ...(override.focusColor || override.backgroundColor
34
- ? { focusedColor: override.focusColor || override.backgroundColor }
42
+ ...(defaultOverride?.backgroundColor
43
+ ? { defaultColor: defaultOverride.backgroundColor }
35
44
  : {}),
36
- ...(override.borderRadius !== undefined
37
- ? { cornerRadius: override.borderRadius }
45
+ ...(focusedColor != null && focusedColor !== "" ? { focusedColor } : {}),
46
+ ...(defaultOverride?.borderRadius !== undefined
47
+ ? { cornerRadius: defaultOverride.borderRadius }
38
48
  : {}),
39
49
  };
40
50
  }
@@ -69,6 +79,36 @@ function mergeItemLabel(
69
79
  ...base,
70
80
  ...(override.fontColor ? { fontColor: override.fontColor } : {}),
71
81
  ...(override.fontSize !== undefined ? { fontSize: override.fontSize } : {}),
82
+ ...(override.lineHeight !== undefined
83
+ ? { lineHeight: override.lineHeight }
84
+ : {}),
85
+ ...(typeof override.fontFamily === "string" && override.fontFamily
86
+ ? {
87
+ iosFontFamily: override.fontFamily,
88
+ androidFontFamily: override.fontFamily,
89
+ }
90
+ : {}),
91
+ ...(override.iosFontFamily
92
+ ? { iosFontFamily: override.iosFontFamily }
93
+ : {}),
94
+ ...(override.androidFontFamily
95
+ ? { androidFontFamily: override.androidFontFamily }
96
+ : {}),
97
+ ...(override.letterSpacing !== undefined
98
+ ? {
99
+ iosLetterSpacing: override.letterSpacing,
100
+ androidLetterSpacing: override.letterSpacing,
101
+ }
102
+ : {}),
103
+ ...(override.iosLetterSpacing !== undefined
104
+ ? { iosLetterSpacing: override.iosLetterSpacing }
105
+ : {}),
106
+ ...(override.androidLetterSpacing !== undefined
107
+ ? { androidLetterSpacing: override.androidLetterSpacing }
108
+ : {}),
109
+ ...(override.textTransform
110
+ ? { textTransform: override.textTransform }
111
+ : {}),
72
112
  };
73
113
  }
74
114
 
@@ -84,13 +124,47 @@ function mergeItemNowPlayingAsset(
84
124
  };
85
125
  }
86
126
 
127
+ function mergeItemCheckboxAssets(
128
+ base: ItemCheckboxAssetsConfiguration,
129
+ override?: Record<string, any>
130
+ ): ItemCheckboxAssetsConfiguration {
131
+ if (!override) return base;
132
+
133
+ return {
134
+ ...base,
135
+ ...(override.asset ? { asset: override.asset } : {}),
136
+ ...(override.checkedAsset ? { checkedAsset: override.checkedAsset } : {}),
137
+ };
138
+ }
139
+
140
+ function mergeItemActionButtonAssets(
141
+ base: ItemActionButtonAssetsConfiguration,
142
+ override?: Record<string, any>
143
+ ): ItemActionButtonAssetsConfiguration {
144
+ if (!override) return base;
145
+
146
+ return {
147
+ ...base,
148
+ ...(override.removeAsset ? { removeAsset: override.removeAsset } : {}),
149
+ ...(override.dragAsset ? { dragAsset: override.dragAsset } : {}),
150
+ ...(override.playAsset ? { playAsset: override.playAsset } : {}),
151
+ ...(override.pauseAsset ? { pauseAsset: override.pauseAsset } : {}),
152
+ };
153
+ }
154
+
87
155
  export function mergeItemConfiguration(
88
156
  base: ItemConfiguration,
89
157
  itemBlock?: Record<string, any>
90
158
  ): ItemConfiguration {
91
159
  if (!itemBlock) return base;
92
160
 
93
- const bg = itemBlock.background?.default || itemBlock.background;
161
+ const bgDefault = itemBlock.background?.default || itemBlock.background;
162
+
163
+ const bgFocused =
164
+ itemBlock.background?.focused ||
165
+ itemBlock.background?.focus ||
166
+ itemBlock.background?.pressed;
167
+
94
168
  const img = itemBlock.image?.default || itemBlock.image;
95
169
  const label1 = itemBlock.textLabel1?.default || itemBlock.textLabel1;
96
170
  const label2 = itemBlock.textLabel2?.default || itemBlock.textLabel2;
@@ -101,14 +175,27 @@ export function mergeItemConfiguration(
101
175
  const npAsset =
102
176
  itemBlock.nowPlayingAsset?.default || itemBlock.nowPlayingAsset;
103
177
 
178
+ const checkbox = itemBlock.checkbox?.default || itemBlock.checkbox;
179
+
180
+ const actionButtons =
181
+ itemBlock.actionButtons?.default || itemBlock.actionButtons;
182
+
104
183
  return {
105
184
  ...base,
106
- background: mergeItemBackground(base.background, bg),
185
+ background: mergeItemBackground(base.background, bgDefault, bgFocused),
107
186
  image: mergeItemImage(base.image, img),
108
187
  textLabel1: mergeItemLabel(base.textLabel1, label1),
109
188
  textLabel2: mergeItemLabel(base.textLabel2, label2),
110
189
  nowPlayingLabel: mergeItemLabel(base.nowPlayingLabel, npLabel),
111
190
  nowPlayingAsset: mergeItemNowPlayingAsset(base.nowPlayingAsset, npAsset),
191
+ checkboxAssets: mergeItemCheckboxAssets(
192
+ base.checkboxAssets || {},
193
+ checkbox
194
+ ),
195
+ actionButtonAssets: mergeItemActionButtonAssets(
196
+ base.actionButtonAssets || {},
197
+ actionButtons
198
+ ),
112
199
  };
113
200
  }
114
201
 
@@ -126,6 +213,122 @@ function mergeHeaderTitle(
126
213
  ...base,
127
214
  ...(override.fontColor ? { fontColor: override.fontColor } : {}),
128
215
  ...(override.fontSize !== undefined ? { fontSize: override.fontSize } : {}),
216
+ ...(override.lineHeight !== undefined
217
+ ? { lineHeight: override.lineHeight }
218
+ : {}),
219
+ ...(typeof override.fontFamily === "string"
220
+ ? {
221
+ iosFontFamily: override.fontFamily,
222
+ androidFontFamily: override.fontFamily,
223
+ }
224
+ : {}),
225
+ ...(override.iosFontFamily
226
+ ? { iosFontFamily: override.iosFontFamily }
227
+ : {}),
228
+ ...(override.androidFontFamily
229
+ ? { androidFontFamily: override.androidFontFamily }
230
+ : {}),
231
+ ...(override.letterSpacing !== undefined
232
+ ? {
233
+ iosLetterSpacing: override.letterSpacing,
234
+ androidLetterSpacing: override.letterSpacing,
235
+ }
236
+ : {}),
237
+ ...(override.iosLetterSpacing !== undefined
238
+ ? { iosLetterSpacing: override.iosLetterSpacing }
239
+ : {}),
240
+ ...(override.androidLetterSpacing !== undefined
241
+ ? { androidLetterSpacing: override.androidLetterSpacing }
242
+ : {}),
243
+ ...(override.textTransform
244
+ ? { textTransform: override.textTransform }
245
+ : {}),
246
+ ...(override.alignment ? { alignment: override.alignment } : {}),
247
+ };
248
+ }
249
+
250
+ function mergeHeaderActionButtons(
251
+ base: HeaderActionButtonsStyleConfiguration,
252
+ defaultOverride?: Record<string, any>,
253
+ focusedOverride?: Record<string, any>
254
+ ): HeaderActionButtonsStyleConfiguration {
255
+ if (!defaultOverride && !focusedOverride) return base;
256
+
257
+ const focusedBackgroundColor =
258
+ focusedOverride?.backgroundColor ??
259
+ defaultOverride?.focusBackgroundColor ??
260
+ defaultOverride?.focusedBackgroundColor;
261
+
262
+ const focusedFontColor =
263
+ focusedOverride?.fontColor ??
264
+ defaultOverride?.focusFontColor ??
265
+ defaultOverride?.focusedFontColor;
266
+
267
+ return {
268
+ ...base,
269
+ ...(defaultOverride?.backgroundColor
270
+ ? { defaultBackgroundColor: defaultOverride.backgroundColor }
271
+ : {}),
272
+ ...(focusedBackgroundColor != null && focusedBackgroundColor !== ""
273
+ ? { focusedBackgroundColor }
274
+ : {}),
275
+ ...(defaultOverride?.fontColor
276
+ ? { fontColor: defaultOverride.fontColor }
277
+ : {}),
278
+ ...(focusedFontColor != null && focusedFontColor !== ""
279
+ ? { focusedFontColor }
280
+ : {}),
281
+ ...(defaultOverride?.fontSize !== undefined
282
+ ? { fontSize: defaultOverride.fontSize }
283
+ : {}),
284
+ ...(defaultOverride?.lineHeight !== undefined
285
+ ? { lineHeight: defaultOverride.lineHeight }
286
+ : {}),
287
+ ...(typeof defaultOverride?.fontFamily === "string"
288
+ ? {
289
+ iosFontFamily: defaultOverride.fontFamily,
290
+ androidFontFamily: defaultOverride.fontFamily,
291
+ }
292
+ : {}),
293
+ ...(defaultOverride?.iosFontFamily
294
+ ? { iosFontFamily: defaultOverride.iosFontFamily }
295
+ : {}),
296
+ ...(defaultOverride?.androidFontFamily
297
+ ? { androidFontFamily: defaultOverride.androidFontFamily }
298
+ : {}),
299
+ ...(defaultOverride?.letterSpacing !== undefined
300
+ ? {
301
+ iosLetterSpacing: defaultOverride.letterSpacing,
302
+ androidLetterSpacing: defaultOverride.letterSpacing,
303
+ }
304
+ : {}),
305
+ ...(defaultOverride?.iosLetterSpacing !== undefined
306
+ ? { iosLetterSpacing: defaultOverride.iosLetterSpacing }
307
+ : {}),
308
+ ...(defaultOverride?.androidLetterSpacing !== undefined
309
+ ? { androidLetterSpacing: defaultOverride.androidLetterSpacing }
310
+ : {}),
311
+ ...(defaultOverride?.textTransform
312
+ ? { textTransform: defaultOverride.textTransform }
313
+ : {}),
314
+ ...(defaultOverride?.borderRadius !== undefined
315
+ ? { cornerRadius: defaultOverride.borderRadius }
316
+ : {}),
317
+ ...(defaultOverride?.cornerRadius !== undefined
318
+ ? { cornerRadius: defaultOverride.cornerRadius }
319
+ : {}),
320
+ ...(defaultOverride?.paddingTop !== undefined
321
+ ? { paddingTop: defaultOverride.paddingTop }
322
+ : {}),
323
+ ...(defaultOverride?.paddingRight !== undefined
324
+ ? { paddingRight: defaultOverride.paddingRight }
325
+ : {}),
326
+ ...(defaultOverride?.paddingBottom !== undefined
327
+ ? { paddingBottom: defaultOverride.paddingBottom }
328
+ : {}),
329
+ ...(defaultOverride?.paddingLeft !== undefined
330
+ ? { paddingLeft: defaultOverride.paddingLeft }
331
+ : {}),
129
332
  };
130
333
  }
131
334
 
@@ -137,9 +340,39 @@ export function mergeHeaderConfiguration(
137
340
 
138
341
  const bgOverride = headerBlock.container?.default?.backgroundColor;
139
342
 
343
+ const actionButtonsDefault =
344
+ headerBlock.actionButtons?.default || headerBlock.actionButtons;
345
+
346
+ const actionButtonsFocused =
347
+ headerBlock.actionButtons?.focused || headerBlock.actionButtons?.focus;
348
+
349
+ // Parser shape is title.default.*; hydrate() returns a flat title object.
350
+ const titleDefault = headerBlock.title?.default;
351
+
352
+ const titleOverride =
353
+ titleDefault &&
354
+ (titleDefault.fontColor !== undefined ||
355
+ titleDefault.fontSize !== undefined ||
356
+ titleDefault.lineHeight !== undefined ||
357
+ titleDefault.fontFamily ||
358
+ titleDefault.iosFontFamily ||
359
+ titleDefault.androidFontFamily ||
360
+ titleDefault.letterSpacing !== undefined ||
361
+ titleDefault.iosLetterSpacing !== undefined ||
362
+ titleDefault.androidLetterSpacing !== undefined ||
363
+ titleDefault.textTransform ||
364
+ titleDefault.alignment)
365
+ ? titleDefault
366
+ : headerBlock.title;
367
+
140
368
  return {
141
369
  ...base,
142
- title: mergeHeaderTitle(base.title, headerBlock.title?.default),
370
+ title: mergeHeaderTitle(base.title, titleOverride),
371
+ actionButtons: mergeHeaderActionButtons(
372
+ base.actionButtons,
373
+ actionButtonsDefault,
374
+ actionButtonsFocused
375
+ ),
143
376
  ...(bgOverride ? { backgroundColor: bgOverride } : {}),
144
377
  };
145
378
  }
@@ -148,33 +381,146 @@ export function mergeHeaderConfiguration(
148
381
  // Button Merging Helpers
149
382
  // ---------------------------------------------------------------------------
150
383
 
384
+ function fontFamilyName(value: unknown): string | undefined {
385
+ if (typeof value === "string" && value.trim()) {
386
+ return value;
387
+ }
388
+
389
+ if (value && typeof value === "object") {
390
+ const family = (value as { fontFamily?: unknown }).fontFamily;
391
+
392
+ if (typeof family === "string" && family.trim()) {
393
+ return family;
394
+ }
395
+ }
396
+
397
+ return undefined;
398
+ }
399
+
151
400
  function mergeButtonBackground(
152
401
  base: ButtonBackgroundConfiguration,
153
- override?: Record<string, any>
402
+ defaultOverride?: Record<string, any>,
403
+ focusedOverride?: Record<string, any>
154
404
  ): ButtonBackgroundConfiguration {
155
- if (!override) return base;
405
+ if (!defaultOverride && !focusedOverride) return base;
406
+
407
+ // Same as mergeItemBackground: do not use default background as focusedColor.
408
+ const focusedColor =
409
+ focusedOverride?.backgroundColor ??
410
+ defaultOverride?.focusColor ??
411
+ defaultOverride?.focusBackgroundColor;
156
412
 
157
413
  return {
158
414
  ...base,
159
- ...(override.backgroundColor
160
- ? { defaultColor: override.backgroundColor }
415
+ ...(defaultOverride?.backgroundColor
416
+ ? { defaultColor: defaultOverride.backgroundColor }
161
417
  : {}),
162
- ...(override.borderRadius !== undefined
163
- ? { cornerRadius: override.borderRadius }
418
+ ...(defaultOverride?.inactiveColor
419
+ ? { inactiveColor: defaultOverride.inactiveColor }
420
+ : {}),
421
+ ...(focusedColor != null && focusedColor !== "" ? { focusedColor } : {}),
422
+ ...(defaultOverride?.borderRadius !== undefined
423
+ ? { cornerRadius: defaultOverride.borderRadius }
424
+ : {}),
425
+ ...(defaultOverride?.paddingTop !== undefined
426
+ ? { paddingTop: defaultOverride.paddingTop }
427
+ : {}),
428
+ ...(defaultOverride?.paddingRight !== undefined
429
+ ? { paddingRight: defaultOverride.paddingRight }
430
+ : {}),
431
+ ...(defaultOverride?.paddingBottom !== undefined
432
+ ? { paddingBottom: defaultOverride.paddingBottom }
433
+ : {}),
434
+ ...(defaultOverride?.paddingLeft !== undefined
435
+ ? { paddingLeft: defaultOverride.paddingLeft }
436
+ : {}),
437
+ ...(defaultOverride?.horizontalGutter !== undefined
438
+ ? { horizontalGutter: defaultOverride.horizontalGutter }
164
439
  : {}),
165
440
  };
166
441
  }
167
442
 
168
443
  function mergeButtonTitle(
169
444
  base: ButtonTitleConfiguration,
170
- override?: Record<string, any>
445
+ override?: Record<string, any>,
446
+ focusedOverride?: Record<string, any>
171
447
  ): ButtonTitleConfiguration {
172
- if (!override) return base;
448
+ if (!override && !focusedOverride) return base;
449
+
450
+ const fontFamily = fontFamilyName(override?.fontFamily);
451
+
452
+ const focusedFontColor =
453
+ focusedOverride?.fontColor || override?.focusedFontColor;
454
+
455
+ const inactiveFontColor = override?.inactiveFontColor;
173
456
 
174
457
  return {
175
458
  ...base,
176
- ...(override.fontColor ? { fontColor: override.fontColor } : {}),
177
- ...(override.fontSize !== undefined ? { fontSize: override.fontSize } : {}),
459
+ ...(override?.fontColor ? { fontColor: override.fontColor } : {}),
460
+ ...(focusedFontColor ? { focusedFontColor } : {}),
461
+ ...(inactiveFontColor ? { inactiveFontColor } : {}),
462
+ ...(override?.fontSize !== undefined
463
+ ? { fontSize: override.fontSize }
464
+ : {}),
465
+ ...(override?.lineHeight !== undefined
466
+ ? { lineHeight: override.lineHeight }
467
+ : {}),
468
+ ...(fontFamily
469
+ ? {
470
+ iosFontFamily: fontFamily,
471
+ androidFontFamily: fontFamily,
472
+ }
473
+ : {}),
474
+ ...(override?.iosFontFamily
475
+ ? { iosFontFamily: override.iosFontFamily }
476
+ : {}),
477
+ ...(override?.androidFontFamily
478
+ ? { androidFontFamily: override.androidFontFamily }
479
+ : {}),
480
+ ...(override?.letterSpacing !== undefined
481
+ ? {
482
+ iosLetterSpacing: override.letterSpacing,
483
+ androidLetterSpacing: override.letterSpacing,
484
+ }
485
+ : {}),
486
+ ...(override?.iosLetterSpacing !== undefined
487
+ ? { iosLetterSpacing: override.iosLetterSpacing }
488
+ : {}),
489
+ ...(override?.androidLetterSpacing !== undefined
490
+ ? { androidLetterSpacing: override.androidLetterSpacing }
491
+ : {}),
492
+ ...(override?.textTransform
493
+ ? { textTransform: override.textTransform }
494
+ : {}),
495
+ };
496
+ }
497
+
498
+ function mergeButtonIcons(
499
+ base: ButtonConfiguration["icons"],
500
+ iconsOverride?: Record<string, any>,
501
+ leadingOverride?: Record<string, any>
502
+ ): ButtonConfiguration["icons"] {
503
+ if (!iconsOverride && !leadingOverride) return base;
504
+
505
+ const iconsDefault = iconsOverride?.default || iconsOverride;
506
+ const leadingDefault = leadingOverride?.default || leadingOverride;
507
+
508
+ return {
509
+ ...base,
510
+ ...(iconsDefault?.width !== undefined ? { width: iconsDefault.width } : {}),
511
+ ...(iconsDefault?.height !== undefined
512
+ ? { height: iconsDefault.height }
513
+ : {}),
514
+ leadingIcon: {
515
+ ...base.leadingIcon,
516
+ ...(leadingDefault?.enabled !== undefined
517
+ ? { enabled: leadingDefault.enabled }
518
+ : {}),
519
+ ...(leadingDefault?.actionType
520
+ ? { actionType: leadingDefault.actionType }
521
+ : {}),
522
+ ...(leadingDefault?.asset ? { asset: leadingDefault.asset } : {}),
523
+ },
178
524
  };
179
525
  }
180
526
 
@@ -185,15 +531,33 @@ export function mergeButtonConfiguration(
185
531
  ): ButtonConfiguration {
186
532
  if (!buttonBlock && !actionBlock) return base;
187
533
 
188
- const bgOverride =
534
+ const bgDefault =
189
535
  buttonBlock?.background?.default || actionBlock?.background?.default;
190
536
 
537
+ const bgFocused =
538
+ buttonBlock?.background?.focused ||
539
+ buttonBlock?.background?.focus ||
540
+ actionBlock?.background?.focused ||
541
+ actionBlock?.background?.focus ||
542
+ buttonBlock?.background?.pressed ||
543
+ actionBlock?.background?.pressed;
544
+
191
545
  const titleOverride =
192
546
  buttonBlock?.title?.default || actionBlock?.title?.default;
193
547
 
548
+ const titleFocused =
549
+ buttonBlock?.title?.focused ||
550
+ buttonBlock?.title?.focus ||
551
+ actionBlock?.title?.focused ||
552
+ actionBlock?.title?.focus;
553
+
554
+ const iconsOverride = buttonBlock?.icons || actionBlock?.icons;
555
+ const leadingOverride = buttonBlock?.leadingIcon || actionBlock?.leadingIcon;
556
+
194
557
  return {
195
558
  ...base,
196
- background: mergeButtonBackground(base.background, bgOverride),
197
- title: mergeButtonTitle(base.title, titleOverride),
559
+ background: mergeButtonBackground(base.background, bgDefault, bgFocused),
560
+ title: mergeButtonTitle(base.title, titleOverride, titleFocused),
561
+ icons: mergeButtonIcons(base.icons, iconsOverride, leadingOverride),
198
562
  };
199
563
  }