refactor: streamline color handling and text initialization in SlideBuilder

Author: ya7010

src/tppt/pptx/dml/color.py

@@ -3,7 +3,9 @@
 from lxml.etree import _Element
 from pptx.dml.color import ColorFormat as PptxColorFormat
 from pptx.dml.color import RGBColor as PptxRGBColor
+from pptx.dml.color import _SRgbColor
 from pptx.enum.dml import MSO_THEME_COLOR
+from pptx.oxml.ns import _nsmap as namespace
 from pptx.oxml.xmlchemy import OxmlElement
 
 from tppt.pptx.converter import PptxConvertible, to_pptx_rgb_color, to_tppt_rgb_color
@@ -41,13 +43,14 @@ def rgb(self) -> Color:
     def rgb(self, color: Color | LiteralColor):
         pptx_color, alpha = to_pptx_rgb_color(color)
         self._pptx.rgb = pptx_color
-        if alpha:
-            solid_fill = cast(
-                _Element, self._pptx._xFill.solidFill.get_or_change_to_srgbClr()
-            )
+        srgbClr = cast(_Element, cast(_SRgbColor, self._pptx._color)._srgbClr)
+        if alpha is not None:
             element = OxmlElement("a:alpha")
-            element.attrib["val"] = str(alpha)
-            solid_fill.append(element)
+            element.attrib["val"] = str(int(100000 * (alpha / 255)))
+            srgbClr.append(element)
+        else:
+            if alpha := srgbClr.find("a:alpha", namespace):
+                srgbClr.remove(alpha)
 
     @property
     def theme_color(self) -> MSO_THEME_COLOR:

src/tppt/pptx/shape/text.py

@@ -3,10 +3,9 @@
 from pptx.enum.text import MSO_ANCHOR, MSO_AUTO_SIZE, PP_ALIGN
 from pptx.shapes.autoshape import Shape as PptxShape
 
-from tppt.pptx.converter import to_pptx_length
 from tppt.pptx.text.text_frame import TextFrame
 from tppt.types._color import Color, LiteralColor, to_color
-from tppt.types._length import Length, LiteralLength
+from tppt.types._length import Length, LiteralLength, to_length
 
 from . import RangeProps, Shape
 
@@ -40,23 +39,23 @@ class Text(Shape):
 
     def __init__(self, pptx_obj: PptxShape, data: TextData | None = None, /) -> None:
         if data and data["text"] != "":
-            text_frame = pptx_obj.text_frame
+            text_frame = TextFrame(pptx_obj.text_frame)
             p = text_frame.paragraphs[0]
             run = p.add_run()
             run.text = data["text"]
             font = run.font
             if size := data.get("size"):
-                font.size = to_pptx_length(size)
+                font.size = to_length(size)
             if (bold := data.get("bold")) is not None:
                 font.bold = bold
             if (italic := data.get("italic")) is not None:
                 font.italic = italic
             if (color := data.get("color")) is not None:
                 font.color.rgb = to_color(color)
             if (margin_bottom := data.get("margin_bottom")) is not None:
-                p.space_after = to_pptx_length(margin_bottom)
+                p.space_after = to_length(margin_bottom)
             if (margin_left := data.get("margin_left")) is not None:
-                p.space_before = to_pptx_length(margin_left)
+                p.space_before = to_length(margin_left)
             if (vertical_anchor := data.get("vertical_anchor")) is not None:
                 text_frame.vertical_anchor = vertical_anchor
             if (word_wrap := data.get("word_wrap")) is not None:

src/tppt/pptx/slide.py

@@ -126,10 +126,7 @@ def _register(slide: Slide) -> Text:
             data = TextData(
                 type="text",
                 text=text if isinstance(text, str) else "",
-                top=kwargs["top"],
-                left=kwargs["left"],
-                width=kwargs["width"],
-                height=kwargs["height"],
+                **kwargs,
             )
 
             text_obj = Text(

tests/test_text.py

@@ -15,15 +15,33 @@ def test_text_with_options(output) -> None:
             lambda slide: slide.BlankLayout()
             .builder()
             .text(
-                "サンプルテキスト",
+                "サンプルテキスト1",
+                left=(100, "pt"),
+                top=(300, "pt"),
+                width=(400, "pt"),
+                height=(200, "pt"),
+                size=(24, "pt"),
+                bold=True,
+                italic=True,
+                color="#0C0",
+                margin_bottom=(10, "pt"),
+                margin_left=(10, "pt"),
+                vertical_anchor=MSO_ANCHOR.MIDDLE,
+                word_wrap=True,
+                auto_size=MSO_AUTO_SIZE.TEXT_TO_FIT_SHAPE,
+                alignment=PP_ALIGN.CENTER,
+                level=1,
+            )
+            .text(
+                "サンプルテキスト2",
                 left=(100, "pt"),
                 top=(100, "pt"),
                 width=(400, "pt"),
                 height=(200, "pt"),
                 size=(24, "pt"),
                 bold=True,
                 italic=True,
-                color="#0000FF99",
+                color="#0000BB99",
                 margin_bottom=(10, "pt"),
                 margin_left=(10, "pt"),
                 vertical_anchor=MSO_ANCHOR.MIDDLE,