@draftbit/core 48.1.1-7606b6.2 → 48.1.1-bfaf07.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "48.1.1-7606b6.2+7606b62",
+  "version": "48.1.1-bfaf07.2+bfaf07d",
   "description": "Core (non-native) Components",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^48.1.1-7606b6.2+7606b62",
+    "@draftbit/types": "^48.1.1-bfaf07.2+bfaf07d",
     "@expo/vector-icons": "^13.0.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
@@ -82,17 +82,20 @@
     "lib/"
   ],
   "jest": {
-    "preset": "react-native",
-    "setupFiles": [
-      "./jest-setup.js"
-    ],
+    "preset": "jest-expo",
     "setupFilesAfterEnv": [
-      "@testing-library/jest-native/extend-expect"
+      "@testing-library/jest-native/extend-expect",
+      "./jest-setup.js"
     ],
     "testPathIgnorePatterns": [
       "lib",
-      "__mocks__"
-    ]
+      "__mocks__",
+      "declarations.d.ts"
+    ],
+    "transformIgnorePatterns": [
+      "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|react-native-svg)"
+    ],
+    "testEnvironment": "node"
   },
-  "gitHead": "7606b625bc440ba6831dee90720216277b85f764"
+  "gitHead": "bfaf07de3571ebdad09f600b5775ee2ec7ccbefa"
 }

package/src/components/AudioPlayer/AudioPlayerCommon.ts

@@ -0,0 +1,44 @@
+import { AVPlaybackSource } from "expo-av";
+import { StyleProp, ViewStyle, TextStyle } from "react-native";
+import type { Theme } from "../../styles/DefaultTheme";
+
+export type AudioInterruptionMode = "lower volume" | "stop";
+
+export interface AudioPlayerStatus {
+  isPlaying: boolean;
+  isLoading: boolean;
+  isBuffering: boolean;
+  currentPositionMillis: number;
+  durationMillis: number;
+  bufferedDurationMillis: number;
+  isError: boolean;
+  error?: string;
+}
+
+export interface HeadlessAudioPlayerRef {
+  seekToPosition: (positionMillis: number) => void;
+  togglePlayback: () => void;
+}
+
+export interface HeadlessAudioPlayerProps {
+  onPlaybackStatusUpdate?: (status: AudioPlayerStatus) => void;
+  onPlaybackFinish?: () => void;
+  source: AVPlaybackSource;
+  interruptionMode?: AudioInterruptionMode;
+  playsInBackground?: boolean;
+  playsInSilentModeIOS?: boolean;
+  playThroughEarpieceAndroid?: boolean;
+}
+
+export interface AudioPlayerInterfaceProps {
+  style?: StyleProp<ViewStyle & TextStyle>;
+  thumbColor?: string;
+  completedTrackColor?: string;
+  remainingTrackColor?: string;
+  togglePlaybackIconSize?: number;
+  togglePlaybackIconColor?: string;
+  hidePlaybackIcon?: boolean;
+  hideDuration?: boolean;
+  hideSlider?: boolean;
+  theme: Theme;
+}

package/src/components/{MediaPlayer/AudioPlayer → AudioPlayer}/AudioPlayerWithInterface.js

@@ -1,10 +1,10 @@
 import * as React from "react";
 import { Text, View, StyleSheet } from "react-native";
 import { AntDesign } from "@expo/vector-icons";
-import { withTheme } from "../../../theming";
+import { withTheme } from "../../theming";
 import Slider from "@react-native-community/slider";
 import HeadlessAudioPlayer from "./HeadlessAudioPlayer";
-import Pressable from "../../Pressable";
+import Pressable from "../Pressable";
 /**
  * Built on top of HeadlessAudioPlayer to provide a simple interface for playing audio
  */

package/src/components/AudioPlayer/AudioPlayerWithInterface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AudioPlayerWithInterface.js","sourceRoot":"","sources":["AudioPlayerWithInterface.tsx"],"names":[],"mappings":"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"}

