Merge pull request #5275 from GeekyAnts/release/3.4.13-rc.0

Release/3.4.13 rc.0
GeekyAnts · Aug 17, 2022 · 5930fac · 5930fac
2 parents 8ec24ff + 2f3b31c
commit 5930fac
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.12",
+  "version": "3.4.13-rc.0",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",

diff --git a/src/components/composites/Actionsheet/ActionsheetContent.tsx b/src/components/composites/Actionsheet/ActionsheetContent.tsx
@@ -28,6 +28,16 @@ const Content = memo(
         ...resolvedProps
       } = usePropsResolution('ActionsheetContent', props);
 
+      const handleCloseRef = React.useRef(null);
+      const handleCloseCallback = React.useCallback(() => {
+        let handleCloseCurrent = handleCloseRef.current;
+        //@ts-ignore
+        return handleCloseCurrent();
+      }, []);
+      React.useEffect(() => {
+        handleCloseRef.current = handleClose;
+      }, [handleClose]);
+
       const panResponder = React.useRef(
         PanResponder.create({
           onStartShouldSetPanResponder: () => true,
@@ -48,7 +58,7 @@ const Content = memo(
                 toValue: { x: 0, y: sheetHeight.current },
                 duration: 150,
                 useNativeDriver: true,
-              }).start(handleClose);
+              }).start(handleCloseCallback);
 
               setTimeout(() => {
                 Animated.timing(pan, {

diff --git a/src/components/composites/Toast/Toast.tsx b/src/components/composites/Toast/Toast.tsx
@@ -83,7 +83,11 @@ const CustomToast = ({ _overlay, _stack, _presenceTransition }: any) => {
   });
 
   return getPositions().length > 0 ? (
-    <Overlay {..._overlay} isOpen={hasToastOnOverlay}>
+    <Overlay
+      {..._overlay}
+      isOpen={hasToastOnOverlay}
+      isKeyboardDismissable={false}
+    >
       {getPositions().map((position: string) => {
         if (Object.keys(POSITIONS).includes(position))
           return (

diff --git a/src/components/primitives/Select/Select.tsx b/src/components/primitives/Select/Select.tsx
@@ -31,6 +31,7 @@ const Select = (
     isHovered: isHoveredProp,
     isFocused: isFocusedProp,
     isFocusVisible: isFocusVisibleProp,
+    variant,
     ...props
   }: ISelectProps,
   ref: any
@@ -170,6 +171,7 @@ const Select = (
       focusable={false}
       isDisabled={isDisabled}
       pointerEvents="none"
+      variant={variant}
     />
   );