attempt modal conversion

Author: NeloBlivion

discord/components.py

@@ -266,7 +266,7 @@ def __init__(self, data: InputTextComponentPayload):
         self.id: int | None = data.get("id")
         self.style: InputTextStyle = try_enum(InputTextStyle, data["style"])
         self.custom_id = data["custom_id"]
-        self.label: str = data.get("label", None)
+        self.label: str | None = data.get("label", None)
         self.placeholder: str | None = data.get("placeholder", None)
         self.min_length: int | None = data.get("min_length", None)
         self.max_length: int | None = data.get("max_length", None)
@@ -278,7 +278,6 @@ def to_dict(self) -> InputTextComponentPayload:
             "type": 4,
             "id": self.id,
             "style": self.style.value,
-            "label": self.label,
         }
         if self.custom_id:
             payload["custom_id"] = self.custom_id
@@ -298,6 +297,9 @@ def to_dict(self) -> InputTextComponentPayload:
         if self.value:
             payload["value"] = self.value
 
+        if self.label:
+            payload["label"] = self.label
+
         return payload  # type: ignore
 
 
@@ -1305,7 +1307,7 @@ class Label(Component):
     ``component`` may only be:
 
     - :class:`InputText`
-    - :class:`SelectMenu` (string)
+    - :class:`SelectMenu`
 
     This inherits from :class:`Component`.
 

discord/ui/action_row.py

@@ -68,7 +68,7 @@ def __init__(
     ):
         super().__init__()
 
-        self.items: list[Item] = []
+        self.children: list[Item] = []
 
         self._underlying = ActionRowComponent._raw_construct(
             type=ComponentType.action_row,
@@ -114,7 +114,7 @@ def add_item(self, item: Item) -> Self:
         item._view = self.view
         item.parent = self
 
-        self.items.append(item)
+        self.children.append(item)
         self._add_component_from_item(item)
         return self
 
@@ -130,13 +130,13 @@ def remove_item(self, item: Item | str | int) -> Self:
         if isinstance(item, (str, int)):
             item = self.get_item(item)
         try:
-            self.items.remove(item)
+            self.children.remove(item)
         except ValueError:
             pass
         return self
 
     def get_item(self, id: str | int) -> Item | None:
-        """Get an item from this action row. Roughly equivalent to `utils.get(row.items, ...)`.
+        """Get an item from this action row. Roughly equivalent to `utils.get(row.children, ...)`.
         If an ``int`` is provided, the item will be retrieved by ``id``, otherwise by ``custom_id``.
 
         Parameters
@@ -152,7 +152,7 @@ def get_item(self, id: str | int) -> Item | None:
         if not id:
             return None
         attr = "id" if isinstance(id, int) else "custom_id"
-        child = find(lambda i: getattr(i, attr, None) == id, self.items)
+        child = find(lambda i: getattr(i, attr, None) == id, self.children)
         return child
 
     def add_button(
@@ -268,29 +268,25 @@ def add_select(
     @Item.view.setter
     def view(self, value):
         self._view = value
-        for item in self.items:
+        for item in self.children:
             item.parent = self
             item._view = value
 
     @property
     def type(self) -> ComponentType:
         return self._underlying.type
 
-    @property
-    def width(self) -> int:
-        return 5
-
     def is_dispatchable(self) -> bool:
-        return any(item.is_dispatchable() for item in self.items)
+        return any(item.is_dispatchable() for item in self.children)
 
     def is_persistent(self) -> bool:
-        return all(item.is_persistent() for item in self.items)
+        return all(item.is_persistent() for item in self.children)
 
     def refresh_component(self, component: ActionRowComponent) -> None:
         self._underlying = component
         i = 0
         for y in component.components:
-            x = self.items[i]
+            x = self.children[i]
             x.refresh_component(y)
             i += 1
 
@@ -301,7 +297,7 @@ def disable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
         Parameters
         ----------
         exclusions: Optional[List[:class:`Item`]]
-            A list of items in `self.items` to not disable.
+            A list of items in `self.children` to not disable.
         """
         for item in self.walk_items():
             if exclusions is None or item not in exclusions:
@@ -315,7 +311,7 @@ def enable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
         Parameters
         ----------
         exclusions: Optional[List[:class:`Item`]]
-            A list of items in `self.items` to not enable.
+            A list of items in `self.children` to not enable.
         """
         for item in self.walk_items():
             if hasattr(item, "disabled") and (
@@ -325,10 +321,10 @@ def enable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
         return self
 
     def walk_items(self) -> Iterator[Item]:
-        yield from self.items
+        yield from self.children
 
     def to_component_dict(self) -> ActionRowPayload:
-        self._set_components(self.items)
+        self._set_components(self.children)
         return self._underlying.to_dict()
 
     @classmethod

discord/ui/core.py

@@ -86,7 +86,7 @@ def __init__(
         *items: Item,
         timeout: float | None = 180.0,
     ):
-        self.timeout = timeout
+        self.timeout: float | None = timeout
         self.children: list[Item] = []
         for item in items:
             self.add_item(item)

discord/ui/input_text.py

@@ -27,11 +27,6 @@ class InputText:
     label: :class:`str`
         The label for the input text field.
         Must be 45 characters or fewer.
-    description: Optional[:class:`str`]
-        The description for the input text field.
-        Must be 100 characters or fewer.
-
-        .. versionadded:: 2.7
     placeholder: Optional[:class:`str`]
         The placeholder text that is shown if nothing is selected, if any.
         Must be 100 characters or fewer.
@@ -64,29 +59,25 @@ class InputText:
         "max_length",
         "custom_id",
         "id",
-        "description",
     )
 
     def __init__(
         self,
         *,
         style: InputTextStyle = InputTextStyle.short,
         custom_id: str | None = None,
-        label: str,
+        label: str | None = None,
         placeholder: str | None = None,
         min_length: int | None = None,
         max_length: int | None = None,
         required: bool | None = True,
         value: str | None = None,
         row: int | None = None,
         id: int | None = None,
-        description: str | None = None,
     ):
         super().__init__()
-        if len(str(label)) > 45:
+        if label and len(str(label)) > 45:
             raise ValueError("label must be 45 characters or fewer")
-        if description and len(description) > 100:
-            raise ValueError("description must be 100 characters or fewer")
         if min_length and (min_length < 0 or min_length > 4000):
             raise ValueError("min_length must be between 0 and 4000")
         if max_length and (max_length < 0 or max_length > 4000):
@@ -100,7 +91,6 @@ def __init__(
                 f"expected custom_id to be str, not {custom_id.__class__.__name__}"
             )
         custom_id = os.urandom(16).hex() if custom_id is None else custom_id
-        self.description: str | None = description
 
         self._underlying = InputTextComponent._raw_construct(
             type=ComponentType.input_text,
@@ -251,8 +241,5 @@ def refresh_state(self, data) -> None:
     def refresh_from_modal(self, interaction: Interaction, data: dict) -> None:
         return self.refresh_state(data)
 
-    def uses_label(self) -> bool:
-        return self.description is not None
-
 
 TextInput = InputText

discord/ui/item.py

@@ -196,6 +196,11 @@ def view(self) -> V | None:
             The parent view of this item, or ``None`` if the item is not attached to any view.
         """
         return self._view
+    
+    @view.setter
+    def view(self, value) -> None:
+        self._view = value
+    
 
     async def callback(self, interaction: Interaction):
         """|coro|