@@ -233,16 +233,16 @@ impl<T: Item + 'static> Component for Menu<T> {
233233 let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
234234 let row = option.row();
235235 // maintain max for each column
236− for (i, cell) in row.cells.iter().enumerate() {
236+ for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
237237 let width = cell.content.width();
238− if width > acc[i] {
239− acc[i] = width;
238+ if width > *acc {
239+ *acc = width;
240240 }
241241 }
242242
243243 acc
244244 });
245− let len = (max_lens.iter().sum::<usize>()) + n + 1; // +1: reserve some space for scrollbar
245+ let len = max_lens.iter().sum::<usize>() + n + 1; // +1: reserve some space for scrollbar
246246 let width = len.min(viewport.0 as usize);
247247
248248 self.widths = max_lens
@@ -250,9 +250,7 @@ impl<T: Item + 'static> Component for Menu<T> {
250250 .map(|len| Constraint::Length(len as u16))
251251 .collect();
252252
253− const MAX: usize = 10;
254− let height = std::cmp::min(self.options.len(), MAX);
255− let height = std::cmp::min(height, viewport.1 as usize);
253+ let height = self.options.len().min(10).min(viewport.1 as usize);
256254
257255 self.size = (width as u16, height as u16);
258256