From 66cbef9f7d7ea58b2819f7c6b06e25dc6b1b36a8 Mon Sep 17 00:00:00 2001 From: robot-divkit Date: Wed, 19 Jun 2024 12:39:29 +0300 Subject: [PATCH] Updated version to 30.6.0 b9a9cd547d02f68a2a317de685cd98a721ddcb7e --- client/ios/Configurations/Version.xcconfig | 2 +- client/ios/DivKit/DivKitInfo.swift | 2 +- client/web/divkit/package.json | 2 +- .../divkit/dsl/CollectionItemBuilder.kt | 24 +++++ .../src/generated/kotlin/divkit/dsl/Input.kt | 53 +++++++++-- .../src/generated/kotlin/divkit/dsl/Select.kt | 33 +++++++ .../src/generated/kotlin/divkit/dsl/Slider.kt | 24 +++++ .../src/generated/kotlin/divkit/dsl/Text.kt | 91 +++++++++++++++---- json-builder/python/pyproject.toml | 2 +- json-builder/typescript/package.json | 2 +- version | 2 +- 11 files changed, 204 insertions(+), 33 deletions(-) diff --git a/client/ios/Configurations/Version.xcconfig b/client/ios/Configurations/Version.xcconfig index fab11ea5a..c79a0ce26 100644 --- a/client/ios/Configurations/Version.xcconfig +++ b/client/ios/Configurations/Version.xcconfig @@ -1,2 +1,2 @@ -MARKETING_VERSION = 30.5.0 +MARKETING_VERSION = 30.6.0 CURRENT_PROJECT_VERSION = 30 diff --git a/client/ios/DivKit/DivKitInfo.swift b/client/ios/DivKit/DivKitInfo.swift index 742c7ee8b..31e2d4085 100644 --- a/client/ios/DivKit/DivKitInfo.swift +++ b/client/ios/DivKit/DivKitInfo.swift @@ -1,3 +1,3 @@ public enum DivKitInfo { - public static let version = "30.5.0" + public static let version = "30.6.0" } diff --git a/client/web/divkit/package.json b/client/web/divkit/package.json index 4a09b84f0..21c648f33 100644 --- a/client/web/divkit/package.json +++ b/client/web/divkit/package.json @@ -1,6 +1,6 @@ { "name": "@divkitframework/divkit", - "version": "30.5.0", + "version": "30.6.0", "description": "DivKit for the web", "keywords": [ "server-driven-ui", diff --git a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/CollectionItemBuilder.kt b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/CollectionItemBuilder.kt index 6211fd987..8a8552e04 100644 --- a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/CollectionItemBuilder.kt +++ b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/CollectionItemBuilder.kt @@ -79,6 +79,7 @@ class CollectionItemBuilder internal constructor( operator fun plus(additive: Properties): Prototype = Prototype( Properties( div = additive.div ?: properties.div, + id = additive.id ?: properties.id, selector = additive.selector ?: properties.selector, ) ) @@ -88,6 +89,10 @@ class CollectionItemBuilder internal constructor( * `Div` from which the collection elements will be created. In `Div`, you can use expressions using data from `data`. To access the next `data` element, you need to use the same prefix as in `data_element_prefix`. */ val div: Property
?, + /** + * `id` of the element which is created from the prototype. May contain expression. Has higher priority than `div-base.id.` + */ + val id: Property?, /** * A condition that is used to select the prototype for the next element in the collection. If there is more than 1 true condition, the earlier prototype is selected. If none of the conditions are met, the element from `data` is skipped. * Default value: `true`. @@ -98,6 +103,7 @@ class CollectionItemBuilder internal constructor( val result = mutableMapOf() result.putAll(properties) result.tryPutProperty("div", div) + result.tryPutProperty("id", id) result.tryPutProperty("selector", selector) return result } @@ -217,90 +223,108 @@ fun CollectionItemBuilder.asList() = listOf(this) /** * @param div `Div` from which the collection elements will be created. In `Div`, you can use expressions using data from `data`. To access the next `data` element, you need to use the same prefix as in `data_element_prefix`. + * @param id `id` of the element which is created from the prototype. May contain expression. Has higher priority than `div-base.id.` * @param selector A condition that is used to select the prototype for the next element in the collection. If there is more than 1 true condition, the earlier prototype is selected. If none of the conditions are met, the element from `data` is skipped. */ @Generated fun DivScope.collectionItemBuilderPrototype( `use named arguments`: Guard = Guard.instance, div: Div? = null, + id: String? = null, selector: Boolean? = null, ): CollectionItemBuilder.Prototype = CollectionItemBuilder.Prototype( CollectionItemBuilder.Prototype.Properties( div = valueOrNull(div), + id = valueOrNull(id), selector = valueOrNull(selector), ) ) /** * @param div `Div` from which the collection elements will be created. In `Div`, you can use expressions using data from `data`. To access the next `data` element, you need to use the same prefix as in `data_element_prefix`. + * @param id `id` of the element which is created from the prototype. May contain expression. Has higher priority than `div-base.id.` * @param selector A condition that is used to select the prototype for the next element in the collection. If there is more than 1 true condition, the earlier prototype is selected. If none of the conditions are met, the element from `data` is skipped. */ @Generated fun DivScope.collectionItemBuilderPrototypeProps( `use named arguments`: Guard = Guard.instance, div: Div? = null, + id: String? = null, selector: Boolean? = null, ) = CollectionItemBuilder.Prototype.Properties( div = valueOrNull(div), + id = valueOrNull(id), selector = valueOrNull(selector), ) /** * @param div `Div` from which the collection elements will be created. In `Div`, you can use expressions using data from `data`. To access the next `data` element, you need to use the same prefix as in `data_element_prefix`. + * @param id `id` of the element which is created from the prototype. May contain expression. Has higher priority than `div-base.id.` * @param selector A condition that is used to select the prototype for the next element in the collection. If there is more than 1 true condition, the earlier prototype is selected. If none of the conditions are met, the element from `data` is skipped. */ @Generated fun TemplateScope.collectionItemBuilderPrototypeRefs( `use named arguments`: Guard = Guard.instance, div: ReferenceProperty
? = null, + id: ReferenceProperty? = null, selector: ReferenceProperty? = null, ) = CollectionItemBuilder.Prototype.Properties( div = div, + id = id, selector = selector, ) /** * @param div `Div` from which the collection elements will be created. In `Div`, you can use expressions using data from `data`. To access the next `data` element, you need to use the same prefix as in `data_element_prefix`. + * @param id `id` of the element which is created from the prototype. May contain expression. Has higher priority than `div-base.id.` * @param selector A condition that is used to select the prototype for the next element in the collection. If there is more than 1 true condition, the earlier prototype is selected. If none of the conditions are met, the element from `data` is skipped. */ @Generated fun CollectionItemBuilder.Prototype.override( `use named arguments`: Guard = Guard.instance, div: Div? = null, + id: String? = null, selector: Boolean? = null, ): CollectionItemBuilder.Prototype = CollectionItemBuilder.Prototype( CollectionItemBuilder.Prototype.Properties( div = valueOrNull(div) ?: properties.div, + id = valueOrNull(id) ?: properties.id, selector = valueOrNull(selector) ?: properties.selector, ) ) /** * @param div `Div` from which the collection elements will be created. In `Div`, you can use expressions using data from `data`. To access the next `data` element, you need to use the same prefix as in `data_element_prefix`. + * @param id `id` of the element which is created from the prototype. May contain expression. Has higher priority than `div-base.id.` * @param selector A condition that is used to select the prototype for the next element in the collection. If there is more than 1 true condition, the earlier prototype is selected. If none of the conditions are met, the element from `data` is skipped. */ @Generated fun CollectionItemBuilder.Prototype.defer( `use named arguments`: Guard = Guard.instance, div: ReferenceProperty
? = null, + id: ReferenceProperty? = null, selector: ReferenceProperty? = null, ): CollectionItemBuilder.Prototype = CollectionItemBuilder.Prototype( CollectionItemBuilder.Prototype.Properties( div = div ?: properties.div, + id = id ?: properties.id, selector = selector ?: properties.selector, ) ) /** + * @param id `id` of the element which is created from the prototype. May contain expression. Has higher priority than `div-base.id.` * @param selector A condition that is used to select the prototype for the next element in the collection. If there is more than 1 true condition, the earlier prototype is selected. If none of the conditions are met, the element from `data` is skipped. */ @Generated fun CollectionItemBuilder.Prototype.evaluate( `use named arguments`: Guard = Guard.instance, + id: ExpressionProperty? = null, selector: ExpressionProperty? = null, ): CollectionItemBuilder.Prototype = CollectionItemBuilder.Prototype( CollectionItemBuilder.Prototype.Properties( div = properties.div, + id = id ?: properties.id, selector = selector ?: properties.selector, ) ) diff --git a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Input.kt b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Input.kt index f819c0973..2f1ff0d00 100644 --- a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Input.kt +++ b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Input.kt @@ -50,6 +50,7 @@ class Input internal constructor( fontSize = additive.fontSize ?: properties.fontSize, fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit, fontWeight = additive.fontWeight ?: properties.fontWeight, + fontWeightValue = additive.fontWeightValue ?: properties.fontWeightValue, height = additive.height ?: properties.height, highlightColor = additive.highlightColor ?: properties.highlightColor, hintColor = additive.hintColor ?: properties.hintColor, @@ -148,6 +149,10 @@ class Input internal constructor( * Default value: `regular`. */ val fontWeight: Property?, + /** + * Style. Numeric value. + */ + val fontWeightValue: Property?, /** * 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). * Default value: `{"type": "wrap_content"}`. @@ -198,7 +203,7 @@ class Input internal constructor( */ val mask: Property?, /** - * The maximum number of characters that can be entered in the input field. + * Maximum number of characters that can be entered in the input field. */ val maxLength: Property?, /** @@ -313,6 +318,7 @@ class Input internal constructor( result.tryPutProperty("font_size", fontSize) result.tryPutProperty("font_size_unit", fontSizeUnit) result.tryPutProperty("font_weight", fontWeight) + result.tryPutProperty("font_weight_value", fontWeightValue) result.tryPutProperty("height", height) result.tryPutProperty("highlight_color", highlightColor) result.tryPutProperty("hint_color", hintColor) @@ -412,6 +418,7 @@ class Input internal constructor( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. @@ -423,7 +430,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 maxLength 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. @@ -464,6 +471,7 @@ fun DivScope.input( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, highlightColor: Color? = null, hintColor: Color? = null, @@ -514,6 +522,7 @@ fun DivScope.input( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), highlightColor = valueOrNull(highlightColor), hintColor = valueOrNull(hintColor), @@ -566,6 +575,7 @@ fun DivScope.input( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. @@ -577,7 +587,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 maxLength 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. @@ -618,6 +628,7 @@ fun DivScope.inputProps( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, highlightColor: Color? = null, hintColor: Color? = null, @@ -667,6 +678,7 @@ fun DivScope.inputProps( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), highlightColor = valueOrNull(highlightColor), hintColor = valueOrNull(hintColor), @@ -718,6 +730,7 @@ fun DivScope.inputProps( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. @@ -729,7 +742,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 maxLength 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. @@ -770,6 +783,7 @@ fun TemplateScope.inputRefs( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, highlightColor: ReferenceProperty? = null, hintColor: ReferenceProperty? = null, @@ -819,6 +833,7 @@ fun TemplateScope.inputRefs( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = height, highlightColor = highlightColor, hintColor = hintColor, @@ -870,6 +885,7 @@ fun TemplateScope.inputRefs( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. @@ -881,7 +897,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 maxLength 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. @@ -922,6 +938,7 @@ fun Input.override( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, highlightColor: Color? = null, hintColor: Color? = null, @@ -972,6 +989,7 @@ fun Input.override( fontSize = valueOrNull(fontSize) ?: properties.fontSize, fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit, fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight, + fontWeightValue = valueOrNull(fontWeightValue) ?: properties.fontWeightValue, height = valueOrNull(height) ?: properties.height, highlightColor = valueOrNull(highlightColor) ?: properties.highlightColor, hintColor = valueOrNull(hintColor) ?: properties.hintColor, @@ -1024,6 +1042,7 @@ fun Input.override( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. @@ -1035,7 +1054,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 maxLength 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. @@ -1076,6 +1095,7 @@ fun Input.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, highlightColor: ReferenceProperty? = null, hintColor: ReferenceProperty? = null, @@ -1126,6 +1146,7 @@ fun Input.defer( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, height = height ?: properties.height, highlightColor = highlightColor ?: properties.highlightColor, hintColor = hintColor ?: properties.hintColor, @@ -1172,6 +1193,7 @@ fun Input.defer( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. * @param hintText Tooltip text. @@ -1179,7 +1201,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 maxLength 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. @@ -1199,6 +1221,7 @@ fun Input.evaluate( fontSize: ExpressionProperty? = null, fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, + fontWeightValue: ExpressionProperty? = null, highlightColor: ExpressionProperty? = null, hintColor: ExpressionProperty? = null, hintText: ExpressionProperty? = null, @@ -1230,6 +1253,7 @@ fun Input.evaluate( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, height = properties.height, highlightColor = highlightColor ?: properties.highlightColor, hintColor = hintColor ?: properties.hintColor, @@ -1282,6 +1306,7 @@ fun Input.evaluate( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. @@ -1293,7 +1318,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 maxLength 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. @@ -1334,6 +1359,7 @@ fun Component.override( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, highlightColor: Color? = null, hintColor: Color? = null, @@ -1385,6 +1411,7 @@ fun Component.override( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), highlightColor = valueOrNull(highlightColor), hintColor = valueOrNull(hintColor), @@ -1437,6 +1464,7 @@ fun Component.override( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. @@ -1448,7 +1476,7 @@ fun Component.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 maxLength 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. @@ -1489,6 +1517,7 @@ fun Component.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, highlightColor: ReferenceProperty? = null, hintColor: ReferenceProperty? = null, @@ -1540,6 +1569,7 @@ fun Component.defer( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = height, highlightColor = highlightColor, hintColor = hintColor, @@ -1586,6 +1616,7 @@ fun Component.defer( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param highlightColor Text highlight color. If the value isn't set, the color set in the client will be used instead. * @param hintColor Text color. * @param hintText Tooltip text. @@ -1593,7 +1624,7 @@ fun Component.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 maxLength 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. @@ -1613,6 +1644,7 @@ fun Component.evaluate( fontSize: ExpressionProperty? = null, fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, + fontWeightValue: ExpressionProperty? = null, highlightColor: ExpressionProperty? = null, hintColor: ExpressionProperty? = null, hintText: ExpressionProperty? = null, @@ -1645,6 +1677,7 @@ fun Component.evaluate( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = null, highlightColor = highlightColor, hintColor = hintColor, diff --git a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Select.kt b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Select.kt index 6e93b6299..ae7579d78 100644 --- a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Select.kt +++ b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Select.kt @@ -50,6 +50,7 @@ class Select internal constructor( fontSize = additive.fontSize ?: properties.fontSize, fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit, fontWeight = additive.fontWeight ?: properties.fontWeight, + fontWeightValue = additive.fontWeightValue ?: properties.fontWeightValue, height = additive.height ?: properties.height, hintColor = additive.hintColor ?: properties.hintColor, hintText = additive.hintText ?: properties.hintText, @@ -138,6 +139,10 @@ class Select internal constructor( * Default value: `regular`. */ val fontWeight: Property?, + /** + * Style. Numeric value. + */ + val fontWeightValue: Property?, /** * 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). * Default value: `{"type": "wrap_content"}`. @@ -255,6 +260,7 @@ class Select internal constructor( result.tryPutProperty("font_size", fontSize) result.tryPutProperty("font_size_unit", fontSizeUnit) result.tryPutProperty("font_weight", fontWeight) + result.tryPutProperty("font_weight_value", fontWeightValue) result.tryPutProperty("height", height) result.tryPutProperty("hint_color", hintColor) result.tryPutProperty("hint_text", hintText) @@ -342,6 +348,7 @@ class Select internal constructor( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param hintColor Hint color. * @param hintText Hint text. @@ -383,6 +390,7 @@ fun DivScope.select( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, hintColor: Color? = null, hintText: String? = null, @@ -423,6 +431,7 @@ fun DivScope.select( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), hintColor = valueOrNull(hintColor), hintText = valueOrNull(hintText), @@ -465,6 +474,7 @@ fun DivScope.select( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param hintColor Hint color. * @param hintText Hint text. @@ -506,6 +516,7 @@ fun DivScope.selectProps( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, hintColor: Color? = null, hintText: String? = null, @@ -545,6 +556,7 @@ fun DivScope.selectProps( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), hintColor = valueOrNull(hintColor), hintText = valueOrNull(hintText), @@ -586,6 +598,7 @@ fun DivScope.selectProps( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param hintColor Hint color. * @param hintText Hint text. @@ -627,6 +640,7 @@ fun TemplateScope.selectRefs( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, hintColor: ReferenceProperty? = null, hintText: ReferenceProperty? = null, @@ -666,6 +680,7 @@ fun TemplateScope.selectRefs( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = height, hintColor = hintColor, hintText = hintText, @@ -707,6 +722,7 @@ fun TemplateScope.selectRefs( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param hintColor Hint color. * @param hintText Hint text. @@ -748,6 +764,7 @@ fun Select.override( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, hintColor: Color? = null, hintText: String? = null, @@ -788,6 +805,7 @@ fun Select.override( fontSize = valueOrNull(fontSize) ?: properties.fontSize, fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit, fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight, + fontWeightValue = valueOrNull(fontWeightValue) ?: properties.fontWeightValue, height = valueOrNull(height) ?: properties.height, hintColor = valueOrNull(hintColor) ?: properties.hintColor, hintText = valueOrNull(hintText) ?: properties.hintText, @@ -830,6 +848,7 @@ fun Select.override( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param hintColor Hint color. * @param hintText Hint text. @@ -871,6 +890,7 @@ fun Select.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, hintColor: ReferenceProperty? = null, hintText: ReferenceProperty? = null, @@ -911,6 +931,7 @@ fun Select.defer( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, height = height ?: properties.height, hintColor = hintColor ?: properties.hintColor, hintText = hintText ?: properties.hintText, @@ -947,6 +968,7 @@ fun Select.defer( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param hintColor Hint color. * @param hintText Hint text. * @param letterSpacing Spacing between characters. @@ -966,6 +988,7 @@ fun Select.evaluate( fontSize: ExpressionProperty? = null, fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, + fontWeightValue: ExpressionProperty? = null, hintColor: ExpressionProperty? = null, hintText: ExpressionProperty? = null, letterSpacing: ExpressionProperty? = null, @@ -989,6 +1012,7 @@ fun Select.evaluate( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, height = properties.height, hintColor = hintColor ?: properties.hintColor, hintText = hintText ?: properties.hintText, @@ -1031,6 +1055,7 @@ fun Select.evaluate( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param hintColor Hint color. * @param hintText Hint text. @@ -1072,6 +1097,7 @@ fun Component.override( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), hintColor = valueOrNull(hintColor), hintText = valueOrNull(hintText), @@ -1155,6 +1182,7 @@ fun Component.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, hintColor: ReferenceProperty? = null, hintText: ReferenceProperty? = null, @@ -1237,6 +1266,7 @@ fun Component.defer( * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param hintColor Hint color. * @param hintText Hint text. * @param letterSpacing Spacing between characters. @@ -1292,6 +1323,7 @@ fun Component.evaluate( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = null, hintColor = hintColor, hintText = hintText, diff --git a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt index a99f47068..3c9457bd7 100644 --- a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt +++ b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Slider.kt @@ -375,6 +375,7 @@ class Slider internal constructor( fontSize = additive.fontSize ?: properties.fontSize, fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit, fontWeight = additive.fontWeight ?: properties.fontWeight, + fontWeightValue = additive.fontWeightValue ?: properties.fontWeightValue, offset = additive.offset ?: properties.offset, textColor = additive.textColor ?: properties.textColor, ) @@ -394,6 +395,10 @@ class Slider internal constructor( * Default value: `regular`. */ val fontWeight: Property?, + /** + * Style. Numeric value. + */ + val fontWeightValue: Property?, /** * Shift relative to the center. */ @@ -410,6 +415,7 @@ class Slider internal constructor( result.tryPutProperty("font_size", fontSize) result.tryPutProperty("font_size_unit", fontSizeUnit) result.tryPutProperty("font_weight", fontWeight) + result.tryPutProperty("font_weight_value", fontWeightValue) result.tryPutProperty("offset", offset) result.tryPutProperty("text_color", textColor) return result @@ -1638,6 +1644,7 @@ fun Slider.Range.asList() = listOf(this) /** * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1647,6 +1654,7 @@ fun DivScope.sliderTextStyle( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, offset: Point? = null, textColor: Color? = null, ): Slider.TextStyle = Slider.TextStyle( @@ -1654,6 +1662,7 @@ fun DivScope.sliderTextStyle( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), offset = valueOrNull(offset), textColor = valueOrNull(textColor), ) @@ -1662,6 +1671,7 @@ fun DivScope.sliderTextStyle( /** * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1671,12 +1681,14 @@ fun DivScope.sliderTextStyleProps( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, offset: Point? = null, textColor: Color? = null, ) = Slider.TextStyle.Properties( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), offset = valueOrNull(offset), textColor = valueOrNull(textColor), ) @@ -1684,6 +1696,7 @@ fun DivScope.sliderTextStyleProps( /** * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1693,12 +1706,14 @@ fun TemplateScope.sliderTextStyleRefs( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, offset: ReferenceProperty? = null, textColor: ReferenceProperty? = null, ) = Slider.TextStyle.Properties( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, offset = offset, textColor = textColor, ) @@ -1706,6 +1721,7 @@ fun TemplateScope.sliderTextStyleRefs( /** * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1715,6 +1731,7 @@ fun Slider.TextStyle.override( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, offset: Point? = null, textColor: Color? = null, ): Slider.TextStyle = Slider.TextStyle( @@ -1722,6 +1739,7 @@ fun Slider.TextStyle.override( fontSize = valueOrNull(fontSize) ?: properties.fontSize, fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit, fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight, + fontWeightValue = valueOrNull(fontWeightValue) ?: properties.fontWeightValue, offset = valueOrNull(offset) ?: properties.offset, textColor = valueOrNull(textColor) ?: properties.textColor, ) @@ -1730,6 +1748,7 @@ fun Slider.TextStyle.override( /** * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param offset Shift relative to the center. * @param textColor Text color. */ @@ -1739,6 +1758,7 @@ fun Slider.TextStyle.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, offset: ReferenceProperty? = null, textColor: ReferenceProperty? = null, ): Slider.TextStyle = Slider.TextStyle( @@ -1746,6 +1766,7 @@ fun Slider.TextStyle.defer( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, offset = offset ?: properties.offset, textColor = textColor ?: properties.textColor, ) @@ -1754,6 +1775,7 @@ fun Slider.TextStyle.defer( /** * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param textColor Text color. */ @Generated @@ -1762,12 +1784,14 @@ fun Slider.TextStyle.evaluate( fontSize: ExpressionProperty? = null, fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, + fontWeightValue: ExpressionProperty? = null, textColor: ExpressionProperty? = null, ): Slider.TextStyle = Slider.TextStyle( Slider.TextStyle.Properties( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, offset = properties.offset, textColor = textColor ?: properties.textColor, ) diff --git a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt index 819ae00e7..ebaad1830 100644 --- a/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt +++ b/json-builder/kotlin/src/generated/kotlin/divkit/dsl/Text.kt @@ -59,6 +59,7 @@ class Text internal constructor( fontSize = additive.fontSize ?: properties.fontSize, fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit, fontWeight = additive.fontWeight ?: properties.fontWeight, + fontWeightValue = additive.fontWeightValue ?: properties.fontWeightValue, height = additive.height ?: properties.height, id = additive.id ?: properties.id, images = additive.images ?: properties.images, @@ -175,7 +176,7 @@ class Text internal constructor( */ val fontFamily: Property?, /** - * 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 + * List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop */ val fontFeatureSettings: Property?, /** @@ -192,6 +193,10 @@ class Text internal constructor( * Default value: `regular`. */ val fontWeight: Property?, + /** + * Style. Numeric value. + */ + val fontWeightValue: Property?, /** * 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). * Default value: `{"type": "wrap_content"}`. @@ -363,6 +368,7 @@ class Text internal constructor( result.tryPutProperty("font_size", fontSize) result.tryPutProperty("font_size_unit", fontSizeUnit) result.tryPutProperty("font_weight", fontWeight) + result.tryPutProperty("font_weight_value", fontWeightValue) result.tryPutProperty("height", height) result.tryPutProperty("id", id) result.tryPutProperty("images", images) @@ -566,6 +572,7 @@ class Text internal constructor( fontSize = additive.fontSize ?: properties.fontSize, fontSizeUnit = additive.fontSizeUnit ?: properties.fontSizeUnit, fontWeight = additive.fontWeight ?: properties.fontWeight, + fontWeightValue = additive.fontWeightValue ?: properties.fontWeightValue, letterSpacing = additive.letterSpacing ?: properties.letterSpacing, lineHeight = additive.lineHeight ?: properties.lineHeight, start = additive.start ?: properties.start, @@ -599,7 +606,7 @@ class Text internal constructor( */ val fontFamily: Property?, /** - * 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 + * List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop */ val fontFeatureSettings: Property?, /** @@ -615,6 +622,10 @@ class Text internal constructor( * Style. */ val fontWeight: Property?, + /** + * Style. Numeric value. + */ + val fontWeightValue: Property?, /** * Spacing between characters. */ @@ -660,6 +671,7 @@ class Text internal constructor( result.tryPutProperty("font_size", fontSize) result.tryPutProperty("font_size_unit", fontSizeUnit) result.tryPutProperty("font_weight", fontWeight) + result.tryPutProperty("font_weight_value", fontWeightValue) result.tryPutProperty("letter_spacing", letterSpacing) result.tryPutProperty("line_height", lineHeight) result.tryPutProperty("start", start) @@ -695,9 +707,10 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param id Element ID. It must be unique within the root element. It is used as `accessibilityIdentifier` on iOS. * @param images Images embedded in text. @@ -758,6 +771,7 @@ fun DivScope.text( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, id: String? = null, images: List? = null, @@ -816,6 +830,7 @@ fun DivScope.text( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), id = valueOrNull(id), images = valueOrNull(images), @@ -872,9 +887,10 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param id Element ID. It must be unique within the root element. It is used as `accessibilityIdentifier` on iOS. * @param images Images embedded in text. @@ -935,6 +951,7 @@ fun DivScope.textProps( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, id: String? = null, images: List? = null, @@ -992,6 +1009,7 @@ fun DivScope.textProps( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), id = valueOrNull(id), images = valueOrNull(images), @@ -1047,9 +1065,10 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param id Element ID. It must be unique within the root element. It is used as `accessibilityIdentifier` on iOS. * @param images Images embedded in text. @@ -1110,6 +1129,7 @@ fun TemplateScope.textRefs( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, id: ReferenceProperty? = null, images: ReferenceProperty>? = null, @@ -1167,6 +1187,7 @@ fun TemplateScope.textRefs( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = height, id = id, images = images, @@ -1222,9 +1243,10 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param id Element ID. It must be unique within the root element. It is used as `accessibilityIdentifier` on iOS. * @param images Images embedded in text. @@ -1285,6 +1307,7 @@ fun Text.override( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, id: String? = null, images: List? = null, @@ -1343,6 +1366,7 @@ fun Text.override( fontSize = valueOrNull(fontSize) ?: properties.fontSize, fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit, fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight, + fontWeightValue = valueOrNull(fontWeightValue) ?: properties.fontWeightValue, height = valueOrNull(height) ?: properties.height, id = valueOrNull(id) ?: properties.id, images = valueOrNull(images) ?: properties.images, @@ -1399,9 +1423,10 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param id Element ID. It must be unique within the root element. It is used as `accessibilityIdentifier` on iOS. * @param images Images embedded in text. @@ -1462,6 +1487,7 @@ fun Text.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, id: ReferenceProperty? = null, images: ReferenceProperty>? = null, @@ -1520,6 +1546,7 @@ fun Text.defer( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, height = height ?: properties.height, id = id ?: properties.id, images = images ?: properties.images, @@ -1565,9 +1592,10 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. * @param maxLines Maximum number of lines not to be cropped when breaking the limits. @@ -1597,6 +1625,7 @@ fun Text.evaluate( fontSize: ExpressionProperty? = null, fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, + fontWeightValue: ExpressionProperty? = null, letterSpacing: ExpressionProperty? = null, lineHeight: ExpressionProperty? = null, maxLines: ExpressionProperty? = null, @@ -1635,6 +1664,7 @@ fun Text.evaluate( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, height = properties.height, id = properties.id, images = properties.images, @@ -1691,9 +1721,10 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param id Element ID. It must be unique within the root element. It is used as `accessibilityIdentifier` on iOS. * @param images Images embedded in text. @@ -1754,6 +1785,7 @@ fun Component.override( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, height: Size? = null, id: String? = null, images: List? = null, @@ -1813,6 +1845,7 @@ fun Component.override( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), height = valueOrNull(height), id = valueOrNull(id), images = valueOrNull(images), @@ -1869,9 +1902,10 @@ fun Component.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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @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). * @param id Element ID. It must be unique within the root element. It is used as `accessibilityIdentifier` on iOS. * @param images Images embedded in text. @@ -1932,6 +1966,7 @@ fun Component.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, height: ReferenceProperty? = null, id: ReferenceProperty? = null, images: ReferenceProperty>? = null, @@ -1991,6 +2026,7 @@ fun Component.defer( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = height, id = id, images = images, @@ -2036,9 +2072,10 @@ fun Component.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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. * @param maxLines Maximum number of lines not to be cropped when breaking the limits. @@ -2068,6 +2105,7 @@ fun Component.evaluate( fontSize: ExpressionProperty? = null, fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, + fontWeightValue: ExpressionProperty? = null, letterSpacing: ExpressionProperty? = null, lineHeight: ExpressionProperty? = null, maxLines: ExpressionProperty? = null, @@ -2107,6 +2145,7 @@ fun Component.evaluate( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, height = null, id = null, images = null, @@ -2464,10 +2503,11 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. Units specified in `font_size_unit`. * @param start Ordinal number of a character which the range begins from. The first character has a number `0`. @@ -2489,6 +2529,7 @@ fun DivScope.textRange( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, letterSpacing: Double? = null, lineHeight: Int? = null, start: Int? = null, @@ -2508,6 +2549,7 @@ fun DivScope.textRange( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), letterSpacing = valueOrNull(letterSpacing), lineHeight = valueOrNull(lineHeight), start = valueOrNull(start), @@ -2525,10 +2567,11 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. Units specified in `font_size_unit`. * @param start Ordinal number of a character which the range begins from. The first character has a number `0`. @@ -2550,6 +2593,7 @@ fun DivScope.textRangeProps( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, letterSpacing: Double? = null, lineHeight: Int? = null, start: Int? = null, @@ -2568,6 +2612,7 @@ fun DivScope.textRangeProps( fontSize = valueOrNull(fontSize), fontSizeUnit = valueOrNull(fontSizeUnit), fontWeight = valueOrNull(fontWeight), + fontWeightValue = valueOrNull(fontWeightValue), letterSpacing = valueOrNull(letterSpacing), lineHeight = valueOrNull(lineHeight), start = valueOrNull(start), @@ -2584,10 +2629,11 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. Units specified in `font_size_unit`. * @param start Ordinal number of a character which the range begins from. The first character has a number `0`. @@ -2609,6 +2655,7 @@ fun TemplateScope.textRangeRefs( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, letterSpacing: ReferenceProperty? = null, lineHeight: ReferenceProperty? = null, start: ReferenceProperty? = null, @@ -2627,6 +2674,7 @@ fun TemplateScope.textRangeRefs( fontSize = fontSize, fontSizeUnit = fontSizeUnit, fontWeight = fontWeight, + fontWeightValue = fontWeightValue, letterSpacing = letterSpacing, lineHeight = lineHeight, start = start, @@ -2643,10 +2691,11 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. Units specified in `font_size_unit`. * @param start Ordinal number of a character which the range begins from. The first character has a number `0`. @@ -2668,6 +2717,7 @@ fun Text.Range.override( fontSize: Int? = null, fontSizeUnit: SizeUnit? = null, fontWeight: FontWeight? = null, + fontWeightValue: Int? = null, letterSpacing: Double? = null, lineHeight: Int? = null, start: Int? = null, @@ -2687,6 +2737,7 @@ fun Text.Range.override( fontSize = valueOrNull(fontSize) ?: properties.fontSize, fontSizeUnit = valueOrNull(fontSizeUnit) ?: properties.fontSizeUnit, fontWeight = valueOrNull(fontWeight) ?: properties.fontWeight, + fontWeightValue = valueOrNull(fontWeightValue) ?: properties.fontWeightValue, letterSpacing = valueOrNull(letterSpacing) ?: properties.letterSpacing, lineHeight = valueOrNull(lineHeight) ?: properties.lineHeight, start = valueOrNull(start) ?: properties.start, @@ -2704,10 +2755,11 @@ 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:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. Units specified in `font_size_unit`. * @param start Ordinal number of a character which the range begins from. The first character has a number `0`. @@ -2729,6 +2781,7 @@ fun Text.Range.defer( fontSize: ReferenceProperty? = null, fontSizeUnit: ReferenceProperty? = null, fontWeight: ReferenceProperty? = null, + fontWeightValue: ReferenceProperty? = null, letterSpacing: ReferenceProperty? = null, lineHeight: ReferenceProperty? = null, start: ReferenceProperty? = null, @@ -2748,6 +2801,7 @@ fun Text.Range.defer( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, letterSpacing = letterSpacing ?: properties.letterSpacing, lineHeight = lineHeight ?: properties.lineHeight, start = start ?: properties.start, @@ -2762,10 +2816,11 @@ fun Text.Range.defer( /** * @param end Ordinal number of the last character to be included in the range. * @param fontFamily Font family:
  • `text` — a standard text font;
  • `display` — a family of fonts with a large font size.
    • - * @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 fontFeatureSettings List of OpenType font features. The format matches the CSS attribute "font-feature-settings". Learn more: https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop * @param fontSize Font size. * @param fontSizeUnit Unit of measurement:
  • `px` — a physical pixel.
  • `dp` — a logical pixel that doesn't depend on screen density.
  • `sp` — a logical pixel that depends on the font size on a device. Specify height in `sp`. Only available on Android.
    • * @param fontWeight Style. + * @param fontWeightValue Style. Numeric value. * @param letterSpacing Spacing between characters. * @param lineHeight Line spacing of the text. Units specified in `font_size_unit`. * @param start Ordinal number of a character which the range begins from. The first character has a number `0`. @@ -2783,6 +2838,7 @@ fun Text.Range.evaluate( fontSize: ExpressionProperty? = null, fontSizeUnit: ExpressionProperty? = null, fontWeight: ExpressionProperty? = null, + fontWeightValue: ExpressionProperty? = null, letterSpacing: ExpressionProperty? = null, lineHeight: ExpressionProperty? = null, start: ExpressionProperty? = null, @@ -2801,6 +2857,7 @@ fun Text.Range.evaluate( fontSize = fontSize ?: properties.fontSize, fontSizeUnit = fontSizeUnit ?: properties.fontSizeUnit, fontWeight = fontWeight ?: properties.fontWeight, + fontWeightValue = fontWeightValue ?: properties.fontWeightValue, letterSpacing = letterSpacing ?: properties.letterSpacing, lineHeight = lineHeight ?: properties.lineHeight, start = start ?: properties.start, diff --git a/json-builder/python/pyproject.toml b/json-builder/python/pyproject.toml index 353396638..01a4c8633 100644 --- a/json-builder/python/pyproject.toml +++ b/json-builder/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pydivkit" -version = "30.5.0" +version = "30.6.0" description = "DivKit python library" readme = "README.md" repository = "https://github.com/divkit/divkit/tree/main/json-builder/python" diff --git a/json-builder/typescript/package.json b/json-builder/typescript/package.json index a525dba19..915f41fff 100644 --- a/json-builder/typescript/package.json +++ b/json-builder/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@divkitframework/jsonbuilder", - "version": "30.5.0", + "version": "30.6.0", "description": "DivKit TypeScript JSON Builder", "main": "./dist/jsonbuilder.js", "module": "./dist/es/jsonbuilder.js", diff --git a/version b/version index fa6ef6c4b..29dac4b58 100644 --- a/version +++ b/version @@ -1 +1 @@ -30.5.0 +30.6.0