@applicaster/zapp-react-native-ui-components 16.0.0-rc.8 → 16.0.0-rc.81

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

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

package/Components/ModalComponent/AudioPlayer/utils/__tests__/mergeStyles.test.ts

@@ -0,0 +1,230 @@
+import {
+  mergeItemConfiguration,
+  mergeButtonConfiguration,
+} from "../mergeStyles";
+
+const base = {
+  background: {
+    defaultColor: "transparent",
+    focusedColor: "rgba(62, 62, 62, 1)",
+    cornerRadius: 12,
+  },
+  image: {
+    width: 48,
+    height: 48,
+    borderWidth: 1,
+    borderColor: "rgba(255, 255, 255, 0.1)",
+    cornerRadius: 6,
+  },
+  nowPlayingAsset: {},
+  nowPlayingLabel: { fontColor: "#fff", fontSize: 12 },
+  textLabel1: { fontColor: "#fff", fontSize: 15 },
+  textLabel2: { fontColor: "#999", fontSize: 13 },
+};
+
+describe("mergeItemConfiguration background", () => {
+  it("applies Studio focus background to focusedColor", () => {
+    const merged = mergeItemConfiguration(base as any, {
+      background: {
+        default: { backgroundColor: "transparent" },
+        focused: { backgroundColor: "#FF3B30" },
+      },
+    });
+
+    expect(merged.background.defaultColor).toBe("transparent");
+    expect(merged.background.focusedColor).toBe("#FF3B30");
+  });
+
+  it("accepts focus alias bucket from parser output", () => {
+    const merged = mergeItemConfiguration(base as any, {
+      background: {
+        default: { backgroundColor: "transparent" },
+        focus: { backgroundColor: "#00FF66" },
+      },
+    });
+
+    expect(merged.background.focusedColor).toBe("#00FF66");
+  });
+
+  it("merges text label lineHeight from Studio keys", () => {
+    const merged = mergeItemConfiguration(base as any, {
+      textLabel1: {
+        default: { fontSize: 28, lineHeight: 40 },
+      },
+    });
+
+    expect(merged.textLabel1.fontSize).toBe(28);
+    expect(merged.textLabel1.lineHeight).toBe(40);
+  });
+
+  it("merges background padding from Studio keys", () => {
+    const merged = mergeItemConfiguration(base as any, {
+      background: {
+        default: {
+          backgroundColor: "#2E7D32",
+          paddingTop: 32,
+          paddingBottom: 32,
+          paddingLeft: 40,
+          paddingRight: 40,
+        },
+      },
+    });
+
+    expect(merged.background.paddingTop).toBe(32);
+    expect(merged.background.paddingBottom).toBe(32);
+    expect(merged.background.paddingLeft).toBe(40);
+    expect(merged.background.paddingRight).toBe(40);
+    // Default-only override must not steal the base focused highlight color.
+    expect(merged.background.focusedColor).toBe("rgba(62, 62, 62, 1)");
+  });
+
+  it("preserves base focusedColor when only default background is set", () => {
+    const merged = mergeItemConfiguration(base as any, {
+      background: {
+        default: { backgroundColor: "#2E7D32" },
+      },
+    });
+
+    expect(merged.background.defaultColor).toBe("#2E7D32");
+    expect(merged.background.focusedColor).toBe("rgba(62, 62, 62, 1)");
+  });
+
+  it("applies Studio checkbox assets onto checkboxAssets", () => {
+    const merged = mergeItemConfiguration(base as any, {
+      checkbox: {
+        default: {
+          asset: "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=CB",
+          checkedAsset: "https://placehold.co/24x24/FFD60A/000000/png?text=CK",
+        },
+      },
+    });
+
+    expect(merged.checkboxAssets?.asset).toBe(
+      "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=CB"
+    );
+
+    expect(merged.checkboxAssets?.checkedAsset).toBe(
+      "https://placehold.co/24x24/FFD60A/000000/png?text=CK"
+    );
+  });
+
+  it("applies Studio reorder/remove assets onto actionButtonAssets", () => {
+    const merged = mergeItemConfiguration(base as any, {
+      actionButtons: {
+        default: {
+          removeAsset: "https://placehold.co/24x24/00FF00/000000/png?text=RM",
+          dragAsset: "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
+        },
+      },
+    });
+
+    expect(merged.actionButtonAssets?.removeAsset).toBe(
+      "https://placehold.co/24x24/00FF00/000000/png?text=RM"
+    );
+
+    expect(merged.actionButtonAssets?.dragAsset).toBe(
+      "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH"
+    );
+  });
+});
+
+describe("mergeButtonConfiguration background", () => {
+  const buttonBase = {
+    background: {
+      defaultColor: "#FFFFFF",
+      focusedColor: "#E0E0E0",
+      inactiveColor: "#CCCCCC",
+      cornerRadius: 12,
+      paddingTop: 12,
+      paddingRight: 12,
+      paddingBottom: 12,
+      paddingLeft: 12,
+      horizontalGutter: 8,
+    },
+    title: {
+      fontColor: "#000000",
+      focusedFontColor: "#000000",
+      inactiveFontColor: "#666666",
+      iosFontFamily: "SFProText-Semibold",
+      androidFontFamily: "Roboto-Medium",
+      fontSize: 15,
+      lineHeight: 24,
+      iosLetterSpacing: 0,
+      androidLetterSpacing: 0,
+      textTransform: "default" as const,
+    },
+    icons: {
+      width: 24,
+      height: 24,
+      leadingIcon: { enabled: true },
+    },
+  };
+
+  it("applies Studio button focus background to focusedColor", () => {
+    const merged = mergeButtonConfiguration(buttonBase as any, {
+      background: {
+        default: { backgroundColor: "#FFFFFF" },
+        focused: { backgroundColor: "#00FF00" },
+      },
+    });
+
+    expect(merged.background.defaultColor).toBe("#FFFFFF");
+    expect(merged.background.focusedColor).toBe("#00FF00");
+  });
+
+  it("applies Studio button title lineHeight", () => {
+    const merged = mergeButtonConfiguration(buttonBase as any, {
+      title: {
+        default: { fontColor: "#000000", fontSize: 15, lineHeight: 40 },
+      },
+    });
+
+    expect(merged.title.lineHeight).toBe(40);
+    expect(merged.title.fontSize).toBe(15);
+  });
+
+  it("applies Studio button background padding", () => {
+    const merged = mergeButtonConfiguration(buttonBase as any, {
+      background: {
+        default: {
+          backgroundColor: "#FFFFFF",
+          paddingTop: 32,
+          paddingRight: 20,
+          paddingBottom: 8,
+          paddingLeft: 4,
+        },
+      },
+    });
+
+    expect(merged.background.paddingTop).toBe(32);
+    expect(merged.background.paddingRight).toBe(20);
+    expect(merged.background.paddingBottom).toBe(8);
+    expect(merged.background.paddingLeft).toBe(4);
+    expect(merged.background.focusedColor).toBe("#E0E0E0");
+  });
+
+  it("preserves base button focusedColor when only default background is set", () => {
+    const merged = mergeButtonConfiguration(buttonBase as any, {
+      background: {
+        default: { backgroundColor: "#ABCDEF" },
+      },
+    });
+
+    expect(merged.background.defaultColor).toBe("#ABCDEF");
+    expect(merged.background.focusedColor).toBe("#E0E0E0");
+  });
+
+  it("applies Studio create-new leading icon asset", () => {
+    const merged = mergeButtonConfiguration(buttonBase as any, {
+      leadingIcon: {
+        default: {
+          asset: "https://placehold.co/24x24/FF00FF/FFFFFF/png?text=CN",
+        },
+      },
+    });
+
+    expect(merged.icons.leadingIcon.asset).toBe(
+      "https://placehold.co/24x24/FF00FF/FFFFFF/png?text=CN"
+    );
+  });
+});

