Updated version to 30.3.0

7a90327d1684f4b386087b31f516d73ed1e0072b
This commit is contained in:
robot-divkit
2024-05-29 12:36:23 +03:00
parent d512fea6d2
commit 7b962df9f5
8 changed files with 96 additions and 6 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
MARKETING_VERSION = 30.2.0
MARKETING_VERSION = 30.3.0
CURRENT_PROJECT_VERSION = 30
+1 -1
View File
@@ -1,3 +1,3 @@
public enum DivKitInfo {
public static let version = "30.2.0"
public static let version = "30.3.0"
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@divkitframework/divkit",
"version": "30.2.0",
"version": "30.3.0",
"description": "DivKit for the web",
"keywords": [
"server-driven-ui",
@@ -61,6 +61,7 @@ class Input internal constructor(
lineHeight = additive.lineHeight ?: properties.lineHeight,
margins = additive.margins ?: properties.margins,
mask = additive.mask ?: properties.mask,
maxLength = additive.maxLength ?: properties.maxLength,
maxVisibleLines = additive.maxVisibleLines ?: properties.maxVisibleLines,
nativeInterface = additive.nativeInterface ?: properties.nativeInterface,
paddings = additive.paddings ?: properties.paddings,
@@ -195,6 +196,10 @@ class Input internal constructor(
* Mask for entering text based on the specified template.
*/
val mask: Property<InputMask>?,
/**
* The maximum number of characters that can be entered in the input field.
*/
val maxLength: Property<Int>?,
/**
* Maximum number of lines to be displayed in the input field.
*/
@@ -314,6 +319,7 @@ class Input internal constructor(
result.tryPutProperty("line_height", lineHeight)
result.tryPutProperty("margins", margins)
result.tryPutProperty("mask", mask)
result.tryPutProperty("max_length", maxLength)
result.tryPutProperty("max_visible_lines", maxVisibleLines)
result.tryPutProperty("native_interface", nativeInterface)
result.tryPutProperty("paddings", paddings)
@@ -411,6 +417,7 @@ class Input internal constructor(
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param margins External margins from the element stroke.
* @param mask Mask for entering text based on the specified template.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param nativeInterface Text input line used in the native interface.
* @param paddings Internal margins from the element stroke.
@@ -461,6 +468,7 @@ fun DivScope.input(
lineHeight: Int? = null,
margins: EdgeInsets? = null,
mask: InputMask? = null,
maxLength: Int? = null,
maxVisibleLines: Int? = null,
nativeInterface: Input.NativeInterface? = null,
paddings: EdgeInsets? = null,
@@ -509,6 +517,7 @@ fun DivScope.input(
lineHeight = valueOrNull(lineHeight),
margins = valueOrNull(margins),
mask = valueOrNull(mask),
maxLength = valueOrNull(maxLength),
maxVisibleLines = valueOrNull(maxVisibleLines),
nativeInterface = valueOrNull(nativeInterface),
paddings = valueOrNull(paddings),
@@ -559,6 +568,7 @@ fun DivScope.input(
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param margins External margins from the element stroke.
* @param mask Mask for entering text based on the specified template.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param nativeInterface Text input line used in the native interface.
* @param paddings Internal margins from the element stroke.
@@ -609,6 +619,7 @@ fun DivScope.inputProps(
lineHeight: Int? = null,
margins: EdgeInsets? = null,
mask: InputMask? = null,
maxLength: Int? = null,
maxVisibleLines: Int? = null,
nativeInterface: Input.NativeInterface? = null,
paddings: EdgeInsets? = null,
@@ -656,6 +667,7 @@ fun DivScope.inputProps(
lineHeight = valueOrNull(lineHeight),
margins = valueOrNull(margins),
mask = valueOrNull(mask),
maxLength = valueOrNull(maxLength),
maxVisibleLines = valueOrNull(maxVisibleLines),
nativeInterface = valueOrNull(nativeInterface),
paddings = valueOrNull(paddings),
@@ -705,6 +717,7 @@ fun DivScope.inputProps(
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param margins External margins from the element stroke.
* @param mask Mask for entering text based on the specified template.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param nativeInterface Text input line used in the native interface.
* @param paddings Internal margins from the element stroke.
@@ -755,6 +768,7 @@ fun TemplateScope.inputRefs(
lineHeight: ReferenceProperty<Int>? = null,
margins: ReferenceProperty<EdgeInsets>? = null,
mask: ReferenceProperty<InputMask>? = null,
maxLength: ReferenceProperty<Int>? = null,
maxVisibleLines: ReferenceProperty<Int>? = null,
nativeInterface: ReferenceProperty<Input.NativeInterface>? = null,
paddings: ReferenceProperty<EdgeInsets>? = null,
@@ -802,6 +816,7 @@ fun TemplateScope.inputRefs(
lineHeight = lineHeight,
margins = margins,
mask = mask,
maxLength = maxLength,
maxVisibleLines = maxVisibleLines,
nativeInterface = nativeInterface,
paddings = paddings,
@@ -851,6 +866,7 @@ fun TemplateScope.inputRefs(
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param margins External margins from the element stroke.
* @param mask Mask for entering text based on the specified template.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param nativeInterface Text input line used in the native interface.
* @param paddings Internal margins from the element stroke.
@@ -901,6 +917,7 @@ fun Input.override(
lineHeight: Int? = null,
margins: EdgeInsets? = null,
mask: InputMask? = null,
maxLength: Int? = null,
maxVisibleLines: Int? = null,
nativeInterface: Input.NativeInterface? = null,
paddings: EdgeInsets? = null,
@@ -949,6 +966,7 @@ fun Input.override(
lineHeight = valueOrNull(lineHeight) ?: properties.lineHeight,
margins = valueOrNull(margins) ?: properties.margins,
mask = valueOrNull(mask) ?: properties.mask,
maxLength = valueOrNull(maxLength) ?: properties.maxLength,
maxVisibleLines = valueOrNull(maxVisibleLines) ?: properties.maxVisibleLines,
nativeInterface = valueOrNull(nativeInterface) ?: properties.nativeInterface,
paddings = valueOrNull(paddings) ?: properties.paddings,
@@ -999,6 +1017,7 @@ fun Input.override(
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param margins External margins from the element stroke.
* @param mask Mask for entering text based on the specified template.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param nativeInterface Text input line used in the native interface.
* @param paddings Internal margins from the element stroke.
@@ -1049,6 +1068,7 @@ fun Input.defer(
lineHeight: ReferenceProperty<Int>? = null,
margins: ReferenceProperty<EdgeInsets>? = null,
mask: ReferenceProperty<InputMask>? = null,
maxLength: ReferenceProperty<Int>? = null,
maxVisibleLines: ReferenceProperty<Int>? = null,
nativeInterface: ReferenceProperty<Input.NativeInterface>? = null,
paddings: ReferenceProperty<EdgeInsets>? = null,
@@ -1097,6 +1117,7 @@ fun Input.defer(
lineHeight = lineHeight ?: properties.lineHeight,
margins = margins ?: properties.margins,
mask = mask ?: properties.mask,
maxLength = maxLength ?: properties.maxLength,
maxVisibleLines = maxVisibleLines ?: properties.maxVisibleLines,
nativeInterface = nativeInterface ?: properties.nativeInterface,
paddings = paddings ?: properties.paddings,
@@ -1137,6 +1158,7 @@ fun Input.defer(
* @param keyboardType Keyboard type.
* @param letterSpacing Spacing between characters.
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param rowSpan Merges cells in a string of the [grid](div-grid.md) element.
* @param selectAllOnFocus Highlighting input text when focused.
@@ -1163,6 +1185,7 @@ fun Input.evaluate(
keyboardType: ExpressionProperty<Input.KeyboardType>? = null,
letterSpacing: ExpressionProperty<Double>? = null,
lineHeight: ExpressionProperty<Int>? = null,
maxLength: ExpressionProperty<Int>? = null,
maxVisibleLines: ExpressionProperty<Int>? = null,
rowSpan: ExpressionProperty<Int>? = null,
selectAllOnFocus: ExpressionProperty<Boolean>? = null,
@@ -1197,6 +1220,7 @@ fun Input.evaluate(
lineHeight = lineHeight ?: properties.lineHeight,
margins = properties.margins,
mask = properties.mask,
maxLength = maxLength ?: properties.maxLength,
maxVisibleLines = maxVisibleLines ?: properties.maxVisibleLines,
nativeInterface = properties.nativeInterface,
paddings = properties.paddings,
@@ -1247,6 +1271,7 @@ fun Input.evaluate(
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param margins External margins from the element stroke.
* @param mask Mask for entering text based on the specified template.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param nativeInterface Text input line used in the native interface.
* @param paddings Internal margins from the element stroke.
@@ -1297,6 +1322,7 @@ fun Component<Input>.override(
lineHeight: Int? = null,
margins: EdgeInsets? = null,
mask: InputMask? = null,
maxLength: Int? = null,
maxVisibleLines: Int? = null,
nativeInterface: Input.NativeInterface? = null,
paddings: EdgeInsets? = null,
@@ -1346,6 +1372,7 @@ fun Component<Input>.override(
lineHeight = valueOrNull(lineHeight),
margins = valueOrNull(margins),
mask = valueOrNull(mask),
maxLength = valueOrNull(maxLength),
maxVisibleLines = valueOrNull(maxVisibleLines),
nativeInterface = valueOrNull(nativeInterface),
paddings = valueOrNull(paddings),
@@ -1396,6 +1423,7 @@ fun Component<Input>.override(
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param margins External margins from the element stroke.
* @param mask Mask for entering text based on the specified template.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param nativeInterface Text input line used in the native interface.
* @param paddings Internal margins from the element stroke.
@@ -1446,6 +1474,7 @@ fun Component<Input>.defer(
lineHeight: ReferenceProperty<Int>? = null,
margins: ReferenceProperty<EdgeInsets>? = null,
mask: ReferenceProperty<InputMask>? = null,
maxLength: ReferenceProperty<Int>? = null,
maxVisibleLines: ReferenceProperty<Int>? = null,
nativeInterface: ReferenceProperty<Input.NativeInterface>? = null,
paddings: ReferenceProperty<EdgeInsets>? = null,
@@ -1495,6 +1524,7 @@ fun Component<Input>.defer(
lineHeight = lineHeight,
margins = margins,
mask = mask,
maxLength = maxLength,
maxVisibleLines = maxVisibleLines,
nativeInterface = nativeInterface,
paddings = paddings,
@@ -1535,6 +1565,7 @@ fun Component<Input>.defer(
* @param keyboardType Keyboard type.
* @param letterSpacing Spacing between characters.
* @param lineHeight Line spacing of the text. Units specified in `font_size_unit`.
* @param maxLength The maximum number of characters that can be entered in the input field.
* @param maxVisibleLines Maximum number of lines to be displayed in the input field.
* @param rowSpan Merges cells in a string of the [grid](div-grid.md) element.
* @param selectAllOnFocus Highlighting input text when focused.
@@ -1561,6 +1592,7 @@ fun Component<Input>.evaluate(
keyboardType: ExpressionProperty<Input.KeyboardType>? = null,
letterSpacing: ExpressionProperty<Double>? = null,
lineHeight: ExpressionProperty<Int>? = null,
maxLength: ExpressionProperty<Int>? = null,
maxVisibleLines: ExpressionProperty<Int>? = null,
rowSpan: ExpressionProperty<Int>? = null,
selectAllOnFocus: ExpressionProperty<Boolean>? = null,
@@ -1596,6 +1628,7 @@ fun Component<Input>.evaluate(
lineHeight = lineHeight,
margins = null,
mask = null,
maxLength = maxLength,
maxVisibleLines = maxVisibleLines,
nativeInterface = null,
paddings = null,
@@ -55,6 +55,7 @@ class Text internal constructor(
focus = additive.focus ?: properties.focus,
focusedTextColor = additive.focusedTextColor ?: properties.focusedTextColor,
fontFamily = additive.fontFamily ?: properties.fontFamily,
fontFeatureSettings = additive.fontFeatureSettings ?: properties.fontFeatureSettings,
fontSize = additive.fontSize ?: properties.fontSize,
fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit,
fontWeight = additive.fontWeight ?: properties.fontWeight,
@@ -172,6 +173,10 @@ class Text internal constructor(
* Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
*/
val fontFamily: Property<String>?,
/**
* List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
*/
val fontFeatureSettings: Property<String>?,
/**
* Font size.
* Default value: `12`.
@@ -349,6 +354,7 @@ class Text internal constructor(
result.tryPutProperty("focus", focus)
result.tryPutProperty("focused_text_color", focusedTextColor)
result.tryPutProperty("font_family", fontFamily)
result.tryPutProperty("font_feature_settings", fontFeatureSettings)
result.tryPutProperty("font_size", fontSize)
result.tryPutProperty("font_size_unit", fontSizeUnit)
result.tryPutProperty("font_weight", fontWeight)
@@ -550,6 +556,7 @@ class Text internal constructor(
border = additive.border ?: properties.border,
end = additive.end ?: properties.end,
fontFamily = additive.fontFamily ?: properties.fontFamily,
fontFeatureSettings = additive.fontFeatureSettings ?: properties.fontFeatureSettings,
fontSize = additive.fontSize ?: properties.fontSize,
fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit,
fontWeight = additive.fontWeight ?: properties.fontWeight,
@@ -585,6 +592,10 @@ class Text internal constructor(
* Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
*/
val fontFamily: Property<String>?,
/**
* List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
*/
val fontFeatureSettings: Property<String>?,
/**
* Font size.
*/
@@ -639,6 +650,7 @@ class Text internal constructor(
result.tryPutProperty("border", border)
result.tryPutProperty("end", end)
result.tryPutProperty("font_family", fontFamily)
result.tryPutProperty("font_feature_settings", fontFeatureSettings)
result.tryPutProperty("font_size", fontSize)
result.tryPutProperty("font_size_unit", fontSizeUnit)
result.tryPutProperty("font_weight", fontWeight)
@@ -677,6 +689,7 @@ class Text internal constructor(
* @param focus Parameters when focusing on an element or losing focus.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
@@ -734,6 +747,7 @@ fun DivScope.text(
focus: Focus? = null,
focusedTextColor: Color? = null,
fontFamily: String? = null,
fontFeatureSettings: String? = null,
fontSize: Int? = null,
fontSizeUnit: SizeUnit? = null,
fontWeight: FontWeight? = null,
@@ -790,6 +804,7 @@ fun DivScope.text(
focus = valueOrNull(focus),
focusedTextColor = valueOrNull(focusedTextColor),
fontFamily = valueOrNull(fontFamily),
fontFeatureSettings = valueOrNull(fontFeatureSettings),
fontSize = valueOrNull(fontSize),
fontSizeUnit = valueOrNull(fontSizeUnit),
fontWeight = valueOrNull(fontWeight),
@@ -848,6 +863,7 @@ fun DivScope.text(
* @param focus Parameters when focusing on an element or losing focus.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
@@ -905,6 +921,7 @@ fun DivScope.textProps(
focus: Focus? = null,
focusedTextColor: Color? = null,
fontFamily: String? = null,
fontFeatureSettings: String? = null,
fontSize: Int? = null,
fontSizeUnit: SizeUnit? = null,
fontWeight: FontWeight? = null,
@@ -960,6 +977,7 @@ fun DivScope.textProps(
focus = valueOrNull(focus),
focusedTextColor = valueOrNull(focusedTextColor),
fontFamily = valueOrNull(fontFamily),
fontFeatureSettings = valueOrNull(fontFeatureSettings),
fontSize = valueOrNull(fontSize),
fontSizeUnit = valueOrNull(fontSizeUnit),
fontWeight = valueOrNull(fontWeight),
@@ -1017,6 +1035,7 @@ fun DivScope.textProps(
* @param focus Parameters when focusing on an element or losing focus.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
@@ -1074,6 +1093,7 @@ fun TemplateScope.textRefs(
focus: ReferenceProperty<Focus>? = null,
focusedTextColor: ReferenceProperty<Color>? = null,
fontFamily: ReferenceProperty<String>? = null,
fontFeatureSettings: ReferenceProperty<String>? = null,
fontSize: ReferenceProperty<Int>? = null,
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
fontWeight: ReferenceProperty<FontWeight>? = null,
@@ -1129,6 +1149,7 @@ fun TemplateScope.textRefs(
focus = focus,
focusedTextColor = focusedTextColor,
fontFamily = fontFamily,
fontFeatureSettings = fontFeatureSettings,
fontSize = fontSize,
fontSizeUnit = fontSizeUnit,
fontWeight = fontWeight,
@@ -1186,6 +1207,7 @@ fun TemplateScope.textRefs(
* @param focus Parameters when focusing on an element or losing focus.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
@@ -1243,6 +1265,7 @@ fun Text.override(
focus: Focus? = null,
focusedTextColor: Color? = null,
fontFamily: String? = null,
fontFeatureSettings: String? = null,
fontSize: Int? = null,
fontSizeUnit: SizeUnit? = null,
fontWeight: FontWeight? = null,
@@ -1299,6 +1322,7 @@ fun Text.override(
focus = valueOrNull(focus) ?: properties.focus,
focusedTextColor = valueOrNull(focusedTextColor) ?: properties.focusedTextColor,
fontFamily = valueOrNull(fontFamily) ?: properties.fontFamily,
fontFeatureSettings = valueOrNull(fontFeatureSettings) ?: properties.fontFeatureSettings,
fontSize = valueOrNull(fontSize) ?: properties.fontSize,
fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit,
fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight,
@@ -1357,6 +1381,7 @@ fun Text.override(
* @param focus Parameters when focusing on an element or losing focus.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
@@ -1414,6 +1439,7 @@ fun Text.defer(
focus: ReferenceProperty<Focus>? = null,
focusedTextColor: ReferenceProperty<Color>? = null,
fontFamily: ReferenceProperty<String>? = null,
fontFeatureSettings: ReferenceProperty<String>? = null,
fontSize: ReferenceProperty<Int>? = null,
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
fontWeight: ReferenceProperty<FontWeight>? = null,
@@ -1470,6 +1496,7 @@ fun Text.defer(
focus = focus ?: properties.focus,
focusedTextColor = focusedTextColor ?: properties.focusedTextColor,
fontFamily = fontFamily ?: properties.fontFamily,
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
fontSize = fontSize ?: properties.fontSize,
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
fontWeight = fontWeight ?: properties.fontWeight,
@@ -1517,6 +1544,7 @@ fun Text.defer(
* @param columnSpan Merges cells in a column of the [grid](div-grid.md) element.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param letterSpacing Spacing between characters.
@@ -1544,6 +1572,7 @@ fun Text.evaluate(
columnSpan: ExpressionProperty<Int>? = null,
focusedTextColor: ExpressionProperty<Color>? = null,
fontFamily: ExpressionProperty<String>? = null,
fontFeatureSettings: ExpressionProperty<String>? = null,
fontSize: ExpressionProperty<Int>? = null,
fontSizeUnit: ExpressionProperty<SizeUnit>? = null,
fontWeight: ExpressionProperty<FontWeight>? = null,
@@ -1581,6 +1610,7 @@ fun Text.evaluate(
focus = properties.focus,
focusedTextColor = focusedTextColor ?: properties.focusedTextColor,
fontFamily = fontFamily ?: properties.fontFamily,
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
fontSize = fontSize ?: properties.fontSize,
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
fontWeight = fontWeight ?: properties.fontWeight,
@@ -1639,6 +1669,7 @@ fun Text.evaluate(
* @param focus Parameters when focusing on an element or losing focus.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
@@ -1696,6 +1727,7 @@ fun Component<Text>.override(
focus: Focus? = null,
focusedTextColor: Color? = null,
fontFamily: String? = null,
fontFeatureSettings: String? = null,
fontSize: Int? = null,
fontSizeUnit: SizeUnit? = null,
fontWeight: FontWeight? = null,
@@ -1753,6 +1785,7 @@ fun Component<Text>.override(
focus = valueOrNull(focus),
focusedTextColor = valueOrNull(focusedTextColor),
fontFamily = valueOrNull(fontFamily),
fontFeatureSettings = valueOrNull(fontFeatureSettings),
fontSize = valueOrNull(fontSize),
fontSizeUnit = valueOrNull(fontSizeUnit),
fontWeight = valueOrNull(fontWeight),
@@ -1811,6 +1844,7 @@ fun Component<Text>.override(
* @param focus Parameters when focusing on an element or losing focus.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param height Element height. For Android: if there is text in this or in a child element, specify height in `sp` to scale the element together with the text. To learn more about units of size measurement, see [Layout inside the card](../../layout).
@@ -1868,6 +1902,7 @@ fun Component<Text>.defer(
focus: ReferenceProperty<Focus>? = null,
focusedTextColor: ReferenceProperty<Color>? = null,
fontFamily: ReferenceProperty<String>? = null,
fontFeatureSettings: ReferenceProperty<String>? = null,
fontSize: ReferenceProperty<Int>? = null,
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
fontWeight: ReferenceProperty<FontWeight>? = null,
@@ -1925,6 +1960,7 @@ fun Component<Text>.defer(
focus = focus,
focusedTextColor = focusedTextColor,
fontFamily = fontFamily,
fontFeatureSettings = fontFeatureSettings,
fontSize = fontSize,
fontSizeUnit = fontSizeUnit,
fontWeight = fontWeight,
@@ -1972,6 +2008,7 @@ fun Component<Text>.defer(
* @param columnSpan Merges cells in a column of the [grid](div-grid.md) element.
* @param focusedTextColor Text color when focusing on the element.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontWeight Style.
* @param letterSpacing Spacing between characters.
@@ -1999,6 +2036,7 @@ fun Component<Text>.evaluate(
columnSpan: ExpressionProperty<Int>? = null,
focusedTextColor: ExpressionProperty<Color>? = null,
fontFamily: ExpressionProperty<String>? = null,
fontFeatureSettings: ExpressionProperty<String>? = null,
fontSize: ExpressionProperty<Int>? = null,
fontSizeUnit: ExpressionProperty<SizeUnit>? = null,
fontWeight: ExpressionProperty<FontWeight>? = null,
@@ -2037,6 +2075,7 @@ fun Component<Text>.evaluate(
focus = null,
focusedTextColor = focusedTextColor,
fontFamily = fontFamily,
fontFeatureSettings = fontFeatureSettings,
fontSize = fontSize,
fontSizeUnit = fontSizeUnit,
fontWeight = fontWeight,
@@ -2396,6 +2435,7 @@ fun Text.Image.asList() = listOf(this)
* @param border Character range border.
* @param end Ordinal number of the last character to be included in the range.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
* @param fontWeight Style.
@@ -2416,6 +2456,7 @@ fun DivScope.textRange(
border: TextRangeBorder? = null,
end: Int? = null,
fontFamily: String? = null,
fontFeatureSettings: String? = null,
fontSize: Int? = null,
fontSizeUnit: SizeUnit? = null,
fontWeight: FontWeight? = null,
@@ -2434,6 +2475,7 @@ fun DivScope.textRange(
border = valueOrNull(border),
end = valueOrNull(end),
fontFamily = valueOrNull(fontFamily),
fontFeatureSettings = valueOrNull(fontFeatureSettings),
fontSize = valueOrNull(fontSize),
fontSizeUnit = valueOrNull(fontSizeUnit),
fontWeight = valueOrNull(fontWeight),
@@ -2454,6 +2496,7 @@ fun DivScope.textRange(
* @param border Character range border.
* @param end Ordinal number of the last character to be included in the range.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
* @param fontWeight Style.
@@ -2474,6 +2517,7 @@ fun DivScope.textRangeProps(
border: TextRangeBorder? = null,
end: Int? = null,
fontFamily: String? = null,
fontFeatureSettings: String? = null,
fontSize: Int? = null,
fontSizeUnit: SizeUnit? = null,
fontWeight: FontWeight? = null,
@@ -2491,6 +2535,7 @@ fun DivScope.textRangeProps(
border = valueOrNull(border),
end = valueOrNull(end),
fontFamily = valueOrNull(fontFamily),
fontFeatureSettings = valueOrNull(fontFeatureSettings),
fontSize = valueOrNull(fontSize),
fontSizeUnit = valueOrNull(fontSizeUnit),
fontWeight = valueOrNull(fontWeight),
@@ -2510,6 +2555,7 @@ fun DivScope.textRangeProps(
* @param border Character range border.
* @param end Ordinal number of the last character to be included in the range.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
* @param fontWeight Style.
@@ -2530,6 +2576,7 @@ fun TemplateScope.textRangeRefs(
border: ReferenceProperty<TextRangeBorder>? = null,
end: ReferenceProperty<Int>? = null,
fontFamily: ReferenceProperty<String>? = null,
fontFeatureSettings: ReferenceProperty<String>? = null,
fontSize: ReferenceProperty<Int>? = null,
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
fontWeight: ReferenceProperty<FontWeight>? = null,
@@ -2547,6 +2594,7 @@ fun TemplateScope.textRangeRefs(
border = border,
end = end,
fontFamily = fontFamily,
fontFeatureSettings = fontFeatureSettings,
fontSize = fontSize,
fontSizeUnit = fontSizeUnit,
fontWeight = fontWeight,
@@ -2566,6 +2614,7 @@ fun TemplateScope.textRangeRefs(
* @param border Character range border.
* @param end Ordinal number of the last character to be included in the range.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
* @param fontWeight Style.
@@ -2586,6 +2635,7 @@ fun Text.Range.override(
border: TextRangeBorder? = null,
end: Int? = null,
fontFamily: String? = null,
fontFeatureSettings: String? = null,
fontSize: Int? = null,
fontSizeUnit: SizeUnit? = null,
fontWeight: FontWeight? = null,
@@ -2604,6 +2654,7 @@ fun Text.Range.override(
border = valueOrNull(border) ?: properties.border,
end = valueOrNull(end) ?: properties.end,
fontFamily = valueOrNull(fontFamily) ?: properties.fontFamily,
fontFeatureSettings = valueOrNull(fontFeatureSettings) ?: properties.fontFeatureSettings,
fontSize = valueOrNull(fontSize) ?: properties.fontSize,
fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit,
fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight,
@@ -2624,6 +2675,7 @@ fun Text.Range.override(
* @param border Character range border.
* @param end Ordinal number of the last character to be included in the range.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
* @param fontWeight Style.
@@ -2644,6 +2696,7 @@ fun Text.Range.defer(
border: ReferenceProperty<TextRangeBorder>? = null,
end: ReferenceProperty<Int>? = null,
fontFamily: ReferenceProperty<String>? = null,
fontFeatureSettings: ReferenceProperty<String>? = null,
fontSize: ReferenceProperty<Int>? = null,
fontSizeUnit: ReferenceProperty<SizeUnit>? = null,
fontWeight: ReferenceProperty<FontWeight>? = null,
@@ -2662,6 +2715,7 @@ fun Text.Range.defer(
border = border ?: properties.border,
end = end ?: properties.end,
fontFamily = fontFamily ?: properties.fontFamily,
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
fontSize = fontSize ?: properties.fontSize,
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
fontWeight = fontWeight ?: properties.fontWeight,
@@ -2679,6 +2733,7 @@ fun Text.Range.defer(
/**
* @param end Ordinal number of the last character to be included in the range.
* @param fontFamily Font family:<li>`text` — a standard text font;</li><li>`display` — a family of fonts with a large font size.</li>
* @param fontFeatureSettings List of OpenType font features. The format is the same as the CSS font-feature-settings attribute: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop
* @param fontSize Font size.
* @param fontSizeUnit Unit of measurement:<li>`px` — a physical pixel.</li><li>`dp` — a logical pixel that doesn't depend on screen density.</li><li>`sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.</li>
* @param fontWeight Style.
@@ -2695,6 +2750,7 @@ fun Text.Range.evaluate(
`use named arguments`: Guard = Guard.instance,
end: ExpressionProperty<Int>? = null,
fontFamily: ExpressionProperty<String>? = null,
fontFeatureSettings: ExpressionProperty<String>? = null,
fontSize: ExpressionProperty<Int>? = null,
fontSizeUnit: ExpressionProperty<SizeUnit>? = null,
fontWeight: ExpressionProperty<FontWeight>? = null,
@@ -2712,6 +2768,7 @@ fun Text.Range.evaluate(
border = properties.border,
end = end ?: properties.end,
fontFamily = fontFamily ?: properties.fontFamily,
fontFeatureSettings = fontFeatureSettings ?: properties.fontFeatureSettings,
fontSize = fontSize ?: properties.fontSize,
fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit,
fontWeight = fontWeight ?: properties.fontWeight,
+1 -1
View File
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pydivkit"
version = "30.2.0"
version = "30.3.0"
description = "DivKit python library"
readme = "README.md"
repository = "https://github.com/divkit/divkit/tree/main/json-builder/python"
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@divkitframework/jsonbuilder",
"version": "30.2.0",
"version": "30.3.0",
"description": "DivKit TypeScript JSON Builder",
"main": "./dist/jsonbuilder.js",
"module": "./dist/es/jsonbuilder.js",
+1 -1
View File
@@ -1 +1 @@
30.2.0
30.3.0