mg-library 1.0.583 → 1.0.585

package/blocks.js

@@ -597,35 +597,64 @@ export function MGButton(props) {
 
 export function MGPopover(props) {
     const [visible, setVisible] = useState(false);
-    const button = () => (
-        <NBButton py={4} colorScheme='primary'
-            leftIcon={
-                <NBIcon as={MaterialCommunityIcons} name={props.icon} size='lg' color='white' />
-            }
-            onPress={() => setVisible(true)}>
-            <MGText category="p1" color="white">
-                {props.title}
-            </MGText>
-        </NBButton>
-    );    
-    let cardFooter = (
-        <>
-            <View style={{ flexGrow: 1, flexDirection: 'row', justifyContent: 'space-around', marginTop: 20, marginBottom: 20 }}>
-                <NBButton py={4} colorScheme='primary' style={{ flexGrow: 0.3 }} onPress={() => { setVisible(false); props.callback() }}>
-                    <MGText color="white">{mgFunctionsLib.i18nString('yes', props.language)}</MGText>
-                </NBButton>
-                <NBButton py={4} colorScheme='primary' style={{ flexGrow: 0.3 }} onPress={() => { setVisible(false) }}>
-                    <MGText color="white">{mgFunctionsLib.i18nString('no', props.language)}</MGText>
-                </NBButton>
-            </View>
-        </>
+
+    const footer = (
+        <View style={{
+            flexGrow: 1,
+            flexDirection: 'row',
+            justifyContent: 'space-around',
+            marginTop: 20,
+            marginBottom: 20
+        }}>
+            <NBButton
+                py={4}
+                colorScheme='primary'
+                style={{ flexGrow: 0.3 }}
+                onPress={() => {
+                    setVisible(false);
+                    props.callback();
+                }}
+            >
+                <MGText color="white">
+                    {mgFunctionsLib.i18nString('yes', props.language)}
+                </MGText>
+            </NBButton>
+            <NBButton
+                py={4}
+                colorScheme='primary'
+                style={{ flexGrow: 0.3 }}
+                onPress={() => setVisible(false)}
+            >
+                <MGText color="white">
+                    {mgFunctionsLib.i18nString('no', props.language)}
+                </MGText>
+            </NBButton>
+        </View>
     );
+
     return (
         <NBPopover
             isOpen={visible}
             onClose={() => setVisible(false)}
             trigger={triggerProps => (
-               button()
+                <NBButton
+                    {...triggerProps}
+                    py={4}
+                    colorScheme='primary'
+                    leftIcon={
+                        <NBIcon
+                            as={MaterialCommunityIcons}
+                            name={props.icon}
+                            size='lg'
+                            color='white'
+                        />
+                    }
+                    onPress={() => setVisible(true)}
+                >
+                    <MGText category="p1" color="white">
+                        {props.title}
+                    </MGText>
+                </NBButton>
             )}
         >
             <NBPopover.Content w="300px" bg="white">
@@ -633,18 +662,24 @@ export function MGPopover(props) {
                 <NBPopover.CloseButton />
                 <NBPopover.Body>
                     <Box alignItems="center" justifyContent="center">
-                        <NBIcon as={MaterialCommunityIcons} name="alert-outline" size={16} color={props.theme['color-primary-500']} mb={3} />
+                        <NBIcon
+                            as={MaterialCommunityIcons}
+                            name="alert-outline"
+                            size={16}
+                            color={props.theme['color-primary-500']}
+                            mb={3}
+                        />
                         <MGText textAlign="center">
                             {mgFunctionsLib.i18nString('confirm', props.language)}?
                         </MGText>
                     </Box>
                 </NBPopover.Body>
                 <NBPopover.Footer>
-                    {cardFooter}
+                    {footer}
                 </NBPopover.Footer>
             </NBPopover.Content>
         </NBPopover>
-    )
+    );
 }
 
 export function MGGoBack(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mg-library",
-    "version": "1.0.583",
+    "version": "1.0.585",
     "description": "",
     "main": "index.js",
     "scripts": {