@applicaster/quick-brick-core 16.0.0-alpha.4880104344 → 16.0.0-alpha.4934353272

package/App/ActionSetters/index.ts

@@ -4,8 +4,8 @@ import { allSettled } from "promise";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
 
 import * as React from "react";
-import { coreAppLogger } from "../logger";
-const logger = coreAppLogger.addSubsystem("AppLifeCycleManager");
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
+const logger = subsystemLogger("app/lifecycle", "AppLifeCycleManager");
 
 const debugActions = (actions) =>
   logger.debug({

package/App/ActionsProvider/ActionsProvider.tsx

@@ -3,6 +3,14 @@ import * as R from "ramda";
 
 import { ActionsContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ActionsContext";
 import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
+import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
+
+import { LegacyActionsRegistryAdapter } from "./LegacyActionsRegistryAdapter";
+
+const { log_debug } = createLogger({
+  subsystem: "core/actions",
+  category: "ActionRegistration",
+});
 
 type Props = {
   children: React.ReactNode;
@@ -36,19 +44,17 @@ const abstractIdentifier = (actionPlugins: Plugin[]): PluginsIdMap =>
  * Component returning children.
  * Can be used to create Component from children
  */
-const ChildrenWrapper = ({
-  children,
-}: {
-  children: React.ReactElement<any>;
-}) => {
-  return children;
+const ChildrenWrapper = ({ children }: { children: React.ReactNode }) => {
+  return <>{children}</>;
 };
 
 /**
  * It wraps children in multiple context providers
  * @param contexts - Array of React Context Providers
  */
-const contextComposer = (contexts: Plugin[]): React.ExoticComponent =>
+const contextComposer = (
+  contexts: Plugin[]
+): React.ComponentType<React.PropsWithChildren> =>
   R.compose(...contexts)(ChildrenWrapper);
 
 /**
@@ -69,6 +75,19 @@ export function ActionsProvider(props: Props) {
     [plugins]
   );
 
+  React.useEffect(() => {
+    const count = Object.keys(actionPlugins).length;
+
+    if (count > 0) {
+      log_debug(
+        `ActionsProvider: composed ${count} action plugin(s) into context`,
+        { identifiers: Object.keys(actionPlugins) }
+      );
+    } else {
+      log_debug("ActionsProvider: no action plugins to compose");
+    }
+  }, [actionPlugins]);
+
   const contextProviders = React.useMemo((): [Plugin] | [] => {
     try {
       const providers = R.compose(
@@ -88,7 +107,7 @@ export function ActionsProvider(props: Props) {
         ? contextComposer(contextProviders)
         : React.Fragment,
     []
-  );
+  ) as React.ComponentType<React.PropsWithChildren>;
 
   const contextValue = React.useMemo(
     () => ({ actions: actionPlugins }),
@@ -97,7 +116,10 @@ export function ActionsProvider(props: Props) {
 
   return (
     <ActionsContext.Provider value={contextValue}>
-      <Context>{children}</Context>
+      <Context>
+        <LegacyActionsRegistryAdapter actionPlugins={actionPlugins} />
+        {children}
+      </Context>
     </ActionsContext.Provider>
   );
 }

package/App/ActionsProvider/LegacyActionsRegistryAdapter.tsx

@@ -0,0 +1,123 @@
+import * as React from "react";
+import * as R from "ramda";
+
+import { uiActionsRegistry } from "@applicaster/zapp-react-native-utils/uiActionsRegistrator";
+import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
+
+const { log_debug, log_warning } = createLogger({
+  subsystem: "core/actions/legacy_registry",
+  category: "ActionRegistration",
+});
+
+type LegacyActionPlugin = Record<string, any> & {
+  identifier: string;
+  module: {
+    context?: React.Context<any>;
+    [key: string]: any;
+  };
+};
+
+/**
+ * Bridges a single legacy action plugin (one that exposes `module.context`)
+ * into the `uiActionsRegistry`.
+ *
+ * Reactivity note: legacy stateful actions rely on React Context re-renders to
+ * propagate their latest value to subscribed UI (via `useActions`). We keep
+ * that mechanism intact and only *mirror* the current value into the registry
+ * through a ref, so registry-based consumers always read the freshest value at
+ * call time without changing legacy reactivity.
+ */
+function LegacyActionBridge({ plugin }: { plugin: LegacyActionPlugin }) {
+  // `plugin.module.context` is stable for the lifetime of the plugin, so this
+  // single `useContext` call is safe and rules-of-hooks compliant.
+  const value = React.useContext(plugin.module.context as React.Context<any>);
+
+  const valueRef = React.useRef(value);
+  valueRef.current = value;
+
+  React.useEffect(() => {
+    if (value == null) {
+      log_warning(
+        `LegacyActionBridge: context value for "${plugin.identifier}" is null/undefined – skipping registration`,
+        { identifier: plugin.identifier }
+      );
+    } else {
+      log_debug(
+        `LegacyActionBridge: context value ready for "${plugin.identifier}", registering in UIActionsRegistry`,
+        { identifier: plugin.identifier }
+      );
+    }
+
+    const unregister = uiActionsRegistry.registerActionProvider(
+      plugin.identifier,
+      () =>
+        valueRef.current
+          ? [{ identifier: plugin.identifier, action: valueRef.current }]
+          : []
+    );
+
+    return () => {
+      log_debug(
+        `LegacyActionBridge: unmounting bridge for "${plugin.identifier}"`,
+        { identifier: plugin.identifier }
+      );
+
+      unregister();
+    };
+  }, [plugin.identifier]);
+
+  // Consumers resolve a snapshot of `value`; when the plugin publishes a new
+  // one (e.g. cast devices found), make them re-resolve so availability
+  // predicates are not read from a stale value. Registration already
+  // notifies, so the first render is skipped.
+  const isFirstValueRef = React.useRef(true);
+
+  React.useEffect(() => {
+    if (isFirstValueRef.current) {
+      isFirstValueRef.current = false;
+
+      return;
+    }
+
+    uiActionsRegistry.notifyProviderChanged(plugin.identifier);
+  }, [value, plugin.identifier]);
+
+  return null;
+}
+
+type Props = {
+  actionPlugins: Record<string, LegacyActionPlugin>;
+};
+
+/**
+ * Registers every legacy action plugin's live context value into the
+ * `uiActionsRegistry`. It must be rendered *inside* the composed context
+ * providers (see `ActionsProvider`) so that each plugin's context is populated.
+ *
+ * This is the compatibility layer that lets new, registry-based consumers read
+ * actions coming from old plugins that still export `contextProvider`/`context`.
+ */
+export function LegacyActionsRegistryAdapter({ actionPlugins }: Props) {
+  const bridgedPlugins = React.useMemo(
+    () =>
+      R.values(actionPlugins).filter(
+        (plugin) => plugin?.module?.context != null
+      ),
+    [actionPlugins]
+  );
+
+  log_debug(
+    `LegacyActionsRegistryAdapter: bridging ${bridgedPlugins.length} legacy action plugin(s)`,
+    { identifiers: bridgedPlugins.map((p) => p.identifier) }
+  );
+
+  return (
+    <>
+      {bridgedPlugins.map((plugin) => (
+        <LegacyActionBridge key={plugin.identifier} plugin={plugin} />
+      ))}
+    </>
+  );
+}
+
+LegacyActionsRegistryAdapter.displayName = "LegacyActionsRegistryAdapter";

package/App/ActionsProvider/__tests__/LegacyActionsRegistryAdapter.test.tsx

@@ -0,0 +1,64 @@
+import React from "react";
+import { render } from "@testing-library/react-native";
+import { uiActionsRegistry } from "@applicaster/zapp-react-native-utils/uiActionsRegistrator";
+import { LegacyActionsRegistryAdapter } from "../LegacyActionsRegistryAdapter";
+
+const CastContext = React.createContext<any>(null);
+
+const plugin = {
+  identifier: "cast-action-test",
+  module: { context: CastContext },
+};
+
+const renderWithValue = (value) => (
+  <CastContext.Provider value={value}>
+    <LegacyActionsRegistryAdapter actionPlugins={{ cast: plugin } as any} />
+  </CastContext.Provider>
+);
+
+describe("LegacyActionsRegistryAdapter", () => {
+  it("makes consumers re-resolve when the plugin publishes a new value", () => {
+    const noDevices = { isActionAvailable: () => false };
+    const devicesFound = { isActionAvailable: () => true };
+
+    const { rerender, unmount } = render(renderWithValue(noDevices));
+
+    // what a consumer resolved at first paint
+    expect(
+      uiActionsRegistry
+        .getAction("cast-action-test")
+        ?.isActionAvailable?.({} as any)
+    ).toBe(false);
+
+    const listener = jest.fn();
+    const unsubscribe = uiActionsRegistry.subscribe(listener);
+
+    rerender(renderWithValue(devicesFound));
+
+    expect(listener).toHaveBeenCalledTimes(1);
+
+    expect(
+      uiActionsRegistry
+        .getAction("cast-action-test")
+        ?.isActionAvailable?.({} as any)
+    ).toBe(true);
+
+    unsubscribe();
+    unmount();
+  });
+
+  it("does not notify again when the value is unchanged", () => {
+    const stable = { isActionAvailable: () => true };
+    const { rerender, unmount } = render(renderWithValue(stable));
+
+    const listener = jest.fn();
+    const unsubscribe = uiActionsRegistry.subscribe(listener);
+
+    rerender(renderWithValue(stable));
+
+    expect(listener).not.toHaveBeenCalled();
+
+    unsubscribe();
+    unmount();
+  });
+});

package/App/AssetCache/logger.ts

@@ -5,6 +5,6 @@ import { coreAppLogger } from "../logger";
 export const { log_verbose, log_debug, log_warning, log_info, log_error } =
   createLogger({
     category: "AssetCache",
-    subsystem: "quick-brick-core",
+    subsystem: "storage/asset_cache",
     parent: coreAppLogger,
   });

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/useOpenSchemeHandler.test.tsx

@@ -60,11 +60,21 @@ jest.spyOn(useNavigationHooks, "useNavigation").mockReturnValue(navigator);
 const helperSpy = jest.spyOn(helpers, "handlePresentNavigation");
 const feedLoaderSpy = jest.spyOn(feedLoader, "useFeedLoader");
 
-const setEntryContext = jest.fn();
-
-jest.doMock("@applicaster/zapp-react-native-ui-components/Contexts", () => ({
+const mockSetEntryContext = jest.fn();
+
+// `jest.mock` is hoisted above the imports, so the entry context is replaced
+// before anything can pull the real one in. `jest.doMock` is not hoisted, and
+// only worked here for as long as no import above happened to load this module
+// first - which any new import anywhere in the graph could silently undo,
+// leaving the hook writing to the real context while the spy stayed at zero
+// calls. The rest of the module is kept, since other consumers loaded by this
+// graph read other exports from it.
+jest.mock("@applicaster/zapp-react-native-ui-components/Contexts", () => ({
+  ...jest.requireActual(
+    "@applicaster/zapp-react-native-ui-components/Contexts"
+  ),
   ZappPipesEntryContext: {
-    useZappPipesContext: () => [{}, setEntryContext],
+    useZappPipesContext: () => [{}, mockSetEntryContext],
   },
 }));
 
@@ -76,7 +86,7 @@ jest.mock("../../../logger", () => ({
   log_debug: jest.fn(),
 }));
 
-// to use import instead of require it's required to use jest.mock above
+// Required after the mocks above, so the hook binds to them.
 const { useOpenSchemeHandler } = require("../useOpenSchemeHandler");
 
 const mockStoreObj = { rivers, contentTypes, pipesEndpoints, appData };
@@ -101,7 +111,7 @@ function clearMocks() {
   navigator.replace.mockClear();
   navigator.push.mockClear();
   navigator.goHome.mockClear();
-  setEntryContext.mockClear();
+  mockSetEntryContext.mockClear();
 }
 
 describe("useOpenSchemeHandler", () => {
@@ -215,7 +225,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           expect.objectContaining({
             ...params,
             extensions: { ...params, initial_player_state: "fullscreen" },
@@ -272,7 +282,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           expect.objectContaining({
             ...params,
             extensions: { ...params, initial_player_state: "fullscreen" },
@@ -331,7 +341,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           entryWithInitialPlayerState
         );
       };
@@ -361,7 +371,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           entryWithInitialPlayerState
         );
       };
@@ -391,7 +401,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           entryWithInitialPlayerState
         );
       };
@@ -421,7 +431,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           entryWithInitialPlayerState
         );
       };
@@ -451,7 +461,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           entryWithInitialPlayerState
         );
       };
@@ -485,7 +495,7 @@ describe("useOpenSchemeHandler", () => {
           })
         );
 
-        expect(setEntryContext).toHaveBeenCalledWith(
+        expect(mockSetEntryContext).toHaveBeenCalledWith(
           expect.objectContaining(entryWithInitialPlayerState)
         );
       };
@@ -514,7 +524,7 @@ describe("useOpenSchemeHandler", () => {
         );
 
         expect(navigator.goHome).toHaveBeenCalled();
-        expect(setEntryContext).not.toHaveBeenCalled();
+        expect(mockSetEntryContext).not.toHaveBeenCalled();
       };
 
       await testHook({

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/usePresentSchemeHandler.ts

@@ -28,6 +28,7 @@ import {
 
 import { log_error, log_info } from "../../logger";
 import { useRivers } from "@applicaster/zapp-react-native-utils/reactHooks/state";
+import { rememberLayoutPreview } from "../../../layoutPreview/persistence";
 
 const getFeed = (query) => ({
   content: { src: query.data_source },
@@ -155,6 +156,8 @@ export function usePresentSchemeHandler({
           rivers_configuration_id
         );
 
+        await rememberLayoutPreview(rivers_configuration_id);
+
         onFinish((done) => {
           actions?.setAppReady();
           navigator.replace(homeRiver);

package/App/DeepLinking/URLSchemeListener/URLSchemeContextProvider.tsx

@@ -3,6 +3,7 @@ import React, {
   createContext,
   useEffect,
   useCallback,
+  useMemo,
   ComponentType,
   ReactChild,
 } from "react";
@@ -196,9 +197,11 @@ function URLSchemeContextProvider(props: Props) {
     };
   }, []);
 
+  const contextValue = useMemo(() => ({ url: state, done }), [state, done]);
+
   return (
     <View style={fillStyles.container}>
-      <URLSchemeContext.Provider value={{ url: state, done }}>
+      <URLSchemeContext.Provider value={contextValue}>
         {props.children}
       </URLSchemeContext.Provider>
     </View>

package/App/DeepLinking/logger.ts

@@ -5,6 +5,6 @@ import { coreAppLogger } from "../logger";
 export const { log_verbose, log_debug, log_warning, log_info, log_error } =
   createLogger({
     category: "DeepLinking",
-    subsystem: "General",
+    subsystem: "app/deep_linking",
     parent: coreAppLogger,
   });

package/App/ErrorBoundary/index.tsx

@@ -1,13 +1,16 @@
 import * as React from "react";
 import pick from "lodash/pick";
 
-import { coreLogger } from "@applicaster/zapp-react-native-utils/logger";
+import { subsystemLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { ErrorScreen } from "@applicaster/zapp-react-native-ui-components/Components/ErrorScreen";
 
 import { useErrorStore } from "./store";
 import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
 
-const errorBoundaryLogger = coreLogger.addSubsystem("react_error-boundary");
+const errorBoundaryLogger = subsystemLogger(
+  "crash/error_boundary",
+  "ErrorBoundary"
+);
 
 type Props = {
   children: React.ReactNode;

package/App/ModalProvider/ModalBottomSheet/DraggableBottomSheet/__tests__/index.test.tsx

@@ -0,0 +1,88 @@
+import React from "react";
+import { View } from "react-native";
+import { render } from "@testing-library/react-native";
+import { State } from "react-native-gesture-handler";
+import { DraggableBottomSheet } from "../index";
+
+// Render the gesture handlers as passthrough Views so we can mount the sheet
+// and drive its release handler directly. State stays real (we need ACTIVE).
+jest.mock("react-native-gesture-handler", () => {
+  const RN = require("react-native");
+  const ReactActual = require("react");
+  const actual = jest.requireActual("react-native-gesture-handler");
+
+  const Passthrough = ReactActual.forwardRef(({ children }: any, _ref: any) => (
+    <RN.View>{children}</RN.View>
+  ));
+
+  return {
+    __esModule: true,
+    ...actual,
+    PanGestureHandler: Passthrough,
+    TapGestureHandler: Passthrough,
+  };
+});
+
+// height 800, sheetHeight 400, no header:
+//   SnapPoints.top = 800 - 400 = 400 (lastSnap after mount)
+//   SnapPoints.threshold = max(800 - 400 / 2, 100) = 600
+// Release dismisses when lastSnap + translationY + 0.05 * velocityY > 600,
+// i.e. once the drag+toss pushes past 200px.
+const mountSheet = () => {
+  const dismiss = jest.fn();
+  const ref = React.createRef<DraggableBottomSheet>();
+
+  render(
+    <DraggableBottomSheet
+      ref={ref}
+      header={() => null}
+      dismiss={dismiss}
+      visible={true}
+      sheetHeight={400}
+      width={320}
+      height={800}
+      hasHeader={false}
+      maxWidth={320}
+    >
+      <View testID="child" />
+    </DraggableBottomSheet>
+  );
+
+  return { instance: ref.current as DraggableBottomSheet, dismiss };
+};
+
+const release = (
+  instance: DraggableBottomSheet,
+  translationY: number,
+  velocityY = 0
+) =>
+  instance._onHandlerStateChange({
+    nativeEvent: { oldState: State.ACTIVE, translationY, velocityY },
+  });
+
+describe("DraggableBottomSheet release", () => {
+  // Mounting an open sheet schedules a deferred animateIn via setTimeout. Keep
+  // it on fake timers so it never fires into a torn-down Jest environment.
+  beforeEach(() => jest.useFakeTimers());
+
+  afterEach(() => {
+    jest.clearAllTimers();
+    jest.useRealTimers();
+  });
+
+  it("dismisses when the release lands past the threshold", () => {
+    const { instance, dismiss } = mountSheet();
+
+    release(instance, 300);
+
+    expect(dismiss).toHaveBeenCalledTimes(1);
+  });
+
+  it("springs back (does not dismiss) when the release is below the threshold", () => {
+    const { instance, dismiss } = mountSheet();
+
+    release(instance, 50);
+
+    expect(dismiss).not.toHaveBeenCalled();
+  });
+});