package/src/components/{MediaPlayer/AudioPlayer → AudioPlayer}/AudioPlayerWithInterface.tsx

@@ -1,21 +1,22 @@
 import * as React from "react";
 import { Text, View, StyleSheet } from "react-native";
 import { AntDesign } from "@expo/vector-icons";
-import { withTheme } from "../../../theming";
+import { withTheme } from "../../theming";
 import Slider from "@react-native-community/slider";
 import HeadlessAudioPlayer from "./HeadlessAudioPlayer";
 import {
   AudioPlayerInterfaceProps,
+  AudioPlayerStatus,
   HeadlessAudioPlayerProps,
+  HeadlessAudioPlayerRef,
 } from "./AudioPlayerCommon";
-import Pressable from "../../Pressable";
-import { MediaPlayerRef, MediaPlayerStatus } from "../MediaPlayerCommon";
+import Pressable from "../Pressable";
 
 /**
  * Built on top of HeadlessAudioPlayer to provide a simple interface for playing audio
  */
 const AudioPlayerWithInterface = React.forwardRef<
-  MediaPlayerRef,
+  HeadlessAudioPlayerRef,
   AudioPlayerInterfaceProps & HeadlessAudioPlayerProps
 >(
   (
@@ -43,11 +44,12 @@ const AudioPlayerWithInterface = React.forwardRef<
     >(1);
     const [isDraggingSlider, setIsDraggingSlider] = React.useState(false);
     const [sliderPositionMillis, setSliderPositionMillis] = React.useState(0);
-    const newHeadlessAudioPlayerRef = React.useRef<MediaPlayerRef>(null);
+    const newHeadlessAudioPlayerRef =
+      React.useRef<HeadlessAudioPlayerRef>(null);
 
     // Use the provided ref or default to new ref when not provided
     const headlessAudioPlayerRef = ref
-      ? (ref as React.RefObject<MediaPlayerRef>)
+      ? (ref as React.RefObject<HeadlessAudioPlayerRef>)
       : newHeadlessAudioPlayerRef;
 
     const {
@@ -79,7 +81,7 @@ const AudioPlayerWithInterface = React.forwardRef<
       textDecorationStyle,
     };
 
-    const onPlaybackStatusUpdate = (status: MediaPlayerStatus) => {
+    const onPlaybackStatusUpdate = (status: AudioPlayerStatus) => {
       setIsLoading(status.isLoading);
       setDurationMillis(status.durationMillis);
       setSliderPositionMillis(status.currentPositionMillis);

package/{lib/src/components/MediaPlayer → src/components}/AudioPlayer/HeadlessAudioPlayer.js

@@ -1,7 +1,5 @@
 import * as React from "react";
 import { Audio, InterruptionModeIOS, InterruptionModeAndroid, } from "expo-av";
-import { mapToMediaPlayerStatus } from "../MediaPlayerCommon";
-import MediaPlaybackWrapper from "../MediaPlaybackWrapper";
 /**
  * Audio Player component without an interface (UI).
  * Only handles playing of the audio and provides callbacks and ref functions
@@ -33,18 +31,33 @@ const HeadlessAudioPlayer = React.forwardRef(({ source, interruptionMode = "lowe
         playThroughEarpieceAndroid,
     ]);
     const onPlaybackStatusUpdate = (status) => {
-        const mappedStatus = mapToMediaPlayerStatus(status);
-        onPlaybackStatusUpdateProp === null || onPlaybackStatusUpdateProp === void 0 ? void 0 : onPlaybackStatusUpdateProp(mappedStatus);
         if (status.isLoaded) {
+            onPlaybackStatusUpdateProp === null || onPlaybackStatusUpdateProp === void 0 ? void 0 : onPlaybackStatusUpdateProp({
+                isPlaying: status.isPlaying,
+                isLoading: false,
+                isBuffering: status.isBuffering,
+                currentPositionMillis: status.positionMillis || 0,
+                durationMillis: status.durationMillis || 0,
+                bufferedDurationMillis: status.playableDurationMillis || 0,
+                isError: false,
+            });
             if (status.didJustFinish) {
                 onPlaybackFinish === null || onPlaybackFinish === void 0 ? void 0 : onPlaybackFinish();
             }
             setIsPlaying(status.isPlaying);
         }
-    };
-    const onTogglePlayback = () => {
-        //Has to be called everytime a player is played to reconfigure the global Audio config based on each player's configuration
-        updateAudioMode();
+        else if (status.error) {
+            onPlaybackStatusUpdateProp === null || onPlaybackStatusUpdateProp === void 0 ? void 0 : onPlaybackStatusUpdateProp({
+                isPlaying: false,
+                isLoading: false,
+                isBuffering: false,
+                currentPositionMillis: 0,
+                durationMillis: 0,
+                bufferedDurationMillis: 0,
+                isError: true,
+                error: status.error,
+            });
+        }
     };
     const loadAudio = async () => {
         onPlaybackStatusUpdateProp === null || onPlaybackStatusUpdateProp === void 0 ? void 0 : onPlaybackStatusUpdateProp({
@@ -60,11 +73,37 @@ const HeadlessAudioPlayer = React.forwardRef(({ source, interruptionMode = "lowe
         setCurrentSound(sound);
         sound.setOnPlaybackStatusUpdate(onPlaybackStatusUpdate);
     };
+    const togglePlayback = React.useCallback(async () => {
+        //Has to be called everytime a player is played to reconfigure the global Audio config based on each player's configuration
+        await updateAudioMode();
+        if (isPlaying) {
+            await (currentSound === null || currentSound === void 0 ? void 0 : currentSound.pauseAsync());
+        }
+        else {
+            await (currentSound === null || currentSound === void 0 ? void 0 : currentSound.playAsync());
+        }
+    }, [currentSound, updateAudioMode, isPlaying]);
+    const seekToPosition = React.useCallback(async (positionMillis) => {
+        await (currentSound === null || currentSound === void 0 ? void 0 : currentSound.setPositionAsync(positionMillis));
+    }, [currentSound]);
     useSourceDeepCompareEffect(() => {
         loadAudio();
         // Ignore dependency of loadAudio
     }, [source]);
-    return (React.createElement(MediaPlaybackWrapper, { ref: ref, isPlaying: isPlaying, media: currentSound, onTogglePlayback: onTogglePlayback }));
+    React.useEffect(() => {
+        return currentSound
+            ? () => {
+                currentSound.unloadAsync();
+            }
+            : undefined;
+    }, [currentSound]);
+    React.useImperativeHandle(ref, () => {
+        return {
+            seekToPosition,
+            togglePlayback,
+        };
+    }, [seekToPosition, togglePlayback]);
+    return null;
 });
 // The source provided into the AudioPlayer can be of type {uri: "some uri"}
 // In the case that this object is created inline, each rerender provides a new source object because a new object is initialized everytime

package/src/components/AudioPlayer/HeadlessAudioPlayer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HeadlessAudioPlayer.js","sourceRoot":"","sources":["HeadlessAudioPlayer.tsx"],"names":[],"mappings":"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"}

package/src/components/{MediaPlayer/AudioPlayer → AudioPlayer}/HeadlessAudioPlayer.tsx

@@ -5,16 +5,17 @@ import {
   InterruptionModeIOS,
   InterruptionModeAndroid,
 } from "expo-av";
-import { HeadlessAudioPlayerProps } from "./AudioPlayerCommon";
-import { MediaPlayerRef, mapToMediaPlayerStatus } from "../MediaPlayerCommon";
-import MediaPlaybackWrapper from "../MediaPlaybackWrapper";
+import {
+  HeadlessAudioPlayerProps,
+  HeadlessAudioPlayerRef,
+} from "./AudioPlayerCommon";
 
 /**
  * Audio Player component without an interface (UI).
  * Only handles playing of the audio and provides callbacks and ref functions
  */
 const HeadlessAudioPlayer = React.forwardRef<
-  MediaPlayerRef,
+  HeadlessAudioPlayerRef,
   HeadlessAudioPlayerProps
 >(
   (
@@ -61,22 +62,36 @@ const HeadlessAudioPlayer = React.forwardRef<
     ]);
 
     const onPlaybackStatusUpdate = (status: AVPlaybackStatus) => {
-      const mappedStatus = mapToMediaPlayerStatus(status);
-      onPlaybackStatusUpdateProp?.(mappedStatus);
-
       if (status.isLoaded) {
+        onPlaybackStatusUpdateProp?.({
+          isPlaying: status.isPlaying,
+          isLoading: false,
+          isBuffering: status.isBuffering,
+          currentPositionMillis: status.positionMillis || 0,
+          durationMillis: status.durationMillis || 0,
+          bufferedDurationMillis: status.playableDurationMillis || 0,
+          isError: false,
+        });
+
         if (status.didJustFinish) {
           onPlaybackFinish?.();
         }
+
         setIsPlaying(status.isPlaying);
+      } else if (status.error) {
+        onPlaybackStatusUpdateProp?.({
+          isPlaying: false,
+          isLoading: false,
+          isBuffering: false,
+          currentPositionMillis: 0,
+          durationMillis: 0,
+          bufferedDurationMillis: 0,
+          isError: true,
+          error: status.error,
+        });
       }
     };
 
-    const onTogglePlayback = () => {
-      //Has to be called everytime a player is played to reconfigure the global Audio config based on each player's configuration
-      updateAudioMode();
-    };
-
     const loadAudio = async () => {
       onPlaybackStatusUpdateProp?.({
         isPlaying: false,
@@ -93,20 +108,50 @@ const HeadlessAudioPlayer = React.forwardRef<
       sound.setOnPlaybackStatusUpdate(onPlaybackStatusUpdate);
     };
 
+    const togglePlayback = React.useCallback(async () => {
+      //Has to be called everytime a player is played to reconfigure the global Audio config based on each player's configuration
+      await updateAudioMode();
+
+      if (isPlaying) {
+        await currentSound?.pauseAsync();
+      } else {
+        await currentSound?.playAsync();
+      }
+    }, [currentSound, updateAudioMode, isPlaying]);
+
+    const seekToPosition = React.useCallback(
+      async (positionMillis: number) => {
+        await currentSound?.setPositionAsync(positionMillis);
+      },
+      [currentSound]
+    );
+
     useSourceDeepCompareEffect(() => {
       loadAudio();
 
       // Ignore dependency of loadAudio
     }, [source]);
 
-    return (
-      <MediaPlaybackWrapper
-        ref={ref}
-        isPlaying={isPlaying}
-        media={currentSound}
-        onTogglePlayback={onTogglePlayback}
-      />
+    React.useEffect(() => {
+      return currentSound
+        ? () => {
+            currentSound.unloadAsync();
+          }
+        : undefined;
+    }, [currentSound]);
+
+    React.useImperativeHandle(
+      ref,
+      () => {
+        return {
+          seekToPosition,
+          togglePlayback,
+        };
+      },
+      [seekToPosition, togglePlayback]
     );
+
+    return null;
   }
 );
 

package/src/components/{MediaPlayer/AudioPlayer → AudioPlayer}/index.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { withTheme } from "../../../theming";
+import { withTheme } from "../../theming";
 import HeadlessAudioPlayer from "./HeadlessAudioPlayer";
 import AudioPlayerWithInterface from "./AudioPlayerWithInterface";
 const AudioPlayer = React.forwardRef(({ mode = "interface", ...rest }, ref) => {

package/src/components/AudioPlayer/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAM1C,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAMlE,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAGlC,CAAC,EAAE,IAAI,GAAG,WAAW,EAAE,GAAG,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE;IACzC,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU;YACb,OAAO,oBAAC,mBAAmB,IAAC,GAAG,EAAE,GAAG,KAAM,IAAI,GAAI,CAAC;QACrD,KAAK,WAAW;YACd,gEAAgE;YAChE,OAAO,oBAAC,wBAAwB,IAAC,GAAG,EAAE,GAAG,KAAM,IAAI,GAAI,CAAC;KAC3D;AACH,CAAC,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC,WAAW,CAAC,CAAC"}

package/src/components/{MediaPlayer/AudioPlayer → AudioPlayer}/index.tsx

@@ -1,19 +1,19 @@
 import * as React from "react";
-import { withTheme } from "../../../theming";
+import { withTheme } from "../../theming";
 import {
   AudioPlayerInterfaceProps,
   HeadlessAudioPlayerProps,
+  HeadlessAudioPlayerRef,
 } from "./AudioPlayerCommon";
 import HeadlessAudioPlayer from "./HeadlessAudioPlayer";
 import AudioPlayerWithInterface from "./AudioPlayerWithInterface";
-import { MediaPlayerRef } from "../MediaPlayerCommon";
 
 interface AudioPlayerProps {
   mode?: "interface" | "headless";
 }
 
 const AudioPlayer = React.forwardRef<
-  MediaPlayerRef,
+  HeadlessAudioPlayerRef,
   AudioPlayerProps & AudioPlayerInterfaceProps & HeadlessAudioPlayerProps
 >(({ mode = "interface", ...rest }, ref) => {
   switch (mode) {
@@ -27,4 +27,4 @@ const AudioPlayer = React.forwardRef<
 
 export default withTheme(AudioPlayer);
 
-export { MediaPlayerRef as AudioPlayerRef } from "../MediaPlayerCommon";
+export { HeadlessAudioPlayerRef as AudioPlayerRef } from "./AudioPlayerCommon";

package/src/components/Progress/CircularProgress/CircularProgress.js

@@ -0,0 +1,101 @@
+import React from "react";
+import Svg, { Path } from "react-native-svg";
+import Animated, { useAnimatedProps, useSharedValue, withTiming, } from "react-native-reanimated";
+import { DEFAULT_ANIMATION_DURATION, } from "../ProgressCommon";
+export const AnimatedPath = Animated.createAnimatedComponent(Path);
+export const CircularProgress = ({ theme, minimumValue = 0, maximumValue = 100, value = minimumValue, thickness = 10, trackThickness = thickness, color = theme.colors.primary, trackColor = theme.colors.divider, trackOpacity = 1, showTrack = true, animationDuration = DEFAULT_ANIMATION_DURATION, isAnimated = true, lineCap = "round", trackLineCap = lineCap, dashWidth, trackDashWidth, dashGap, trackDashGap, dashOffset, trackDashOffset, customDashArray, trackCustomDashArray, onFullPathWidth, startPosition = "top", style, testID, }) => {
+    const [svgContainerWidth, setSvgContainerWidth] = React.useState(0);
+    const [circumfrence, setCircumefrence] = React.useState(0);
+    const dashArray = dashWidth !== undefined
+        ? `${dashWidth} ${dashGap || dashWidth}`
+        : undefined;
+    const trackDashArray = trackDashWidth !== undefined
+        ? `${trackDashWidth} ${trackDashGap || trackDashWidth}`
+        : undefined;
+    const maxThickness = Math.max(thickness, trackThickness);
+    const thicknessOffset = maxThickness / 2; // This offset guarantees nothing is cut off by view bounds
+    const radius = svgContainerWidth / 2;
+    const c = 2 * Math.PI * radius;
+    if (c !== circumfrence) {
+        setCircumefrence(c);
+    }
+    const startAngle = React.useMemo(() => {
+        switch (startPosition) {
+            case "top":
+                return 0;
+            case "right":
+                return 90;
+            case "bottom":
+                return 180;
+            case "left":
+                return 270;
+        }
+    }, [startPosition]);
+    const currentFillPercentage = value / (maximumValue + minimumValue);
+    const currentAngle = useSharedValue(startAngle + currentFillPercentage * 360);
+    const progressPathAnimatedProps = useAnimatedProps(() => {
+        const isBelowMinAngle = currentAngle.value <= startAngle;
+        return {
+            d: circlePath(radius, radius, radius - thicknessOffset, startAngle, Math.min(currentAngle.value, startAngle + 360) //Prevents going beyond the max angle
+            ),
+            strokeOpacity: isBelowMinAngle ? 0.0 : 1.0,
+        };
+    });
+    React.useEffect(() => {
+        currentAngle.value = withTiming(startAngle + currentFillPercentage * 360, {
+            duration: isAnimated ? animationDuration : 0,
+        });
+    }, [
+        value,
+        currentFillPercentage,
+        animationDuration,
+        currentAngle,
+        maximumValue,
+        minimumValue,
+        isAnimated,
+        startAngle,
+    ]);
+    React.useEffect(() => {
+        onFullPathWidth === null || onFullPathWidth === void 0 ? void 0 : onFullPathWidth(circumfrence);
+    }, [circumfrence, onFullPathWidth]);
+    return (React.createElement(Svg, { testID: testID !== null && testID !== void 0 ? testID : "circular-progress-component", onLayout: (event) => {
+            const width = event.nativeEvent.layout.width;
+            setSvgContainerWidth(width);
+        }, style: [
+            {
+                height: svgContainerWidth,
+            },
+            style,
+        ] },
+        showTrack && (React.createElement(Path, { d: circlePath(radius, radius, radius - thicknessOffset, startAngle, startAngle + 360), stroke: trackColor, strokeWidth: trackThickness, strokeOpacity: trackOpacity, strokeLinecap: trackLineCap, strokeDasharray: trackCustomDashArray || trackDashArray, strokeDashoffset: trackDashOffset })),
+        React.createElement(AnimatedPath, { animatedProps: progressPathAnimatedProps, stroke: color, strokeWidth: thickness, strokeLinecap: lineCap, strokeDasharray: customDashArray || dashArray, strokeDashoffset: dashOffset })));
+};
+// From: https://github.com/bartgryszko/react-native-circular-progress/blob/a93b501aea40306126c8ede72089741eead52308/src/CircularProgress.js#L15
+function circlePath(x, y, radius, startAngle, endAngle) {
+    "worklet"; // Reanimated worklet to be runnable on the UI thread
+    function polarToCartesian(centerX, centerY, radius, angleInDegrees) {
+        var angleInRadians = ((angleInDegrees - 90) * Math.PI) / 180.0;
+        return {
+            x: centerX + radius * Math.cos(angleInRadians),
+            y: centerY + radius * Math.sin(angleInRadians),
+        };
+    }
+    var start = polarToCartesian(x, y, radius, endAngle * 0.9999);
+    var end = polarToCartesian(x, y, radius, startAngle);
+    var largeArcFlag = endAngle - startAngle <= 180 ? "0" : "1";
+    var d = [
+        "M",
+        start.x,
+        start.y,
+        "A",
+        radius,
+        radius,
+        0,
+        largeArcFlag,
+        0,
+        end.x,
+        end.y,
+    ];
+    return d.join(" ");
+}
+//# sourceMappingURL=CircularProgress.js.map

package/src/components/Progress/CircularProgress/CircularProgress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CircularProgress.js","sourceRoot":"","sources":["CircularProgress.tsx"],"names":[],"mappings":"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"}