Skip to content

Commit d61193a

Browse files
authored
Merge pull request #4956 from GeekyAnts/release/3.4.2-rc.0
Release/3.4.2 rc.0
2 parents 53e5112 + 6bd7c0b commit d61193a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+318
-162
lines changed

example/storybook/stories/components/basic/View/Basic.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const Example = () => {
77
A component library for the{' '}
88
<Heading color="emerald.400">React Ecosystem</Heading>
99
</Heading>
10-
<Text pt="3" fontWeight="md">
10+
<Text pt="3">
1111
NativeBase is a simple, modular and accessible component library that
1212
gives you building blocks to build you React applications.
1313
</Text>

example/storybook/stories/components/primitives/Image/BorderRadius.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export function Example() {
55
<Center>
66
<Image
77
size={150}
8-
resizeMode={'contain'}
98
borderRadius={100}
109
source={{
1110
uri: 'https://wallpaperaccess.com/full/317501.jpg',

example/storybook/stories/components/primitives/Image/WithRef.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ export function Example() {
66
const myRef = React.useRef(null);
77

88
React.useEffect(() => {
9-
if (myRef.current && myRef.current.setNativeProps)
10-
myRef.current?.setNativeProps({ borderWidth: 10, opacity: 0.5 });
9+
const styleObj = {
10+
borderWidth: 4,
11+
borderRadius: 4,
12+
borderColor: '#22D3EE',
13+
};
14+
myRef?.current?.setNativeProps({
15+
style: styleObj,
16+
});
1117
}, [myRef]);
1218

1319
return (

example/storybook/stories/components/primitives/Input/Size.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Input, Stack } from 'native-base';
33

44
export const Example = () => {
55
return (
6-
<Stack space={4} w="75%" maxW="300px">
6+
<Stack space={4} w="75%" maxW="300px" mx="auto">
77
<Input size="xs" placeholder="xs Input" />
88
<Input size="sm" placeholder="sm Input" />
99
<Input size="md" placeholder="md Input" />

example/storybook/stories/components/primitives/Input/Variant.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import { Input, Stack } from 'native-base';
33
export const Example = () => {
44
return (
5-
<Stack space={4} w="75%" maxW="300px">
5+
<Stack space={4} w="75%" maxW="300px" mx="auto">
66
<Input variant="outline" placeholder="Outline" />
77
<Input variant="filled" placeholder="Filled" />
88
<Input variant="underlined" placeholder="Underlined" />

example/storybook/stories/components/primitives/Select/Basic.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const Example = () => {
66

77
return (
88
<Center>
9-
<Box w="3/4" maxW="300">
9+
<Box maxW="300">
1010
<Select
1111
selectedValue={service}
1212
minWidth="200"

example/storybook/stories/components/primitives/TextArea/value.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ import { TextArea, Box } from 'native-base';
33

44
export const Example = () => {
55
const [textAreaValue, setTextAreaValue] = useState('Value Controlled');
6-
const demoValueControlledTextArea = (e: any) => {
7-
setTextAreaValue(e.currentTarget.value);
8-
};
96
return (
107
<Box alignItems="center" w="100%">
118
<TextArea
129
value={textAreaValue}
13-
onChange={demoValueControlledTextArea}
10+
onChange={(e: any) => setTextAreaValue(e.currentTarget.value)} // for web
11+
onChangeText={(text: any) => setTextAreaValue(text)} // for android and ios
1412
w="75%"
1513
maxW="300"
1614
/>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"prettier --write"
3737
]
3838
},
39-
"version": "3.4.1",
39+
"version": "3.4.2-rc.0",
4040
"license": "MIT",
4141
"private": false,
4242
"main": "lib/commonjs/index",

src/components/composites/Modal/Modal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const Modal = (
5555
bottom={avoidKeyboard ? bottomInset + 'px' : undefined}
5656
{...resolvedProps}
5757
ref={ref}
58+
pointerEvents="box-none"
5859
>
5960
{children}
6061
</Box>

src/components/primitives/Checkbox/Checkbox.web.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,7 @@ const CheckboxComponent = React.memo(
147147
<Stack {..._stack} {...layoutProps}>
148148
<Center>
149149
{/* Interaction Box */}
150-
<Box
151-
{..._interactionBox}
152-
h={isFocusVisible || isFocusVisibleProp ? '130%' : '0%'}
153-
w={isFocusVisible || isFocusVisibleProp ? '130%' : '0%'}
154-
/>
150+
<Box {..._interactionBox} />
155151
{/* Checkbox */}
156152
<Center {...nonLayoutProps}>
157153
{/* {iconResolver()} */}
@@ -170,10 +166,8 @@ const CheckboxComponent = React.memo(
170166
_interactionBox,
171167
icon,
172168
isChecked,
173-
isFocusVisible,
174169
nonLayoutProps,
175170
layoutProps,
176-
isFocusVisibleProp,
177171
resolvedProps?.children,
178172
]);
179173

0 commit comments

Comments
 (0)