neater fix

Author: NeloBlivion

discord/ui/container.py

@@ -13,6 +13,7 @@
 from .section import Section
 from .separator import Separator
 from .text_display import TextDisplay
+from .view import _walk_all_components
 
 __all__ = ("Container",)
 
@@ -58,21 +59,16 @@ def __init__(
         super().__init__()
 
         self.items = [i for i in items]
+        components = [i._underlying for i in items]
         self._color = colour
 
         self._underlying = ContainerComponent._raw_construct(
             type=ComponentType.container,
             id=None,
-            components=[],
+            components=components,
             accent_color=colour,
             spoiler=spoiler,
         )
-        for i in items:
-            if isinstance(i, ActionRow):
-                for c in i.children:
-                    self.add_item(c)
-            else:
-                self.add_item(i)
 
     def add_item(self, item: Item) -> None:
         """Adds an item to the container.
@@ -243,7 +239,7 @@ def to_component_dict(self) -> ContainerComponentPayload:
     def from_component(cls: type[C], component: ContainerComponent) -> C:
         from .view import _component_to_item
 
-        items = [_component_to_item(c) for c in component.components]
+        items = [_component_to_item(c) for c in _walk_all_components(component.components)]
         return cls(*items, colour=component.accent_color, spoiler=component.spoiler)
 
     callback = None

discord/ui/view.py

@@ -49,7 +49,7 @@
 from ..utils import get
 from .item import Item, ItemCallbackType
 
-__all__ = ("View", "_component_to_item")
+__all__ = ("View", "_component_to_item", "_walk_all_components")
 
 
 if TYPE_CHECKING:
@@ -104,7 +104,7 @@ def _component_to_item(component: Component) -> Item:
         from .container import Container
 
         return Container.from_component(component)
-    if isinstance(component, ActionRow):
+    if isinstance(component, ActionRowComponent):
         # Handle ActionRow.children manually, or design ui.ActionRow?
 
         return component