Skip to content

Commit cbc7532

Browse files
author
crstnmac
committed
refactor(text-area): 🎨 improve demo controls & resolve merge conflicts
1 parent 669e8e0 commit cbc7532

File tree

2 files changed

+56
-47
lines changed

2 files changed

+56
-47
lines changed

example/src/AppRoot.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ const AppRoot = () => {
123123
name="TooltipScreen"
124124
component={TooltipScreen}
125125
/>
126-
<Drawer.Screen
127-
options={{ title: "Text Area" }}
128-
name="TextAreaScreen"
129-
component={TextAreaScreen}
130-
/>
131126
</Drawer.Navigator>
132127
);
133128
};

example/src/modules/forms/TextAreaScreen.tsx

Lines changed: 56 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,24 @@ export const TextAreaScreen = () => {
2525
const ref = useRef(null);
2626

2727
return (
28-
<Box
29-
style={tailwind.style(
30-
"flex-1 justify-center bg-white-500 items-center p-2 w-full",
31-
)}
32-
>
33-
<TextArea
34-
placeholder={"Type Something...."}
35-
size={size}
36-
variant={variant}
37-
loading={loading}
38-
invalid={invalid}
39-
suffix={suffix}
40-
editable={!disabled}
41-
ref={ref}
42-
/>
43-
<Box style={tailwind.style("absolute bottom-0")}>
28+
<Box style={tailwind.style("flex-1 justify-center bg-white-900")}>
29+
<Box style={tailwind.style("flex-1 px-2 justify-center")}>
30+
<TextArea
31+
placeholder={"Type Something...."}
32+
size={size}
33+
variant={variant}
34+
loading={loading}
35+
invalid={invalid}
36+
suffix={suffix}
37+
editable={!disabled}
38+
ref={ref}
39+
/>
40+
</Box>
41+
<Box
42+
style={tailwind.style(
43+
"py-2 rounded-t-lg shadow-lg bg-gray-100 justify-end items-center",
44+
)}
45+
>
4446
<RadioGroup
4547
value={variant}
4648
onChange={value => setVariant(value as TextAreaVariants)}
@@ -55,34 +57,46 @@ export const TextAreaScreen = () => {
5557
onChange={value => setSize(value as TextAreaSizes)}
5658
orientation="horizontal"
5759
>
58-
<Radio value="sm" label="Small" />
59-
<Radio value="md" label="Medium" />
60-
<Radio value="lg" label="Large" />
61-
<Radio value="xl" label="Extra Large" />
60+
<Radio value="sm" label="sm" />
61+
<Radio value="md" label="md" />
62+
<Radio value="lg" label="lg" />
63+
<Radio value="xl" label="xl" />
6264
</RadioGroup>
63-
<Box style={tailwind.style("flex-row justify-center")}>
64-
<Box style={tailwind.style("flex-col items-center")}>
65-
<Switch
66-
label="Loading"
67-
state={loading}
68-
onStateChange={setLoading}
69-
/>
70-
<Switch
71-
label="Invalid"
72-
state={invalid}
73-
onStateChange={setInvalid}
74-
/>
75-
</Box>
76-
<Box style={tailwind.style("flex-col items-center")}>
77-
<Switch
78-
label="Disabled"
79-
state={disabled}
80-
onStateChange={setDisabled}
81-
/>
82-
<Switch label="Icon" state={icon} onStateChange={setIcon} />
83-
</Box>
65+
<Box
66+
style={tailwind.style(
67+
"flex flex-row justify-center flex-wrap w-full",
68+
)}
69+
>
70+
<Switch
71+
label="Loading"
72+
state={loading}
73+
onStateChange={setLoading}
74+
size="md"
75+
style={tailwind.style("mt-1")}
76+
/>
77+
<Switch
78+
label="Invalid"
79+
state={invalid}
80+
onStateChange={setInvalid}
81+
size="md"
82+
style={tailwind.style("ml-1 mt-1")}
83+
/>
84+
<Switch
85+
label="Disabled"
86+
state={disabled}
87+
onStateChange={setDisabled}
88+
size="md"
89+
style={tailwind.style("ml-1 mt-1")}
90+
/>
91+
<Switch
92+
label="Icon"
93+
state={icon}
94+
onStateChange={setIcon}
95+
size="md"
96+
style={tailwind.style("ml-1 mt-1")}
97+
/>
8498
</Box>
85-
<Box style={tailwind.style("flex-row justify-center")}>
99+
<Box style={tailwind.style("flex-row justify-center py-2")}>
86100
<Button
87101
style={tailwind.style("mr-2")}
88102
onPress={() => ref.current.blur()}

0 commit comments

Comments
 (0)