@applicaster/zapp-react-native-ui-components 16.0.0-alpha.9235607812 → 16.0.0-alpha.9338540010

package/Components/ModalComponent/BottomSheetModalContent.tsx

@@ -90,6 +90,7 @@ type ModalComponentProps = {
   /** Optional body that replaces the items list (header stays DefaultModalHeader). */
   contentComponent?: React.ComponentType<any>;
   contentComponentProps?: Record<string, any>;
+  themePluginId?: string;
   styleOverrides?: ModalBlocksConfig | Record<string, any>;
   measurementPhase?: boolean;
   /** Copy under Next Up when the queue has no upcoming items. */
@@ -115,7 +116,7 @@ function _BottomSheetModalContent(props: ModalComponentProps) {
     iconPlacement,
     contentComponent: ContentComponent,
     contentComponentProps = {},
-    styleOverrides: propStyleOverrides,
+    themePluginId: themePluginIdProp,
     measurementPhase = false,
     emptyMessage,
   } = props;
@@ -140,12 +141,14 @@ function _BottomSheetModalContent(props: ModalComponentProps) {
     role,
     behavior,
     editableCollection,
-    themePluginId,
+    themePluginId: themePluginIdFromSheet,
   } = useBottomSheetContent({
     onPress,
     viewModel,
   });
 
+  const themePluginId = themePluginIdFromSheet || themePluginIdProp;
+
   const plugins = usePlugins();
 
   const plugin = useMemo(
@@ -157,78 +160,10 @@ function _BottomSheetModalContent(props: ModalComponentProps) {
     const configuration =
       plugin?.configuration || (plugin as any)?.configuration_json;
 
-    const parsed =
-      configuration && themePluginId
-        ? parseModalBlocksConfiguration(configuration, themePluginId)
-        : null;
-
-    if (!propStyleOverrides) {
-      return parsed;
-    }
-
-    // hydrate(QueueStyles) only emits sectionHeader after the plugin class
-    // includes it. Until then, Studio/local keys in configuration_json still
-    // apply via the parser.
-    const hydratedSection = propStyleOverrides.sectionHeader;
-
-    const hasTitleStyle = (style?: Record<string, any>) =>
-      Boolean(
-        style &&
-          (style.fontColor ||
-            style.fontSize !== undefined ||
-            style.lineHeight !== undefined ||
-            style.fontFamily ||
-            style.iosFontFamily ||
-            style.androidFontFamily ||
-            style.letterSpacing !== undefined ||
-            style.iosLetterSpacing !== undefined ||
-            style.androidLetterSpacing !== undefined ||
-            style.textTransform ||
-            style.alignment)
-      );
-
-    const hasActionStyle = (style?: Record<string, any>) =>
-      Boolean(
-        style &&
-          (style.backgroundColor ||
-            style.fontColor ||
-            style.fontSize !== undefined ||
-            style.lineHeight !== undefined ||
-            style.fontFamily ||
-            style.iosFontFamily ||
-            style.androidFontFamily ||
-            style.letterSpacing !== undefined ||
-            style.iosLetterSpacing !== undefined ||
-            style.androidLetterSpacing !== undefined ||
-            style.textTransform ||
-            style.borderRadius !== undefined ||
-            style.cornerRadius !== undefined ||
-            style.paddingTop !== undefined ||
-            style.paddingRight !== undefined ||
-            style.paddingBottom !== undefined ||
-            style.paddingLeft !== undefined)
-      );
-
-    const actionNode = hydratedSection?.actionButtons;
-
-    // An empty `default: {}` is truthy and would hide fields set on the flat
-    // object or on the focused bucket.
-    const hasHydratedSection =
-      hasTitleStyle(hydratedSection?.title?.default) ||
-      hasTitleStyle(hydratedSection?.title) ||
-      hasActionStyle(actionNode?.default) ||
-      hasActionStyle(actionNode?.focused) ||
-      hasActionStyle(actionNode?.focus) ||
-      hasActionStyle(actionNode);
-
-    return {
-      ...parsed,
-      ...propStyleOverrides,
-      sectionHeader: hasHydratedSection
-        ? hydratedSection
-        : parsed?.sectionHeader,
-    };
-  }, [propStyleOverrides, plugin, themePluginId]);
+    return configuration && themePluginId
+      ? parseModalBlocksConfiguration(configuration, themePluginId)
+      : null;
+  }, [plugin, themePluginId]);
 
   const pluginLocalizations = useLocalizedStrings({
     localizations:

package/Components/ModalComponent/__tests__/showTextInput.test.ts

@@ -92,4 +92,29 @@ describe("showTextInputAction", () => {
     expect(result).toBe(ActionResult.Error);
     expect(actionExecutor.handleAction).not.toHaveBeenCalled();
   });
+
+  it("forwards themePluginId so the sheet can read plugin button styles", async () => {
+    const action = {
+      type: "showTextInput",
+      options: {
+        headerTitle: "Create New Playlist",
+        inputLabel: "Name your playlist",
+        buttonLabel: "Create",
+        themePluginId: "playlist-experience",
+        actions: [{ type: "sendCloudEvent", options: {} }],
+      },
+    };
+
+    await showTextInputAction(action as any);
+
+    expect(actionExecutor.handleAction).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: "openBottomSheet",
+        options: expect.objectContaining({
+          themePluginId: "playlist-experience",
+        }),
+      }),
+      undefined
+    );
+  });
 });

