refactor: rework how item.view is determined (#2981)

* feat: rework how item.view is determined

* docs: changelog

* style(pre-commit): auto fixes from pre-commit.com hooks

* Update discord/ui/view.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: plun1331 <plun1331@gmail.com>

* remove useless stuff

* fuckin circles man

* style(pre-commit): auto fixes from pre-commit.com hooks

* Update discord/ui/item.py

Signed-off-by: Paillat <jeremiecotti@ik.me>

* Annotate return type for remove_item method

Added return type annotation for remove_item method.

Signed-off-by: Paillat <paillat@pycord.dev>

---------

Signed-off-by: plun1331 <plun1331@gmail.com>
Signed-off-by: Nelo <41271523+NeloBlivion@users.noreply.github.com>
Signed-off-by: Paillat <paillat@pycord.dev>
Signed-off-by: Paillat <jeremiecotti@ik.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Nelo <41271523+NeloBlivion@users.noreply.github.com>
Co-authored-by: Paillat <paillat@pycord.dev>

Author: 5 people

CHANGELOG.md

@@ -22,6 +22,8 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Fixed
 
+- Fixed the `view` attribute on many view items being incorrect.
+  ([#2981](https://github.com/Pycord-Development/pycord/pull/2981))
 - Fixed `TypeError` in paginator implementation when only passing `PageGroup` objects
   and `show_menu` is falsy.
   ([#2993](https://github.com/Pycord-Development/pycord/pull/2993))
@@ -32,6 +34,9 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Deprecated
 
+- Deprecated manually setting the `view` attribute on view items.
+  ([#2981](https://github.com/Pycord-Development/pycord/pull/2981))
+
 ### Removed
 
 - ⚠️ **Removed support for Python 3.9.**

discord/ui/action_row.py

@@ -140,7 +140,6 @@ def add_item(self, item: ViewItem) -> Self:
         if self.width + item.width > 5:
             raise ValueError(f"Not enough space left on this ActionRow")
 
-        item._view = self.view
         item.parent = self
 
         self.children.append(item)
@@ -162,6 +161,7 @@ def remove_item(self, item: ViewItem | str | int) -> Self:
             self.children.remove(item)
         except ValueError:
             pass
+        item.parent = None
         return self
 
     def get_item(self, id: str | int) -> ViewItem | None:
@@ -351,13 +351,6 @@ def add_select(
 
         return self.add_item(select)
 
-    @ViewItem.view.setter
-    def view(self, value):
-        self._view = value
-        for item in self.children:
-            item.parent = self
-            item._view = value
-
     def is_dispatchable(self) -> bool:
         return any(item.is_dispatchable() for item in self.children)
 

discord/ui/container.py

@@ -149,9 +149,6 @@ def add_item(self, item: ViewItem) -> Self:
                 f"{item.__class__!r} cannot be added directly. Use ActionRow instead."
             )
 
-        item._view = self.view
-        if hasattr(item, "items"):
-            item.view = self
         item.parent = self
 
         self.items.append(item)
@@ -170,12 +167,13 @@ def remove_item(self, item: ViewItem | str | int) -> Self:
         if isinstance(item, (str, int)):
             item = self.get_item(item)
         try:
-            if isinstance(item, Container):
+            if item.parent is self:
                 self.items.remove(item)
             else:
                 item.parent.remove_item(item)
         except ValueError:
             pass
+        item.parent = None
         return self
 
     def get_item(self, id: str | int) -> ViewItem | None:
@@ -361,15 +359,6 @@ def colour(self, value: int | Colour | None):  # type: ignore
 
     color = colour
 
-    @ViewItem.view.setter
-    def view(self, value):
-        self._view = value
-        for item in self.items:
-            item.parent = self
-            item._view = value
-            if hasattr(item, "items") or hasattr(item, "children"):
-                item.view = value
-
     def is_dispatchable(self) -> bool:
         return any(item.is_dispatchable() for item in self.items)
 

discord/ui/item.py

@@ -35,6 +35,8 @@
     "ModalItem",
 )
 
+from ..utils import warn_deprecated
+
 if TYPE_CHECKING:
     from ..components import Component
     from ..enums import ComponentType
@@ -152,7 +154,7 @@ def __init__(self):
         self._view: V | None = None
         self._row: int | None = None
         self._rendered_row: int | None = None
-        self.parent: ViewItem | BaseView | None = self.view
+        self.parent: ViewItem | BaseView | None = None
 
     @property
     def row(self) -> int | None:
@@ -208,10 +210,19 @@ def view(self) -> V | None:
         Optional[:class:`BaseView`]
             The parent view of this item, or ``None`` if the item is not attached to any view.
         """
-        return self._view
+        if self._view:
+            return self._view
+        if self.parent:
+            from .view import BaseView
+
+            if isinstance(self.parent, BaseView):
+                return self.parent
+            return self.parent.view
+        return None
 
     @view.setter
-    def view(self, value) -> None:
+    def view(self, value: V | None) -> None:
+        warn_deprecated("Manually setting .view", since="2.7", removed="3.0")
         self._view = value
 
     async def callback(self, interaction: Interaction):

discord/ui/section.py

@@ -162,6 +162,7 @@ def remove_item(self, item: ViewItem | str | int) -> Self:
             self.items.remove(item)
         except ValueError:
             pass
+        item.parent = None
         return self
 
     def get_item(self, id: int | str) -> ViewItem | None:
@@ -226,8 +227,7 @@ def set_accessory(self, item: ViewItem) -> Self:
 
         if not isinstance(item, ViewItem):
             raise TypeError(f"expected ViewItem not {item.__class__!r}")
-        if self.view:
-            item._view = self.view
+
         item.parent = self
 
         self.accessory = item
@@ -260,13 +260,6 @@ def set_thumbnail(
 
         return self.set_accessory(thumbnail)
 
-    @ViewItem.view.setter
-    def view(self, value):
-        self._view = value
-        for item in self.walk_items():
-            item._view = value
-            item.parent = self
-
     def copy_text(self) -> str:
         """Returns the text of all :class:`~discord.ui.TextDisplay` items in this section.
         Equivalent to the `Copy Text` option on Discord clients.

discord/ui/view.py

@@ -236,33 +236,40 @@ def add_item(self, item: ViewItem[V]) -> Self:
             raise TypeError(f"expected ViewItem not {item.__class__!r}")
 
         item.parent = self
-        item._view = self
         self.children.append(item)
         return self
 
-    def remove_item(self, item: ViewItem[V] | int | str) -> None:
+    def remove_item(self, item: ViewItem[V] | int | str) -> Self:
         """Removes an item from the view. If an :class:`int` or :class:`str` is passed,
         the item will be removed by ViewItem ``id`` or ``custom_id`` respectively.
 
         Parameters
         ----------
         item: Union[:class:`ViewItem`, :class:`int`, :class:`str`]
             The item, item ``id``, or item ``custom_id`` to remove from the view.
+
+        Returns
+        -------
+        :class:`BaseView`
+            The view instance.
         """
 
         if isinstance(item, (str, int)):
             item = self.get_item(item)
         try:
-            if isinstance(item.parent, BaseView):
+            if item.parent is self:
                 self.children.remove(item)
             else:
                 item.parent.remove_item(item)
         except ValueError:
             pass
+        item.parent = None
         return self
 
-    def clear_items(self) -> None:
+    def clear_items(self) -> Self:
         """Removes all items from this view."""
+        for child in self.children:
+            child.parent = None
         self.children.clear()
         return self
 
@@ -580,7 +587,6 @@ def __init__(
                 **func.__discord_ui_model_kwargs__
             )
             item.callback = partial(func, self, item)
-            item._view = self
             item.parent = self
             setattr(self, func.__name__, item)
             self.children.append(item)
@@ -887,8 +893,6 @@ def add_item(self, item: ViewItem[V]) -> Self:
             )
 
         super().add_item(item)
-        if hasattr(item, "items"):
-            item.view = self
         return self
 
     def refresh(self, components: list[Component]):