further consolidate

Author: NeloBlivion

discord/ui/action_row.py

@@ -389,7 +389,7 @@ def walk_items(self) -> Iterator[ViewItem]:
 
     def to_component_dict(self) -> ActionRowPayload:
         self._set_components(self.items)
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
     @classmethod
     def from_component(cls: type[A], component: ActionRowComponent) -> A:

discord/ui/button.py

@@ -42,6 +42,7 @@
 if TYPE_CHECKING:
     from ..emoji import AppEmoji, GuildEmoji
     from .view import BaseView
+    from ..types.components import ButtonComponent as ButtonComponentPayload
 
 B = TypeVar("B", bound="Button")
 V = TypeVar("V", bound="BaseView", covariant=True)
@@ -263,8 +264,8 @@ def from_component(cls: type[B], button: ButtonComponent) -> B:
             id=button.id,
         )
 
-    def to_component_dict(self):
-        return self._underlying.to_dict()
+    def to_component_dict(self) -> ButtonComponentPayload:
+        return super().to_component_dict()
 
     def is_dispatchable(self) -> bool:
         return self.custom_id is not None

discord/ui/container.py

@@ -402,7 +402,7 @@ def walk_items(self) -> Iterator[ViewItem]:
 
     def to_component_dict(self) -> ContainerComponentPayload:
         self._set_components(self.items)
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
     @classmethod
     def from_component(cls: type[C], component: ContainerComponent) -> C:

discord/ui/file.py

@@ -88,7 +88,7 @@ def refresh_component(self, component: FileComponent) -> None:
         self._underlying = component
 
     def to_component_dict(self) -> FileComponentPayload:
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
     @classmethod
     def from_component(cls: type[F], component: FileComponent) -> F:

discord/ui/input_text.py

@@ -120,11 +120,6 @@ def style(self) -> InputTextStyle:
         """The style of the input text field."""
         return self._underlying.style
 
-    @property
-    def id(self) -> int | None:
-        """The input text's ID. If not provided by the user, it is set sequentially by Discord."""
-        return self._underlying.id
-
     @style.setter
     def style(self, value: InputTextStyle):
         if not isinstance(value, InputTextStyle):
@@ -225,8 +220,12 @@ def value(self, value: str | None):
             raise ValueError("value must be 4000 characters or fewer")
         self._underlying.value = value
 
+    @property
+    def width(self) -> int:
+        return 5
+
     def to_component_dict(self) -> InputTextComponentPayload:
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
     def refresh_state(self, data) -> None:
         self._input_value = data["value"]

discord/ui/item.py

@@ -81,7 +81,9 @@ def __init__(self):
         self.parent: Item | ItemInterface | None = None
 
     def to_component_dict(self) -> dict[str, Any]:
-        raise NotImplementedError
+        if not self._underlying:
+            raise NotImplementedError
+        return self._underlying.to_dict()
 
     def refresh_component(self, component: Component) -> None:
         self._underlying = component

discord/ui/label.py

@@ -20,7 +20,7 @@
     from ..emoji import AppEmoji, GuildEmoji
     from ..interaction import Interaction
     from ..partial_emoji import PartialEmoji, _EmojiTag
-    from ..types.components import Label as LabelPayload
+    from ..types.components import LabelComponent as LabelComponentPayload
     from .modal import DesignerModal
 
 
@@ -335,11 +335,11 @@ def refresh_component(self, component: LabelComponent) -> None:
     def walk_items(self) -> Iterator[ModalItem]:
         yield from [self.item]
 
-    def to_component_dict(self) -> LabelPayload:
+    def to_component_dict(self) -> LabelComponentPayload:
         self._set_component_from_item(self.item)
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
-    def refresh_from_modal(self, interaction: Interaction, data: LabelPayload) -> None:
+    def refresh_from_modal(self, interaction: Interaction, data: LabelComponentPayload) -> None:
         return self.item.refresh_from_modal(interaction, data.get("component", {}))
 
     @classmethod

discord/ui/media_gallery.py

@@ -106,7 +106,7 @@ def add_item(
         return self.append_item(item)
 
     def to_component_dict(self) -> MediaGalleryComponentPayload:
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
     @classmethod
     def from_component(cls: type[M], component: MediaGalleryComponent) -> M:

discord/ui/section.py

@@ -309,7 +309,7 @@ def to_component_dict(self) -> SectionComponentPayload:
         self._set_components(self.items)
         if self.accessory:
             self.set_accessory(self.accessory)
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
     @classmethod
     def from_component(cls: type[S], component: SectionComponent) -> S:

discord/ui/select.py

@@ -714,7 +714,7 @@ def width(self) -> int:
         return 5
 
     def to_component_dict(self) -> SelectMenuPayload:
-        return self._underlying.to_dict()
+        return super().to_component_dict()
 
     def refresh_component(self, component: SelectMenu) -> None:
         self._underlying = component