mg-library 1.0.726 → 1.0.728

package/components.js

@@ -1,6 +1,7 @@
 import React, { useRef, useState } from "react";
 import { Platform, Animated, View } from "react-native";
-import { Box, Text, Divider, Button, ButtonText, ButtonIcon, Icon, Popover, PopoverAnchor, PopoverBackdrop, PopoverContent, PopoverArrow, PopoverCloseButton, PopoverBody, PopoverFooter } from '@gluestack-ui/themed';
+import { Box, Text, Divider, ButtonIcon, Icon, Popover, PopoverTrigger, PopoverBackdrop, PopoverContent, PopoverArrow, PopoverCloseButton, PopoverBody, PopoverFooter } from '@gluestack-ui/themed';
+import { Button, ButtonText } from '@gluestack-ui/button';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 import * as mgFunctionsLib from './functions.js';
@@ -168,41 +169,23 @@ export function MGButton({
 }
 
 export function MGPopover(props) {
+    const { title, icon, language, callback } = props;
     const [open, setOpen] = useState(false);
-    const footer = (
-        <Box flexDirection="row" justifyContent="space-around" mt="$5" mb="$5">
-            <MGButton
-                title={mgFunctionsLib.i18nString("yes", props.language)}
-                action="primary"
-                variant="solid"
-                py="$4"
-                callback={async () => {
-                    setOpen(false);
-                    await props.callback?.();
-                }}
-            />
-            <MGButton
-                title={mgFunctionsLib.i18nString("no", props.language)}
-                action="primary"
-                variant="outline"
-                py="$4"
-                callback={() => setOpen(false)}
-            />
-        </Box>
-    );
+    const handleConfirm = async () => {
+        try {
+            await callback?.();
+        } finally {
+            setOpen(false);
+        }
+    };
     return (
-        <Popover
-            isOpen={open}
-            onOpenChange={setOpen}
-            trigger={(triggerProps) => (
-                <Button {...triggerProps} action="primary" variant="solid">
-                    {props.icon ? (
-                        <Icon as={MaterialCommunityIcons} name={props.icon} mr="$2" color="$white" />
-                    ) : null}
-                    <ButtonText>{props.title}</ButtonText>
+        <Popover isOpen={open} onOpenChange={setOpen}>
+            <PopoverTrigger>
+                <Button action="primary" variant="solid" onPress={() => setOpen(true)}>
+                    {icon ? <Icon as={MaterialCommunityIcons} name={icon} mr="$2" color="$white" /> : null}
+                    <ButtonText>{title}</ButtonText>
                 </Button>
-            )}
-        >
+            </PopoverTrigger>
             <PopoverBackdrop />
             <PopoverContent w={300} bg="$white">
                 <PopoverArrow />
@@ -211,11 +194,20 @@ export function MGPopover(props) {
                     <Box alignItems="center" justifyContent="center">
                         <Icon as={MaterialCommunityIcons} name="alert-outline" size={16} color="$primary500" mb="$3" />
                         <MGText textAlign="center">
-                            {mgFunctionsLib.i18nString("confirm", props.language)}?
+                            {mgFunctionsLib.i18nString('confirm', language)}?
                         </MGText>
                     </Box>
                 </PopoverBody>
-                <PopoverFooter>{footer}</PopoverFooter>
+                <PopoverFooter>
+                    <Box flexDirection="row" justifyContent="space-around" mt="$5" mb="$5">
+                        <Button action="primary" variant="solid" py="$4" onPress={handleConfirm}>
+                            <ButtonText>{mgFunctionsLib.i18nString('yes', language)}</ButtonText>
+                        </Button>
+                        <Button action="primary" variant="outline" py="$4" onPress={() => setOpen(false)}>
+                            <ButtonText>{mgFunctionsLib.i18nString('no', language)}</ButtonText>
+                        </Button>
+                    </Box>
+                </PopoverFooter>
             </PopoverContent>
         </Popover>
     );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mg-library",
-    "version": "1.0.726",
+    "version": "1.0.728",
     "description": "",
     "main": "index.js",
     "react-native": "index.js",