more

Author: NeloBlivion

discord/ui/action_row.py

@@ -10,7 +10,7 @@
 from ..utils import find, get
 from .button import Button
 from .file import File
-from .item import Item, ItemCallbackType
+from .item import ViewItem, ItemCallbackType
 from .select import Select
 
 __all__ = ("ActionRow",)
@@ -28,7 +28,7 @@
 V = TypeVar("V", bound="DesignerView", covariant=True)
 
 
-class ActionRow(Item[V]):
+class ActionRow(ViewItem[V]):
     """Represents a UI Action Row used in :class:`discord.ui.DesignerView`.
 
     The items supported are as follows:
@@ -40,7 +40,7 @@ class ActionRow(Item[V]):
 
     Parameters
     ----------
-    *items: :class:`Item`
+    *items: :class:`ViewItem`
         The initial items in this action row.
     id: Optional[:class:`int`]
         The action's ID.
@@ -64,12 +64,12 @@ def __init_subclass__(cls) -> None:
 
     def __init__(
         self,
-        *items: Item,
+        *items: ViewItem,
         id: int | None = None,
     ):
         super().__init__()
 
-        self.children: list[Item] = []
+        self.children: list[ViewItem] = []
 
         self._underlying = ActionRowComponent._raw_construct(
             type=ComponentType.action_row,
@@ -78,7 +78,7 @@ def __init__(
         )
 
         for func in self.__row_children_items__:
-            item: Item = func.__discord_ui_model_type__(
+            item: ViewItem = func.__discord_ui_model_type__(
                 **func.__discord_ui_model_kwargs__
             )
             item.callback = partial(func, self, item)
@@ -87,26 +87,26 @@ def __init__(
         for i in items:
             self.add_item(i)
 
-    def _add_component_from_item(self, item: Item):
+    def _add_component_from_item(self, item: ViewItem):
         self._underlying.children.append(item._underlying)
 
-    def _set_components(self, items: list[Item]):
+    def _set_components(self, items: list[ViewItem]):
         self._underlying.children.clear()
         for item in items:
             self._add_component_from_item(item)
 
-    def add_item(self, item: Item) -> Self:
+    def add_item(self, item: ViewItem) -> Self:
         """Adds an item to the action row.
 
         Parameters
         ----------
-        item: :class:`Item`
+        item: :class:`ViewItem`
             The item to add to the action row.
 
         Raises
         ------
         TypeError
-            An :class:`Item` was not passed.
+            A :class:`ViewItem` was not passed.
         """
 
         if not isinstance(item, (Select, Button)):
@@ -123,12 +123,12 @@ def add_item(self, item: Item) -> Self:
         self._add_component_from_item(item)
         return self
 
-    def remove_item(self, item: Item | str | int) -> Self:
+    def remove_item(self, item: ViewItem | str | int) -> Self:
         """Removes an item from the action row. If an int or str is passed, it will remove by Item :attr:`id` or ``custom_id`` respectively.
 
         Parameters
         ----------
-        item: Union[:class:`Item`, :class:`int`, :class:`str`]
+        item: Union[:class:`ViewItem`, :class:`int`, :class:`str`]
             The item, ``id``, or item ``custom_id`` to remove from the action row.
         """
 
@@ -140,7 +140,7 @@ def remove_item(self, item: Item | str | int) -> Self:
             pass
         return self
 
-    def get_item(self, id: str | int) -> Item | None:
+    def get_item(self, id: str | int) -> ViewItem | None:
         """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``.
 
@@ -151,7 +151,7 @@ def get_item(self, id: str | int) -> Item | None:
 
         Returns
         -------
-        Optional[:class:`Item`]
+        Optional[:class:`ViewItem`]
             The item with the matching ``id`` or ``custom_id`` if it exists.
         """
         if not id:
@@ -327,7 +327,7 @@ def add_select(
 
         return self.add_item(select)
 
-    @Item.view.setter
+    @ViewItem.view.setter
     def view(self, value):
         self._view = value
         for item in self.children:
@@ -352,27 +352,27 @@ def refresh_component(self, component: ActionRowComponent) -> None:
             x.refresh_component(y)
             i += 1
 
-    def disable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
+    def disable_all_items(self, *, exclusions: list[ViewItem] | None = None) -> Self:
         """
         Disables all items in the row.
 
         Parameters
         ----------
