@applicaster/quick-brick-core 15.1.0-rc.9 → 16.0.0-alpha.1833861900

package/App/DeepLinking/URLSchemeListener/index.tsx

@@ -3,16 +3,15 @@ import React, { useCallback, useContext } from "react";
 import { URLSchemeHandler } from "../URLSchemeHandler";
 import { URLSchemeContext } from "./URLSchemeContextProvider";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { useAppSelector } from "@applicaster/zapp-react-native-redux/hooks";
+import { selectAppReady } from "@applicaster/zapp-react-native-redux";
 
 export function URLSchemeListener({ children }: { children: React.ReactNode }) {
   const { url, done } = useContext(URLSchemeContext);
 
   const navigator = useNavigation();
 
-  const { appState } = usePickFromState(["appState"]);
-
-  const appReady = appState?.appReady;
+  const appReady = useAppSelector(selectAppReady);
 
   const onFinish = useCallback(
     (callback) => {

package/App/ErrorBoundary/__tests__/store.test.js

@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks";
+import { act, renderHook } from "@testing-library/react-native";
 import { useErrorStore } from "../store";
 
 describe("Error Store", () => {

package/App/NavigationProvider/Loader.tsx

@@ -2,8 +2,9 @@ import React from "react";
 import { View, StyleSheet } from "react-native";
 
 import { Spinner } from "@applicaster/zapp-react-native-ui-components/Components/Spinner";
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { useAppSelector } from "@applicaster/zapp-react-native-redux/hooks";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
+import { selectAppLaunched } from "@applicaster/zapp-react-native-redux";
 
 type Props = {
   children: React.ReactChild;
@@ -21,9 +22,7 @@ const styles = StyleSheet.create({
 });
 
 export function Loader({ children }: Props) {
-  const {
-    appState: { appLaunched },
-  } = usePickFromState(["appState"]);
+  const appLaunched = useAppSelector(selectAppLaunched);
 
   const { currentRoute } = useNavigation();
 

package/App/NavigationProvider/NavigationProvider.tsx

@@ -13,10 +13,6 @@ import {
   useGetScreenOrientation,
 } from "@applicaster/zapp-react-native-utils/appUtils/orientationHelper";
 import { focusManager } from "@applicaster/zapp-react-native-utils/focusManager/FocusManager";
-import {
-  useContentTypes,
-  usePickFromState,
-} from "@applicaster/zapp-react-native-redux/hooks";
 
 import reducer, {
   ACTIONS,
@@ -44,6 +40,7 @@ import {
   activeRiverSelector,
   homeRiverSelector,
   lastEntrySelector,
+  startUpHookPluginIdentifiersSelector,
 } from "./navigator/selectors";
 
 import { coreAppLogger } from "../logger";
@@ -79,6 +76,16 @@ import { Hook } from "@applicaster/zapp-react-native-utils/appUtils/HooksManager
 import { URLSchemeContext } from "../DeepLinking/URLSchemeListener/URLSchemeContextProvider";
 
 import { loadingOverlayManager } from "../LoadingOverlay";
+import {
+  selectAppLaunched,
+  useAppSelector,
+  useContentTypes,
+  usePlugins,
+} from "@applicaster/zapp-react-native-redux";
+import {
+  useLayoutVersion,
+  useRivers,
+} from "@applicaster/zapp-react-native-utils/reactHooks";
 
 const logger = coreAppLogger.addSubsystem("Navigator");
 
@@ -100,22 +107,11 @@ const platform = getPlatform();
 export function NavigationProvider({ children }: Props) {
   const { url: deepLinkURL } = React.useContext(URLSchemeContext);
 
-  const {
-    appData: { layoutVersion },
-    rivers,
-    plugins,
-    pluginConfigurations,
-    appState: { appLaunched },
-  } = usePickFromState([
-    "appData",
-    "rivers",
-    "plugins",
-    "pluginConfigurations",
-    "appState",
-    "contentTypes",
-  ]);
-
+  const appLaunched = useAppSelector(selectAppLaunched);
+  const layoutVersion = useLayoutVersion();
+  const rivers = useRivers();
   const contentTypes = useContentTypes();
+  const plugins = usePlugins();
 
   const [state, dispatch] = React.useReducer<
     NavigationReducer,
@@ -227,6 +223,7 @@ export function NavigationProvider({ children }: Props) {
   };
 
   const isVideoModalDocked = () =>
+    state?.options.videoModal.visible &&
     state?.options.videoModal.mode === "MINIMIZED";
 
   // TODO: Remove as it's using a concept of "current" route.
@@ -485,21 +482,11 @@ export function NavigationProvider({ children }: Props) {
     openLoadingOverlay();
   };
 
-  const checkStartUpHooks = React.useMemo(() => {
-    if (!pluginConfigurations) return false;
-
-    const startUpHooksIdentifiers = R.compose(
-      R.map((item) => item.plugin.identifier),
-      R.filter(
-        R.allPass([
-          R.pathEq(["plugin", "api", "require_startup_execution"], true),
-          R.pathEq(["plugin", "react_native"], true),
-          R.pathEq(["plugin", "preload"], true),
-        ])
-      ),
-      R.values
-    )(pluginConfigurations);
+  const startUpHooksIdentifiers = useAppSelector(
+    startUpHookPluginIdentifiersSelector
+  );
 
+  const checkStartUpHooks = React.useMemo(() => {
     if (startUpHooksIdentifiers?.length) {
       const startUpHooks = R.filter(
         (plugin) => R.includes(plugin.identifier, startUpHooksIdentifiers),
@@ -531,7 +518,7 @@ export function NavigationProvider({ children }: Props) {
     }
 
     return false;
-  }, [pluginConfigurations, plugins, rivers]);
+  }, [startUpHooksIdentifiers, plugins, rivers]);
 
   const [startUpHooks, _setStartUpHooks] = React.useState(checkStartUpHooks);
   const currentStartUpHooks = React.useRef(checkStartUpHooks);
@@ -734,7 +721,7 @@ export function NavigationProvider({ children }: Props) {
       activeRiver,
       getPathname: () => pathnameRef.current, // hack use to fix issue causing broken navigation as currentRoute is unreliable
       currentRoute: pathname, // TODO: remove. Current route shouldn't be needed
-      previousAction: lastEntrySelector(state)
+      previousAction: (lastEntrySelector(state) as any)
         ?.action as QuickBrickNavigationActionType,
       push: pushItem,
       replace: replaceItem,

package/App/NavigationProvider/ScreenHooks/usePluginScreenHooks.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as R from "ramda";
 
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { usePlugins } from "@applicaster/zapp-react-native-redux";
 
 enum ReactHooks {
   useEffect = "useEffect",
@@ -39,7 +39,7 @@ function invokeScreenHook(hooksWrappers) {
 }
 
 export function usePluginScreenHooks(pathname: string) {
-  const { plugins } = usePickFromState(["plugins"]);
+  const plugins = usePlugins();
 
   const hooks = React.useMemo(
     () => R.filter(hasScreenHook, plugins) || [],