@applicaster/zapp-react-native-ui-components 16.0.0-alpha.1263110541 → 16.0.0-alpha.1334507601

package/Components/ModalComponent/AudioPlayer/Components/Item.tsx

@@ -12,14 +12,8 @@
  */
 
 import React from "react";
-import {
-  Image,
-  Platform,
-  Pressable,
-  StyleSheet,
-  Text,
-  View,
-} from "react-native";
+import { QBImage as Image } from "@applicaster/zapp-react-native-ui-components/Components/Image";
+import { Platform, Pressable, StyleSheet, Text, View } from "react-native";
 import {
   MenuItem,
   SelectionBehavior,
@@ -56,6 +50,12 @@ export type BackgroundConfiguration = {
   defaultColor: string;
   focusedColor: string;
   cornerRadius: number;
+  paddingTop?: number;
+  paddingRight?: number;
+  paddingBottom?: number;
+  paddingLeft?: number;
+  highlightInsetLeft?: number;
+  highlightInsetRight?: number;
 };
 
 export type ImageConfiguration = {
@@ -82,6 +82,20 @@ export type NowPlayingAssetConfiguration = {
   asset?: string;
 };
 
+export type CheckboxAssetsConfiguration = {
+  /** Unchecked multiSelect control (item.checkbox_asset). */
+  asset?: string;
+  /** Checked multiSelect control (item.checked_checkbox_asset). */
+  checkedAsset?: string;
+};
+
+export type ActionButtonAssetsConfiguration = {
+  /** Leading remove control on Edit Order rows. */
+  removeAsset?: string;
+  /** Trailing drag handle on Edit Order / queue rows. */
+  dragAsset?: string;
+};
+
 export type ItemConfiguration = {
   background: BackgroundConfiguration;
   image: ImageConfiguration;
@@ -89,6 +103,8 @@ export type ItemConfiguration = {
   nowPlayingLabel: LabelConfiguration;
   textLabel1: LabelConfiguration;
   textLabel2: LabelConfiguration;
+  checkboxAssets?: CheckboxAssetsConfiguration;
+  actionButtonAssets?: ActionButtonAssetsConfiguration;
 };
 
 export const DEFAULT_TEXT_LABEL_1_CONFIGURATION: LabelConfiguration = {
@@ -189,9 +205,9 @@ const CONTAINER_SPEC_LARGE_IMAGE: ContainerSpec = {
 
 const CONTAINER_SPEC_DEFAULT: ContainerSpec = {
   paddingTop: 8,
-  paddingRight: 20,
+  paddingRight: 10,
   paddingBottom: 8,
-  paddingLeft: 20,
+  paddingLeft: 10,
   horizontalGutter: 12,
   verticalGutter: 2,
 };
@@ -271,13 +287,14 @@ function resolveContainerSpec(image: ImageConfiguration): ContainerSpec {
 
 export function mapMenuItemToNowPlayingData(
   item: MenuItem,
-  isPaused?: boolean
+  isPaused?: boolean,
+  nowPlayingLabel = "Now Playing"
 ): ItemData {
   return {
     imageUri: item.icon,
     textLabel1: item.title,
     textLabel2: item.summary ?? "",
-    nowPlayingLabel: "Now Playing",
+    nowPlayingLabel,
     trailingButton: "playPause",
     isSelected: isPaused !== undefined ? !isPaused : item.isSelected,
   };
@@ -301,10 +318,13 @@ export function mapMenuItemToPlaylistData(
   const showSelectionWidget =
     behavior?.selectMode !== "none" && item.trailingButton !== "none";
 
+  const summary =
+    typeof item.summary === "string" ? item.summary.trim() : item.summary;
+
   return {
     imageUri: item.icon,
     textLabel1: item.title,
-    textLabel2: item.summary ?? "",
+    textLabel2: summary || "",
     trailingButton: showSelectionWidget
       ? item.trailingButton || ("multiSelect" as ItemButtonAction)
       : undefined,
@@ -332,21 +352,30 @@ function ItemContainer({
   onPress,
 }: ItemContainerProps) {
   const container = resolveContainerSpec(image);
-  const bg = focused ? background.focusedColor : background.defaultColor;
+  const insetLeft = background.highlightInsetLeft ?? 0;
+  const insetRight = background.highlightInsetRight ?? 0;
 
   return (
-    <Pressable
-      onPress={onPress}
-      style={({ pressed }) => ({
-        backgroundColor: pressed ? background.focusedColor : bg,
-        borderRadius: background.cornerRadius,
-        paddingTop: container.paddingTop,
-        paddingRight: container.paddingRight,
-        paddingBottom: container.paddingBottom,
-        paddingLeft: container.paddingLeft,
-      })}
-    >
-      {children}
+    <Pressable onPress={onPress}>
+      {({ pressed }) => (
+        <View
+          style={{
+            marginLeft: insetLeft,
+            marginRight: insetRight,
+            backgroundColor:
+              pressed || focused
+                ? background.focusedColor
+                : background.defaultColor,
+            borderRadius: background.cornerRadius,
+            paddingTop: background.paddingTop ?? container.paddingTop,
+            paddingRight: background.paddingRight ?? container.paddingRight,
+            paddingBottom: background.paddingBottom ?? container.paddingBottom,
+            paddingLeft: background.paddingLeft ?? container.paddingLeft,
+          }}
+        >
+          {children}
+        </View>
+      )}
     </Pressable>
   );
 }
@@ -379,6 +408,10 @@ type ItemLabelProps = {
 };
 
 function ItemLabel({ text, configuration, focused = false }: ItemLabelProps) {
+  if (!text) {
+    return null;
+  }
+
   const color =
     focused && configuration.focusedFontColor
       ? configuration.focusedFontColor
@@ -450,6 +483,8 @@ type ItemButtonProps = {
   focused?: boolean;
   onPress?: () => void;
   isSelected?: boolean;
+  checkboxAssets?: CheckboxAssetsConfiguration;
+  actionButtonAssets?: ActionButtonAssetsConfiguration;
 };
 
 function ItemButton({
@@ -457,6 +492,8 @@ function ItemButton({
   focused = false,
   onPress,
   isSelected = false,
+  checkboxAssets,
+  actionButtonAssets,
 }: ItemButtonProps) {
   const layout = BUTTON_LAYOUT_SPEC[action];
 
@@ -531,6 +568,19 @@ function ItemButton({
       }
 
       case "drag": {
+        if (actionButtonAssets?.dragAsset) {
+          return (
+            <Image
+              source={{ uri: actionButtonAssets.dragAsset }}
+              style={{
+                width: layout.assetWidth,
+                height: layout.assetHeight,
+              }}
+              resizeMode="contain"
+            />
+          );
+        }
+
         return (
           <View
             style={{
@@ -565,6 +615,19 @@ function ItemButton({
       }
 
       case "remove": {
+        if (actionButtonAssets?.removeAsset) {
+          return (
+            <Image
+              source={{ uri: actionButtonAssets.removeAsset }}
+              style={{
+                width: layout.assetWidth,
+                height: layout.assetHeight,
+              }}
+              resizeMode="contain"
+            />
+          );
+        }
+
         return (
           <View
             style={{
@@ -590,6 +653,23 @@ function ItemButton({
       }
 
       case "multiSelect": {
+        const studioAsset = isSelected
+          ? checkboxAssets?.checkedAsset
+          : checkboxAssets?.asset;
+
+        if (studioAsset) {
+          return (
+            <Image
+              source={{ uri: studioAsset }}
+              style={{
+                width: layout.assetWidth,
+                height: layout.assetHeight,
+              }}
+              resizeMode="contain"
+            />
+          );
+        }
+
         if (!isSelected) {
           return (
             <View
@@ -636,18 +716,31 @@ function ItemButton({
     }
   };
 
+  const buttonPadding = {
+    paddingTop: layout.paddingTop,
+    paddingRight: layout.paddingRight,
+    paddingBottom: layout.paddingBottom,
+    paddingLeft: layout.paddingLeft,
+  };
+
+  // A nested Pressable with no handler swallows the parent row press.
+  if (!onPress) {
+    return (
+      <View pointerEvents="none" style={buttonPadding}>
+        {renderIcon()}
+      </View>
+    );
+  }
+
   return (
     <Pressable
       onPress={(e: any) => {
         e?.stopPropagation?.();
-        onPress?.();
+        onPress();
       }}
       style={({ pressed }) => [
+        buttonPadding,
         {
-          paddingTop: layout.paddingTop,
-          paddingRight: layout.paddingRight,
-          paddingBottom: layout.paddingBottom,
-          paddingLeft: layout.paddingLeft,
           opacity: pressed || focused ? 0.7 : 1,
         },
       ]}
@@ -666,6 +759,8 @@ type ItemButtonsProps = {
   onTrailingButtonPress?: () => void;
   isSelected?: boolean;
   renderHandle?: (element: React.ReactElement) => React.ReactElement;
+  checkboxAssets?: CheckboxAssetsConfiguration;
+  actionButtonAssets?: ActionButtonAssetsConfiguration;
 };
 
 function ItemButtons({
@@ -677,6 +772,8 @@ function ItemButtons({
   onTrailingButtonPress,
   isSelected = false,
   renderHandle,
+  checkboxAssets,
+  actionButtonAssets,
 }: ItemButtonsProps) {
   if (!leadingButton && !trailingButton) {
     return null;
@@ -691,6 +788,8 @@ function ItemButtons({
             focused={focusedLeadingButton}
             onPress={onLeadingButtonPress}
             isSelected={isSelected}
+            checkboxAssets={checkboxAssets}
+            actionButtonAssets={actionButtonAssets}
           />
           <View style={{ width: BUTTONS_CONTAINER_HORIZONTAL_GUTTER }} />
         </>
@@ -704,6 +803,8 @@ function ItemButtons({
                 focused={focusedTrailingButton}
                 onPress={onTrailingButtonPress}
                 isSelected={isSelected}
+                checkboxAssets={checkboxAssets}
+                actionButtonAssets={actionButtonAssets}
               />
             )
           ) : (
@@ -712,6 +813,8 @@ function ItemButtons({
               focused={focusedTrailingButton}
               onPress={onTrailingButtonPress}
               isSelected={isSelected}
+              checkboxAssets={checkboxAssets}
+              actionButtonAssets={actionButtonAssets}
             />
           )
         ) : (
@@ -720,6 +823,8 @@ function ItemButtons({
             focused={focusedTrailingButton}
             onPress={onTrailingButtonPress}
             isSelected={isSelected}
+            checkboxAssets={checkboxAssets}
+            actionButtonAssets={actionButtonAssets}
           />
         )
       ) : null}
@@ -761,10 +866,16 @@ export function AudioPlayerTrackItem({
     textLabel2,
     nowPlayingLabel,
     nowPlayingAsset,
+    checkboxAssets,
+    actionButtonAssets,
   } = effectiveConfig;
 
   const container = resolveContainerSpec(image);
 
+  const handleTrailingButtonPress =
+    onTrailingButtonPress ??
+    (data.trailingButton === "multiSelect" ? onPress : undefined);
+
   return (
     <ItemContainer
       image={image}
@@ -777,22 +888,28 @@ export function AudioPlayerTrackItem({
         <View style={{ width: container.horizontalGutter }} />
         <View style={styles.contentColumn}>
           {showNowPlaying ? (
-            <>
-              <NowPlayingRow
-                assetConfiguration={nowPlayingAsset}
-                labelConfiguration={nowPlayingLabel}
-                label={data.nowPlayingLabel}
-              />
-              <View style={{ height: container.verticalGutter }} />
-            </>
+            <NowPlayingRow
+              assetConfiguration={nowPlayingAsset}
+              labelConfiguration={nowPlayingLabel}
+              label={data.nowPlayingLabel}
+            />
+          ) : null}
+          {showNowPlaying && (data.textLabel1 || data.textLabel2) ? (
+            <View style={{ height: container.verticalGutter }} />
+          ) : null}
+          {data.textLabel1 ? (
+            <ItemLabel
+              text={data.textLabel1}
+              configuration={textLabel1}
+              focused={focused}
+            />
+          ) : null}
+          {data.textLabel1 && data.textLabel2 ? (
+            <View style={{ height: container.verticalGutter }} />
+          ) : null}
+          {data.textLabel2 ? (
+            <ItemLabel text={data.textLabel2} configuration={textLabel2} />
           ) : null}
-          <ItemLabel
-            text={data.textLabel1}
-            configuration={textLabel1}
-            focused={focused}
-          />
-          <View style={{ height: container.verticalGutter }} />
-          <ItemLabel text={data.textLabel2} configuration={textLabel2} />
         </View>
         <ItemButtons
           leadingButton={data.leadingButton}
@@ -800,9 +917,11 @@ export function AudioPlayerTrackItem({
           focusedLeadingButton={focusedLeadingButton}
           focusedTrailingButton={focusedTrailingButton}
           onLeadingButtonPress={onLeadingButtonPress}
-          onTrailingButtonPress={onTrailingButtonPress}
+          onTrailingButtonPress={handleTrailingButtonPress}
           isSelected={data.isSelected}
           renderHandle={renderHandle}
+          checkboxAssets={checkboxAssets}
+          actionButtonAssets={actionButtonAssets}
         />
       </View>
     </ItemContainer>
@@ -819,6 +938,10 @@ export const VARIANT_NOW_PLAYING: ItemConfiguration = {
     defaultColor: "transparent",
     focusedColor: "transparent",
     cornerRadius: 0,
+    paddingTop: 8,
+    paddingRight: 20,
+    paddingBottom: 8,
+    paddingLeft: 20,
   },
   image: {
     width: 72,
@@ -839,6 +962,12 @@ export const VARIANT_QUEUED_ITEM: ItemConfiguration = {
     defaultColor: "transparent",
     focusedColor: "rgba(62, 62, 62, 1)",
     cornerRadius: 12,
+    paddingTop: 8,
+    paddingRight: 10,
+    paddingBottom: 8,
+    paddingLeft: 10,
+    highlightInsetLeft: 10,
+    highlightInsetRight: 10,
   },
   image: {
     width: 48,
@@ -859,6 +988,10 @@ export const VARIANT_PLAYLIST_ITEM: ItemConfiguration = {
     defaultColor: "transparent",
     focusedColor: "rgba(62, 62, 62, 1)",
     cornerRadius: 12,
+    paddingTop: 8,
+    paddingRight: 10,
+    paddingBottom: 8,
+    paddingLeft: 10,
   },
   image: {
     width: 48,

package/Components/ModalComponent/AudioPlayer/Components/NowPlayingHeaderSection.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { StyleSheet, View } from "react-native";
+import { View } from "react-native";
 import {
   AudioPlayerTrackItem,
   VARIANT_NOW_PLAYING,
@@ -10,21 +10,16 @@ import type { MenuItem } from "@applicaster/zapp-react-native-utils/modalState/t
 import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 import { usePlayerState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerState";
 
-const styles = StyleSheet.create({
-  divider: {
-    height: StyleSheet.hairlineWidth,
-    backgroundColor: "rgba(255, 255, 255, 0.1)",
-    marginHorizontal: 20,
-    marginVertical: 8,
-  },
-});
-
 type NowPlayingHeaderSectionProps = {
   onClear?: () => void;
+  nextUpTitle?: string;
+  nowPlayingTitle?: string;
 };
 
 export function NowPlayingHeaderSection({
   onClear,
+  nextUpTitle = "Next Up",
+  nowPlayingTitle = "Now Playing",
 }: NowPlayingHeaderSectionProps) {
   const player = usePlayer();
   const playerState = usePlayerState("queue-now-playing-section");
@@ -53,7 +48,8 @@ export function NowPlayingHeaderSection({
 
     const data = mapMenuItemToNowPlayingData(
       nowPlayingItem,
-      playerState?.isPaused
+      playerState?.isPaused,
+      nowPlayingTitle
     );
 
     const handlePlayPause = () => {
@@ -65,14 +61,11 @@ export function NowPlayingHeaderSection({
     };
 
     return (
-      <View>
-        <AudioPlayerTrackItem
-          configuration={VARIANT_NOW_PLAYING}
-          data={data}
-          onTrailingButtonPress={handlePlayPause}
-        />
-        <View style={styles.divider} />
-      </View>
+      <AudioPlayerTrackItem
+        configuration={VARIANT_NOW_PLAYING}
+        data={data}
+        onTrailingButtonPress={handlePlayPause}
+      />
     );
   };
 
@@ -81,7 +74,7 @@ export function NowPlayingHeaderSection({
       {renderNowPlayingTrack()}
       <AudioPlayerHeader
         configuration={VARIANT_SECTION_HEADER}
-        data={{ title: "Next Up" }}
+        data={{ title: nextUpTitle }}
         onClear={onClear}
       />
     </View>

package/Components/ModalComponent/AudioPlayer/Components/__tests__/Item.test.tsx

@@ -0,0 +1,113 @@
+import React from "react";
+import { Pressable } from "react-native";
+import { fireEvent, render, screen } from "@testing-library/react-native";
+import {
+  AudioPlayerTrackItem,
+  VARIANT_PLAYLIST_ITEM,
+  mapMenuItemToNowPlayingData,
+} from "../Item";
+
+const playlistItemData = {
+  textLabel1: "Queue",
+  textLabel2: "",
+  trailingButton: "multiSelect" as const,
+  isSelected: false,
+};
+
+describe("AudioPlayerTrackItem multiSelect checkbox", () => {
+  it("invokes onPress when the checkbox is pressed even if onTrailingButtonPress is omitted", () => {
+    const onPress = jest.fn();
+
+    render(
+      <AudioPlayerTrackItem
+        configuration={VARIANT_PLAYLIST_ITEM}
+        data={playlistItemData}
+        onPress={onPress}
+      />
+    );
+
+    const pressables = screen.UNSAFE_getAllByType(Pressable);
+    fireEvent.press(pressables[pressables.length - 1]);
+
+    expect(onPress).toHaveBeenCalledTimes(1);
+  });
+
+  it("invokes onTrailingButtonPress instead of onPress when a dedicated trailing handler is provided", () => {
+    const onPress = jest.fn();
+    const onTrailingButtonPress = jest.fn();
+
+    render(
+      <AudioPlayerTrackItem
+        configuration={VARIANT_PLAYLIST_ITEM}
+        data={playlistItemData}
+        onPress={onPress}
+        onTrailingButtonPress={onTrailingButtonPress}
+      />
+    );
+
+    const pressables = screen.UNSAFE_getAllByType(Pressable);
+    fireEvent.press(pressables[pressables.length - 1]);
+
+    expect(onTrailingButtonPress).toHaveBeenCalledTimes(1);
+    expect(onPress).not.toHaveBeenCalled();
+  });
+
+  it("invokes onPress when the row is pressed", () => {
+    const onPress = jest.fn();
+
+    render(
+      <AudioPlayerTrackItem
+        configuration={VARIANT_PLAYLIST_ITEM}
+        data={playlistItemData}
+        onPress={onPress}
+      />
+    );
+
+    fireEvent.press(screen.UNSAFE_getAllByType(Pressable)[0]);
+
+    expect(onPress).toHaveBeenCalledTimes(1);
+  });
+
+  it("renders only textLabel1 Text element when textLabel2 is missing or empty", () => {
+    const { UNSAFE_getAllByType, queryByText } = render(
+      <AudioPlayerTrackItem
+        configuration={VARIANT_PLAYLIST_ITEM}
+        data={{
+          textLabel1: "Only Title",
+          textLabel2: "",
+        }}
+      />
+    );
+
+    const { Text } = require("react-native");
+    const textNodes = UNSAFE_getAllByType(Text);
+    expect(textNodes).toHaveLength(1);
+    expect(queryByText("Only Title")).toBeTruthy();
+  });
+});
+
+describe("mapMenuItemToNowPlayingData", () => {
+  const item = {
+    id: "item_1",
+    title: "Track Title",
+    summary: "Artist Name",
+    icon: "https://example.com/cover.png",
+  };
+
+  it("uses default 'Now Playing' label when omitted", () => {
+    const data = mapMenuItemToNowPlayingData(item as any);
+    expect(data.nowPlayingLabel).toBe("Now Playing");
+    expect(data.textLabel1).toBe("Track Title");
+    expect(data.textLabel2).toBe("Artist Name");
+  });
+
+  it("uses custom nowPlayingLabel when provided", () => {
+    const data = mapMenuItemToNowPlayingData(
+      item as any,
+      false,
+      "En cours de lecture"
+    );
+
+    expect(data.nowPlayingLabel).toBe("En cours de lecture");
+  });
+});

package/Components/ModalComponent/AudioPlayer/Components/index.ts

@@ -1,5 +1,3 @@
-export { AudioPlayerAction } from "./Action";
-
 export { AudioPlayerButton, VARIANT_WITH_ICON } from "./Button";
 
 export { AudioPlayerHeader } from "./Header";