@applicaster/zapp-react-native-ui-components 16.0.0-alpha.6861239588 → 16.0.0-alpha.6918106967

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

@@ -20,6 +20,12 @@ import {
   Text,
   View,
 } from "react-native";
+import {
+  MenuItem,
+  SelectionBehavior,
+} from "@applicaster/zapp-react-native-utils/modalState/types";
+import { useModalBlocksStyle } from "../../ModalBlocksStyleContext";
+import { mergeItemConfiguration } from "../utils/mergeStyles";
 
 const styles = StyleSheet.create({
   row: {
@@ -34,25 +40,6 @@ const styles = StyleSheet.create({
     flexDirection: "row",
     alignItems: "center",
   },
-  demoScreen: {
-    flex: 1,
-    backgroundColor: "#1C1C1E",
-    paddingTop: 64,
-    paddingHorizontal: 0,
-    gap: 16,
-  },
-  demoHeading: {
-    color: "#FFFFFF",
-    fontSize: 20,
-    fontWeight: "600",
-    marginBottom: 8,
-    paddingHorizontal: 16,
-  },
-  demoLabel: {
-    color: "#999999",
-    fontSize: 13,
-    paddingHorizontal: 16,
-  },
 });
 
 // ---------------------------------------------------------------------------
@@ -69,6 +56,10 @@ export type BackgroundConfiguration = {
   defaultColor: string;
   focusedColor: string;
   cornerRadius: number;
+  paddingTop?: number;
+  paddingRight?: number;
+  paddingBottom?: number;
+  paddingLeft?: number;
 };
 
 export type ImageConfiguration = {
@@ -95,6 +86,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;
@@ -102,53 +107,10 @@ export type ItemConfiguration = {
   nowPlayingLabel: LabelConfiguration;
   textLabel1: LabelConfiguration;
   textLabel2: LabelConfiguration;
+  checkboxAssets?: CheckboxAssetsConfiguration;
+  actionButtonAssets?: ActionButtonAssetsConfiguration;
 };
 
-export interface Action {
-  type: string;
-  payload?: any;
-  options?: any;
-}
-
-export interface Header {
-  title: string;
-  subtitle?: string;
-  icon?: string;
-}
-
-export interface Content {
-  title: string;
-  stickyTitle?: boolean;
-  items: MenuItem[];
-  itemsUrl?: string;
-  action?: Action;
-}
-
-export interface Menu {
-  header?: Header;
-  content: Content;
-  closeButton?: boolean;
-}
-
-export interface PresentSubMenuAction extends Action {
-  menu: Menu;
-}
-
-export interface SecondaryAction {
-  action: Action | PresentSubMenuAction;
-  icon?: string;
-}
-
-export interface MenuItem {
-  trailingButton?: ItemButtonAction;
-  title: string;
-  summary?: string;
-  icon?: string;
-  isSelected?: boolean;
-  action?: Action | PresentSubMenuAction;
-  secondaryAction?: SecondaryAction;
-}
-
 export const DEFAULT_TEXT_LABEL_1_CONFIGURATION: LabelConfiguration = {
   fontColor: "#FFFFFF",
   focusedFontColor: "#FFFFFF",
@@ -211,6 +173,7 @@ export type AudioPlayerTrackItemProps = {
   onPress?: () => void;
   onLeadingButtonPress?: () => void;
   onTrailingButtonPress?: () => void;
+  renderHandle?: (element: React.ReactElement) => React.ReactElement;
 };
 
 // ---------------------------------------------------------------------------
@@ -326,14 +289,17 @@ function resolveContainerSpec(image: ImageConfiguration): ContainerSpec {
     : CONTAINER_SPEC_DEFAULT;
 }
 
-export function mapMenuItemToNowPlayingData(item: MenuItem): ItemData {
+export function mapMenuItemToNowPlayingData(
+  item: MenuItem,
+  isPaused?: boolean
+): ItemData {
   return {
     imageUri: item.icon,
     textLabel1: item.title,
     textLabel2: item.summary ?? "",
     nowPlayingLabel: "Now Playing",
     trailingButton: "playPause",
-    isSelected: item.isSelected,
+    isSelected: isPaused !== undefined ? !isPaused : item.isSelected,
   };
 }
 
@@ -348,12 +314,23 @@ export function mapMenuItemToQueuedData(item: MenuItem): ItemData {
   };
 }
 
-export function mapMenuItemToPlaylistData(item: MenuItem): ItemData {
+export function mapMenuItemToPlaylistData(
+  item: MenuItem,
+  behavior?: SelectionBehavior
+): ItemData {
+  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 ?? "",
-    trailingButton: item.trailingButton || ("multiSelect" as ItemButtonAction),
+    textLabel2: summary || "",
+    trailingButton: showSelectionWidget
+      ? item.trailingButton || ("multiSelect" as ItemButtonAction)
+      : undefined,
     isSelected: item.isSelected,
   };
 }
@@ -386,10 +363,10 @@ function ItemContainer({
       style={({ pressed }) => ({
         backgroundColor: pressed ? background.focusedColor : bg,
         borderRadius: background.cornerRadius,
-        paddingTop: container.paddingTop,
-        paddingRight: container.paddingRight,
-        paddingBottom: container.paddingBottom,
-        paddingLeft: container.paddingLeft,
+        paddingTop: background.paddingTop ?? container.paddingTop,
+        paddingRight: background.paddingRight ?? container.paddingRight,
+        paddingBottom: background.paddingBottom ?? container.paddingBottom,
+        paddingLeft: background.paddingLeft ?? container.paddingLeft,
       })}
     >
       {children}
@@ -496,6 +473,8 @@ type ItemButtonProps = {
   focused?: boolean;
   onPress?: () => void;
   isSelected?: boolean;
+  checkboxAssets?: CheckboxAssetsConfiguration;
+  actionButtonAssets?: ActionButtonAssetsConfiguration;
 };
 
 function ItemButton({
@@ -503,9 +482,15 @@ function ItemButton({
   focused = false,
   onPress,
   isSelected = false,
+  checkboxAssets,
+  actionButtonAssets,
 }: ItemButtonProps) {
   const layout = BUTTON_LAYOUT_SPEC[action];
 
+  if (!layout) {
+    return null;
+  }
+
   const renderIcon = () => {
     switch (action) {
       case "playPause": {
@@ -573,6 +558,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={{
@@ -607,6 +605,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={{
@@ -632,6 +643,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
@@ -680,7 +708,10 @@ function ItemButton({
 
   return (
     <Pressable
-      onPress={onPress}
+      onPress={(e: any) => {
+        e?.stopPropagation?.();
+        onPress?.();
+      }}
       style={({ pressed }) => [
         {
           paddingTop: layout.paddingTop,
@@ -704,6 +735,9 @@ type ItemButtonsProps = {
   onLeadingButtonPress?: () => void;
   onTrailingButtonPress?: () => void;
   isSelected?: boolean;
+  renderHandle?: (element: React.ReactElement) => React.ReactElement;
+  checkboxAssets?: CheckboxAssetsConfiguration;
+  actionButtonAssets?: ActionButtonAssetsConfiguration;
 };
 
 function ItemButtons({
@@ -714,6 +748,9 @@ function ItemButtons({
   onLeadingButtonPress,
   onTrailingButtonPress,
   isSelected = false,
+  renderHandle,
+  checkboxAssets,
+  actionButtonAssets,
 }: ItemButtonsProps) {
   if (!leadingButton && !trailingButton) {
     return null;
@@ -728,17 +765,45 @@ function ItemButtons({
             focused={focusedLeadingButton}
             onPress={onLeadingButtonPress}
             isSelected={isSelected}
+            checkboxAssets={checkboxAssets}
+            actionButtonAssets={actionButtonAssets}
           />
           <View style={{ width: BUTTONS_CONTAINER_HORIZONTAL_GUTTER }} />
         </>
       ) : null}
       {trailingButton ? (
-        <ItemButton
-          action={trailingButton}
-          focused={focusedTrailingButton}
-          onPress={onTrailingButtonPress}
-          isSelected={isSelected}
-        />
+        trailingButton === "drag" ? (
+          renderHandle ? (
+            renderHandle(
+              <ItemButton
+                action={trailingButton}
+                focused={focusedTrailingButton}
+                onPress={onTrailingButtonPress}
+                isSelected={isSelected}
+                checkboxAssets={checkboxAssets}
+                actionButtonAssets={actionButtonAssets}
+              />
+            )
+          ) : (
+            <ItemButton
+              action={trailingButton}
+              focused={focusedTrailingButton}
+              onPress={onTrailingButtonPress}
+              isSelected={isSelected}
+              checkboxAssets={checkboxAssets}
+              actionButtonAssets={actionButtonAssets}
+            />
+          )
+        ) : (
+          <ItemButton
+            action={trailingButton}
+            focused={focusedTrailingButton}
+            onPress={onTrailingButtonPress}
+            isSelected={isSelected}
+            checkboxAssets={checkboxAssets}
+            actionButtonAssets={actionButtonAssets}
+          />
+        )
       ) : null}
     </View>
   );
@@ -757,18 +822,32 @@ export function AudioPlayerTrackItem({
   onPress,
   onLeadingButtonPress,
   onTrailingButtonPress,
+  renderHandle,
 }: AudioPlayerTrackItemProps) {
+  const modalBlocksStyle = useModalBlocksStyle();
+  const showNowPlaying = !!data.nowPlayingLabel;
+
+  const itemBlock =
+    showNowPlaying && modalBlocksStyle?.nowPlayingItem
+      ? modalBlocksStyle.nowPlayingItem
+      : modalBlocksStyle?.item;
+
+  const effectiveConfig = React.useMemo(() => {
+    return mergeItemConfiguration(configuration, itemBlock);
+  }, [configuration, itemBlock]);
+
   const {
     background,
     image,
-    nowPlayingAsset,
-    nowPlayingLabel,
     textLabel1,
     textLabel2,
-  } = configuration;
+    nowPlayingLabel,
+    nowPlayingAsset,
+    checkboxAssets,
+    actionButtonAssets,
+  } = effectiveConfig;
 
   const container = resolveContainerSpec(image);
-  const showNowPlaying = !!data.nowPlayingLabel;
 
   return (
     <ItemContainer
@@ -807,6 +886,9 @@ export function AudioPlayerTrackItem({
           onLeadingButtonPress={onLeadingButtonPress}
           onTrailingButtonPress={onTrailingButtonPress}
           isSelected={data.isSelected}
+          renderHandle={renderHandle}
+          checkboxAssets={checkboxAssets}
+          actionButtonAssets={actionButtonAssets}
         />
       </View>
     </ItemContainer>

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

@@ -0,0 +1,89 @@
+import React from "react";
+import { StyleSheet, View } from "react-native";
+import {
+  AudioPlayerTrackItem,
+  VARIANT_NOW_PLAYING,
+  mapMenuItemToNowPlayingData,
+} from "./Item";
+import { AudioPlayerHeader, VARIANT_SECTION_HEADER } from "./Header";
+import type { MenuItem } from "@applicaster/zapp-react-native-utils/modalState/types";
+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;
+};
+
+export function NowPlayingHeaderSection({
+  onClear,
+}: NowPlayingHeaderSectionProps) {
+  const player = usePlayer();
+  const playerState = usePlayerState("queue-now-playing-section");
+
+  const renderNowPlayingTrack = () => {
+    if (!player?.entry) {
+      return null;
+    }
+
+    const mediaGroup = player.entry.media_group;
+
+    const imageGroup = Array.isArray(mediaGroup)
+      ? mediaGroup.find((g: any) => g.type === "image")
+      : null;
+
+    const firstImage = Array.isArray(imageGroup?.media_item)
+      ? imageGroup.media_item[0]?.src
+      : imageGroup?.media_item?.src;
+
+    const nowPlayingItem: MenuItem = {
+      id: String(player.entry.id ?? "now_playing"),
+      title: (player.entry.title as string) || String(player.entry.id),
+      summary: (player.entry.summary as string) ?? "",
+      icon: firstImage,
+    };
+
+    const data = mapMenuItemToNowPlayingData(
+      nowPlayingItem,
+      playerState?.isPaused
+    );
+
+    const handlePlayPause = () => {
+      if (playerState?.isPaused) {
+        player?.play();
+      } else {
+        player?.pause();
+      }
+    };
+
+    return (
+      <View>
+        <AudioPlayerTrackItem
+          configuration={VARIANT_NOW_PLAYING}
+          data={data}
+          onTrailingButtonPress={handlePlayPause}
+        />
+        <View style={styles.divider} />
+      </View>
+    );
+  };
+
+  return (
+    <View>
+      {renderNowPlayingTrack()}
+      <AudioPlayerHeader
+        configuration={VARIANT_SECTION_HEADER}
+        data={{ title: "Next Up" }}
+        onClear={onClear}
+      />
+    </View>
+  );
+}

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

@@ -1,9 +1,11 @@
 export { AudioPlayerAction } from "./Action";
 
-export { AudioPlayerButton } from "./Button";
+export { AudioPlayerButton, VARIANT_WITH_ICON } from "./Button";
 
 export { AudioPlayerHeader } from "./Header";
 
 export { AudioPlayerTrackItem } from "./Item";
 
+export { NowPlayingHeaderSection } from "./NowPlayingHeaderSection";
+
 export { AudioPlayerInput } from "./Input";