Skip to content

Commit f2404e9

Browse files
authored
fix dekstop attach (#28738)
* fix desktop image attach
1 parent 7debd3d commit f2404e9

File tree

2 files changed

+36
-28
lines changed

2 files changed

+36
-28
lines changed

shared/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ main.jsbundle
5151
.eslintcache
5252
.metro-health-check*
5353
.expo
54+
.yarn
5455

5556
coverage-ts
5657
temp.log

shared/chat/conversation/attachment-get-titles.tsx

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -165,40 +165,42 @@ const Container = (ownProps: OwnProps) => {
165165

166166
return (
167167
<Kb.PopupWrapper onCancel={onCancel}>
168-
<Kb.Box2 direction="vertical" style={styles.containerOuter} fullWidth={true}>
169-
<Kb.ClickableBox2 style={styles.container} onClick={() => inputRef.current?.blur()}>
170-
<Kb.BoxGrow style={styles.boxGrow}>{preview}</Kb.BoxGrow>
171-
{pathAndInfos.length > 0 && !Kb.Styles.isMobile && (
172-
<Kb.Box2 direction="vertical" style={styles.filename}>
173-
<Kb.Text type="BodySmallSemibold">Filename</Kb.Text>
174-
<Kb.Text type="BodySmall" center={true}>
175-
{info.filename} ({index + 1} of {pathAndInfos.length})
176-
</Kb.Text>
177-
</Kb.Box2>
178-
)}
179-
<Kb.Box2 direction="vertical" fullWidth={true} style={styles.inputContainer}>
180-
<Kb.PlainInput
181-
ref={inputRef}
182-
style={styles.input}
183-
autoFocus={!Kb.Styles.isMobile}
184-
autoCorrect={true}
185-
placeholder={titleHint}
186-
multiline={true}
187-
rowsMin={2}
188-
padding="tiny"
189-
value={titles[index]}
190-
onEnterKeyDown={onNext}
191-
onChangeText={updateTitle}
192-
selectTextOnFocus={true}
193-
/>
194-
{/* (
168+
<Kb.Box2 alignItems="center" direction="vertical" fullWidth={true} style={styles.container}>
169+
<Kb.ClickableBox2 style={styles.container2} onClick={() => inputRef.current?.blur()}>
170+
<Kb.Box2 direction="vertical" style={styles.containerOuter} fullWidth={true}>
171+
<Kb.BoxGrow style={styles.boxGrow}>{preview}</Kb.BoxGrow>
172+
{pathAndInfos.length > 0 && !Kb.Styles.isMobile && (
173+
<Kb.Box2 direction="vertical" style={styles.filename}>
174+
<Kb.Text type="BodySmallSemibold">Filename</Kb.Text>
175+
<Kb.Text type="BodySmall" center={true}>
176+
{info.filename} ({index + 1} of {pathAndInfos.length})
177+
</Kb.Text>
178+
</Kb.Box2>
179+
)}
180+
<Kb.Box2 direction="vertical" fullWidth={true} style={styles.inputContainer}>
181+
<Kb.PlainInput
182+
ref={inputRef}
183+
style={styles.input}
184+
autoFocus={!Kb.Styles.isMobile}
185+
autoCorrect={true}
186+
placeholder={titleHint}
187+
multiline={true}
188+
rowsMin={2}
189+
padding="tiny"
190+
value={titles[index]}
191+
onEnterKeyDown={onNext}
192+
onChangeText={updateTitle}
193+
selectTextOnFocus={true}
194+
/>
195+
{/* (
195196
<Kb.Checkbox
196197
style={{alignSelf: 'flex-end'}}
197198
label="Spoiler?"
198199
checked={spoiler}
199200
onCheck={setSpoiler}
200201
/>
201202
)*/}
203+
</Kb.Box2>
202204
</Kb.Box2>
203205
</Kb.ClickableBox2>
204206
<Kb.ButtonBar fullWidth={true} small={true} style={styles.buttonContainer}>
@@ -219,7 +221,7 @@ const styles = Kb.Styles.styleSheetCreate(
219221
() =>
220222
({
221223
boxGrow: {
222-
margin: Kb.Styles.globalMargins.small,
224+
marginBottom: Kb.Styles.isMobile ? Kb.Styles.globalMargins.small : 0,
223225
width: '100%',
224226
},
225227
buttonContainer: Kb.Styles.platformStyles({
@@ -241,6 +243,11 @@ const styles = Kb.Styles.styleSheetCreate(
241243
paddingRight: Kb.Styles.globalMargins.small,
242244
width: '100%',
243245
},
246+
container2: {
247+
alignItems: 'center',
248+
flexGrow: 1,
249+
width: '100%',
250+
},
244251
containerOuter: Kb.Styles.platformStyles({
245252
isElectron: {
246253
height: 560,

0 commit comments

Comments
 (0)