Be more nativwind compatible

packages/core/src/components/DeckSwiper/DeckSwiper.tsx

@@ -25,6 +25,7 @@ export interface DeckSwiperProps<T> {
   keyExtractor?: (item: T) => string;
   renderItem?: ({ item, index }: { item: T; index: number }) => JSX.Element;
   style?: StyleProp<ViewStyle>;
+  className?: string;
 }
 
 const DeckSwiper = React.forwardRef<DeckSwiperRef, DeckSwiperProps<any>>(
@@ -48,6 +49,7 @@ const DeckSwiper = React.forwardRef<DeckSwiperRef, DeckSwiperProps<any>>(
       keyExtractor,
       renderItem,
       style,
+      className,
       children,
     }: React.PropsWithChildren<DeckSwiperProps<T>>,
     ref: React.Ref<DeckSwiperRef>
@@ -146,7 +148,9 @@ const DeckSwiper = React.forwardRef<DeckSwiperRef, DeckSwiperProps<any>>(
      */
 
     return (
-      <View>
+      <View // @ts-ignore
+        className={className}
+      >
         <View style={styles.containerHeightFiller}>{renderFirstCard()}</View>
         <DeckSwiperComponent
           ref={deckSwiperRef}

packages/core/src/components/DeckSwiper/DeckSwiperCard.tsx

@@ -1,16 +1,23 @@
 import React from "react";
-import { View, StyleSheet, StyleProp, ViewStyle } from "react-native";
+import {
+  View,
+  ViewProps,
+  StyleSheet,
+  StyleProp,
+  ViewStyle,
+} from "react-native";
 import type { ReadTheme } from "@draftbit/theme";
 import { withTheme } from "@draftbit/theme";
 
-export interface DeckSwiperCardProps {
+export interface DeckSwiperCardProps
+  extends Omit<ViewProps, "style" | "children"> {
   style?: StyleProp<ViewStyle>;
   theme: ReadTheme;
 }
 
 const DeckSwiperCard: React.FC<
   React.PropsWithChildren<DeckSwiperCardProps>
-> = ({ style, children, theme }) => (
+> = ({ style, children, theme, ...rest }) => (
   <View
     style={[
       styles.card,
@@ -20,6 +27,7 @@ const DeckSwiperCard: React.FC<
       },
       style,
     ]}
+    {...rest}
   >
     {children}
   </View>

packages/core/src/components/Layout/Spacer.tsx

@@ -1,7 +1,7 @@
 import React from "react";
-import { View, StyleProp, ViewStyle } from "react-native";
+import { View, ViewProps, StyleProp, ViewStyle } from "react-native";
 
-interface SpacerProps {
+interface SpacerProps extends Omit<ViewProps, "style"> {
   top?: number;
   right?: number;
   left?: number;
@@ -15,6 +15,7 @@ const Spacer: React.FC<SpacerProps> = ({
   bottom = 8,
   left = 8,
   style,
+  ...rest
 }) => {
   return (
     <View
@@ -27,6 +28,7 @@ const Spacer: React.FC<SpacerProps> = ({
           paddingBottom: bottom,
         },
       ]}
+      {...rest}
     />
   );
 };

packages/core/src/components/LottieAnimation.tsx

@@ -25,7 +25,7 @@ const LottieAnimation = forwardRef<LottieView, Props>(
     ref
   ) => {
     return (
-      <View style={style}>
+      <View style={style} {...rest}>
         <LottieView
           ref={ref}
           source={source}
@@ -36,7 +36,6 @@ const LottieAnimation = forwardRef<LottieView, Props>(
           // A specific size is required on mobile, but not on web.
           // This ensures consistent behavior across platforms during preview.
           style={{ width: "100%", height: "100%" }}
-          {...rest}
         />
       </View>
     );

packages/core/src/components/MediaPlayer/AudioPlayer/AudioPlayerCommon.ts

@@ -13,6 +13,7 @@ export interface HeadlessAudioPlayerProps extends MediaPlayerProps {
 }
 
 export interface AudioPlayerInterfaceProps {
+  className?: string;
   style?: StyleProp<ViewStyle & TextStyle>;
   thumbColor?: string;
   completedTrackColor?: string;

packages/core/src/components/MediaPlayer/AudioPlayer/AudioPlayerWithInterface.tsx

@@ -21,6 +21,7 @@ const AudioPlayerWithInterface = React.forwardRef<
   (
     {
       style,
+      className,
       thumbColor,
       completedTrackColor,
       remainingTrackColor,
@@ -127,6 +128,8 @@ const AudioPlayerWithInterface = React.forwardRef<
         />
         <View
           testID="audio-player-interface"
+          // @ts-ignore
+          className={className}
           style={[
             {
               backgroundColor: theme.colors.background.base,

packages/core/src/components/MediaPlayer/VideoPlayer/VideoPlayer.tsx

@@ -75,6 +75,9 @@
     },
     ref
   ) => {
+    // @ts-ignore
+    const { className, ...videoPlayerProps } = rest;
+
     const stableSource = useSourceDeepCompareMemoize(
       normalizeBase64Source(source, "video")
     );
@@ -168,7 +171,7 @@
         playToEndSub.remove();
         statusChangeSub.remove();
       };
     }, []);
 
     // Replace video source when it changes (deep comparison on URI to avoid unnecessary reloads)
     const isFirstSourceRender = React.useRef(true);
@@ -248,7 +251,11 @@
         ref={mediaPlaybackWrapperRef}
         onTogglePlayback={updateAudioMode}
       >
-        <View style={[style, styles.container]}>
+        <View
+          style={[style, styles.container]}
+          // @ts-ignore
+          className={className}
+        >
           <VideoPlayerComponent
             ref={videoPlayerRef}
             player={player}
@@ -258,7 +265,7 @@
             onFullscreenEnter={() => onFullscreenUpdate("entered")}
             onFullscreenExit={() => onFullscreenUpdate("exited")}
             allowsFullscreen={allowsFullscreen}
-            {...rest}
+            {...videoPlayerProps}
           />
           {showPoster && posterSource && (
             <View style={StyleSheet.absoluteFill} pointerEvents="none">

packages/core/src/components/Picker/PickerCommon.ts

@@ -12,6 +12,7 @@ export interface PickerOption {
 }
 
 export interface PickerInputContainerProps extends IconSlot {
+  className?: string;
   error?: boolean;
   placeholder?: string;
   disabled?: boolean;

packages/core/src/components/Picker/PickerInputContainer.tsx

@@ -33,6 +33,7 @@ const PickerInputContainer: React.FC<
   options = [],
   onPress,
   Icon,
+  className,
   style,
   selectedValue,
   disabled = false,
@@ -70,7 +71,12 @@ const PickerInputContainer: React.FC<
   }
 
   return (
-    <View testID={testID} style={[containerStyle, { zIndex }]}>
+    <View
+      testID={testID}
+      style={[containerStyle, { zIndex }]}
+      // @ts-ignore
+      className={className}
+    >
       <TextField
         Icon={Icon}
         numberOfLines={1}

packages/core/src/components/Progress/CircularProgress/CircularProgress.tsx

@@ -41,6 +41,7 @@ export const CircularProgress: React.FC<
   trackCustomDashArray,
   onFullPathWidth,
   startPosition = "top",
+  className,
   style,
   testID,
 }) => {
@@ -128,6 +129,8 @@ export const CircularProgress: React.FC<
         },
         style,
       ]}
+      // @ts-ignore
+      className={className}
     >
       <Svg testID={testID ?? "circular-progress-component"} style={{ flex: 1 }}>
         {showTrack && (

packages/core/src/components/Progress/LinearProgress/LinearProgress.tsx

@@ -37,6 +37,7 @@ export const LinearProgress: React.FC<ValueProgressProps> = ({
   customDashArray,
   trackCustomDashArray,
   onFullPathWidth,
+  className,
   style,
   testID,
 }) => {
@@ -101,6 +102,8 @@ export const LinearProgress: React.FC<ValueProgressProps> = ({
         },
         style,
       ]}
+      // @ts-ignore
+      className={className}
     >
       <Svg testID={testID ?? "linear-progress-component"} style={{ flex: 1 }}>
         {showTrack && (

packages/core/src/components/Progress/ProgressCommon.ts

@@ -25,6 +25,7 @@ export interface BaseProgressProps {
   customDashArray?: string;
   trackCustomDashArray?: string;
   onFullPathWidth?: (width: number) => void;
+  className?: string;
   style?: StyleProp<ViewStyle>;
   theme: ReadTheme;
   testID?: string;

packages/core/src/components/SVG.native.tsx

@@ -7,14 +7,20 @@ import Config from "./Config";
 type SVGComponentProps = {
   source: string;
   style?: StyleProp<ImageStyle>;
+  className?: string;
 };
 
 const SVG: React.FC<React.PropsWithChildren<SVGComponentProps>> = ({
   source = Config.placeholderSvgURL,
   style,
+  className,
 }) => {
   return (
-    <View style={style as StyleProp<ViewStyle>}>
+    <View
+      style={style as StyleProp<ViewStyle>}
+      // @ts-ignore
+      className={className}
+    >
       <SvgUri width="100%" height="100%" uri={source} />
     </View>
   );

packages/core/src/components/SVG.tsx

@@ -6,13 +6,22 @@ import Config from "./Config";
 type SVGComponentProps = {
   source: string;
   style?: StyleProp<ImageStyle>;
+  className?: string;
 };
 
 const SVG: React.FC<React.PropsWithChildren<SVGComponentProps>> = ({
   source = Config.placeholderSvgURL,
   style,
+  className,
 }) => {
-  return <Image style={style} source={{ uri: source }} />;
+  return (
+    <Image
+      style={style}
+      source={{ uri: source }}
+      // @ts-ignore
+      className={className}
+    />
+  );
 };
 
 export default SVG;

packages/core/src/components/SectionList/SectionHeader.tsx

@@ -1,16 +1,21 @@
 import React from "react";
-import { View, StyleProp, ViewStyle, Text } from "react-native";
+import { View, ViewProps, StyleProp, ViewStyle, Text } from "react-native";
 import { withTheme } from "@draftbit/theme";
 import type { ReadTheme } from "@draftbit/theme";
 
-interface SectionHeaderProps {
+interface SectionHeaderProps extends Omit<ViewProps, "style" | "children"> {
   style?: StyleProp<ViewStyle>;
 }
 
 const SectionHeader: React.FC<React.PropsWithChildren<SectionHeaderProps>> = ({
   style,
   children,
-}) => <View style={style}>{children}</View>;
+  ...rest
+}) => (
+  <View style={style} {...rest}>
+    {children}
+  </View>
+);
 
 interface DefaultSectionHeaderProps {
   title: string;

packages/core/src/components/SwipeableItem/SwipeableItem.tsx

@@ -50,6 +50,7 @@ import {
  */
 
 export interface SwipeableItemProps extends IconSlot {
+  className?: string;
   closeOnPress?: boolean;
   leftOpenValue?: number;
   rightOpenValue?: number;
@@ -74,6 +75,7 @@ type Props = SwipeableItemProps & RightSwipeProps & LeftSwipeProps;
 
 const SwipeableItem: React.FC<React.PropsWithChildren<Props>> = ({
   theme,
+  className,
   style,
   children: childrenProp,
   Icon,
@@ -232,6 +234,8 @@ const SwipeableItem: React.FC<React.PropsWithChildren<Props>> = ({
         setComponentWidth(event.nativeEvent.layout.width);
       }}
       style={[styles.parentContainer, parentContainerStyles]}
+      // @ts-ignore
+      className={className}
     >
       {/*@ts-ignore*/}
       <SwipeRow

packages/core/src/components/Swiper/Swiper.tsx

@@ -1,6 +1,6 @@
 import { ReadTheme, withTheme } from "@draftbit/theme";
 import React, { forwardRef, useImperativeHandle } from "react";
-import { View, StyleProp, ViewStyle } from "react-native";
+import { View, StyleProp, ViewStyle, ViewProps } from "react-native";
 import SwiperComponent from "react-native-web-swiper";
 
 export interface SwiperRef {
@@ -9,7 +9,7 @@ export interface SwiperRef {
   swipePrev: () => void;
 }
 
-export interface SwiperProps<T> {
+export interface SwiperProps<T> extends Omit<ViewProps, "style" | "children"> {
   onSwipe?: (index: number) => void;
   onSwipedNext?: (index: number) => void;
   onSwipedPrevious?: (index: number) => void;
@@ -63,6 +63,7 @@ const Swiper = forwardRef<SwiperRef, SwiperProps<any>>(
       minDistanceToCapture,
       style,
       hideDots = false,
+      ...rest
     }: SwiperProps<any>,
     ref
   ) => {
@@ -141,7 +142,7 @@ const Swiper = forwardRef<SwiperRef, SwiperProps<any>>(
     }));
 
     return (
-      <View style={style}>
+      <View style={style} {...rest}>
         {/* @ts-ignore */}
         <SwiperComponent
           ref={swiperRef}

packages/core/src/components/Swiper/SwiperItem.tsx

@@ -1,19 +1,27 @@
 import React from "react";
-import { View, StyleSheet, StyleProp, ViewStyle } from "react-native";
+import {
+  View,
+  StyleSheet,
+  StyleProp,
+  ViewStyle,
+  ViewProps,
+} from "react-native";
 
 const styles = StyleSheet.create({
   wrapper: {
     flex: 1,
   },
 });
 
-export interface SwiperProps {
+export interface SwiperProps extends Omit<ViewProps, "style" | "children"> {
   children: React.ReactNode;
   style?: StyleProp<ViewStyle>;
 }
 
-const SwiperItem = ({ children, style }: SwiperProps) => (
-  <View style={[styles.wrapper, style]}>{children}</View>
+const SwiperItem = ({ children, style, ...rest }: SwiperProps) => (
+  <View style={[styles.wrapper, style]} {...rest}>
+    {children}
+  </View>
 );
 
 export default SwiperItem;