package/Components/ModalComponent/AudioPlayer/utils/mergeStyles.ts

@@ -0,0 +1,332 @@
+import {
+  BackgroundConfiguration as ItemBackgroundConfiguration,
+  ImageConfiguration as ItemImageConfiguration,
+  LabelConfiguration as ItemLabelConfiguration,
+  NowPlayingAssetConfiguration as ItemNowPlayingAssetConfiguration,
+  CheckboxAssetsConfiguration as ItemCheckboxAssetsConfiguration,
+  ActionButtonAssetsConfiguration as ItemActionButtonAssetsConfiguration,
+  ItemConfiguration,
+} from "../Components/Item";
+import {
+  TitleConfiguration as HeaderTitleConfiguration,
+  HeaderConfiguration,
+} from "../Components/Header";
+import {
+  BackgroundConfiguration as ButtonBackgroundConfiguration,
+  TitleConfiguration as ButtonTitleConfiguration,
+  ButtonConfiguration,
+} from "../Components/Button";
+
+// ---------------------------------------------------------------------------
+// Item Merging Helpers
+// ---------------------------------------------------------------------------
+
+function mergeItemBackground(
+  base: ItemBackgroundConfiguration,
+  defaultOverride?: Record<string, any>,
+  focusedOverride?: Record<string, any>
+): ItemBackgroundConfiguration {
+  if (!defaultOverride && !focusedOverride) return base;
+
+  // Only take focused color from the focused/pressed bucket (or legacy
+  // mis-parsed focus* aliases). Never fall back to default background —
+  // that would overwrite base.focusedColor whenever Studio only sets default.
+  const focusedColor =
+    focusedOverride?.backgroundColor ??
+    defaultOverride?.focusColor ??
+    defaultOverride?.focusBackgroundColor;
+
+  return {
+    ...base,
+    ...(defaultOverride?.backgroundColor
+      ? { defaultColor: defaultOverride.backgroundColor }
+      : {}),
+    ...(focusedColor != null && focusedColor !== "" ? { focusedColor } : {}),
+    ...(defaultOverride?.borderRadius !== undefined
+      ? { cornerRadius: defaultOverride.borderRadius }
+      : {}),
+    ...(defaultOverride?.paddingTop !== undefined
+      ? { paddingTop: defaultOverride.paddingTop }
+      : {}),
+    ...(defaultOverride?.paddingRight !== undefined
+      ? { paddingRight: defaultOverride.paddingRight }
+      : {}),
+    ...(defaultOverride?.paddingBottom !== undefined
+      ? { paddingBottom: defaultOverride.paddingBottom }
+      : {}),
+    ...(defaultOverride?.paddingLeft !== undefined
+      ? { paddingLeft: defaultOverride.paddingLeft }
+      : {}),
+  };
+}
+
+function mergeItemImage(
+  base: ItemImageConfiguration,
+  override?: Record<string, any>
+): ItemImageConfiguration {
+  if (!override) return base;
+
+  return {
+    ...base,
+    ...(override.width !== undefined ? { width: override.width } : {}),
+    ...(override.height !== undefined ? { height: override.height } : {}),
+    ...(override.borderRadius !== undefined
+      ? { cornerRadius: override.borderRadius }
+      : {}),
+    ...(override.borderWidth !== undefined
+      ? { borderWidth: override.borderWidth }
+      : {}),
+    ...(override.borderColor ? { borderColor: override.borderColor } : {}),
+  };
+}
+
+function mergeItemLabel(
+  base: ItemLabelConfiguration,
+  override?: Record<string, any>
+): ItemLabelConfiguration {
+  if (!override) return base;
+
+  return {
+    ...base,
+    ...(override.fontColor ? { fontColor: override.fontColor } : {}),
+    ...(override.fontSize !== undefined ? { fontSize: override.fontSize } : {}),
+    ...(override.lineHeight !== undefined
+      ? { lineHeight: override.lineHeight }
+      : {}),
+  };
+}
+
+function mergeItemNowPlayingAsset(
+  base: ItemNowPlayingAssetConfiguration,
+  override?: Record<string, any>
+): ItemNowPlayingAssetConfiguration {
+  if (!override) return base;
+
+  return {
+    ...base,
+    ...(override.asset ? { asset: override.asset } : {}),
+  };
+}
+
+function mergeItemCheckboxAssets(
+  base: ItemCheckboxAssetsConfiguration,
+  override?: Record<string, any>
+): ItemCheckboxAssetsConfiguration {
+  if (!override) return base;
+
+  return {
+    ...base,
+    ...(override.asset ? { asset: override.asset } : {}),
+    ...(override.checkedAsset ? { checkedAsset: override.checkedAsset } : {}),
+  };
+}
+
+function mergeItemActionButtonAssets(
+  base: ItemActionButtonAssetsConfiguration,
+  override?: Record<string, any>
+): ItemActionButtonAssetsConfiguration {
+  if (!override) return base;
+
+  return {
+    ...base,
+    ...(override.removeAsset ? { removeAsset: override.removeAsset } : {}),
+    ...(override.dragAsset ? { dragAsset: override.dragAsset } : {}),
+  };
+}
+
+export function mergeItemConfiguration(
+  base: ItemConfiguration,
+  itemBlock?: Record<string, any>
+): ItemConfiguration {
+  if (!itemBlock) return base;
+
+  const bgDefault = itemBlock.background?.default || itemBlock.background;
+
+  const bgFocused =
+    itemBlock.background?.focused ||
+    itemBlock.background?.focus ||
+    itemBlock.background?.pressed;
+
+  const img = itemBlock.image?.default || itemBlock.image;
+  const label1 = itemBlock.textLabel1?.default || itemBlock.textLabel1;
+  const label2 = itemBlock.textLabel2?.default || itemBlock.textLabel2;
+
+  const npLabel =
+    itemBlock.nowPlayingLabel?.default || itemBlock.nowPlayingLabel;
+
+  const npAsset =
+    itemBlock.nowPlayingAsset?.default || itemBlock.nowPlayingAsset;
+
+  const checkbox = itemBlock.checkbox?.default || itemBlock.checkbox;
+
+  const actionButtons =
+    itemBlock.actionButtons?.default || itemBlock.actionButtons;
+
+  return {
+    ...base,
+    background: mergeItemBackground(base.background, bgDefault, bgFocused),
+    image: mergeItemImage(base.image, img),
+    textLabel1: mergeItemLabel(base.textLabel1, label1),
+    textLabel2: mergeItemLabel(base.textLabel2, label2),
+    nowPlayingLabel: mergeItemLabel(base.nowPlayingLabel, npLabel),
+    nowPlayingAsset: mergeItemNowPlayingAsset(base.nowPlayingAsset, npAsset),
+    checkboxAssets: mergeItemCheckboxAssets(
+      base.checkboxAssets || {},
+      checkbox
+    ),
+    actionButtonAssets: mergeItemActionButtonAssets(
+      base.actionButtonAssets || {},
+      actionButtons
+    ),
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Header Merging Helpers
+// ---------------------------------------------------------------------------
+
+function mergeHeaderTitle(
+  base: HeaderTitleConfiguration,
+  override?: Record<string, any>
+): HeaderTitleConfiguration {
+  if (!override) return base;
+
+  return {
+    ...base,
+    ...(override.fontColor ? { fontColor: override.fontColor } : {}),
+    ...(override.fontSize !== undefined ? { fontSize: override.fontSize } : {}),
+  };
+}
+
+export function mergeHeaderConfiguration(
+  base: HeaderConfiguration,
+  headerBlock?: Record<string, any>
+): HeaderConfiguration & { backgroundColor?: string } {
+  if (!headerBlock) return base;
+
+  const bgOverride = headerBlock.container?.default?.backgroundColor;
+
+  return {
+    ...base,
+    title: mergeHeaderTitle(base.title, headerBlock.title?.default),
+    ...(bgOverride ? { backgroundColor: bgOverride } : {}),
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Button Merging Helpers
+// ---------------------------------------------------------------------------
+
+function mergeButtonBackground(
+  base: ButtonBackgroundConfiguration,
+  defaultOverride?: Record<string, any>,
+  focusedOverride?: Record<string, any>
+): ButtonBackgroundConfiguration {
+  if (!defaultOverride && !focusedOverride) return base;
+
+  // Same as mergeItemBackground: do not use default background as focusedColor.
+  const focusedColor =
+    focusedOverride?.backgroundColor ??
+    defaultOverride?.focusColor ??
+    defaultOverride?.focusBackgroundColor;
+
+  return {
+    ...base,
+    ...(defaultOverride?.backgroundColor
+      ? { defaultColor: defaultOverride.backgroundColor }
+      : {}),
+    ...(focusedColor != null && focusedColor !== "" ? { focusedColor } : {}),
+    ...(defaultOverride?.borderRadius !== undefined
+      ? { cornerRadius: defaultOverride.borderRadius }
+      : {}),
+    ...(defaultOverride?.paddingTop !== undefined
+      ? { paddingTop: defaultOverride.paddingTop }
+      : {}),
+    ...(defaultOverride?.paddingRight !== undefined
+      ? { paddingRight: defaultOverride.paddingRight }
+      : {}),
+    ...(defaultOverride?.paddingBottom !== undefined
+      ? { paddingBottom: defaultOverride.paddingBottom }
+      : {}),
+    ...(defaultOverride?.paddingLeft !== undefined
+      ? { paddingLeft: defaultOverride.paddingLeft }
+      : {}),
+  };
+}
+
+function mergeButtonTitle(
+  base: ButtonTitleConfiguration,
+  override?: Record<string, any>
+): ButtonTitleConfiguration {
+  if (!override) return base;
+
+  return {
+    ...base,
+    ...(override.fontColor ? { fontColor: override.fontColor } : {}),
+    ...(override.fontSize !== undefined ? { fontSize: override.fontSize } : {}),
+    ...(override.lineHeight !== undefined
+      ? { lineHeight: override.lineHeight }
+      : {}),
+  };
+}
+
+function mergeButtonIcons(
+  base: ButtonConfiguration["icons"],
+  iconsOverride?: Record<string, any>,
+  leadingOverride?: Record<string, any>
+): ButtonConfiguration["icons"] {
+  if (!iconsOverride && !leadingOverride) return base;
+
+  const iconsDefault = iconsOverride?.default || iconsOverride;
+  const leadingDefault = leadingOverride?.default || leadingOverride;
+
+  return {
+    ...base,
+    ...(iconsDefault?.width !== undefined ? { width: iconsDefault.width } : {}),
+    ...(iconsDefault?.height !== undefined
+      ? { height: iconsDefault.height }
+      : {}),
+    leadingIcon: {
+      ...base.leadingIcon,
+      ...(leadingDefault?.enabled !== undefined
+        ? { enabled: leadingDefault.enabled }
+        : {}),
+      ...(leadingDefault?.actionType
+        ? { actionType: leadingDefault.actionType }
+        : {}),
+      ...(leadingDefault?.asset ? { asset: leadingDefault.asset } : {}),
+    },
+  };
+}
+
+export function mergeButtonConfiguration(
+  base: ButtonConfiguration,
+  buttonBlock?: Record<string, any>,
+  actionBlock?: Record<string, any>
+): ButtonConfiguration {
+  if (!buttonBlock && !actionBlock) return base;
+
+  const bgDefault =
+    buttonBlock?.background?.default || actionBlock?.background?.default;
+
+  const bgFocused =
+    buttonBlock?.background?.focused ||
+    buttonBlock?.background?.focus ||
+    actionBlock?.background?.focused ||
+    actionBlock?.background?.focus ||
+    buttonBlock?.background?.pressed ||
+    actionBlock?.background?.pressed;
+
+  const titleOverride =
+    buttonBlock?.title?.default || actionBlock?.title?.default;
+
+  const iconsOverride = buttonBlock?.icons || actionBlock?.icons;
+  const leadingOverride = buttonBlock?.leadingIcon || actionBlock?.leadingIcon;
+
+  return {
+    ...base,
+    background: mergeButtonBackground(base.background, bgDefault, bgFocused),
+    title: mergeButtonTitle(base.title, titleOverride),
+    icons: mergeButtonIcons(base.icons, iconsOverride, leadingOverride),
+  };
+}

package/Components/ModalComponent/BottomSheetDragArea.tsx

@@ -0,0 +1,33 @@
+import React from "react";
+import { PanGestureHandler } from "react-native-gesture-handler";
+import { View } from "react-native";
+import { useBottomSheet } from "@applicaster/zapp-react-native-utils/bottomSheet";
+
+/**
+ * Turns its children into a drag zone for the enclosing DraggableBottomSheet:
+ * dragging here moves/dismisses the sheet (used for the modal header bar).
+ * Outside a sheet (no context) it renders children unchanged.
+ */
+export const BottomSheetDragArea = ({
+  children,
+}: {
+  children: React.ReactElement;
+}) => {
+  const sheet = useBottomSheet();
+
+  // Outside a sheet (no context) render children unchanged.
+  if (!sheet) return children;
+
+  return (
+    <PanGestureHandler
+      simultaneousHandlers={[sheet.masterDrawerRef]}
+      shouldCancelWhenOutside={false}
+      onGestureEvent={sheet.onDragGestureEvent}
+      onHandlerStateChange={sheet.onDragStateChange}
+    >
+      {/* Old-API PanGestureHandler needs a host-component child; children may
+          be a function component (e.g. ModalHeader), so wrap in a View. */}
+      <View>{children}</View>
+    </PanGestureHandler>
+  );
+};