From 6fa1481a33439abc0dfeaa800f04c0d30273a8b2 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro.celaya@hypothes.is>
Date: Mon, 21 Oct 2024 15:22:18 +0200
Subject: [PATCH] Prevent Select listbox to grow out of viewport

---
 src/components/input/Select.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/input/Select.tsx b/src/components/input/Select.tsx
index 9aaa56869..6d6b80496 100644
--- a/src/components/input/Select.tsx
+++ b/src/components/input/Select.tsx
@@ -446,6 +446,7 @@ type BaseSelectProps = CompositeProps & {
   /**
    * Indicates how overflowing content should be handled in the listbox.
    *
+<<<<<<< HEAD
    * - `truncate`: Truncate the options via `text-overflow: ellipsis`, so that
    *               they all fit in one line. This is the default value.
    * - `wrap`: Let options content wrap onto multiple lines via
@@ -453,6 +454,16 @@ type BaseSelectProps = CompositeProps & {
    *
    * Complex content may still need to provide its own styling to handle content
    * overflow.
+=======
+   * - `truncate`: Truncate the options so that they all fit in one line. An
+   *               ellipsis will be rendered where needed.
+   *               This is the default value.
+   * - `wrap`: Let options content wrap multiple lines so that all content is
+   *           visible.
+   *
+   * This behavior can be also overwritten by providing more complex options
+   * content.
+>>>>>>> 51ceff5 (Prevent Select listbox to grow out of viewport)
    */
   listboxOverflow?: ListboxOverflow;
 };