Merge branch 'main' into v1-controls-integration-tests

Author: FeodorFitsner

sdk/python/Taskfile.yml

@@ -7,6 +7,7 @@ tasks:
     desc: "Lists all available tasks."
     aliases:
       - ls
+      - help
       - tasks
     cmds:
       - task --list

sdk/python/packages/flet/integration_tests/controls/golden/macos/elevated_button/issue_5538.png

@@ -1,6 +1,7 @@
+import pytest
+
 import flet as ft
 import flet.testing as ftt
-import pytest
 
 
 @pytest.mark.asyncio(loop_scope="module")
@@ -9,4 +10,25 @@ async def test_elevated_button_basic(flet_app: ftt.FletTestApp, request):
     await flet_app.assert_control_screenshot(
         request.node.name,
         ft.ElevatedButton("Click me"),
-    )
+    )
+
+
+@pytest.mark.asyncio(loop_scope="module")
+async def test_issue_5538(flet_app: ftt.FletTestApp, request):
+    flet_app.page.theme_mode = ft.ThemeMode.LIGHT
+    await flet_app.assert_control_screenshot(
+        request.node.name,
+        ft.Column(
+            controls=[
+                ft.ElevatedButton(
+                    content="Button 1",
+                    style=ft.ButtonStyle(shape=ft.RoundedRectangleBorder(radius=4)),
+                ),
+                ft.ElevatedButton(
+                    content="Button 2",
+                    bgcolor=ft.Colors.RED,
+                    style=ft.ButtonStyle(shape=ft.RoundedRectangleBorder(radius=4)),
+                ),
+            ]
+        ),
+    )

sdk/python/packages/flet/integration_tests/controls/test_elevated_button.py

@@ -78,4 +78,4 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [tool.uv.sources]
-mkdocs-external-images = { git = "https://github.com/flet-dev/mkdocs-external-images", rev = "aace23d55a8cec7947ecc837f006e751ae28963d" }
+mkdocs-external-images = { git = "https://github.com/flet-dev/mkdocs-external-images", tag = "v0.2.0" }

sdk/python/packages/flet/pyproject.toml

@@ -169,7 +169,7 @@ def before_update(self):
         ), "at least icon or content (string or visible Control) must be provided"
 
         if (
-            self.style is None
+            self.style is not None
             or self.color is not None
             or self.bgcolor is not None
             or self.elevation != 1

sdk/python/packages/flet/src/flet/controls/material/elevated_button.py

@@ -264,11 +264,20 @@ def test_button_basic_diff():
 
     # 2nd iteration
     patch, _, _, _ = make_diff(b2, b1)
-    assert len(patch) == 2
+    assert len(patch) == 3
     assert cmp_ops(
         patch,
         [
-            {"op": "replace", "path": ["scale"], "value": ft.Scale(0.2)},
+            {
+                "op": "add",
+                "path": ["_internals", "style"],
+                "value": ft.ButtonStyle(color=ft.Colors.RED, elevation=1),
+            },
+            {
+                "op": "replace",
+                "path": ["scale"],
+                "value": ft.Scale(scale=0.2),
+            },
             {"op": "replace", "path": ["content"], "value": "Click me"},
         ],
     )
@@ -281,9 +290,12 @@ def test_button_basic_diff():
         patch,
         [
             {
-                "op": "add",
+                "op": "remove",
                 "path": ["_internals", "style"],
-                "value": ft.ButtonStyle(elevation=1),
+                "value": ft.ButtonStyle(
+                    color=ft.Colors.RED,
+                    elevation=1,
+                ),
             },
             {"op": "replace", "path": ["scale", "scale"], "value": 0.1},
             {"op": "replace", "path": ["content"], "value": ft.Text("Text_1")},
@@ -641,14 +653,16 @@ class AppState:
                     state,
                     lambda state: ft.Text(
                         value=f"{state.count}",
-                        spans=[
-                            ft.TextSpan(
-                                f"SPAN {state.count}",
-                                on_click=lambda: print("span clicked!"),
-                            )
-                        ]
-                        if state.count > 0
-                        else [],
+                        spans=(
+                            [
+                                ft.TextSpan(
+                                    f"SPAN {state.count}",
+                                    on_click=lambda: print("span clicked!"),
+                                )
+                            ]
+                            if state.count > 0
+                            else []
+                        ),
                         size=50,
                     ),
                 ),

sdk/python/packages/flet/tests/test_object_diff_frozen.py

@@ -1,7 +1,6 @@
 from dataclasses import field
 from typing import Any, Optional
 
-import flet as ft
 from flet.controls.base_control import control
 from flet.controls.buttons import ButtonStyle
 from flet.controls.colors import Colors
@@ -23,6 +22,8 @@
 from flet.messaging.session import Session
 from flet.pubsub.pubsub_hub import PubSubHub
 
+import flet as ft
+
 from .common import (
     LineChart,
     LineChartData,
@@ -275,21 +276,7 @@ def test_simple_page():
                 "op": "replace",
                 "path": ["views", 0, "controls", 0, "controls", 0],
                 "value": SuperElevatedButton("Foo"),
-            },
-            {
-                "op": "replace",
-                "path": [
-                    "views",
-                    0,
-                    "controls",
-                    0,
-                    "controls",
-                    1,
-                    "_internals",
-                    "style",
-                ],
-                "value": ButtonStyle(elevation=1),
-            },
+            }
         ],
     )
 