package/Components/ModalComponent/showTextInput.ts

@@ -21,6 +21,7 @@ export async function showTextInputAction(
     validationLabel,
     actions,
     maxLength,
+    themePluginId,
   } = action.options || {};
 
   if (!headerTitle || !buttonLabel || !actions || !actions.length) {
@@ -34,6 +35,7 @@ export async function showTextInputAction(
         header: {
           title: headerTitle,
         },
+        ...(themePluginId ? { themePluginId } : {}),
         content: {
           component: TextInputContent,
           props: {

package/Components/River/ComponentsMap/ComponentsMap.tsx

@@ -118,7 +118,10 @@ function ComponentsMapComponent(props: Props) {
       };
 
       return (
-        <ScreenLoadingMeasurementsListItemWrapper index={index}>
+        <ScreenLoadingMeasurementsListItemWrapper
+          index={index}
+          testID={`component-${item.id}`}
+        >
           <RiverItem {...riverItemProps} />
         </ScreenLoadingMeasurementsListItemWrapper>
       );

package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap

@@ -213,6 +213,7 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           <View
             onLayout={[Function]}
             style={{}}
+            testID="component-A1"
           >
             <View />
           </View>
@@ -225,6 +226,7 @@ exports[`componentsMap renders renders components map correctly 1`] = `
           <View
             onLayout={[Function]}
             style={{}}
+            testID="component-A2"
           />
         </View>
         <View

package/Components/Transitioner/AnimationManager.js

@@ -66,7 +66,7 @@ export class AnimationManager {
    *
    * @param {object} to contains style to animate and scenes index
    * @param {string} action push|back
-   * @param {number} stepsBack number of steps back
+   * @param {number} [stepsBack] number of steps back, used by the back action only
    */
   stateForAction({ to, scenes }, action, stepsBack) {
     let rootIndex = to.index;

package/Components/Transitioner/Scene.tsx

@@ -17,13 +17,14 @@ const fullWidthDimensions = {
 type Props = {
   children: any;
   style: any;
-  pointerEvents: ViewProps["pointerEvents"];
-  overlayStyle: ViewStyle;
-  animating: boolean;
+  pointerEvents?: ViewProps["pointerEvents"];
+  overlayStyle?: ViewStyle;
+  animating?: boolean;
   contentStyle: ViewStyle;
   pathname: string;
   isActive: boolean;
   screenData: NavigationScreenData;
+  screenUniqueId?: string;
 };
 
 export function CurrentScreenContextProvider({

package/Components/Transitioner/Transitioner.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View } from "react-native";
-import { append, compose, identity, tail, take, update } from "ramda";
+import { append, compose, identity, tail, update } from "ramda";
 
 import { AnimationManager } from "./AnimationManager";
 import { Scene } from "./Scene";
@@ -18,11 +18,23 @@ export const NAV_ACTION_REPLACE = "REPLACE";
 
 export const NAV_ACTION_BACK = "POP";
 
-type SceneProps = {
-  children: React.ReactNode;
-  overlayStyle: any;
-  style: any;
-  animating: boolean;
+const RIVER_SEGMENT_REGEX = /river\//g;
+
+// Number of "river/" segments in the route, i.e. its depth in the navigation stack
+function countRiverSegments(route?: string): number {
+  return (route?.match(RIVER_SEGMENT_REGEX) || []).length;
+}
+
+// The screen element rendered for the current route
+type SceneChild = React.ReactElement<{
+  pathname: string;
+  screenData: NavigationScreenData;
+}>;
+
+type TransitionerScene = {
+  children: SceneChild;
+  key: string;
+  screenUniqueId: string;
 };
 
 /**
@@ -31,7 +43,7 @@ type SceneProps = {
  * @param {Object} children
  * @returns { children: Object, key: string }
  */
-function prepareScene(children) {
+function prepareScene(children: SceneChild): TransitionerScene {
   return {
     children,
     key: children.props.pathname,
@@ -45,7 +57,10 @@ function prepareScene(children) {
  * @param {any} props Component's props
  * @param {any} state Component's state
  */
-function scenesForBackTransition(props: SceneProps, { scenes }) {
+function scenesForBackTransition(
+  props: Pick<Props, "children">,
+  { scenes }: Pick<State, "scenes">
+): TransitionerScene[] {
   return scenes.length > 1
     ? identity(scenes)
     : [prepareScene(props.children), scenes[0]];
@@ -53,7 +68,8 @@ function scenesForBackTransition(props: SceneProps, { scenes }) {
 
 type Props = {
   transitionConfig: any;
-  children: React.ReactNode;
+  isRTL?: boolean;
+  children: SceneChild;
   navigator: {
     previousAction: string;
     currentRoute: string;
@@ -78,13 +94,12 @@ type Props = {
 };
 
 type State = {
-  animatedValue: any;
   animating: boolean;
   duration: number;
   easing: any;
   from: any;
   to: any;
-  scenes: any;
+  scenes: TransitionerScene[];
 };
 
 const styles = {
@@ -92,11 +107,18 @@ const styles = {
 } as const;
 
 export class TransitionerComponent extends React.PureComponent<Props, State> {
+  private animationManager: AnimationManager;
+
+  private transitionId: number;
+
   constructor(props: Props) {
     super(props);
 
     this.animationManager = new AnimationManager(props);
 
+    // Bumped by every animated transition; end callbacks of older ones are ignored
+    this.transitionId = 0;
+
     this.state = {
       scenes: [prepareScene(props.children)], // starting with index: 0
       ...this.animationManager.initialState(),
@@ -113,28 +135,36 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
    * and trigger push animation with callbacks.
    */
   pushTransitionStart() {
+    const transitionId = ++this.transitionId;
+
     this.setState(
       {
-        scenes: append(prepareScene(this.props.children), this.state.scenes),
+        // Append right after the visible scene: stateForAction(PUSH) animates to.index + 1
+        scenes: [
+          ...this.state.scenes.slice(0, this.state.to.index + 1),
+          prepareScene(this.props.children),
+        ],
         ...this.animationManager.stateForAction(this.state, NAV_ACTION_PUSH),
       },
       () => {
-        this.animationManager.animate(this.state, this.pushTransitionEnd);
+        this.animationManager.animate(this.state, () =>
+          this.pushTransitionEnd(transitionId)
+        );
       }
     );
   }
 
   /**
    * Trigger back animation.
-   * The last scene in the array is removed in the "backTransitionEnd" callback,
+   * The scenes after the target one are removed in the "backTransitionEnd" callback,
    * only after the animation is complete.
    */
   backTransitionStart(previousRoute: string) {
+    const transitionId = ++this.transitionId;
     const currentRoute = this.props.navigator?.currentRoute;
 
     const diffLengthRoutes =
-      (previousRoute?.match(/river\//g) || []).length -
-      (currentRoute?.match(/river\//g) || []).length;
+      countRiverSegments(previousRoute) - countRiverSegments(currentRoute);
 
     const stepsBack =
       diffLengthRoutes && diffLengthRoutes > 0 ? diffLengthRoutes : 1;
@@ -150,30 +180,32 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
       },
       () => {
         this.animationManager.animate(this.state, () =>
-          this.backTransitionEnd(stepsBack)
+          this.backTransitionEnd(transitionId)
         );
       }
     );
   }
 
-  shouldSkipAnimationForRoute(route) {
+  shouldSkipAnimationForRoute(route: string) {
     // We are skipping animations for some routes, likes hooks & the player mainly
 
     return route.includes("/playable") || route.includes("/hook");
   }
 
-  shouldResetStateForRoute(route) {
+  shouldResetStateForRoute(route: string) {
     // We are resetting the transitioner state for root routes
 
-    return (route?.match(/river\//g) || []).length === 1;
+    return countRiverSegments(route) === 1;
   }
 
-  transitionWithoutAnimation(resetState) {
-    const { scenes } = this.state;
+  transitionWithoutAnimation(resetState?: boolean) {
+    // Scenes after the visible one are only leaving (back animation in flight),
+    // so the new scene replaces the one being backed to
+    const scenes = this.state.scenes.slice(0, this.state.to.index + 1);
     const newScene = prepareScene(this.props.children);
     const isLastSceneHook = scenes[scenes.length - 1].key.startsWith("/hook");
 
-    let newState;
+    let newState: Pick<State, "scenes"> | Pick<State, "scenes" | "to">;
 
     if (resetState) {
       newState = {
@@ -263,20 +295,27 @@ export class TransitionerComponent extends React.PureComponent<Props, State> {
     }
   }
 
-  // Sets state.animating to false
-  pushTransitionEnd() {
+  // Sets state.animating to false,
+  // unless a newer transition has started since this one
+  pushTransitionEnd(transitionId: number) {
+    if (transitionId !== this.transitionId) return;
+
     this.setState({
       animating: false,
     });
   }
 
   // Sets state.animating to false
-  // and remove last scene from scenes stack
-  backTransitionEnd(stepsBack) {
-    this.setState({
+  // and drops every scene after the target one. Reads the latest state,
+  // so it's correct however many backs were merged into this animation.
+  // Ignored if a newer transition has started since this one
+  backTransitionEnd(transitionId: number) {
+    if (transitionId !== this.transitionId) return;
+
+    this.setState(({ scenes, to }) => ({
       animating: false,
-      scenes: take(this.state.scenes.length - stepsBack, this.state.scenes),
-    });
+      scenes: scenes.slice(0, to.index + 1),
+    }));
   }
 
   // On initial state, both "to" and "from" point to a single scene