-        exclusions: Optional[List[:class:`Item`]]
+        exclusions: Optional[List[:class:`ViewItem`]]
             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:
                 item.disabled = True
         return self
 
-    def enable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
+    def enable_all_items(self, *, exclusions: list[ViewItem] | None = None) -> Self:
         """
         Enables all items in the row.
 
         Parameters
         ----------
-        exclusions: Optional[List[:class:`Item`]]
+        exclusions: Optional[List[:class:`ViewItem`]]
             A list of items in `self.children` to not enable.
         """
         for item in self.walk_items():
@@ -388,7 +388,7 @@ def width(self):
             t += 1 if item._underlying.type is ComponentType.button else 5
         return t
 
-    def walk_items(self) -> Iterator[Item]:
+    def walk_items(self) -> Iterator[ViewItem]:
         yield from self.children
 
     def to_component_dict(self) -> ActionRowPayload:

discord/ui/label.py

@@ -40,8 +40,8 @@ class Label(ModalItem[M]):
 
     Parameters
     ----------
-    item: :class:`Item`
-        The initial item in this label.
+    item: :class:`ModalItem`
+        The initial item attached to this label.
     label: :class:`str`
         The label text. Must be 45 characters or fewer.
     description: Optional[:class:`str`]
@@ -60,14 +60,14 @@ class Label(ModalItem[M]):
     def __init__(
         self,
         label: str,
-        item: Item = None,
+        item: ModalItem = None,
         *,
         description: str | None = None,
         id: int | None = None,
     ):
         super().__init__()
 
-        self.item: Item = None
+        self.item: ModalItem = None
 
         self._underlying = LabelComponent._raw_construct(
             type=ComponentType.label,
@@ -80,26 +80,32 @@ def __init__(
         if item:
             self.set_item(item)
 
-    def _set_component_from_item(self, item: Item):
+    @ModalItem.modal.setter
+    def modal(self, value):
+        self._modal = value
+        if self.item:
+            self.item.modal = value
+
+    def _set_component_from_item(self, item: ModalItem):
         self._underlying.component = item._underlying
 
-    def set_item(self, item: Item) -> Self:
+    def set_item(self, item: ModalItem) -> Self:
         """Set this label's item.
 
         Parameters
         ----------
-        item: Union[:class:`Item`, :class:`InputText`]
+        item: Union[:class:`ModalItem`, :class:`InputText`]
             The item to set.
             Currently only supports :class:`~discord.ui.Select` and :class:`~discord.ui.InputText`.
 
         Raises
         ------
         TypeError
-            An :class:`Item` was not passed.
+            A :class:`ModalItem` was not passed.
         """
 
-        if not isinstance(item, (Item, InputText)):
-            raise TypeError(f"expected Item not {item.__class__!r}")
+        if not isinstance(item, ModalItem):
+            raise TypeError(f"expected ModalItem not {item.__class__!r}")
         if isinstance(item, InputText) and item.label:
             raise ValueError(f"InputText.label cannot be set inside Label")
         if self.view:
@@ -110,7 +116,7 @@ def set_item(self, item: Item) -> Self:
         self._set_component_from_item(item)
         return self
 
-    def get_item(self, id: str | int) -> Item | None:
+    def get_item(self, id: str | int) -> ModalItem | None:
         """Get the item from this label if it matches the provided id.
         If an ``int`` is provided, the item will match by ``id``, otherwise by ``custom_id``.
 
@@ -121,7 +127,7 @@ def get_item(self, id: str | int) -> Item | None:
 
         Returns
         -------
-        Optional[:class:`Item`]
+        Optional[:class:`ModalItem`]
             The item if its ``id`` or ``custom_id`` matches.
         """
         if not id:
@@ -330,7 +336,7 @@ def refresh_component(self, component: LabelComponent) -> None:
         self._underlying = component
         self.item.refresh_component(component.component)
 
-    def walk_items(self) -> Iterator[Item]:
+    def walk_items(self) -> Iterator[ModalItem]:
         yield from [self.item]
 
     def to_component_dict(self) -> LabelPayload: