1
1
import dataclasses
2
2
from enum import Enum
3
3
from typing import Any , List , Optional , Union
4
+ from warnings import warn
4
5
5
6
from flet_core .constrained_control import ConstrainedControl
6
7
from flet_core .control import OptionalNumber
@@ -120,7 +121,7 @@ def __init__(
120
121
size : OptionalNumber = None ,
121
122
weight : Optional [FontWeight ] = None ,
122
123
italic : Optional [bool ] = None ,
123
- style : Optional [ Union [TextThemeStyle , TextStyle ] ] = None ,
124
+ style : Union [TextThemeStyle , TextStyle , None ] = None ,
124
125
theme_style : Optional [TextThemeStyle ] = None ,
125
126
max_lines : Optional [int ] = None ,
126
127
overflow : TextOverflow = TextOverflow .NONE ,
@@ -260,16 +261,21 @@ def __set_weight(self, value: FontWeightString):
260
261
261
262
# style
262
263
@property
263
- def style (self ) -> Optional [ Union [TextThemeStyle , TextStyle ] ]:
264
+ def style (self ) -> Union [TextThemeStyle , TextStyle , None ]:
264
265
return self .__style
265
266
266
267
@style .setter
267
- def style (self , value : Optional [ Union [TextThemeStyle , TextStyle ] ]):
268
+ def style (self , value : Union [TextThemeStyle , TextStyle , None ]):
268
269
self .__style = value
269
270
if isinstance (value , (TextThemeStyle , str )) or value is None :
270
271
self ._set_attr (
271
272
"style" , value .value if isinstance (value , TextThemeStyle ) else value
272
273
)
274
+ warn (
275
+ "If you wish to set the TextThemeStyle, use `Text.theme_style` instead. "
276
+ "The `Text.style` property should be used to set the TextStyle only." ,
277
+ stacklevel = 2 ,
278
+ )
273
279
274
280
# theme_style
275
281
@property
@@ -278,7 +284,7 @@ def theme_style(self):
278
284
279
285
@theme_style .setter
280
286
def theme_style (self , value : Optional [TextThemeStyle ]):
281
- self ._set_attr ("theme_style" , value .value if value is not None else None )
287
+ self ._set_attr ("theme_style" , value .value if isinstance ( value , TextThemeStyle ) else value )
282
288
283
289
# italic
284
290
@property
0 commit comments