@applicaster/quick-brick-core 12.0.0-alpha.5471145113 → 12.0.0-alpha.5521005225

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 (4) hide show
  1. package/App/NavigationProvider/NavigationProvider.tsx +18 -6
  2. package/createZappApp/__tests__/__snapshots__/createZappApp.test.js.snap +0 -1
  3. package/createZappApp/index.tsx +9 -2
  4. package/package.json +8 -8
package/App/NavigationProvider/NavigationProvider.tsx CHANGED
@@ -414,9 +414,12 @@ export function NavigationProvider({ children }: Props) {
414
414
  }
415
415
  };
416
416
 
417
- const handleHookCancel = ({ hookPlugin }, dispose) => {
418
- if (hookPlugin?.lastHook) {
419
- dispose();
417
+ const handleHookCancel = ({ hookPlugin, callback }, dispose) => {
418
+ dispose();
419
+ setStartUpHooks(false);
420
+
421
+ if (callback && typeof callback === "function") {
422
+ callback();
420
423
  }
421
424
 
422
425
  if (hookPlugin.isModalHook()) {
@@ -482,7 +485,13 @@ export function NavigationProvider({ children }: Props) {
482
485
  return false;
483
486
  }, [pluginConfigurations, plugins, rivers]);
484
487
 
485
- const [startUpHooks, setStartUpHooks] = React.useState(checkStartUpHooks);
488
+ const [startUpHooks, _setStartUpHooks] = React.useState(checkStartUpHooks);
489
+ const currentStartUpHooks = React.useRef(checkStartUpHooks);
490
+
491
+ const setStartUpHooks = (value) => {
492
+ _setStartUpHooks(value);
493
+ currentStartUpHooks.current = value;
494
+ };
486
495
 
487
496
  const handleHookComplete =
488
497
  (navigationAction, targetRoute, { screen, options }) =>
@@ -490,7 +499,7 @@ export function NavigationProvider({ children }: Props) {
490
499
  if (hookPlugin?.lastHook) {
491
500
  dispose({ disposeAll: true });
492
501
 
493
- startUpHooks && setStartUpHooks(false);
502
+ startUpHooks.current && setStartUpHooks(false);
494
503
  }
495
504
 
496
505
  dispatch(
@@ -599,7 +608,10 @@ export function NavigationProvider({ children }: Props) {
599
608
  targetScreen: screen,
600
609
  rivers,
601
610
  plugins,
602
- startUpHooksData: { startUpHooks, setStartUpHooks },
611
+ startUpHooksData: {
612
+ startUpHooks: currentStartUpHooks.current,
613
+ setStartUpHooks,
614
+ },
603
615
  };
604
616
 
605
617
  HooksManager(hooksOptions)
package/createZappApp/__tests__/__snapshots__/createZappApp.test.js.snap CHANGED
@@ -20,7 +20,6 @@ Object {
20
20
  "isAvailable": null,
21
21
  "nextState": null,
22
22
  },
23
- "isTransitioning": false,
24
23
  },
25
24
  "cellStyles": Object {},
26
25
  "components": Object {
package/createZappApp/index.tsx CHANGED
@@ -7,6 +7,10 @@
7
7
  import * as React from "react";
8
8
  import * as R from "ramda";
9
9
  import { Dimensions } from "react-native";
10
+ import {
11
+ isNotEmpty,
12
+ isNotNil,
13
+ } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
10
14
 
11
15
  import {
12
16
  createZappReduxStore,
@@ -27,6 +31,9 @@ import { remoteDataLoader } from "../App/appRemoteDataLoader/remoteDataLoader";
27
31
  import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
28
32
  import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
29
33
 
34
+ const isNotEmptyObject = (value: unknown) =>
35
+ isNotNil(value) && R.is(Object, value) && isNotEmpty(value);
36
+
30
37
  /**
31
38
  * Creates a Zapp App with the provided options
32
39
  * @export
@@ -55,8 +62,8 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
55
62
 
56
63
  const useTabletLayout =
57
64
  isTablet({ width, height }, width > height ? "landscape" : "portrait") &&
58
- tabletLayout &&
59
- tabletCellStyles;
65
+ isNotEmptyObject(tabletLayout) &&
66
+ isNotEmptyObject(tabletCellStyles);
60
67
 
61
68
  function fetchPluginConfiguration(plugin) {
62
69
  const configuration = R.compose(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@applicaster/quick-brick-core",
3
- "version": "12.0.0-alpha.5471145113",
3
+ "version": "12.0.0-alpha.5521005225",
4
4
  "description": "Core package for Applicaster's Quick Brick App",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",
@@ -30,13 +30,13 @@
30
30
  },
31
31
  "homepage": "https://github.com/applicaster/quickbrick#readme",
32
32
  "dependencies": {
33
- "@applicaster/applicaster-types": "12.0.0-alpha.5471145113",
34
- "@applicaster/quick-brick-core-plugins": "12.0.0-alpha.5471145113",
35
- "@applicaster/zapp-pipes-v2-client": "12.0.0-alpha.5471145113",
36
- "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.5471145113",
37
- "@applicaster/zapp-react-native-redux": "12.0.0-alpha.5471145113",
38
- "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.5471145113",
39
- "@applicaster/zapp-react-native-utils": "12.0.0-alpha.5471145113",
33
+ "@applicaster/applicaster-types": "12.0.0-alpha.5521005225",
34
+ "@applicaster/quick-brick-core-plugins": "12.0.0-alpha.5521005225",
35
+ "@applicaster/zapp-pipes-v2-client": "12.0.0-alpha.5521005225",
36
+ "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.5521005225",
37
+ "@applicaster/zapp-react-native-redux": "12.0.0-alpha.5521005225",
38
+ "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.5521005225",
39
+ "@applicaster/zapp-react-native-utils": "12.0.0-alpha.5521005225",
40
40
  "atob": "^2.1.2",
41
41
  "axios": "^0.28.0",
42
42
  "btoa": "^1.2.1",