Commit 847e1b3
committed
Keep the tile's icon whole when the truncation warning is on it
The warning arrived as a third line of text in a tile whose height is fixed, so
it did not fit: at this repository's 15px root the two in-flow children need
63.75px inside a 58px box, and the icon is the only one that can give. Measured
in Chromium, it rendered 18.75x13 on exactly the tiles carrying the warning.
Pinning the icon alone only moves the overflow onto the border, so the warning
folds onto the size line instead and the tile keeps two lines. `truncate` is
what guarantees that: `formatBytes` is unbounded, and a large enough file would
otherwise wrap the line and put the third one back.
Also drops the `attachment.type` test from the composer's derivation. The filter
above it already excludes images using `stagedModality`, which prefers the mime
the server sniffed; `attachment.type` is the browser's claim, fixed at pick time
and never revised. Testing both could only subtract, and the file it subtracted
is the one that matters: a file the browser called a PNG and the server read as
text goes down the extraction path and is exactly what gets cut. Covered by a
composer-level test, which the warning did not have.1 parent d28a666 commit 847e1b3
4 files changed
Lines changed: 80 additions & 13 deletions
File tree
- app
- src/components/channels/composer
- tests
Lines changed: 29 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
129 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
130 | 136 | | |
131 | 137 | | |
132 | 138 | | |
133 | 139 | | |
134 | 140 | | |
135 | 141 | | |
136 | 142 | | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
142 | 156 | | |
143 | | - | |
144 | | - | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
145 | 163 | | |
146 | | - | |
| 164 | + | |
| 165 | + | |
147 | 166 | | |
148 | | - | |
| 167 | + | |
149 | 168 | | |
150 | 169 | | |
151 | 170 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1013 | 1013 | | |
1014 | 1014 | | |
1015 | 1015 | | |
| 1016 | + | |
| 1017 | + | |
| 1018 | + | |
| 1019 | + | |
| 1020 | + | |
| 1021 | + | |
| 1022 | + | |
1016 | 1023 | | |
1017 | 1024 | | |
1018 | 1025 | | |
1019 | | - | |
1020 | 1026 | | |
1021 | 1027 | | |
1022 | 1028 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
133 | | - | |
| 133 | + | |
134 | 134 | | |
135 | 135 | | |
136 | 136 | | |
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
148 | | - | |
| 148 | + | |
149 | 149 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
404 | 404 | | |
405 | 405 | | |
406 | 406 | | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
0 commit comments