docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
cursor: isDisabled ? 'not-allowed' : 'pointer', | <mask> opacity={isDisabled ? 0.4 : 1}
<mask> {...(Platform.OS === 'web'
<mask> ? {
<mask> disabled: isDisabled,
<mask> cursor: isDisabled ? 'not-allowed' : 'auto',
<mask> }
<mask> : {})}
<mask> >
<mask> <Center
<mask> backgroundColor={
</s> fix: circularprogress remove label and checkbox , radio ux changes </s> remove cursor: inputProps.disabled ? 'not-allowed' : 'auto',
</s> add cursor: inputProps.disabled ? 'not-allowed' : 'pointer', </s> remove <Box fontSize={sizeProps.height / 4}>{props.children}</Box>
</s> add <Box fontSize={sizeProps.height / 4} _text={_text}>
{props.children}
</Box> </s> remove <CircularProgress.Label>550%</CircularProgress.Label>
</s> add 550% </s> remove import { default as CircularProgressMain } from './CircularProgress';
import type { ICircularProgressComponentType } from './types';
import Text from './../../primitives/Text';
const CircularProgressTemp: any = CircularProgressMain;
CircularProgressTemp.Label = Text;
const CircularProgress = CircularProgressTemp as ICircularProgressComponentType;
</s> add import { default as CircularProgress } from './CircularProgress'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bd93b15408a650bdfa46a772041d091ed885f06f | src/components/primitives/Checkbox/Checkbox.tsx |
cursor: inputProps.disabled ? 'not-allowed' : 'pointer', | <mask> opacity={inputProps.disabled ? 0.4 : 1}
<mask> {...(Platform.OS === 'web'
<mask> ? {
<mask> disabled: inputProps.disabled,
<mask> cursor: inputProps.disabled ? 'not-allowed' : 'auto',
<mask> }
<mask> : {})}
<mask> >
<mask> <Box
<mask> borderColor={outlineColor}
</s> fix: circularprogress remove label and checkbox , radio ux changes </s> remove cursor: isDisabled ? 'not-allowed' : 'auto',
</s> add cursor: isDisabled ? 'not-allowed' : 'pointer', </s> remove <Box fontSize={sizeProps.height / 4}>{props.children}</Box>
</s> add <Box fontSize={sizeProps.height / 4} _text={_text}>
{props.children}
</Box> </s> remove <CircularProgress.Label>550%</CircularProgress.Label>
</s> add 550% </s> remove import { default as CircularProgressMain } from './CircularProgress';
import type { ICircularProgressComponentType } from './types';
import Text from './../../primitives/Text';
const CircularProgressTemp: any = CircularProgressMain;
CircularProgressTemp.Label = Text;
const CircularProgress = CircularProgressTemp as ICircularProgressComponentType;
</s> add import { default as CircularProgress } from './CircularProgress'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bd93b15408a650bdfa46a772041d091ed885f06f | src/components/primitives/Radio/Radio.tsx |
import { AlertDialog, Button, Center } from 'native-base'; | <mask> import React from 'react';
<mask> import {
<mask> AlertDialog,
<mask> AlertDialogBody,
<mask> AlertDialogContent,
<mask> AlertDialogFooter,
<mask> AlertDialogHeader,
<mask> AlertDialogOverlay,
<mask> Button,
<mask> Center,
<mask> } from 'native-base';
<mask> import type { TouchableOpacity } from 'react-native';
<mask>
<mask> export default function () {
<mask> const [isOpen, setIsOpen] = React.useState(false);
<mask> const onClose = () => setIsOpen(false);
</s> fix: modal apichages , make modal a compound component </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
} from 'native-base';
</s> add import { Modal, Button, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Basic.tsx |
<AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.Header _text={{ fontSize: 'lg', fontWeight: 'bold' }}> | <mask> isOpen={isOpen}
<mask> onClose={onClose}
<mask> motionPreset={'slide'}
<mask> >
<mask> <AlertDialogOverlay />
<mask> <AlertDialogContent>
<mask> <AlertDialogHeader fontSize="lg" fontWeight="bold">
<mask> Delete Customer
<mask> </AlertDialogHeader>
<mask> <AlertDialogBody>
<mask> Are you sure? You can't undo this action afterwards.
<mask> </AlertDialogBody>
</s> fix: modal apichages , make modal a compound component </s> remove </AlertDialogHeader>
<AlertDialogBody>
</s> add </AlertDialog.Header>
<AlertDialog.Body> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove <AlertDialogOverlay />
<AlertDialogContent>
<AlertDialogCloseButton />
<AlertDialogHeader>Discard Changes?</AlertDialogHeader>
<AlertDialogBody>
</s> add <AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.CloseButton />
<AlertDialog.Header>Discard Changes?</AlertDialog.Header>
<AlertDialog.Body> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Basic.tsx |
</AlertDialog.Header>
<AlertDialog.Body> | <mask> <AlertDialogOverlay />
<mask> <AlertDialogContent>
<mask> <AlertDialogHeader fontSize="lg" fontWeight="bold">
<mask> Delete Customer
<mask> </AlertDialogHeader>
<mask> <AlertDialogBody>
<mask> Are you sure? You can't undo this action afterwards.
<mask> </AlertDialogBody>
<mask> <AlertDialogFooter>
<mask> <Button onPress={onClose}>Cancel</Button>
<mask> <Button colorScheme="red" onPress={onClose} ml={3}>
</s> fix: modal apichages , make modal a compound component </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove <AlertDialogOverlay />
<AlertDialogContent>
<AlertDialogHeader fontSize="lg" fontWeight="bold">
</s> add <AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.Header _text={{ fontSize: 'lg', fontWeight: 'bold' }}> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove <AlertDialogOverlay />
<AlertDialogContent>
<AlertDialogCloseButton />
<AlertDialogHeader>Discard Changes?</AlertDialogHeader>
<AlertDialogBody>
</s> add <AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.CloseButton />
<AlertDialog.Header>Discard Changes?</AlertDialog.Header>
<AlertDialog.Body> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Basic.tsx |
</AlertDialog.Body>
<AlertDialog.Footer> | <mask> Delete Customer
<mask> </AlertDialogHeader>
<mask> <AlertDialogBody>
<mask> Are you sure? You can't undo this action afterwards.
<mask> </AlertDialogBody>
<mask> <AlertDialogFooter>
<mask> <Button onPress={onClose}>Cancel</Button>
<mask> <Button colorScheme="red" onPress={onClose} ml={3}>
<mask> Delete
<mask> </Button>
<mask> </AlertDialogFooter>
</s> fix: modal apichages , make modal a compound component </s> remove </AlertDialogHeader>
<AlertDialogBody>
</s> add </AlertDialog.Header>
<AlertDialog.Body> </s> remove <AlertDialogOverlay />
<AlertDialogContent>
<AlertDialogHeader fontSize="lg" fontWeight="bold">
</s> add <AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.Header _text={{ fontSize: 'lg', fontWeight: 'bold' }}> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Basic.tsx |
</AlertDialog.Footer>
</AlertDialog.Content> | <mask> <Button onPress={onClose}>Cancel</Button>
<mask> <Button colorScheme="red" onPress={onClose} ml={3}>
<mask> Delete
<mask> </Button>
<mask> </AlertDialogFooter>
<mask> </AlertDialogContent>
<mask> </AlertDialog>
<mask> </Center>
<mask> );
<mask> }
</s> fix: modal apichages , make modal a compound component </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove </AlertDialogHeader>
<AlertDialogBody>
</s> add </AlertDialog.Header>
<AlertDialog.Body> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Basic.tsx |
import { AlertDialog, Button, Center } from 'native-base'; | <mask> import React from 'react';
<mask> import {
<mask> AlertDialog,
<mask> AlertDialogBody,
<mask> AlertDialogContent,
<mask> AlertDialogFooter,
<mask> AlertDialogHeader,
<mask> AlertDialogOverlay,
<mask> Button,
<mask> AlertDialogCloseButton,
<mask> Center,
<mask> } from 'native-base';
<mask> import type { TouchableOpacity } from 'react-native';
<mask>
<mask> export default function () {
<mask> const [isOpen, setIsOpen] = React.useState(false);
<mask> const onClose = () => setIsOpen(false);
</s> fix: modal apichages , make modal a compound component </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
} from 'native-base';
</s> add import { Modal, Button, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Transition.tsx |
<AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.CloseButton />
<AlertDialog.Header>Discard Changes?</AlertDialog.Header>
<AlertDialog.Body> | <mask> onClose={onClose}
<mask> isOpen={isOpen}
<mask> isCentered
<mask> >
<mask> <AlertDialogOverlay />
<mask> <AlertDialogContent>
<mask> <AlertDialogCloseButton />
<mask> <AlertDialogHeader>Discard Changes?</AlertDialogHeader>
<mask> <AlertDialogBody>
<mask> Are you sure you want to discard all of your notes? 44 words will be
<mask> deleted.
<mask> </AlertDialogBody>
<mask> <AlertDialogFooter>
<mask> <Button ref={cancelRef} onPress={onClose}>
</s> fix: modal apichages , make modal a compound component </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove <AlertDialogOverlay />
<AlertDialogContent>
<AlertDialogHeader fontSize="lg" fontWeight="bold">
</s> add <AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.Header _text={{ fontSize: 'lg', fontWeight: 'bold' }}> </s> remove </AlertDialogHeader>
<AlertDialogBody>
</s> add </AlertDialog.Header>
<AlertDialog.Body> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove <View pointerEvents="none" style={overlayStyle.itemBackground}>
</s> add {/* Added box-none instead of none to fix Web modal not able to get clicked inside Modal.Body */}
<View pointerEvents="box-none" style={overlayStyle.itemBackground}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Transition.tsx |
</AlertDialog.Body>
<AlertDialog.Footer> | <mask> <AlertDialogHeader>Discard Changes?</AlertDialogHeader>
<mask> <AlertDialogBody>
<mask> Are you sure you want to discard all of your notes? 44 words will be
<mask> deleted.
<mask> </AlertDialogBody>
<mask> <AlertDialogFooter>
<mask> <Button ref={cancelRef} onPress={onClose}>
<mask> No
<mask> </Button>
<mask> <Button colorScheme="red" ml={3}>
<mask> Yes
</s> fix: modal apichages , make modal a compound component </s> remove <AlertDialogOverlay />
<AlertDialogContent>
<AlertDialogCloseButton />
<AlertDialogHeader>Discard Changes?</AlertDialogHeader>
<AlertDialogBody>
</s> add <AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.CloseButton />
<AlertDialog.Header>Discard Changes?</AlertDialog.Header>
<AlertDialog.Body> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove </AlertDialogHeader>
<AlertDialogBody>
</s> add </AlertDialog.Header>
<AlertDialog.Body> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove <AlertDialogOverlay />
<AlertDialogContent>
<AlertDialogHeader fontSize="lg" fontWeight="bold">
</s> add <AlertDialog.Overlay />
<AlertDialog.Content>
<AlertDialog.Header _text={{ fontSize: 'lg', fontWeight: 'bold' }}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Transition.tsx |
</AlertDialog.Footer>
</AlertDialog.Content> | <mask> </Button>
<mask> <Button colorScheme="red" ml={3}>
<mask> Yes
<mask> </Button>
<mask> </AlertDialogFooter>
<mask> </AlertDialogContent>
<mask> </AlertDialog>
<mask> <Button onPress={() => setIsOpen(!isOpen)}>Discard</Button>
<mask> </Center>
<mask> );
<mask> }
</s> fix: modal apichages , make modal a compound component </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove </AlertDialogBody>
<AlertDialogFooter>
</s> add </AlertDialog.Body>
<AlertDialog.Footer> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/AlertDialog/Transition.tsx |
import { Modal, Button, Center, Input } from 'native-base'; | <mask> import React from 'react';
<mask> import {
<mask> Modal,
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalContent,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> Button,
<mask> Center,
<mask> Input,
<mask> } from 'native-base';
<mask>
<mask> export default function () {
<mask> const [modalVisible, setModalVisible] = React.useState(false);
<mask> return (
<mask> <>
</s> fix: modal apichages , make modal a compound component </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
} from 'native-base';
</s> add import { Modal, Button, Input } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Basic.tsx |
<Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> | <mask> isOpen={modalVisible}
<mask> onClose={setModalVisible}
<mask> overlayVisible={true}
<mask> >
<mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
</s> fix: modal apichages , make modal a compound component </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Basic.tsx |
</Modal.Header>
<Modal.Body> | <mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
<mask> Debitis esse, ea blanditiis iste enim iure at odit fugiat autem.
<mask> <Input mt={4} placeholder="Lorem ipsum dolor sit" />
<mask> </ModalBody>
</s> fix: modal apichages , make modal a compound component </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Basic.tsx |
</Modal.Body>
<Modal.Footer> | <mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
<mask> Debitis esse, ea blanditiis iste enim iure at odit fugiat autem.
<mask> <Input mt={4} placeholder="Lorem ipsum dolor sit" />
<mask> </ModalBody>
<mask> <ModalFooter>
<mask> <Button colorScheme="blue" mr={1}>
<mask> Done
<mask> </Button>
<mask> <Button
<mask> colorScheme="secondary"
</s> fix: modal apichages , make modal a compound component </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Basic.tsx |
</Modal.Footer>
</Modal.Content> | <mask> }}
<mask> >
<mask> Cancel
<mask> </Button>
<mask> </ModalFooter>
<mask> </ModalContent>
<mask> </Modal>
<mask> <Center>
<mask> <Button
<mask> onPress={() => {
<mask> setModalVisible(!modalVisible);
</s> fix: modal apichages , make modal a compound component </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove {disableOverlay ? null : <ModalOverlay />}
</s> add {disableOverlay ? null : <Modal.Overlay />} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Basic.tsx |
import { Modal, Button, Input } from 'native-base'; | <mask> import React from 'react';
<mask> import {
<mask> Modal,
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalContent,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> Button,
<mask> Input,
<mask> } from 'native-base';
<mask>
<mask> export default function () {
<mask> const [modalVisible, setModalVisible] = React.useState(false);
<mask> const initialRef = React.useRef(null);
<mask> const finalRef = React.useRef(null);
</s> fix: modal apichages , make modal a compound component </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalRefEg.tsx |
<Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> | <mask> onClose={setModalVisible}
<mask> initialFocusRef={initialRef}
<mask> finalFocusRef={finalRef}
<mask> >
<mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
</s> fix: modal apichages , make modal a compound component </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalRefEg.tsx |
</Modal.Header>
<Modal.Body> | <mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
<mask> Debitis esse, ea blanditiis iste enim iure at odit fugiat autem.
<mask> Accusamus?
<mask> <Input mt={4} ref={initialRef} placeholder="First name" />
</s> fix: modal apichages , make modal a compound component </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalRefEg.tsx |
</Modal.Body>
<Modal.Footer> | <mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
<mask> Debitis esse, ea blanditiis iste enim iure at odit fugiat autem.
<mask> Accusamus?
<mask> <Input mt={4} ref={initialRef} placeholder="First name" />
<mask> </ModalBody>
<mask> <ModalFooter>
<mask> <Button colorScheme="blue" mr={1}>
<mask> Save
<mask> </Button>
<mask> <Button
<mask> colorScheme="secondary"
</s> fix: modal apichages , make modal a compound component </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalRefEg.tsx |
</Modal.Footer>
</Modal.Content> | <mask> }}
<mask> >
<mask> Close
<mask> </Button>
<mask> </ModalFooter>
<mask> </ModalContent>
<mask> </Modal>
<mask> <Button
<mask> onPress={() => {
<mask> setModalVisible(!modalVisible);
<mask> }}
</s> fix: modal apichages , make modal a compound component </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove <View pointerEvents="none" style={overlayStyle.itemBackground}>
</s> add {/* Added box-none instead of none to fix Web modal not able to get clicked inside Modal.Body */}
<View pointerEvents="box-none" style={overlayStyle.itemBackground}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalRefEg.tsx |
import { Modal, Button, Input, VStack, Text } from 'native-base'; | <mask> import React from 'react';
<mask> import {
<mask> Modal,
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalContent,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> Button,
<mask> Input,
<mask> VStack,
<mask> Text,
<mask> } from 'native-base';
<mask>
<mask> export default function () {
<mask> const [modalVisible, setModalVisible] = React.useState(false);
<mask> return (
<mask> <>
</s> fix: modal apichages , make modal a compound component </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
} from 'native-base';
</s> add import { Modal, Button, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalWithAvoidKeyboard.tsx |
<Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> | <mask> isOpen={modalVisible}
<mask> onClose={setModalVisible}
<mask> avoidKeyboard
<mask> >
<mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
</s> fix: modal apichages , make modal a compound component </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalWithAvoidKeyboard.tsx |
</Modal.Header>
<Modal.Body> | <mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
<mask> Debitis esse, ea blanditiis iste enim iure at odit fugiat autem.
<mask> Accusamus?
<mask> <Input mt={4} placeholder="Lorem ipsum dolor sit" />
</s> fix: modal apichages , make modal a compound component </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalWithAvoidKeyboard.tsx |
</Modal.Body>
<Modal.Footer> | <mask> cupiditate expedita, ipsa corporis officia totam similique delectus!
<mask> Debitis esse, ea blanditiis iste enim iure at odit fugiat autem.
<mask> Accusamus?
<mask> <Input mt={4} placeholder="Lorem ipsum dolor sit" />
<mask> </ModalBody>
<mask> <ModalFooter>
<mask> <Button colorScheme="blue" mr={1}>
<mask> Save
<mask> </Button>
<mask> <Button
<mask> colorScheme="secondary"
</s> fix: modal apichages , make modal a compound component </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalWithAvoidKeyboard.tsx |
</Modal.Footer>
</Modal.Content> | <mask> }}
<mask> >
<mask> Close
<mask> </Button>
<mask> </ModalFooter>
<mask> </ModalContent>
<mask> </Modal>
<mask> <VStack space={2}>
<mask> <Button
<mask> onPress={() => {
<mask> setModalVisible(!modalVisible);
</s> fix: modal apichages , make modal a compound component </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove {disableOverlay ? null : <ModalOverlay />}
</s> add {disableOverlay ? null : <Modal.Overlay />} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/ModalWithAvoidKeyboard.tsx |
import { Modal, Button, Center, Input } from 'native-base'; | <mask> import React from 'react';
<mask> import {
<mask> Modal,
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalContent,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> Button,
<mask> Center,
<mask> Input,
<mask> } from 'native-base';
<mask>
<mask> export default function () {
<mask> const [modalVisible, setModalVisible] = React.useState(false);
<mask> const [size, setSize] = React.useState('md');
<mask>
</s> fix: modal apichages , make modal a compound component </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
} from 'native-base';
</s> add import { Modal, Button, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Size.tsx |
<Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> | <mask> isOpen={modalVisible}
<mask> onClose={setModalVisible}
<mask> size={size}
<mask> >
<mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa delectus!
</s> fix: modal apichages , make modal a compound component </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Size.tsx |
</Modal.Header>
<Modal.Body> | <mask> <ModalContent>
<mask> <ModalCloseButton />
<mask> <ModalHeader fontSize="4xl" fontWeight="bold">
<mask> Hello World
<mask> </ModalHeader>
<mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa delectus!
<mask> <Input mt={4} placeholder="Lorem ipsum dolor sit" />
<mask> </ModalBody>
<mask> <ModalFooter>
</s> fix: modal apichages , make modal a compound component </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove <ModalContent>
<ModalCloseButton />
<ModalHeader fontSize="4xl" fontWeight="bold">
</s> add <Modal.Content>
<Modal.CloseButton />
<Modal.Header _text={{ fontSize: '4xl', fontWeight: 'bold' }}> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Size.tsx |
</Modal.Body>
<Modal.Footer> | <mask> <ModalBody>
<mask> Lorem ipsum dolor sit amet consectetur adipisicing elit. Quos quasi
<mask> cupiditate expedita, ipsa delectus!
<mask> <Input mt={4} placeholder="Lorem ipsum dolor sit" />
<mask> </ModalBody>
<mask> <ModalFooter>
<mask> <Button colorScheme="blue" mr={1} mb={1}>
<mask> Save
<mask> </Button>
<mask> <Button
<mask> colorScheme="secondary"
</s> fix: modal apichages , make modal a compound component </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalBody>
<ModalFooter>
</s> add </Modal.Body>
<Modal.Footer> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> </s> remove </ModalHeader>
<ModalBody>
</s> add </Modal.Header>
<Modal.Body> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Size.tsx |
</Modal.Footer>
</Modal.Content> | <mask> }}
<mask> >
<mask> Close
<mask> </Button>
<mask> </ModalFooter>
<mask> </ModalContent>
<mask> </Modal>
<mask> <Center>
<mask> <Button
<mask> onPress={() => handleSizeClick('xs')}
<mask> key={'xs'}
</s> fix: modal apichages , make modal a compound component </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </AlertDialogFooter>
</AlertDialogContent>
</s> add </AlertDialog.Footer>
</AlertDialog.Content> </s> remove {disableOverlay ? null : <ModalOverlay />}
</s> add {disableOverlay ? null : <Modal.Overlay />} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | example/storybook/stories/components/composites/Modal/Size.tsx |
import { Modal } from '../../composites'; | <mask> import React from 'react';
<mask> import { default as Modal, ModalOverlay } from '../Modal';
<mask> import type { IActionsheetProps } from './types';
<mask> import { omitUndefined } from '../../../theme/tools/utils';
<mask>
<mask> const Actionsheet = ({ children, ...props }: IActionsheetProps) => {
<mask> const { isOpen, disableOverlay, onClose, ...newProps } = omitUndefined(props);
</s> fix: modal apichages , make modal a compound component </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
} from 'native-base';
</s> add import { Modal, Button, Input } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/Actionsheet.tsx |
{disableOverlay ? null : <Modal.Overlay />} | <mask> justifyContent="flex-end"
<mask> {...newProps}
<mask> size="xl"
<mask> >
<mask> {disableOverlay ? null : <ModalOverlay />}
<mask> {children}
<mask> </Modal>
<mask> );
<mask> };
<mask>
</s> fix: modal apichages , make modal a compound component </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove <ModalContent m={3} p={2} mb={1} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={1} borderRadius="lg" {...props}> </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/Actionsheet.tsx |
import { Modal } from '../../composites'; | <mask> import React from 'react';
<mask> import { ModalContent } from '../Modal';
<mask> import type { IActionsheetContentProps } from './types';
<mask>
<mask> const ActionsheetContent = ({
<mask> children,
<mask> ...props
</s> fix: modal apichages , make modal a compound component </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove import { default as Modal, ModalOverlay } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/ActionsheetContent.tsx |
<Modal.Content m={3} p={2} mb={1} borderRadius="lg" {...props}> | <mask> children,
<mask> ...props
<mask> }: IActionsheetContentProps) => {
<mask> return (
<mask> <ModalContent m={3} p={2} mb={1} borderRadius="lg" {...props}>
<mask> {children}
<mask> </ModalContent>
<mask> );
<mask> };
<mask>
</s> fix: modal apichages , make modal a compound component </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/ActionsheetContent.tsx |
</Modal.Content> | <mask> }: IActionsheetContentProps) => {
<mask> return (
<mask> <ModalContent m={3} p={2} mb={1} borderRadius="lg" {...props}>
<mask> {children}
<mask> </ModalContent>
<mask> );
<mask> };
<mask>
<mask> export default React.memo(ActionsheetContent);
</s> fix: modal apichages , make modal a compound component </s> remove <ModalContent m={3} p={2} mb={1} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={1} borderRadius="lg" {...props}> </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove const AlertDialog = React.memo((props: IAlertDialogProps) => {
const { leastDestructiveRef, ...rest } = props;
return (
<Modal
{...rest}
initialFocusRef={leastDestructiveRef}
closeOnOverlayClick={false}
/>
);
});
const AlertDialogContent = React.forwardRef(function AlertDialogContent(
props: any,
ref
) {
return <ModalContent ref={ref} accessibilityRole="alert" {...props} />;
});
export {
AlertDialog,
AlertDialogContent,
ModalBody as AlertDialogBody,
ModalCloseButton as AlertDialogCloseButton,
ModalFooter as AlertDialogFooter,
ModalHeader as AlertDialogHeader,
ModalOverlay as AlertDialogOverlay,
};
</s> add // To add typings
const AlertDialog = AlertDialogTemp as IAlertDialogComponentType;
export { AlertDialog }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/ActionsheetContent.tsx |
import { Modal } from '../../composites'; | <mask> import React from 'react';
<mask> import { ModalContent } from '../Modal';
<mask> import type { IActionsheetFooterProps } from './types';
<mask>
<mask> const ActionsheetFooter = ({ children, ...props }: IActionsheetFooterProps) => {
<mask> return (
<mask> <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> fix: modal apichages , make modal a compound component </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove import { default as Modal, ModalOverlay } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove <ModalContent m={3} p={2} mb={1} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={1} borderRadius="lg" {...props}> | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/ActionsheetFooter.tsx |
<Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> | <mask> import type { IActionsheetFooterProps } from './types';
<mask>
<mask> const ActionsheetFooter = ({ children, ...props }: IActionsheetFooterProps) => {
<mask> return (
<mask> <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
<mask> {children}
<mask> </ModalContent>
<mask> );
<mask> };
<mask>
</s> fix: modal apichages , make modal a compound component </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove <ModalContent m={3} p={2} mb={1} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={1} borderRadius="lg" {...props}> </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove import { default as Modal, ModalOverlay } from '../Modal';
</s> add import { Modal } from '../../composites'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/ActionsheetFooter.tsx |
</Modal.Content> | <mask> const ActionsheetFooter = ({ children, ...props }: IActionsheetFooterProps) => {
<mask> return (
<mask> <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
<mask> {children}
<mask> </ModalContent>
<mask> );
<mask> };
<mask>
<mask> export default React.memo(ActionsheetFooter);
</s> fix: modal apichages , make modal a compound component </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove <ModalContent m={3} p={2} mb={1} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={1} borderRadius="lg" {...props}> </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Actionsheet/ActionsheetFooter.tsx |
import AlertDialogMain, { IAlertDialogComponentType } from './AlertDialog';
import AlertDialogContent from './AlertDialogContent';
export type { IAlertDialogProps } from './AlertDialog';
import { Modal } from '../../composites'; | <mask> import React from 'react';
<mask> import Modal, {
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> ModalOverlay,
<mask> ModalContent,
<mask> IModalProps,
<mask> } from './../Modal';
<mask>
<mask> export interface IAlertDialogProps
<mask> extends Omit<IModalProps, 'initialFocusRef'> {
<mask> leastDestructiveRef: IModalProps['initialFocusRef'];
<mask> }
</s> fix: modal apichages , make modal a compound component </s> remove export interface IAlertDialogProps
extends Omit<IModalProps, 'initialFocusRef'> {
leastDestructiveRef: IModalProps['initialFocusRef'];
}
</s> add let AlertDialogTemp: any = AlertDialogMain;
AlertDialogTemp.Content = AlertDialogContent;
AlertDialogTemp.Overlay = Modal.Overlay;
AlertDialogTemp.CloseButton = Modal.CloseButton;
AlertDialogTemp.Header = Modal.Header;
AlertDialogTemp.Footer = Modal.Footer;
AlertDialogTemp.Body = Modal.Body; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
} from 'native-base';
</s> add import { Modal, Button, Input } from 'native-base'; | [
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/AlertDialog/index.tsx |
let AlertDialogTemp: any = AlertDialogMain;
AlertDialogTemp.Content = AlertDialogContent;
AlertDialogTemp.Overlay = Modal.Overlay;
AlertDialogTemp.CloseButton = Modal.CloseButton;
AlertDialogTemp.Header = Modal.Header;
AlertDialogTemp.Footer = Modal.Footer;
AlertDialogTemp.Body = Modal.Body; | <mask> ModalContent,
<mask> IModalProps,
<mask> } from './../Modal';
<mask>
<mask> export interface IAlertDialogProps
<mask> extends Omit<IModalProps, 'initialFocusRef'> {
<mask> leastDestructiveRef: IModalProps['initialFocusRef'];
<mask> }
<mask>
<mask> const AlertDialog = React.memo((props: IAlertDialogProps) => {
<mask> const { leastDestructiveRef, ...rest } = props;
<mask> return (
<mask> <Modal
</s> fix: modal apichages , make modal a compound component </s> remove const AlertDialog = React.memo((props: IAlertDialogProps) => {
const { leastDestructiveRef, ...rest } = props;
return (
<Modal
{...rest}
initialFocusRef={leastDestructiveRef}
closeOnOverlayClick={false}
/>
);
});
const AlertDialogContent = React.forwardRef(function AlertDialogContent(
props: any,
ref
) {
return <ModalContent ref={ref} accessibilityRole="alert" {...props} />;
});
export {
AlertDialog,
AlertDialogContent,
ModalBody as AlertDialogBody,
ModalCloseButton as AlertDialogCloseButton,
ModalFooter as AlertDialogFooter,
ModalHeader as AlertDialogHeader,
ModalOverlay as AlertDialogOverlay,
};
</s> add // To add typings
const AlertDialog = AlertDialogTemp as IAlertDialogComponentType;
export { AlertDialog }; </s> remove import React from 'react';
import Modal, {
ModalBody,
ModalCloseButton,
ModalFooter,
ModalHeader,
ModalOverlay,
ModalContent,
IModalProps,
} from './../Modal';
</s> add import AlertDialogMain, { IAlertDialogComponentType } from './AlertDialog';
import AlertDialogContent from './AlertDialogContent';
export type { IAlertDialogProps } from './AlertDialog';
import { Modal } from '../../composites'; </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/AlertDialog/index.tsx |
// To add typings
const AlertDialog = AlertDialogTemp as IAlertDialogComponentType;
export { AlertDialog }; | <mask> extends Omit<IModalProps, 'initialFocusRef'> {
<mask> leastDestructiveRef: IModalProps['initialFocusRef'];
<mask> }
<mask>
<mask> const AlertDialog = React.memo((props: IAlertDialogProps) => {
<mask> const { leastDestructiveRef, ...rest } = props;
<mask> return (
<mask> <Modal
<mask> {...rest}
<mask> initialFocusRef={leastDestructiveRef}
<mask> closeOnOverlayClick={false}
<mask> />
<mask> );
<mask> });
<mask> const AlertDialogContent = React.forwardRef(function AlertDialogContent(
<mask> props: any,
<mask> ref
<mask> ) {
<mask> return <ModalContent ref={ref} accessibilityRole="alert" {...props} />;
<mask> });
<mask>
<mask> export {
<mask> AlertDialog,
<mask> AlertDialogContent,
<mask> ModalBody as AlertDialogBody,
<mask> ModalCloseButton as AlertDialogCloseButton,
<mask> ModalFooter as AlertDialogFooter,
<mask> ModalHeader as AlertDialogHeader,
<mask> ModalOverlay as AlertDialogOverlay,
<mask> };
</s> fix: modal apichages , make modal a compound component </s> remove export interface IAlertDialogProps
extends Omit<IModalProps, 'initialFocusRef'> {
leastDestructiveRef: IModalProps['initialFocusRef'];
}
</s> add let AlertDialogTemp: any = AlertDialogMain;
AlertDialogTemp.Content = AlertDialogContent;
AlertDialogTemp.Overlay = Modal.Overlay;
AlertDialogTemp.CloseButton = Modal.CloseButton;
AlertDialogTemp.Header = Modal.Header;
AlertDialogTemp.Footer = Modal.Footer;
AlertDialogTemp.Body = Modal.Body; </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove export {
AlertDialog,
AlertDialogContent,
AlertDialogBody,
AlertDialogCloseButton,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
} from './AlertDialog';
</s> add export { AlertDialog } from './AlertDialog'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/AlertDialog/index.tsx |
import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; | <mask> import React from 'react';
<mask> import type { Modal as ModalType } from 'react-native';
<mask> import {
<mask> KeyboardAvoidingView,
<mask> Modal as RNModal,
<mask> Platform,
<mask> TouchableOpacity,
<mask> } from 'react-native';
<mask> import styled from 'styled-components/native';
<mask> import { border, color, flexbox, layout, position, space } from 'styled-system';
<mask> import { useOverlay } from '../../../core/Overlay';
<mask> import { useThemeProps } from '../../../hooks';
<mask> import {
<mask> customBackground,
<mask> customBorder,
<mask> customExtra,
<mask> customLayout,
<mask> customOutline,
<mask> customPosition,
<mask> customShadow,
<mask> } from '../../../utils/customProps';
<mask> import {
<mask> default as CloseButton,
<mask> ICloseButtonProps,
<mask> } from '../../composites/CloseButton';
<mask> import { Box, IBoxProps, View } from '../../primitives';
<mask> import type { IModalProps, IModalSemiProps } from './types';
<mask>
<mask> const StyledModal = styled(RNModal)<IModalSemiProps>(
<mask> color,
<mask> space,
<mask> layout,
<mask> flexbox,
<mask> border,
<mask> position,
<mask> customPosition,
<mask> customBorder,
<mask> customBackground,
<mask> customOutline,
<mask> customShadow,
<mask> customExtra,
<mask> customLayout
<mask> );
<mask>
<mask> const ModalContext = React.createContext({
<mask> visible: false,
<mask> toggleVisible: (_bool: boolean) => {},
<mask> toggleOnClose: (_bool: boolean) => {},
<mask> newProps: {
<mask> _width: '60%',
<mask> size: 'md',
<mask> modalOverlayStyle: {},
<mask> closeOnOverlayClick: true,
<mask> modalCloseButtonStyle: {},
<mask> modalCloseButtonProps: {},
<mask> modalFooterProps: {},
<mask> modalBodyProps: {},
<mask> modalContentProps: {},
<mask> modalHeaderProps: {},
<mask> modalOverlayProps: {},
<mask> },
<mask> });
<mask>
<mask> const Modal = (
<mask> {
<mask> children,
<mask> isOpen,
<mask> onClose,
<mask> initialFocusRef,
<mask> finalFocusRef,
<mask> justifyContent,
<mask> alignItems,
<mask> id,
<mask> motionPreset,
<mask> avoidKeyboard,
<mask> overlayColor,
<mask> overlayVisible,
<mask> ...props
<mask> }: IModalProps,
<mask> ref: any
<mask> ) => {
<mask> const { closeOverlay, setOverlay } = useOverlay();
<mask> const [isVisible, setIsVisible] = React.useState(true);
<mask> const closeOverlayInMobile = () => {
<mask> setIsVisible(false);
<mask> onClose(false);
<mask> };
<mask> const newProps = useThemeProps('Modal', props);
<mask> const value: any = {
<mask> visible: isVisible,
<mask> toggleVisible: setIsVisible,
<mask> toggleOnClose: onClose ? onClose : () => {},
<mask> newProps: newProps,
<mask> };
<mask> const modalChildren = (
<mask> <Box
<mask> {...newProps.modalProps}
<mask> justifyContent={justifyContent ?? 'center'}
<mask> alignItems={alignItems ?? 'center'}
<mask> >
<mask> {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
<mask> {children}
<mask> </Box>
<mask> );
<mask> React.useEffect(
<mask> () => {
<mask> isOpen && Platform.OS === 'web'
<mask> ? setOverlay(
<mask> <ModalContext.Provider value={value}>
<mask> <Box ref={ref} nativeID={id} h="100%">
<mask> {modalChildren}
<mask> </Box>
<mask> </ModalContext.Provider>,
<mask> {
<mask> onClose: onClose,
<mask> closeOnPress: props.closeOnOverlayClick === false ? false : true,
<mask> backgroundColor: overlayColor ? overlayColor : undefined,
<mask> disableOverlay: overlayVisible === false ? true : false,
<mask> }
<mask> )
<mask> : setOverlay(<Box />, {
<mask> onClose: closeOverlayInMobile,
<mask> closeOnPress: props.closeOnOverlayClick === false ? false : true,
<mask> backgroundColor: overlayColor ? overlayColor : undefined,
<mask> disableOverlay: overlayVisible === false ? true : false,
<mask> });
<mask>
<mask> !isOpen && closeOverlay();
<mask> setIsVisible(isOpen);
<mask> },
<mask> /*eslint-disable */
<mask> [isOpen]
<mask> );
<mask> return Platform.OS !== 'web' ? (
<mask> <ModalContext.Provider value={value}>
<mask> <View nativeID={id}>
<mask> <StyledModal
<mask> visible={isVisible}
<mask> onRequestClose={() => {
<mask> value.toggleVisible(false);
<mask> value.toggleOnClose(false);
<mask> }}
<mask> onShow={() => initialFocusRef?.current?.focus()}
<mask> onDismiss={() => finalFocusRef?.current?.focus()}
<mask> animationType={motionPreset || 'slide'}
<mask> transparent
<mask> {...props}
<mask> ref={ref}
<mask> >
<mask> {avoidKeyboard ? (
<mask> <KeyboardAvoidingView
<mask> behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
<mask> >
<mask> {modalChildren}
<mask> </KeyboardAvoidingView>
<mask> ) : (
<mask> modalChildren
<mask> )}
<mask> </StyledModal>
<mask> </View>
<mask> </ModalContext.Provider>
<mask> ) : null;
<mask> };
<mask>
<mask> export const ModalHeader = (props: IBoxProps) => {
<mask> const { newProps } = React.useContext(ModalContext);
<mask> return <Box {...newProps.modalHeaderProps} {...props} />;
<mask> };
<mask>
<mask> export const ModalContent = (props: IBoxProps) => {
<mask> const { newProps } = React.useContext(ModalContext);
<mask> return (
<mask> <Box
<mask> {...newProps.modalContentProps}
<mask> width={newProps._width || newProps.size || '75%'}
<mask> {...props}
<mask> />
<mask> );
<mask> };
<mask>
<mask> export const ModalBody = (props: IBoxProps) => {
<mask> const { newProps } = React.useContext(ModalContext);
<mask> return <Box {...newProps.modalBodyProps} {...props} />;
<mask> };
<mask>
<mask> export const ModalFooter = (props: IBoxProps) => {
<mask> const { newProps } = React.useContext(ModalContext);
<mask> return <Box {...newProps.modalFooterProps} {...props} />;
<mask> };
<mask>
<mask> export const ModalCloseButton = (props: ICloseButtonProps) => {
<mask> const { toggleVisible, toggleOnClose, newProps } = React.useContext(
<mask> ModalContext
<mask> );
<mask> return (
<mask> <View style={newProps.modalCloseButtonStyle}>
<mask> <CloseButton
<mask> {...newProps.modalCloseButtonProps}
<mask> {...props}
<mask> // accessibilityLabel="Close dialog"
<mask> onPress={() => {
<mask> toggleVisible(false);
<mask> toggleOnClose(false);
<mask> }}
<mask> />
<mask> </View>
<mask> );
<mask> };
<mask>
<mask> export const ModalOverlay = ({ children, ...props }: any) => {
<mask> const { toggleVisible, toggleOnClose, newProps } = React.useContext(
<mask> ModalContext
<mask> );
<mask>
<mask> return (
<mask> <Box {...props} style={newProps.modalOverlayStyle}>
<mask> <TouchableOpacity
<mask> style={newProps.modalOverlayStyle}
<mask> accessible={false}
<mask> onPress={
<mask> newProps.closeOnOverlayClick === false
<mask> ? () => {}
<mask> : () => {
<mask> toggleVisible(false);
<mask> toggleOnClose(false);
<mask> }
<mask> }
<mask> />
<mask> {children}
<mask> </Box>
<mask> );
<mask> };
<mask> export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
<mask>
<mask> export type { IModalProps };
</s> fix: modal apichages , make modal a compound component </s> remove const AlertDialog = React.memo((props: IAlertDialogProps) => {
const { leastDestructiveRef, ...rest } = props;
return (
<Modal
{...rest}
initialFocusRef={leastDestructiveRef}
closeOnOverlayClick={false}
/>
);
});
const AlertDialogContent = React.forwardRef(function AlertDialogContent(
props: any,
ref
) {
return <ModalContent ref={ref} accessibilityRole="alert" {...props} />;
});
export {
AlertDialog,
AlertDialogContent,
ModalBody as AlertDialogBody,
ModalCloseButton as AlertDialogCloseButton,
ModalFooter as AlertDialogFooter,
ModalHeader as AlertDialogHeader,
ModalOverlay as AlertDialogOverlay,
};
</s> add // To add typings
const AlertDialog = AlertDialogTemp as IAlertDialogComponentType;
export { AlertDialog }; </s> remove {disableOverlay ? null : <ModalOverlay />}
</s> add {disableOverlay ? null : <Modal.Overlay />} </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove import { default as Modal, ModalOverlay } from '../Modal';
</s> add import { Modal } from '../../composites'; </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; | [
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Modal/index.tsx |
import type { IBoxProps } from '../../primitives';
import type { ICloseButtonProps } from '..'; | <mask> customShadowProps,
<mask> } from '../../../utils/customProps';
<mask> type SpaceType = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
<mask> export type IModalSemiProps = ModalProps &
<mask> ColorProps &
<mask> SpaceProps &
</s> fix: modal apichages , make modal a compound component </s> remove
</s> add export type IModalComponentType = ((props: IModalProps) => JSX.Element) & {
Body: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
CloseButton: React.MemoExoticComponent<
(props: ICloseButtonProps) => JSX.Element
>;
Content: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Footer: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Header: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Overlay: React.MemoExoticComponent<(props: any) => JSX.Element>;
}; </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import { ModalContent } from '../Modal';
</s> add import { Modal } from '../../composites'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Modal/types.ts |
export type IModalComponentType = ((props: IModalProps) => JSX.Element) & {
Body: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
CloseButton: React.MemoExoticComponent<
(props: ICloseButtonProps) => JSX.Element
>;
Content: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Footer: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Header: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Overlay: React.MemoExoticComponent<(props: any) => JSX.Element>;
}; | <mask> closeOnOverlayClick?: boolean;
<mask> overlayVisible?: boolean;
<mask> overlayColor?: string;
<mask> };
<mask>
<mask> export type IModalProps = IModalSemiProps & { isOpen: boolean; onClose: any };
</s> fix: modal apichages , make modal a compound component </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; </s> remove <ModalContent m={3} p={2} mb={6} borderRadius="lg" {...props}>
</s> add <Modal.Content m={3} p={2} mb={6} borderRadius="lg" {...props}> </s> remove </ModalContent>
</s> add </Modal.Content> </s> remove const AlertDialog = React.memo((props: IAlertDialogProps) => {
const { leastDestructiveRef, ...rest } = props;
return (
<Modal
{...rest}
initialFocusRef={leastDestructiveRef}
closeOnOverlayClick={false}
/>
);
});
const AlertDialogContent = React.forwardRef(function AlertDialogContent(
props: any,
ref
) {
return <ModalContent ref={ref} accessibilityRole="alert" {...props} />;
});
export {
AlertDialog,
AlertDialogContent,
ModalBody as AlertDialogBody,
ModalCloseButton as AlertDialogCloseButton,
ModalFooter as AlertDialogFooter,
ModalHeader as AlertDialogHeader,
ModalOverlay as AlertDialogOverlay,
};
</s> add // To add typings
const AlertDialog = AlertDialogTemp as IAlertDialogComponentType;
export { AlertDialog }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/Modal/types.ts |
export { Modal } from './Modal';
export type { IModalProps } from './Modal';
| <mask> export {
<mask> default as CircularProgress,
<mask> CircularProgressLabel,
<mask> } from './CircularProgress';
<mask> export {
<mask> default as Modal,
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalContent,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> ModalOverlay,
<mask> } from './Modal';
<mask> export {
<mask> default as Popover,
<mask> PopoverBody,
<mask> PopoverCloseButton,
<mask> PopoverContent,
</s> fix: modal apichages , make modal a compound component </s> remove ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
</s> add </s> remove ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
</s> add </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/index.ts |
export { AlertDialog } from './AlertDialog'; | <mask> PopoverHeader,
<mask> PopoverTrigger,
<mask> } from './Popover';
<mask>
<mask> export {
<mask> AlertDialog,
<mask> AlertDialogContent,
<mask> AlertDialogBody,
<mask> AlertDialogCloseButton,
<mask> AlertDialogFooter,
<mask> AlertDialogHeader,
<mask> AlertDialogOverlay,
<mask> } from './AlertDialog';
<mask>
<mask> export {
<mask> Menu,
<mask> MenuItem,
<mask> MenuGroup,
</s> fix: modal apichages , make modal a compound component </s> remove AlertDialogContent,
AlertDialogBody,
AlertDialogCloseButton,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
</s> add </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove const AlertDialog = React.memo((props: IAlertDialogProps) => {
const { leastDestructiveRef, ...rest } = props;
return (
<Modal
{...rest}
initialFocusRef={leastDestructiveRef}
closeOnOverlayClick={false}
/>
);
});
const AlertDialogContent = React.forwardRef(function AlertDialogContent(
props: any,
ref
) {
return <ModalContent ref={ref} accessibilityRole="alert" {...props} />;
});
export {
AlertDialog,
AlertDialogContent,
ModalBody as AlertDialogBody,
ModalCloseButton as AlertDialogCloseButton,
ModalFooter as AlertDialogFooter,
ModalHeader as AlertDialogHeader,
ModalOverlay as AlertDialogOverlay,
};
</s> add // To add typings
const AlertDialog = AlertDialogTemp as IAlertDialogComponentType;
export { AlertDialog }; </s> remove import React from 'react';
import Modal, {
ModalBody,
ModalCloseButton,
ModalFooter,
ModalHeader,
ModalOverlay,
ModalContent,
IModalProps,
} from './../Modal';
</s> add import AlertDialogMain, { IAlertDialogComponentType } from './AlertDialog';
import AlertDialogContent from './AlertDialogContent';
export type { IAlertDialogProps } from './AlertDialog';
import { Modal } from '../../composites'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/components/composites/index.ts |
{/* Added box-none instead of none to fix Web modal not able to get clicked inside Modal.Body */}
<View pointerEvents="box-none" style={overlayStyle.itemBackground}> | <mask> }}
<mask> >
<mask> <View style={overlayStyle.background} />
<mask> </TouchableWithoutFeedback>
<mask> <View pointerEvents="none" style={overlayStyle.itemBackground}>
<mask> {overlayItem}
<mask> </View>
<mask> </Animated.View>
<mask> );
<mask> }
</s> fix: modal apichages , make modal a compound component </s> remove import React from 'react';
import type { Modal as ModalType } from 'react-native';
import {
KeyboardAvoidingView,
Modal as RNModal,
Platform,
TouchableOpacity,
} from 'react-native';
import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import { useOverlay } from '../../../core/Overlay';
import { useThemeProps } from '../../../hooks';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
import {
default as CloseButton,
ICloseButtonProps,
} from '../../composites/CloseButton';
import { Box, IBoxProps, View } from '../../primitives';
import type { IModalProps, IModalSemiProps } from './types';
const StyledModal = styled(RNModal)<IModalSemiProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout
);
const ModalContext = React.createContext({
visible: false,
toggleVisible: (_bool: boolean) => {},
toggleOnClose: (_bool: boolean) => {},
newProps: {
_width: '60%',
size: 'md',
modalOverlayStyle: {},
closeOnOverlayClick: true,
modalCloseButtonStyle: {},
modalCloseButtonProps: {},
modalFooterProps: {},
modalBodyProps: {},
modalContentProps: {},
modalHeaderProps: {},
modalOverlayProps: {},
},
});
const Modal = (
{
children,
isOpen,
onClose,
initialFocusRef,
finalFocusRef,
justifyContent,
alignItems,
id,
motionPreset,
avoidKeyboard,
overlayColor,
overlayVisible,
...props
}: IModalProps,
ref: any
) => {
const { closeOverlay, setOverlay } = useOverlay();
const [isVisible, setIsVisible] = React.useState(true);
const closeOverlayInMobile = () => {
setIsVisible(false);
onClose(false);
};
const newProps = useThemeProps('Modal', props);
const value: any = {
visible: isVisible,
toggleVisible: setIsVisible,
toggleOnClose: onClose ? onClose : () => {},
newProps: newProps,
};
const modalChildren = (
<Box
{...newProps.modalProps}
justifyContent={justifyContent ?? 'center'}
alignItems={alignItems ?? 'center'}
>
{props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
{children}
</Box>
);
React.useEffect(
() => {
isOpen && Platform.OS === 'web'
? setOverlay(
<ModalContext.Provider value={value}>
<Box ref={ref} nativeID={id} h="100%">
{modalChildren}
</Box>
</ModalContext.Provider>,
{
onClose: onClose,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
}
)
: setOverlay(<Box />, {
onClose: closeOverlayInMobile,
closeOnPress: props.closeOnOverlayClick === false ? false : true,
backgroundColor: overlayColor ? overlayColor : undefined,
disableOverlay: overlayVisible === false ? true : false,
});
!isOpen && closeOverlay();
setIsVisible(isOpen);
},
/*eslint-disable */
[isOpen]
);
return Platform.OS !== 'web' ? (
<ModalContext.Provider value={value}>
<View nativeID={id}>
<StyledModal
visible={isVisible}
onRequestClose={() => {
value.toggleVisible(false);
value.toggleOnClose(false);
}}
onShow={() => initialFocusRef?.current?.focus()}
onDismiss={() => finalFocusRef?.current?.focus()}
animationType={motionPreset || 'slide'}
transparent
{...props}
ref={ref}
>
{avoidKeyboard ? (
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
>
{modalChildren}
</KeyboardAvoidingView>
) : (
modalChildren
)}
</StyledModal>
</View>
</ModalContext.Provider>
) : null;
};
export const ModalHeader = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalHeaderProps} {...props} />;
};
export const ModalContent = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return (
<Box
{...newProps.modalContentProps}
width={newProps._width || newProps.size || '75%'}
{...props}
/>
);
};
export const ModalBody = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalBodyProps} {...props} />;
};
export const ModalFooter = (props: IBoxProps) => {
const { newProps } = React.useContext(ModalContext);
return <Box {...newProps.modalFooterProps} {...props} />;
};
export const ModalCloseButton = (props: ICloseButtonProps) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<View style={newProps.modalCloseButtonStyle}>
<CloseButton
{...newProps.modalCloseButtonProps}
{...props}
// accessibilityLabel="Close dialog"
onPress={() => {
toggleVisible(false);
toggleOnClose(false);
}}
/>
</View>
);
};
export const ModalOverlay = ({ children, ...props }: any) => {
const { toggleVisible, toggleOnClose, newProps } = React.useContext(
ModalContext
);
return (
<Box {...props} style={newProps.modalOverlayStyle}>
<TouchableOpacity
style={newProps.modalOverlayStyle}
accessible={false}
onPress={
newProps.closeOnOverlayClick === false
? () => {}
: () => {
toggleVisible(false);
toggleOnClose(false);
}
}
/>
{children}
</Box>
);
};
export default React.memo(React.forwardRef<ModalType, IModalProps>(Modal));
export type { IModalProps };
</s> add import ModalContent from './ModalContent';
import ModalBody from './ModalBody';
import ModalCloseButton from './ModalCloseButton';
import ModalFooter from './ModalFooter';
import ModalHeader from './ModalHeader';
import ModalOverlay from './ModalOverlay';
import ModalMain from './Modal';
export type { IModalProps, IModalSemiProps } from './types';
import type { IModalComponentType } from './types';
let ModalTemp: any = ModalMain;
ModalTemp.Content = ModalContent;
ModalTemp.Overlay = ModalOverlay;
ModalTemp.CloseButton = ModalCloseButton;
ModalTemp.Header = ModalHeader;
ModalTemp.Footer = ModalFooter;
ModalTemp.Body = ModalBody;
// To add typings
const Modal = ModalTemp as IModalComponentType;
export { Modal }; </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> </s> remove </ModalFooter>
</ModalContent>
</s> add </Modal.Footer>
</Modal.Content> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/core/Overlay/Wrapper.tsx |
<mask> TagLabel,
<mask> TagLeftIcon,
<mask> TagRightIcon,
<mask> Modal,
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalContent,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> ModalOverlay,
<mask> Popover,
<mask> PopoverBody,
<mask> PopoverCloseButton,
<mask> PopoverContent,
<mask> PopoverFooter,
</s> fix: modal apichages , make modal a compound component </s> remove ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
</s> add </s> remove export {
default as Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
} from './Modal';
</s> add export { Modal } from './Modal';
export type { IModalProps } from './Modal';
</s> remove import React from 'react';
import Modal, {
ModalBody,
ModalCloseButton,
ModalFooter,
ModalHeader,
ModalOverlay,
ModalContent,
IModalProps,
} from './../Modal';
</s> add import AlertDialogMain, { IAlertDialogComponentType } from './AlertDialog';
import AlertDialogContent from './AlertDialogContent';
export type { IAlertDialogProps } from './AlertDialog';
import { Modal } from '../../composites'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Center,
Input,
} from 'native-base';
</s> add import { Modal, Button, Center, Input } from 'native-base'; </s> remove import {
Modal,
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
Button,
Input,
VStack,
Text,
} from 'native-base';
</s> add import { Modal, Button, Input, VStack, Text } from 'native-base'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/index.tsx |
|
<mask> PopoverFooter,
<mask> PopoverHeader,
<mask> PopoverTrigger,
<mask> AlertDialog,
<mask> AlertDialogContent,
<mask> AlertDialogBody,
<mask> AlertDialogCloseButton,
<mask> AlertDialogFooter,
<mask> AlertDialogHeader,
<mask> AlertDialogOverlay,
<mask> IToastProps,
<mask> useToast,
<mask> Menu,
<mask> MenuItem,
<mask> MenuGroup,
</s> fix: modal apichages , make modal a compound component </s> remove export {
AlertDialog,
AlertDialogContent,
AlertDialogBody,
AlertDialogCloseButton,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
} from './AlertDialog';
</s> add export { AlertDialog } from './AlertDialog'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
AlertDialogCloseButton,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove import {
AlertDialog,
AlertDialogBody,
AlertDialogContent,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogOverlay,
Button,
Center,
} from 'native-base';
</s> add import { AlertDialog, Button, Center } from 'native-base'; </s> remove const AlertDialog = React.memo((props: IAlertDialogProps) => {
const { leastDestructiveRef, ...rest } = props;
return (
<Modal
{...rest}
initialFocusRef={leastDestructiveRef}
closeOnOverlayClick={false}
/>
);
});
const AlertDialogContent = React.forwardRef(function AlertDialogContent(
props: any,
ref
) {
return <ModalContent ref={ref} accessibilityRole="alert" {...props} />;
});
export {
AlertDialog,
AlertDialogContent,
ModalBody as AlertDialogBody,
ModalCloseButton as AlertDialogCloseButton,
ModalFooter as AlertDialogFooter,
ModalHeader as AlertDialogHeader,
ModalOverlay as AlertDialogOverlay,
};
</s> add // To add typings
const AlertDialog = AlertDialogTemp as IAlertDialogComponentType;
export { AlertDialog }; </s> remove ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/index.tsx |
|
<mask> TagLabel,
<mask> TagLeftIcon,
<mask> TagRightIcon,
<mask> Modal,
<mask> ModalBody,
<mask> ModalCloseButton,
<mask> ModalContent,
<mask> ModalFooter,
<mask> ModalHeader,
<mask> ModalOverlay,
<mask> Popover,
<mask> PopoverBody,
<mask> PopoverCloseButton,
<mask> PopoverContent,
<mask> PopoverFooter,
</s> fix: modal apichages , make modal a compound component | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdc33e23d0d3252e210a780e960347685b5c2c4a | src/index.tsx |
|
fontSize:24,
marginHorizontal:5,
paddingTop:_reactNative.Platform.OS==='ios'?2:undefined}, | <mask>
<mask>
<mask> 'NativeBase.Icon':{
<mask> color:variables.inverseTextColor,
<mask> fontSize:24},
<mask>
<mask> 'NativeBase.IconNB':{
<mask> color:variables.inverseTextColor,
<mask> fontSize:24},
<mask>
</s> android ripple and capitalize added </s> remove fontSize:24},
</s> add fontSize:24,
marginHorizontal:5,
paddingTop:_reactNative.Platform.OS==='ios'?2:undefined}, </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | dist/src/theme/Button.js |
fontSize:24,
marginHorizontal:5,
paddingTop:_reactNative.Platform.OS==='ios'?2:undefined}, | <mask> fontSize:24},
<mask>
<mask> 'NativeBase.IconNB':{
<mask> color:variables.inverseTextColor,
<mask> fontSize:24},
<mask>
<mask>
<mask> paddingVertical:variables.buttonPadding,
<mask> paddingHorizontal:variables.buttonPadding+2,
<mask> backgroundColor:variables.btnPrimaryBg,
</s> android ripple and capitalize added </s> remove fontSize:24},
</s> add fontSize:24,
marginHorizontal:5,
paddingTop:_reactNative.Platform.OS==='ios'?2:undefined}, </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | dist/src/theme/Button.js |
toolbarDefaultBg:_reactNative.Platform.OS==='ios'?'#F8F8F8':'#3F51B5', | <mask>
<mask>
<mask>
<mask> iosToolbarBtnColor:'#007aff',
<mask> toolbarDefaultBg:_reactNative.Platform.OS==='ios'?'#F8F8F8':'#5067FF',
<mask> toolbarHeight:_reactNative.Platform.OS==='ios'?64:56,
<mask> toolbarIconSize:_reactNative.Platform.OS==='ios'?20:22,
<mask> toolbarInputColor:'#CECDD2',
<mask> toolbarInverseBg:'#222',
<mask> toolbarTextColor:_reactNative.Platform.OS==='ios'?'#000':'#fff',
</s> android ripple and capitalize added </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | dist/src/theme/variables.js |
{this.renderChildren()} | <mask> <TouchableNativeFeedback ref={c => this._root = c}
<mask> onPress={this.props.onPress}
<mask> background={(this.props.androidRippleColor) ? TouchableNativeFeedback.Ripple(this.props.androidRippleColor) : TouchableNativeFeedback.Ripple(variable.androidRippleColor)}>
<mask> <View {...this.prepareRootProps()}>
<mask> {this.props.children}
<mask> </View>
<mask> </TouchableNativeFeedback>
<mask> );
<mask> }
<mask> }
</s> android ripple and capitalize added </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | src/basic/Button.js |
capitalize: React.PropTypes.bool, | <mask> warning: React.PropTypes.bool,
<mask> info: React.PropTypes.bool,
<mask> bordered: React.PropTypes.bool,
<mask> disabled: React.PropTypes.bool,
<mask> rounded: React.PropTypes.bool,
<mask> large: React.PropTypes.bool,
<mask> small: React.PropTypes.bool,
<mask> active: React.PropTypes.bool,
</s> android ripple and capitalize added </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | src/basic/Button.js |
Button.defaultProps = {
capitalize: true
} | <mask> badgeValueStyle: React.PropTypes.object,
<mask> };
<mask>
<mask>
<mask> const StyledButton = connectStyle('NativeBase.Button', {}, mapPropsToStyleNames)(Button);
<mask> export {
<mask> StyledButton as Button,
<mask> };
</s> android ripple and capitalize added </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); </s> remove {this.props.children}
</s> add {this.renderChildren()} </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | src/basic/Button.js |
const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); | <mask> style: React.PropTypes.object,
<mask> };
<mask>
<mask> const AnimatedText = connectAnimation(Text);
<mask> const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
<mask>
<mask> export {
<mask> StyledText as Text,
<mask> };
</s> android ripple and capitalize added </s> remove {this.props.children}
</s> add {this.renderChildren()} </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | src/basic/Text.js |
marginHorizontal: 5,
paddingTop: (Platform.OS === 'ios') ? 2 : undefined | <mask>
<mask> 'NativeBase.Icon': {
<mask> color: variables.inverseTextColor,
<mask> fontSize: 24,
<mask> },
<mask> 'NativeBase.IconNB': {
<mask> color: variables.inverseTextColor,
<mask> fontSize: 24,
<mask> marginHorizontal: 5,
</s> android ripple and capitalize added </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | src/theme/Button.js |
marginHorizontal: 5,
paddingTop: (Platform.OS === 'ios') ? 2 : undefined | <mask> },
<mask> 'NativeBase.IconNB': {
<mask> color: variables.inverseTextColor,
<mask> fontSize: 24,
<mask> },
<mask>
<mask> paddingVertical: variables.buttonPadding,
<mask> paddingHorizontal: variables.buttonPadding + 2,
<mask> backgroundColor: variables.btnPrimaryBg,
<mask> borderRadius: variables.borderRadiusBase,
</s> android ripple and capitalize added </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); </s> remove toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
</s> add toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | src/theme/Button.js |
toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#3F51B5', | <mask>
<mask>
<mask> // Header
<mask> iosToolbarBtnColor: '#007aff',
<mask> toolbarDefaultBg: (Platform.OS === 'ios') ? '#F8F8F8' : '#5067FF',
<mask> toolbarHeight: (Platform.OS === 'ios') ? 64 : 56,
<mask> toolbarIconSize: (Platform.OS === 'ios') ? 20 : 22,
<mask> toolbarInputColor: '#CECDD2',
<mask> toolbarInverseBg: '#222',
<mask> toolbarTextColor: (Platform.OS === 'ios') ? '#000' : '#fff',
</s> android ripple and capitalize added </s> remove {this.props.children}
</s> add {this.renderChildren()} </s> remove const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(AnimatedText);
</s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(Text); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bdcdec67305a4134443c6e6932384e885a29e96d | src/theme/variables.js |
StyleSheet, | <mask> TouchableOpacity,
<mask> Animated,
<mask> Platform,
<mask> View,
<mask> StyleSheet
<mask> } from 'react-native';
<mask> import { isArray, remove } from 'lodash';
<mask> import { connectStyle } from 'native-base-shoutem-theme';
<mask>
<mask> import variables from '../theme/variables/platform';
</s> fix: floatingLabel with defaultValue workiing now </s> remove key: 'newLabel'
</s> add key: 'newLabel', </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, </s> remove isFocused: true
</s> add isFocused: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
opacAnim: new Animated.Value(1), | <mask> this.state = {
<mask> isFocused: false,
<mask> text: '',
<mask> topAnim: new Animated.Value(18),
<mask> opacAnim: new Animated.Value(1)
<mask> };
<mask> }
<mask> componentDidMount() {
<mask> if (this.props.floatingLabel) {
<mask> if (this.inputProps && this.inputProps.value) {
</s> fix: floatingLabel with defaultValue workiing now </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { </s> remove labelProps.style
</s> add labelProps.style, </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove isFocused: true
</s> add isFocused: true, </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | <mask> };
<mask> }
<mask> componentDidMount() {
<mask> if (this.props.floatingLabel) {
<mask> if (this.inputProps && this.inputProps.value) {
<mask> const effect = () => {
<mask> this.setState({ isFocused: true });
<mask> };
<mask> this.floatUp(-16);
<mask> effect();
</s> fix: floatingLabel with defaultValue workiing now </s> remove opacAnim: new Animated.Value(1)
</s> add opacAnim: new Animated.Value(1), </s> remove isFocused: true
</s> add isFocused: true, </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove labelProps.style
</s> add labelProps.style, </s> remove onBlur={e => {
</s> add onBlur={(e) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
remove(childrenArray, (item) => { | <mask> // eslint-disable-next-line camelcase
<mask> UNSAFE_componentWillReceiveProps(nextProps) {
<mask> const childrenArray = React.Children.toArray(nextProps.children);
<mask>
<mask> remove(childrenArray, item => {
<mask> if (item.type.displayName === 'Styled(Input)') {
<mask> this.inputProps = item.props;
<mask> return item;
<mask> }
<mask> return null;
</s> fix: floatingLabel with defaultValue workiing now </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove label = remove(childrenArray, item => {
</s> add label = remove(childrenArray, (item) => { </s> remove image = remove(childrenArray, item => {
</s> add image = remove(childrenArray, (item) => { </s> remove icon = remove(childrenArray, item => {
</s> add icon = remove(childrenArray, (item) => { </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
: undefined,
}, | <mask> roundedInputGroup: {
<mask> borderWidth: this.props.rounded ? variables.borderWidth * 2 : undefined,
<mask> borderRadius: this.props.rounded
<mask> ? variables.inputGroupRoundedBorderRadius
<mask> : undefined
<mask> }
<mask> };
<mask> }
<mask>
<mask> getPlacholderValue(inputProps) {
<mask> let placeholderValue;
</s> fix: floatingLabel with defaultValue workiing now </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove left: i === this.props.children.length - 1 ? undefined : 0
</s> add left: i === this.props.children.length - 1 ? undefined : 0, </s> remove marginRight: 12
</s> add marginRight: 12, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
useNativeDriver: false, | <mask> floatBack(e) {
<mask> Animated.timing(this.state.topAnim, {
<mask> toValue: e || 18,
<mask> duration: 150,
<mask> useNativeDriver: false
<mask> }).start();
<mask> Animated.timing(this.state.opacAnim, {
<mask> toValue: 1,
<mask> duration: 150,
<mask> useNativeDriver: false
</s> fix: floatingLabel with defaultValue workiing now </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove isFocused: true
</s> add isFocused: true, </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
useNativeDriver: false, | <mask> }).start();
<mask> Animated.timing(this.state.opacAnim, {
<mask> toValue: 1,
<mask> duration: 150,
<mask> useNativeDriver: false
<mask> }).start();
<mask> }
<mask>
<mask> floatUp(e) {
<mask> Animated.timing(this.state.topAnim, {
</s> fix: floatingLabel with defaultValue workiing now </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove isFocused: true
</s> add isFocused: true, </s> remove onBlur={e => {
</s> add onBlur={(e) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
useNativeDriver: false, | <mask> floatUp(e) {
<mask> Animated.timing(this.state.topAnim, {
<mask> toValue: e || -22,
<mask> duration: 150,
<mask> useNativeDriver: false
<mask> }).start();
<mask> Animated.timing(this.state.opacAnim, {
<mask> toValue: 0.7,
<mask> duration: 150,
<mask> useNativeDriver: false
</s> fix: floatingLabel with defaultValue workiing now </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove isFocused: true
</s> add isFocused: true, </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
useNativeDriver: false, | <mask> }).start();
<mask> Animated.timing(this.state.opacAnim, {
<mask> toValue: 0.7,
<mask> duration: 150,
<mask> useNativeDriver: false
<mask> }).start();
<mask> }
<mask>
<mask> prepareRootProps() {
<mask> const defaultProps = {
</s> fix: floatingLabel with defaultValue workiing now </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, </s> remove labelProps.style
</s> add labelProps.style, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
style: this.getInitialStyle().roundedInputGroup, | <mask> }
<mask>
<mask> prepareRootProps() {
<mask> const defaultProps = {
<mask> style: this.getInitialStyle().roundedInputGroup
<mask> };
<mask>
<mask> return computeProps(this.props, defaultProps);
<mask> }
<mask>
</s> fix: floatingLabel with defaultValue workiing now </s> remove useNativeDriver: false
</s> add useNativeDriver: false, </s> remove style: labelStyle
</s> add style: labelStyle, </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove label = remove(childrenArray, item => {
</s> add label = remove(childrenArray, (item) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
label = remove(childrenArray, (item) => { | <mask> const childrenArray = React.Children.toArray(this.props.children);
<mask>
<mask> let label = [];
<mask> let labelProps = {};
<mask> label = remove(childrenArray, item => {
<mask> if (item.type === Label) {
<mask> labelProps = item.props;
<mask> return item;
<mask> }
<mask> return null;
</s> fix: floatingLabel with defaultValue workiing now </s> remove icon = remove(childrenArray, item => {
</s> add icon = remove(childrenArray, (item) => { </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove image = remove(childrenArray, item => {
</s> add image = remove(childrenArray, (item) => { </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
remove(childrenArray, (item) => { | <mask> return null;
<mask> });
<mask>
<mask> let inputProps = {};
<mask> remove(childrenArray, item => {
<mask> if (item.type === Input) {
<mask> inputProps = item.props;
<mask> this.inputProps = item.props;
<mask> return item;
<mask> }
</s> fix: floatingLabel with defaultValue workiing now </s> remove icon = remove(childrenArray, item => {
</s> add icon = remove(childrenArray, (item) => { </s> remove label = remove(childrenArray, item => {
</s> add label = remove(childrenArray, (item) => { </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove image = remove(childrenArray, item => {
</s> add image = remove(childrenArray, (item) => { </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
icon = remove(childrenArray, (item) => { | <mask> });
<mask>
<mask> let icon = [];
<mask> let iconProps = {};
<mask> icon = remove(childrenArray, item => {
<mask> if (item.type === Icon) {
<mask> iconProps = item.props;
<mask> return item;
<mask> }
<mask> return null;
</s> fix: floatingLabel with defaultValue workiing now </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove label = remove(childrenArray, item => {
</s> add label = remove(childrenArray, (item) => { </s> remove image = remove(childrenArray, item => {
</s> add image = remove(childrenArray, (item) => { </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
image = remove(childrenArray, (item) => { | <mask> return null;
<mask> });
<mask>
<mask> let image = [];
<mask> image = remove(childrenArray, item => {
<mask> if (item.type === Thumbnail) {
<mask> return item;
<mask> }
<mask> return null;
<mask> });
</s> fix: floatingLabel with defaultValue workiing now </s> remove icon = remove(childrenArray, item => {
</s> add icon = remove(childrenArray, (item) => { </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove label = remove(childrenArray, item => {
</s> add label = remove(childrenArray, (item) => { </s> remove remove(childrenArray, item => {
</s> add remove(childrenArray, (item) => { </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
paddingBottom: Platform.OS === 'ios' ? undefined : 12, | <mask> right: 0,
<mask> top: this.state.topAnim,
<mask> opacity: this.state.opacAnim,
<mask> paddingTop: Platform.OS === 'ios' ? undefined : undefined,
<mask> paddingBottom: Platform.OS === 'ios' ? undefined : 12
<mask> }}
<mask> >
<mask> <Label {...labelProps}>
<mask> {this.renderLabel(label, labelProps)}
<mask> </Label>
</s> fix: floatingLabel with defaultValue workiing now </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove left: i === this.props.children.length - 1 ? undefined : 0
</s> add left: i === this.props.children.length - 1 ? undefined : 0, </s> remove : undefined
}
</s> add : undefined,
}, </s> remove marginRight: 12
</s> add marginRight: 12, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
ref={(c) => (this._inputRef = c)} | <mask> );
<mask>
<mask> newChildren.push(
<mask> <Input
<mask> ref={c => (this._inputRef = c)}
<mask> key="l2"
<mask> {...inputProps}
<mask> placeholder={this.getPlacholderValue(inputProps)}
<mask> onFocus={() => {
<mask> this.setState({ isFocused: true });
</s> fix: floatingLabel with defaultValue workiing now </s> remove ref={c => (this._inputRef = c)}
</s> add ref={(c) => (this._inputRef = c)} </s> remove ref={c => (this._inputRef = c)}
value={this.state.text}
</s> add ref={(c) => (this._inputRef = c)}
// value={this.state.text} </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove ref={c => (this._root = c)}
</s> add ref={(c) => (this._root = c)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
onBlur={(e) => { | <mask> if (inputProps.onFocus) {
<mask> inputProps.onFocus();
<mask> }
<mask> }}
<mask> onBlur={e => {
<mask> if (inputProps.value) {
<mask> this.setState({
<mask> isFocused: true
<mask> });
<mask> } else if (!this.state.text.length) {
</s> fix: floatingLabel with defaultValue workiing now </s> remove isFocused: true
</s> add isFocused: true, </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
isFocused: true, | <mask> }}
<mask> onBlur={e => {
<mask> if (inputProps.value) {
<mask> this.setState({
<mask> isFocused: true
<mask> });
<mask> } else if (!this.state.text.length) {
<mask> this.setState({ isFocused: false });
<mask> }
<mask>
</s> fix: floatingLabel with defaultValue workiing now </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
onChangeText={(text) => { | <mask> if (inputProps.onBlur) {
<mask> inputProps.onBlur(e);
<mask> }
<mask> }}
<mask> onChangeText={text => {
<mask> this.setState({ text });
<mask> if (inputProps.onChangeText) {
<mask> inputProps.onChangeText(text);
<mask> }
<mask> }}
</s> fix: floatingLabel with defaultValue workiing now </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove isFocused: true
</s> add isFocused: true, </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
left: i === this.props.children.length - 1 ? undefined : 0, | <mask> key={[i]}
<mask> {...this.props.children[i].props}
<mask> style={{
<mask> right: 10,
<mask> left: i === this.props.children.length - 1 ? undefined : 0
<mask> }}
<mask> />
<mask> );
<mask> }
<mask>
</s> fix: floatingLabel with defaultValue workiing now </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove width: variables.deviceWidth - 15
</s> add width: variables.deviceWidth - 15, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove marginRight: 12
</s> add marginRight: 12, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
paddingBottom: Platform.OS === 'ios' ? undefined : 12, | <mask> right: 0,
<mask> top: this.state.topAnim,
<mask> opacity: this.state.opacAnim,
<mask> paddingTop: Platform.OS === 'ios' ? undefined : undefined,
<mask> paddingBottom: Platform.OS === 'ios' ? undefined : 12
<mask> }}
<mask> >
<mask> <Label {...labelProps}>
<mask> {this.renderLabel(label, labelProps)}
<mask> </Label>
</s> fix: floatingLabel with defaultValue workiing now | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
ref={(c) => (this._inputRef = c)} | <mask> );
<mask>
<mask> newChildren.push(
<mask> <Input
<mask> ref={c => (this._inputRef = c)}
<mask> key="l2"
<mask> {...inputProps}
<mask> placeholder={this.getPlacholderValue(inputProps)}
<mask> onFocus={() => {
<mask> this.setState({ isFocused: true });
</s> fix: floatingLabel with defaultValue workiing now | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
onBlur={(e) => { | <mask> onFocus={() => {
<mask> this.setState({ isFocused: true });
<mask> inputProps.onFocus && inputProps.onFocus();
<mask> }}
<mask> onBlur={e => {
<mask> inputProps.value
<mask> ? this.setState({ isFocused: true })
<mask> : !this.state.text.length &&
<mask> this.setState({ isFocused: false });
<mask> inputProps.onBlur && inputProps.onBlur(e);
</s> fix: floatingLabel with defaultValue workiing now </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove isFocused: true
</s> add isFocused: true, </s> remove onBlur={e => {
</s> add onBlur={(e) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
onChangeText={(text) => { | <mask> : !this.state.text.length &&
<mask> this.setState({ isFocused: false });
<mask> inputProps.onBlur && inputProps.onBlur(e);
<mask> }}
<mask> onChangeText={text => {
<mask> this.setState({ text });
<mask> inputProps.onChangeText && inputProps.onChangeText(text);
<mask> }}
<mask> style={{
<mask> left:
</s> fix: floatingLabel with defaultValue workiing now </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
marginRight: 12, | <mask> ? 4
<mask> : isImage
<mask> ? 10
<mask> : 0,
<mask> marginRight: 12
<mask> }}
<mask> />
<mask> );
<mask> }
<mask> }
</s> fix: floatingLabel with defaultValue workiing now </s> remove left: i === this.props.children.length - 1 ? undefined : 0
</s> add left: i === this.props.children.length - 1 ? undefined : 0, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove : undefined
}
</s> add : undefined,
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
paddingBottom: Platform.OS === 'ios' ? undefined : 12, | <mask> right: 0,
<mask> top: this.state.topAnim,
<mask> opacity: this.state.opacAnim,
<mask> paddingTop: Platform.OS === 'ios' ? undefined : undefined,
<mask> paddingBottom: Platform.OS === 'ios' ? undefined : 12
<mask> }}
<mask> >
<mask> <Label {...labelProps}>{this.renderLabel(label, labelProps)}</Label>
<mask> </Animated.View>
<mask> );
</s> fix: floatingLabel with defaultValue workiing now </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, </s> remove left: i === this.props.children.length - 1 ? undefined : 0
</s> add left: i === this.props.children.length - 1 ? undefined : 0, </s> remove marginRight: 12
</s> add marginRight: 12, </s> remove : undefined
}
</s> add : undefined,
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
ref={(c) => (this._inputRef = c)}
// value={this.state.text} | <mask> );
<mask>
<mask> newChildren.push(
<mask> <Input
<mask> ref={c => (this._inputRef = c)}
<mask> value={this.state.text}
<mask> key="l2"
<mask> {...inputProps}
<mask> placeholder={this.getPlacholderValue(inputProps)}
<mask> onFocus={() => {
<mask> this.setState({ isFocused: true });
</s> fix: floatingLabel with defaultValue workiing now </s> remove ref={c => (this._inputRef = c)}
</s> add ref={(c) => (this._inputRef = c)} </s> remove ref={c => (this._inputRef = c)}
</s> add ref={(c) => (this._inputRef = c)} </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove ref={c => (this._root = c)}
</s> add ref={(c) => (this._root = c)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
onBlur={(e) => { | <mask> onFocus={() => {
<mask> this.setState({ isFocused: true });
<mask> inputProps.onFocus && inputProps.onFocus();
<mask> }}
<mask> onBlur={e => {
<mask> inputProps.value
<mask> ? this.setState({ isFocused: true })
<mask> : !this.state.text.length && this.setState({ isFocused: false });
<mask> inputProps.onBlur && inputProps.onBlur(e);
<mask> }}
</s> fix: floatingLabel with defaultValue workiing now </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove isFocused: true
</s> add isFocused: true, </s> remove onBlur={e => {
</s> add onBlur={(e) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
onChangeText={(text) => { | <mask> ? this.setState({ isFocused: true })
<mask> : !this.state.text.length && this.setState({ isFocused: false });
<mask> inputProps.onBlur && inputProps.onBlur(e);
<mask> }}
<mask> onChangeText={text => {
<mask> this.setState({ text });
<mask> inputProps.onChangeText && inputProps.onChangeText(text);
<mask> }}
<mask> />
<mask> );
</s> fix: floatingLabel with defaultValue workiing now </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
width: variables.deviceWidth - 15, | <mask> key="s"
<mask> style={{
<mask> flexDirection: 'row',
<mask> flex: 1,
<mask> width: variables.deviceWidth - 15
<mask> }}
<mask> >
<mask> <Icon key="s1" {...iconProps} />
<mask> <View style={{ flexDirection: 'column' }}>
<mask> <Label key="s2" {...labelProps} />
</s> fix: floatingLabel with defaultValue workiing now </s> remove left: i === this.props.children.length - 1 ? undefined : 0
</s> add left: i === this.props.children.length - 1 ? undefined : 0, </s> remove marginRight: 12
</s> add marginRight: 12, </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove onChangeText={text => {
</s> add onChangeText={(text) => { </s> remove paddingBottom: Platform.OS === 'ios' ? undefined : 12
</s> add paddingBottom: Platform.OS === 'ios' ? undefined : 12, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
labelProps.style, | <mask> renderLabel(label, labelProps) {
<mask> const newLabel = [];
<mask> const labelStyle = StyleSheet.flatten([
<mask> { fontSize: 15, lineHeight: 30 },
<mask> labelProps.style
<mask> ]);
<mask> if (this.props.floatingLabel) {
<mask> if (this.state.isFocused) {
<mask> newLabel.push(
<mask> React.createElement(Label, {
</s> fix: floatingLabel with defaultValue workiing now </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { </s> remove key: 'newLabel'
</s> add key: 'newLabel', </s> remove label = remove(childrenArray, item => {
</s> add label = remove(childrenArray, (item) => { </s> remove style: labelStyle
</s> add style: labelStyle, </s> remove opacAnim: new Animated.Value(1)
</s> add opacAnim: new Animated.Value(1), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
style: labelStyle, | <mask> React.createElement(Label, {
<mask> ...labelProps,
<mask> key: 'newFLabel',
<mask> float: true,
<mask> style: labelStyle
<mask> })
<mask> );
<mask> this.floatUp(-16);
<mask> } else {
<mask> newLabel.push(label);
</s> fix: floatingLabel with defaultValue workiing now </s> remove key: 'newLabel'
</s> add key: 'newLabel', </s> remove isFocused: true
</s> add isFocused: true, </s> remove labelProps.style
</s> add labelProps.style, </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, </s> remove onBlur={e => {
</s> add onBlur={(e) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
key: 'newLabel', | <mask> } else {
<mask> newLabel.push(
<mask> React.createElement(Label, {
<mask> ...labelProps,
<mask> key: 'newLabel'
<mask> })
<mask> );
<mask> }
<mask> return newLabel;
<mask> }
</s> fix: floatingLabel with defaultValue workiing now </s> remove style: labelStyle
</s> add style: labelStyle, </s> remove onBlur={e => {
</s> add onBlur={(e) => { </s> remove isFocused: true
</s> add isFocused: true, </s> remove labelProps.style
</s> add labelProps.style, </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
ref={(c) => (this._root = c)} | <mask>
<mask> render() {
<mask> return (
<mask> <TouchableOpacity
<mask> ref={c => (this._root = c)}
<mask> {...this.prepareRootProps()}
<mask> activeOpacity={1}
<mask> >
<mask> {this.renderChildren()}
<mask> </TouchableOpacity>
</s> fix: floatingLabel with defaultValue workiing now </s> remove ref={c => (this._inputRef = c)}
</s> add ref={(c) => (this._inputRef = c)} </s> remove ref={c => (this._inputRef = c)}
</s> add ref={(c) => (this._inputRef = c)} </s> remove ref={c => (this._inputRef = c)}
value={this.state.text}
</s> add ref={(c) => (this._inputRef = c)}
// value={this.state.text} </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { </s> remove image = remove(childrenArray, item => {
</s> add image = remove(childrenArray, (item) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
PropTypes.array, | <mask> ...TouchableOpacity.propTypes,
<mask> style: PropTypes.oneOfType([
<mask> PropTypes.object,
<mask> PropTypes.number,
<mask> PropTypes.array
<mask> ]),
<mask> inlineLabel: PropTypes.bool,
<mask> floatingLabel: PropTypes.bool,
<mask> stackedLabel: PropTypes.bool,
<mask> fixedLabel: PropTypes.bool,
</s> fix: floatingLabel with defaultValue workiing now </s> remove error: PropTypes.bool
</s> add error: PropTypes.bool, </s> remove const StyledItem = connectStyle('NativeBase.Item', {}, mapPropsToStyleNames)(
Item
);
</s> add const StyledItem = connectStyle(
'NativeBase.Item',
{},
mapPropsToStyleNames
)(Item); </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, </s> remove style: labelStyle
</s> add style: labelStyle, </s> remove useNativeDriver: false
</s> add useNativeDriver: false, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
error: PropTypes.bool, | <mask> floatingLabel: PropTypes.bool,
<mask> stackedLabel: PropTypes.bool,
<mask> fixedLabel: PropTypes.bool,
<mask> success: PropTypes.bool,
<mask> error: PropTypes.bool
<mask> };
<mask>
<mask> const StyledItem = connectStyle('NativeBase.Item', {}, mapPropsToStyleNames)(
<mask> Item
<mask> );
</s> fix: floatingLabel with defaultValue workiing now </s> remove const StyledItem = connectStyle('NativeBase.Item', {}, mapPropsToStyleNames)(
Item
);
</s> add const StyledItem = connectStyle(
'NativeBase.Item',
{},
mapPropsToStyleNames
)(Item); </s> remove PropTypes.array
</s> add PropTypes.array, </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { </s> remove labelProps.style
</s> add labelProps.style, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
const StyledItem = connectStyle(
'NativeBase.Item',
{},
mapPropsToStyleNames
)(Item); | <mask> success: PropTypes.bool,
<mask> error: PropTypes.bool
<mask> };
<mask>
<mask> const StyledItem = connectStyle('NativeBase.Item', {}, mapPropsToStyleNames)(
<mask> Item
<mask> );
<mask>
<mask> export { StyledItem as Item };
</s> fix: floatingLabel with defaultValue workiing now </s> remove error: PropTypes.bool
</s> add error: PropTypes.bool, </s> remove style: this.getInitialStyle().roundedInputGroup
</s> add style: this.getInitialStyle().roundedInputGroup, </s> remove if (this.inputProps && this.inputProps.value) {
</s> add if (
(this.inputProps && this.inputProps.value) ||
this.inputProps.defaultValue
) { </s> remove PropTypes.array
</s> add PropTypes.array, </s> remove opacAnim: new Animated.Value(1)
</s> add opacAnim: new Animated.Value(1), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bea1ca69d7d5edda875e26b0defa9ae8df6e56e5 | src/basic/Item.js |
<Stack w="50%" space={8}>
<Skeleton h={20}></Skeleton>
<Skeleton.Circle size={20} />
<Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> | <mask> import React from 'react';
<mask> import { Skeleton, Stack } from 'native-base';
<mask> export const Example = () => {
<mask> return (
<mask> <Stack width="90%">
<mask> <Skeleton variant="text" height={6} />
<mask> <Skeleton my={2} height={6} variant="rect" />
<mask> <Skeleton my={2} height={6} variant="circle" size={20} />
<mask> </Stack>
<mask> );
<mask> };
</s> feat: skeleton example and api update </s> remove import { Box } from 'native-base';
</s> add import { Box, Text } from 'native-base'; </s> remove <Composition />
<Composition loaded />
</s> add <CompositionComponent /> </s> remove variant="circle"
</s> add />
<Skeleton.Text
startColor="#0dead0"
endColor="#0face0"
lineHeight={20}
h={24} </s> remove <Skeleton
</s> add <Skeleton.Circle </s> remove import React from 'react';
</s> add import React, { useState } from 'react'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79 | example/storybook/stories/components/composites/Skeleton/Basic.tsx |
<Skeleton.Circle | <mask> endColor="secondary.500"
<mask> height="20px"
<mask> />
<mask> <Skeleton startColor="#0dead0" endColor="#0face0" height="20px" />
<mask> <Skeleton
<mask> startColor="warning.200"
<mask> endColor="danger.200"
<mask> size={20}
<mask> variant="circle"
<mask> />
</s> feat: skeleton example and api update </s> remove variant="circle"
</s> add />
<Skeleton.Text
startColor="#0dead0"
endColor="#0face0"
lineHeight={20}
h={24} </s> remove <Stack width="90%">
<Skeleton variant="text" height={6} />
<Skeleton my={2} height={6} variant="rect" />
<Skeleton my={2} height={6} variant="circle" size={20} />
</s> add <Stack w="50%" space={8}>
<Skeleton h={20}></Skeleton>
<Skeleton.Circle size={20} />
<Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> </s> remove ) : (
<Skeleton variant="rect" height="100%" />
)}
</s> add </Skeleton> </s> remove ) : (
<Skeleton variant="circle" size={12} />
)}
<Text fontWeight="bold" fontSize="lg" ml={2}>
{loaded ? (
'Nativebase'
) : (
<Skeleton>
<Box>Nativebase</Box>
</Skeleton>
)}
</Text>
</s> add </Skeleton.Circle>
<Skeleton.Text
isLoaded={loaded}
w="50%"
ml={2}
_stack={{ justifyContent: 'center' }}
>
<Text fontWeight="bold" fontSize="lg" my="auto" ml={2}>
Nativebase
</Text>
</Skeleton.Text> </s> remove <Composition />
<Composition loaded />
</s> add <CompositionComponent /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79 | example/storybook/stories/components/composites/Skeleton/Color.tsx |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.