Merge pull request #81 from adamtheturtle/fix-bullet

Fix bullets within admonitions

Author: adamtheturtle

src/sphinx_notion/__init__.py

@@ -187,15 +187,6 @@ def _(
     return [code_block]
 
 
-@_process_node_to_blocks.register
-def _(node: nodes.list_item, *, section_level: int) -> list[NotionObject[Any]]:
-    """
-    Process list item nodes by creating BulletedItem blocks.
-    """
-    del section_level
-    return [_process_list_item_recursively(node=node, depth=0)]
-
-
 @_process_node_to_blocks.register
 def _(
     node: nodes.bullet_list,
@@ -206,10 +197,11 @@ def _(
     Process bullet list nodes by creating Notion BulletedItem blocks.
     """
     del section_level
-    del node
-    # We don't create a block for the list itself,
-    # just process the children (list items)
-    return []
+    return [
+        _process_list_item_recursively(node=list_item, depth=0)
+        for list_item in node.children
+        if isinstance(list_item, nodes.list_item)
+    ]
 
 
 @_process_node_to_blocks.register
@@ -499,23 +491,6 @@ def visit_bullet_list(self, node: nodes.Element) -> None:
             section_level=self._section_level,
         )
         self._blocks.extend(blocks)
-
-    def depart_bullet_list(self, node: nodes.Element) -> None:
-        """
-        Handle leaving bullet list nodes.
-        """
-        assert self
-        del node
-
-    def visit_list_item(self, node: nodes.Element) -> None:
-        """
-        Handle list item nodes by creating Notion BulletedItem blocks.
-        """
-        blocks = _process_node_to_blocks(
-            node,
-            section_level=self._section_level,
-        )
-        self._blocks.extend(blocks)
         raise nodes.SkipNode
 
     def visit_topic(self, node: nodes.Element) -> None:

tests/test_integration.py

@@ -889,6 +889,47 @@ def hello():
     )
 
 
+def test_admonition_with_bullet_points(
+    make_app: Callable[..., SphinxTestApp],
+    tmp_path: Path,
+) -> None:
+    """
+    Test that bullet points show up within admonitions (issue #78).
+    """
+    rst_content = """
+        .. note::
+
+           This is an important note that demonstrates the note admonition
+           support.
+
+           * A
+           * B
+    """
+
+    callout = UnoCallout(text="", icon=Emoji(emoji="📝"), color=Color.BLUE)
+    callout.rich_text = text(
+        text="This is an important note that demonstrates the note "
+        "admonition\nsupport."
+    )
+
+    bullet_a = UnoBulletedItem(text="A")
+    bullet_b = UnoBulletedItem(text="B")
+
+    callout.obj_ref.value.children.append(bullet_a.obj_ref)  # pyright: ignore[reportUnknownMemberType]
+    callout.obj_ref.value.children.append(bullet_b.obj_ref)  # pyright: ignore[reportUnknownMemberType]
+
+    expected_objects: list[NotionObject[Any]] = [
+        callout,
+    ]
+
+    _assert_rst_converts_to_notion_objects(
+        rst_content=rst_content,
+        expected_objects=expected_objects,
+        make_app=make_app,
+        tmp_path=tmp_path,
+    )
+
+
 def test_nested_bullet_list(
     make_app: Callable[..., SphinxTestApp],
     tmp_path: Path,