Skip to content

Revert "Remove default props in ToastableWrapper to prevent warning" #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Revert "Remove default props in ToastableWrapper to prevent warning" #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 36 additions & 34 deletions src/components/ToastableWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@ import type {
} from '../types';
import { useConstructor } from '../hooks';

const defaultProps: ToastableWrapperProps = {
animationInTiming: 600,
animationOutTiming: 600,
useNativeDriver: false,
isVisible: false,
panResponderThreshold: 4,
swipeThreshold: 100,
onToasterHide: () => null,
onToasterWillHide: () => null,
swipeDirection: ['right', 'left', 'up'],
onSwipeComplete: () => null,
onSwipeStart: () => null,
};

type ToastableWrapperProps = {
animationInTiming: number;
animationOutTiming: number;
Expand Down Expand Up @@ -222,21 +236,11 @@ const ANIMATION_MAP: Record<SwipeDirection, AnimatableViewAnimation> = {
};

export const ToastableWrapper = ({
animationInTiming = 600,
animationOutTiming = 600,
isVisible = false,
panResponderThreshold = 4,
swipeThreshold = 100,
onToasterHide = () => null,
onToasterWillHide = () => null,
swipeDirection = ['right', 'left', 'up'],
onSwipeComplete = () => null,
onSwipeStart = () => null,
...props
}: PropsWithChildren<ToastableWrapperProps>) => {
const isSwipeable = !!swipeDirection;
const isSwipeable = !!props.swipeDirection;

const [isShown, setIsShown] = useState(isVisible);
const [isVisible, setIsVisible] = useState(props.isVisible);
const pan = useRef(new Animated.ValueXY()).current;
const contentRef = useRef<AnimatableViewRef>(null);

Expand All @@ -260,15 +264,15 @@ export const ToastableWrapper = ({
if (interactionHandle == null) {
interactionHandle = InteractionManager.createInteractionHandle();
}
content.animate('slideInDown', animationInTiming).then(() => {
content.animate('slideInDown', props.animationInTiming).then(() => {
isTransitioning = false;

if (interactionHandle) {
InteractionManager.clearInteractionHandle(interactionHandle);
interactionHandle = null;
}

if (!isVisible) {
if (!props.isVisible) {
close();
}
});
Expand All @@ -287,14 +291,14 @@ export const ToastableWrapper = ({
return;
}

onToasterWillHide?.();
props.onToasterWillHide?.();

if (interactionHandle == null) {
interactionHandle = InteractionManager.createInteractionHandle();
}

content
.animate(ANIMATION_MAP[currentSwipingDirection], animationOutTiming)
.animate(ANIMATION_MAP[currentSwipingDirection], props.animationOutTiming)
.then(() => {
isTransitioning = false;

Expand All @@ -303,9 +307,9 @@ export const ToastableWrapper = ({
interactionHandle = null;
}

if (!isVisible) {
setIsShown(false);
onToasterHide();
if (!props.isVisible) {
setIsVisible(false);
props.onToasterHide();
return;
}

Expand All @@ -315,21 +319,21 @@ export const ToastableWrapper = ({

useConstructor(() => {
buildPanResponder({
onSwipeComplete: onSwipeComplete,
onSwipeStart: onSwipeStart,
onSwipeComplete: props.onSwipeComplete,
onSwipeStart: props.onSwipeStart,
pan,
panResponderThreshold: panResponderThreshold,
swipeDirection: swipeDirection,
swipeThreshold: swipeThreshold,
panResponderThreshold: props.panResponderThreshold,
swipeDirection: props.swipeDirection,
swipeThreshold: props.swipeThreshold,
});
});

useEffect(() => {
if (isShown) {
if (isVisible) {
open();
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isShown]);
}, [isVisible]);

useEffect(() => {
return () => {
Expand All @@ -345,16 +349,12 @@ export const ToastableWrapper = ({
useEffect(() => {
const wasVisible = prevIsVisibleRef.current;

if (isVisible !== wasVisible) {
if (isVisible) {
open();
} else {
close();
}
prevIsVisibleRef.current = isVisible;
if (props.isVisible !== wasVisible) {
props.isVisible ? open() : close();
prevIsVisibleRef.current = props.isVisible;
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isVisible]);
}, [props.isVisible]);

// FIXME: this should be placed in the render method, but it causes a bug
// if (!isVisible) {
Expand All @@ -375,6 +375,8 @@ export const ToastableWrapper = ({
);
};

ToastableWrapper.defaultProps = defaultProps;

const styles = StyleSheet.create({
container: {
...StyleSheet.absoluteFillObject,
Expand Down