chore: cleanup

Author: isekovanic

package/src/components/UIComponents/SwipableWrapper.tsx

@@ -16,7 +16,7 @@ import ReanimatedSwipeable, {
 
 import { useSwipeRegistryContext } from '../../contexts/swipeableContext/SwipeRegistryContext';
 
-const ACTION_WIDTH = 50;
+const ACTION_WIDTH = 80;
 const DEFAULT_RIGHT_ACTIONS_WIDTH = ACTION_WIDTH * 2;
 
 const animationOptions = {
@@ -53,12 +53,6 @@ export const SwipableWrapper = ({ children, swipeableId, swipableProps }: Swipab
   const swipeRegistry = useSwipeRegistryContext();
   const swipeableRef = useRef<SwipeableMethods | null>(null);
 
-  const {
-    onSwipeableWillOpen: onSwipeableWillOpenFromProps,
-    renderRightActions: renderRightActionsFromProps,
-    ...restSwipableProps
-  } = swipableProps ?? {};
-
   const defaultRenderRightActions = useCallback(
     (_progress: SharedValue<number>, translation: SharedValue<number>) => (
       <DefaultRightActions translation={translation} />
@@ -81,9 +75,9 @@ export const SwipableWrapper = ({ children, swipeableId, swipableProps }: Swipab
       if (swipeRegistry && swipeableId) {
         swipeRegistry.notifyWillOpen(swipeableId);
       }
-      onSwipeableWillOpenFromProps?.(direction);
+      swipableProps?.onSwipeableWillOpen?.(direction);
     },
-    [onSwipeableWillOpenFromProps, swipeRegistry, swipeableId],
+    [swipableProps, swipeRegistry, swipeableId],
   );
 
   return (
@@ -96,8 +90,8 @@ export const SwipableWrapper = ({ children, swipeableId, swipableProps }: Swipab
       overshootRight={true}
       overshootFriction={16}
       renderLeftActions={undefined}
-      renderRightActions={renderRightActionsFromProps ?? defaultRenderRightActions}
-      {...restSwipableProps}
+      renderRightActions={defaultRenderRightActions}
+      {...swipableProps}
     >
       {children}
     </ReanimatedSwipeable>

package/src/contexts/swipeableContext/SwipeRegistryContext.tsx

@@ -17,21 +17,25 @@ type SwipeRegistryContextValue = {
 const SwipeRegistryContext = createContext<SwipeRegistryContextValue | undefined>(undefined);
 
 export const SwipeRegistryProvider = ({ children }: PropsWithChildren) => {
-  const swipeablesRef = useRef<Map<string, CloseSwipeable>>(new Map());
+  const swipeablesRef = useRef<Map<string, CloseSwipeable> | undefined>(undefined);
 
   const registerSwipeable = useCallback((id: string, close: CloseSwipeable) => {
+    if (!swipeablesRef.current) {
+      swipeablesRef.current = new Map();
+    }
+
     swipeablesRef.current.set(id, close);
 
     return () => {
-      const registered = swipeablesRef.current.get(id);
+      const registered = swipeablesRef.current?.get(id);
       if (registered === close) {
-        swipeablesRef.current.delete(id);
+        swipeablesRef.current?.delete(id);
       }
     };
   }, []);
 
   const notifyWillOpen = useCallback((id: string) => {
-    for (const [registeredId, close] of swipeablesRef.current.entries()) {
+    for (const [registeredId, close] of swipeablesRef.current?.entries() ?? []) {
       if (registeredId !== id) {
         close();
       }