@@ -312,34 +299,6 @@ def test_simple_page():
                 "path": ["views", 0, "controls", 0, "controls", 1, "content"],
                 "value": "Baz",
             },
-            {
-                "op": "replace",
-                "path": [
-                    "views",
-                    0,
-                    "controls",
-                    0,
-                    "controls",
-                    1,
-                    "_internals",
-                    "style",
-                ],
-                "value": ButtonStyle(elevation=1),
-            },
-            {
-                "op": "replace",
-                "path": [
-                    "views",
-                    0,
-                    "controls",
-                    0,
-                    "controls",
-                    2,
-                    "_internals",
-                    "style",
-                ],
-                "value": ButtonStyle(elevation=1),
-            },
         ],
     )
 
@@ -445,11 +404,6 @@ def test_changes_tracking():
                 "path": ["views", 0, "controls", 0, "height"],
                 "value": 100,
             },
-            {
-                "op": "replace",
-                "path": ["views", 0, "controls", 0, "_internals", "style"],
-                "value": ft.ButtonStyle(elevation=1),
-            },
             {
                 "op": "add",
                 "path": ["views", 0, "controls", 1],

sdk/python/packages/flet/tests/test_object_diff_in_place.py

@@ -17,6 +17,7 @@ flet = { workspace = true }
 flet-cli = { workspace = true }
 flet-desktop = { workspace = true }
 flet-web = { workspace = true }
+mkdocs-external-images = { git = "https://github.com/flet-dev/mkdocs-external-images", tag = "v0.2.0" }
 
 [tool.uv.workspace]
 members = ["packages/*"]
@@ -59,20 +60,25 @@ docs = [
     "markdown-exec[ansi] >=1.11.0",
     "pydocstyle >=6.3.0",
     "linkcheckmd >=1.4.0",
+    "mkdocs-external-images",
     { include-group = 'docs-coverage' },
 ]
 all = [
     { include-group = 'dev' },
     { include-group = 'docs' },
 ]
 
+
 [tool.ruff]
 line-length = 88
 target-version = "py39"
 fix = true
 show-fixes = true
 
 [tool.ruff.lint]
+pydocstyle = { convention = 'google' }
+isort = { known-first-party = ["flet"] }
+preview = true
 select = [
     # pycodestyle
     "E",
@@ -87,8 +93,6 @@ select = [
     # isort
     "I"
 ]
-preview = true
-pydocstyle = { convention = 'google' }
 
 [tool.ruff.format]
 quote-style = "double"