Skip to content

Commit 62af14e

Browse files
OtavioStasiakOtavioStasiak
authored
fix: markdown toolbar not animating correctly when keyboard is opened (#6611)
* fix: showFocused on touch to show toolbar before open keyboard * fix: snapshot test
1 parent 2a4b4fb commit 62af14e

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

‎app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ exports[`MessageComposer Quote Add quote \`abc\` 1`] = `
373373
onChangeText={[Function]}
374374
onFocus={[Function]}
375375
onSelectionChange={[Function]}
376+
onTouchStart={[Function]}
376377
placeholder="Message @Rocket Chat"
377378
placeholderTextColor="#9EA2A8"
378379
style={
@@ -817,6 +818,7 @@ exports[`MessageComposer Quote Add quote \`def\` 1`] = `
817818
onChangeText={[Function]}
818819
onFocus={[Function]}
819820
onSelectionChange={[Function]}
821+
onTouchStart={[Function]}
820822
placeholder="Message @Rocket Chat"
821823
placeholderTextColor="#9EA2A8"
822824
style={
@@ -1443,6 +1445,7 @@ exports[`MessageComposer Quote Remove a quote 1`] = `
14431445
onChangeText={[Function]}
14441446
onFocus={[Function]}
14451447
onSelectionChange={[Function]}
1448+
onTouchStart={[Function]}
14461449
placeholder="Message @Rocket Chat"
14471450
placeholderTextColor="#9EA2A8"
14481451
style={
@@ -1990,6 +1993,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = `
19901993
onChangeText={[Function]}
19911994
onFocus={[Function]}
19921995
onSelectionChange={[Function]}
1996+
onTouchStart={[Function]}
19931997
placeholder="Message @Rocket Chat"
19941998
placeholderTextColor="#9EA2A8"
19951999
style={
@@ -2602,6 +2606,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = `
26022606
onChangeText={[Function]}
26032607
onFocus={[Function]}
26042608
onSelectionChange={[Function]}
2609+
onTouchStart={[Function]}
26052610
placeholder="Message @Rocket Chat"
26062611
placeholderTextColor="#9EA2A8"
26072612
style={
@@ -3214,6 +3219,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = `
32143219
onChangeText={[Function]}
32153220
onFocus={[Function]}
32163221
onSelectionChange={[Function]}
3222+
onTouchStart={[Function]}
32173223
placeholder="Message @Rocket Chat"
32183224
placeholderTextColor="#9EA2A8"
32193225
style={
@@ -3826,6 +3832,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = `
38263832
onChangeText={[Function]}
38273833
onFocus={[Function]}
38283834
onSelectionChange={[Function]}
3835+
onTouchStart={[Function]}
38293836
placeholder="Message @Rocket Chat"
38303837
placeholderTextColor="#9EA2A8"
38313838
style={
@@ -4438,6 +4445,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = `
44384445
onChangeText={[Function]}
44394446
onFocus={[Function]}
44404447
onSelectionChange={[Function]}
4448+
onTouchStart={[Function]}
44414449
placeholder="Message @Rocket Chat"
44424450
placeholderTextColor="#9EA2A8"
44434451
style={
@@ -5050,6 +5058,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = `
50505058
onChangeText={[Function]}
50515059
onFocus={[Function]}
50525060
onSelectionChange={[Function]}
5061+
onTouchStart={[Function]}
50535062
placeholder="Message @Rocket Chat"
50545063
placeholderTextColor="#9EA2A8"
50555064
style={
@@ -5662,6 +5671,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = `
56625671
onChangeText={[Function]}
56635672
onFocus={[Function]}
56645673
onSelectionChange={[Function]}
5674+
onTouchStart={[Function]}
56655675
placeholder="Message @Rocket Chat"
56665676
placeholderTextColor="#9EA2A8"
56675677
style={
@@ -6274,6 +6284,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = `
62746284
onChangeText={[Function]}
62756285
onFocus={[Function]}
62766286
onSelectionChange={[Function]}
6287+
onTouchStart={[Function]}
62776288
placeholder="Message @Rocket Chat"
62786289
placeholderTextColor="#9EA2A8"
62796290
style={
@@ -6886,6 +6897,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = `
68866897
onChangeText={[Function]}
68876898
onFocus={[Function]}
68886899
onSelectionChange={[Function]}
6900+
onTouchStart={[Function]}
68896901
placeholder="Message @Rocket Chat"
68906902
placeholderTextColor="#9EA2A8"
68916903
style={
@@ -7498,6 +7510,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = `
74987510
onChangeText={[Function]}
74997511
onFocus={[Function]}
75007512
onSelectionChange={[Function]}
7513+
onTouchStart={[Function]}
75017514
placeholder="Message @Rocket Chat"
75027515
placeholderTextColor="#9EA2A8"
75037516
style={
@@ -8110,6 +8123,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = `
81108123
onChangeText={[Function]}
81118124
onFocus={[Function]}
81128125
onSelectionChange={[Function]}
8126+
onTouchStart={[Function]}
81138127
placeholder="Message @Rocket Chat"
81148128
placeholderTextColor="#9EA2A8"
81158129
style={
@@ -8722,6 +8736,7 @@ exports[`MessageComposer Toolbar tap actions 1`] = `
87228736
onChangeText={[Function]}
87238737
onFocus={[Function]}
87248738
onSelectionChange={[Function]}
8739+
onTouchStart={[Function]}
87258740
placeholder="Message @Rocket Chat"
87268741
placeholderTextColor="#9EA2A8"
87278742
style={
@@ -9182,6 +9197,7 @@ exports[`MessageComposer Toolbar tap emoji 1`] = `
91829197
onChangeText={[Function]}
91839198
onFocus={[Function]}
91849199
onSelectionChange={[Function]}
9200+
onTouchStart={[Function]}
91859201
placeholder="Message @Rocket Chat"
91869202
placeholderTextColor="#9EA2A8"
91879203
style={
@@ -11065,6 +11081,7 @@ exports[`MessageComposer Toolbar tap mention 1`] = `
1106511081
onChangeText={[Function]}
1106611082
onFocus={[Function]}
1106711083
onSelectionChange={[Function]}
11084+
onTouchStart={[Function]}
1106811085
placeholder="Message @Rocket Chat"
1106911086
placeholderTextColor="#9EA2A8"
1107011087
style={

‎app/containers/MessageComposer/components/ComposerInput.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@ export const ComposerInput = memo(
196196
setFocused(true);
197197
};
198198

199+
const onTouchStart: TextInputProps['onTouchStart'] = () => {
200+
setFocused(true);
201+
};
202+
199203
const onBlur: TextInputProps['onBlur'] = () => {
200204
setFocused(false);
201205
stopAutocomplete();
@@ -355,6 +359,7 @@ export const ComposerInput = memo(
355359
}}
356360
blurOnSubmit={false}
357361
onChangeText={onChangeText}
362+
onTouchStart={onTouchStart}
358363
onSelectionChange={onSelectionChange}
359364
onFocus={onFocus}
360365
onBlur={onBlur}

0 commit comments

Comments
 (0)