Skip to content

Commit 93a446f

Browse files
author
farfromrefug
committed
fix(android): fix after latest @nativescript-community/text changes
1 parent 5553241 commit 93a446f

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@nativescript-community/plugin-seed-tools": "file:tools"
5353
},
5454
"devDependencies": {
55-
"@nativescript-community/text": "^1.6.6"
55+
"@nativescript-community/text": "^1.6.8"
5656
},
5757
"bootstrapper": "nativescript-plugin-seed",
5858
"commitlint": {

packages/label/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"license": "Apache-2.0",
4343
"readmeFilename": "README.md",
4444
"dependencies": {
45-
"@nativescript-community/text": "^1.6.6"
45+
"@nativescript-community/text": "^1.6.8"
4646
},
4747
"gitHead": "a08eb50756c9a5d16fc8aa6ff7fba0051c71d1e0"
4848
}

src/label/index.android.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
useLightFormattedString,
88
verticalTextAlignmentProperty
99
} from '@nativescript-community/text';
10-
import { CSSType, CoreTypes, FormattedString, Observable, Property, PropertyChangeData, Span, Utils, View, booleanConverter, profile } from '@nativescript/core';
11-
import { Color } from '@nativescript/core/color';
10+
import { CSSType, Color, CoreTypes, FormattedString, Observable, Property, PropertyChangeData, Screen, Span, Utils, View, booleanConverter, profile } from '@nativescript/core';
1211
import { ShadowCSSValues } from '@nativescript/core/ui/styling/css-shadow';
1312
import { Font, FontStyleType, FontVariationSettingsType, FontWeightType } from '@nativescript/core/ui/styling/font';
1413
import {
@@ -369,7 +368,7 @@ export class Label extends LabelBase {
369368
this.nativeTextViewProtected.setTextIsSelectable(value);
370369
}
371370
createFormattedTextNative(value: any) {
372-
const result = createNativeAttributedString(value, undefined, this, this.autoFontSize);
371+
const result = createNativeAttributedString(value, undefined, this, this.autoFontSize, this['fontSizeRatio'], Screen.mainScreen.scale);
373372
this._setTappableState(value.spans.some((s) => s.tappable));
374373
return result;
375374
}

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,18 +1486,18 @@ __metadata:
14861486
languageName: unknown
14871487
linkType: soft
14881488

1489-
"@nativescript-community/text@npm:^1.6.6":
1490-
version: 1.6.6
1491-
resolution: "@nativescript-community/text@npm:1.6.6"
1492-
checksum: 75504a5491cf111e6d3b6fb26c6d05f7e4a00b2513e8e67b4ff68adb2ace7b1fa436556ae77cb8dec8ebe852823ffc0c546ca5e469c40508babad31db5303018
1489+
"@nativescript-community/text@npm:^1.6.8":
1490+
version: 1.6.8
1491+
resolution: "@nativescript-community/text@npm:1.6.8"
1492+
checksum: 8e48be29a15af4dc1be9b8543bd242ae4f26d75c3e57820af9ebd05c05c712053446e16660631c9519c500e480ac9204d0f8b98c9672f1514902a1aa0bc85387
14931493
languageName: node
14941494
linkType: hard
14951495

14961496
"@nativescript-community/ui-label@npm:*, @nativescript-community/ui-label@workspace:packages/label":
14971497
version: 0.0.0-use.local
14981498
resolution: "@nativescript-community/ui-label@workspace:packages/label"
14991499
dependencies:
1500-
"@nativescript-community/text": "npm:^1.6.6"
1500+
"@nativescript-community/text": "npm:^1.6.8"
15011501
languageName: unknown
15021502
linkType: soft
15031503

@@ -11686,7 +11686,7 @@ __metadata:
1168611686
resolution: "root-workspace-0b6124@workspace:."
1168711687
dependencies:
1168811688
"@nativescript-community/plugin-seed-tools": "file:tools"
11689-
"@nativescript-community/text": "npm:^1.6.6"
11689+
"@nativescript-community/text": "npm:^1.6.8"
1169011690
languageName: unknown
1169111691
linkType: soft
1169211692

0 commit comments

Comments
 (0)