mg-library 1.0.721 → 1.0.722

package/components.js

@@ -1,6 +1,6 @@
 import React, { useRef, useState } from "react";
 import { Platform, Animated, View } from "react-native";
-import { Box, Text, Divider, Button, ButtonText, ButtonIcon, Icon, Popover, PopoverTrigger, PopoverBackdrop, PopoverContent, PopoverArrow, PopoverCloseButton, PopoverBody, PopoverFooter } from '@gluestack-ui/themed';
+import { Box, Text, Divider, Button, ButtonText, ButtonIcon, Icon, Popover, PopoverAnchor, PopoverBackdrop, PopoverContent, PopoverArrow, PopoverCloseButton, PopoverBody, PopoverFooter } from '@gluestack-ui/themed';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 
 import * as mgFunctionsLib from './functions.js';
@@ -167,110 +167,53 @@ export function MGButton({
     );
 }
 
-export function MGPopover({
-    title,
-    icon,
-    language,
-    callback,
-    confirmText = mgFunctionsLib.i18nString("yes", language),
-    cancelText = mgFunctionsLib.i18nString("no", language),
-    confirmColor = "primary",
-    confirmVariant = "solid",
-    placement = "bottom",
-    isOpen: controlledOpen,
-    onOpenChange,
-    triggerProps = {},
-    contentWidth = 300,
-    confirmIcon,
-    ...rest
-}) {
-    const [visible, setVisible] = useState(false);
-    const isControlled = controlledOpen !== undefined;
-    const open = isControlled ? controlledOpen : visible;
-    const setOpen = onOpenChange ?? setVisible;
-    const [loading, setLoading] = useState(false);
-    const handleConfirm = async () => {
-        try {
-            setLoading(true);
-            await callback?.();
-        } finally {
-            setLoading(false);
-            setOpen(false);
-        }
-    };
+export function MGPopover(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>
+    );
     return (
-        <Popover
-            isOpen={open}
-            onOpenChange={setOpen}
-            placement={placement}
-            {...rest}
-        >
-            <PopoverTrigger>
-                {(tp) => (
-                    <Button
-                        {...tp}
-                        action={triggerProps.action ?? "primary"}
-                        variant={triggerProps.variant ?? "solid"}
-                        py={triggerProps.py ?? "$4"}
-                        bg={triggerProps.bg}
-                        borderColor={triggerProps.borderColor}
-                        isDisabled={triggerProps.isDisabled}
-                    >
-                        {icon ? (
-                            <Icon as={MaterialCommunityIcons} name={icon} mr="$2" color="$white" />
-                        ) : null}
-                        <ButtonText>{title}</ButtonText>
-                    </Button>
-                )}
-            </PopoverTrigger>
+        <Popover isOpen={open} onOpenChange={setOpen}>
+            <PopoverAnchor>
+                <Button action="primary" variant="solid" py="$4" onPress={() => setOpen(true)}>
+                    {props.icon ? (
+                        <Icon as={MaterialCommunityIcons} name={props.icon} mr="$2" color="$white" />
+                    ) : null}
+                    <ButtonText>{props.title}</ButtonText>
+                </Button>
+            </PopoverAnchor>
             <PopoverBackdrop />
-            <PopoverContent w={contentWidth} bg="$white">
+            <PopoverContent w={300} bg="$white">
                 <PopoverArrow />
                 <PopoverCloseButton />
                 <PopoverBody>
                     <Box alignItems="center" justifyContent="center">
                         <Icon as={MaterialCommunityIcons} name="alert-outline" size={16} color="$primary500" mb="$3" />
                         <MGText textAlign="center">
-                            {mgFunctionsLib.i18nString("confirm", language)}?
+                            {mgFunctionsLib.i18nString("confirm", props.language)}?
                         </MGText>
                     </Box>
                 </PopoverBody>
-                <PopoverFooter>
-                    <Box flexDirection="row" justifyContent="space-around" mt="$5" mb="$5">
-                        <MGButton
-                            title={confirmText}
-                            action={confirmColor}
-                            variant={confirmVariant}
-                            py="$4"
-                            icon={confirmIcon}
-                            isLoading={loading}
-                            disabled={loading}
-                            callback={handleConfirm}
-                        />
-                        <MGButton
-                            title={cancelText}
-                            action="primary"
-                            variant="outline"
-                            py="$4"
-                            disabled={loading}
-                            callback={() => setOpen(false)}
-                        />
-                    </Box>
-                </PopoverFooter>
+                <PopoverFooter>{footer}</PopoverFooter>
             </PopoverContent>
         </Popover>
     );
-}
-
-export function MGDivider({ style, ...props }) {
-    return (
-        <Divider
-            h="$0.50"
-            flexGrow={1}
-            alignSelf="stretch"
-            bg="$gray300"
-            style={style}
-            {...props}
-        />
-    );
 }

package/package.json

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