@nativescript/core 8.9.0-next-02-22-2025-13467488692 → 8.9.0-next-02-22-2025-13477043035

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nativescript/core",
3
- "version": "8.9.0-next-02-22-2025-13467488692",
3
+ "version": "8.9.0-next-02-22-2025-13477043035",
4
4
  "description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
5
5
  "main": "index",
6
6
  "types": "index.d.ts",
@@ -1,7 +1,5 @@
1
- import { CssProperty } from '../core/properties';
2
1
  import { View } from '../core/view';
3
2
  import { Property } from '../core/properties';
4
- import { Style } from '../styling/style';
5
3
  import { Color } from '../../color';
6
4
  import { HtmlView as HtmlViewDefinition } from '.';
7
5
  export declare class HtmlViewBase extends View implements HtmlViewDefinition {
@@ -11,4 +9,4 @@ export declare class HtmlViewBase extends View implements HtmlViewDefinition {
11
9
  }
12
10
  export declare const htmlProperty: Property<HtmlViewBase, string>;
13
11
  export declare const selectableProperty: Property<HtmlViewBase, boolean>;
14
- export declare const linkColorProperty: CssProperty<Style, Color>;
12
+ export declare const linkColorProperty: Property<HtmlViewBase, Color>;
@@ -1,8 +1,6 @@
1
- import { CssProperty } from '../core/properties';
2
1
  import { View, CSSType } from '../core/view';
3
2
  import { booleanConverter } from '../core/view-base';
4
3
  import { Property } from '../core/properties';
5
- import { Style } from '../styling/style';
6
4
  import { Color } from '../../color';
7
5
  let HtmlViewBase = class HtmlViewBase extends View {
8
6
  };
@@ -24,11 +22,10 @@ export const selectableProperty = new Property({
24
22
  valueConverter: booleanConverter,
25
23
  });
26
24
  selectableProperty.register(HtmlViewBase);
27
- export const linkColorProperty = new CssProperty({
25
+ export const linkColorProperty = new Property({
28
26
  name: 'linkColor',
29
- cssName: 'link-color',
30
27
  equalityComparer: Color.equals,
31
28
  valueConverter: (value) => new Color(value),
32
29
  });
33
- linkColorProperty.register(Style);
30
+ linkColorProperty.register(HtmlViewBase);
34
31
  //# sourceMappingURL=html-view-common.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"html-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/html-view/html-view-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAI7B,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,IAAI;CAIrC,CAAA;AAJY,YAAY;IADxB,OAAO,CAAC,UAAU,CAAC;GACP,YAAY,CAIxB;;AAED,YAAY,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC;AAElD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAuB;IAC9D,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,EAAE;IAChB,aAAa,EAAE,IAAI;CACnB,CAAC,CAAC;AACH,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,QAAQ,CAAwB;IACrE,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,IAAI;IAClB,cAAc,EAAE,gBAAgB;CAChC,CAAC,CAAC;AACH,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAAe;IAC9D,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,YAAY;IACrB,gBAAgB,EAAE,KAAK,CAAC,MAAM;IAC9B,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC;CAC3C,CAAC,CAAC;AACH,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
1
+ {"version":3,"file":"html-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/html-view/html-view-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAI7B,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,IAAI;CAIrC,CAAA;AAJY,YAAY;IADxB,OAAO,CAAC,UAAU,CAAC;GACP,YAAY,CAIxB;;AAED,YAAY,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC;AAElD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAuB;IAC9D,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,EAAE;IAChB,aAAa,EAAE,IAAI;CACnB,CAAC,CAAC;AACH,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,QAAQ,CAAwB;IACrE,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,IAAI;IAClB,cAAc,EAAE,gBAAgB;CAChC,CAAC,CAAC;AACH,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,QAAQ,CAAsB;IAClE,IAAI,EAAE,WAAW;IACjB,gBAAgB,EAAE,KAAK,CAAC,MAAM;IAC9B,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC;CAC3C,CAAC,CAAC;AACH,iBAAiB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import { View } from '../core/view';
2
2
  import { Property } from '../core/properties';
3
+ import { Color } from '../../color';
3
4
 
4
5
  /**
5
6
  * Represents a view with html content. Use this component instead WebView when you want to show just static HTML content.
@@ -39,3 +40,5 @@ export class HtmlView extends View {
39
40
  }
40
41
 
41
42
  export const htmlProperty: Property<HtmlView, string>;
43
+ export const selectableProperty: Property<HtmlView, boolean>;
44
+ export const linkColorProperty: Property<HtmlView, Color>;
@@ -2,7 +2,6 @@ import { HtmlViewBase } from './html-view-common';
2
2
  export * from './html-view-common';
3
3
  export declare class HtmlView extends HtmlViewBase {
4
4
  nativeViewProtected: UITextView;
5
- private currentHtml;
6
5
  createNativeView(): UITextView;
7
6
  initNativeView(): void;
8
7
  get ios(): UITextView;
@@ -8,13 +8,13 @@ export * from './html-view-common';
8
8
  const majorVersion = iOSNativeHelper.MajorVersion;
9
9
  export class HtmlView extends HtmlViewBase {
10
10
  createNativeView() {
11
- const view = UITextView.new();
12
- view.scrollEnabled = false;
13
- view.editable = false;
14
- view.selectable = true;
15
- view.userInteractionEnabled = true;
16
- view.dataDetectorTypes = -1 /* UIDataDetectorTypes.All */;
17
- return view;
11
+ const nativeView = UITextView.new();
12
+ nativeView.scrollEnabled = false;
13
+ nativeView.editable = false;
14
+ nativeView.selectable = true;
15
+ nativeView.userInteractionEnabled = true;
16
+ nativeView.dataDetectorTypes = -1 /* UIDataDetectorTypes.All */;
17
+ return nativeView;
18
18
  }
19
19
  initNativeView() {
20
20
  super.initNativeView();
@@ -43,23 +43,26 @@ export class HtmlView extends HtmlViewBase {
43
43
  }
44
44
  }
45
45
  renderWithStyles() {
46
- let html = this.currentHtml;
47
- const styles = [];
48
- if (this.nativeViewProtected.font) {
49
- styles.push(`font-family: '${this.nativeViewProtected.font.fontName}';`);
50
- styles.push(`font-size: ${this.nativeViewProtected.font.pointSize}px;`);
46
+ const bodyStyles = [];
47
+ let htmlContent = this.html ?? '';
48
+ htmlContent += '<style>';
49
+ bodyStyles.push(`font-size: ${this.style.fontSize}px;`);
50
+ if (this.style.fontFamily) {
51
+ bodyStyles.push(`font-family: '${this.style.fontFamily}';`);
51
52
  }
52
- if (this.nativeViewProtected.textColor) {
53
- const textColor = Color.fromIosColor(this.nativeViewProtected.textColor);
54
- styles.push(`color: ${textColor.hex};`);
53
+ if (this.style.color) {
54
+ bodyStyles.push(`color: ${this.style.color.hex};`);
55
55
  }
56
- if (styles.length > 0) {
57
- html += `<style>body {${styles.join('')}}</style>`;
56
+ htmlContent += `body {${bodyStyles.join('')}}`;
57
+ if (this.linkColor) {
58
+ htmlContent += `a, a:link, a:visited { color: ${this.linkColor.hex} !important; }`;
58
59
  }
59
- const htmlString = NSString.stringWithString(html + '');
60
+ htmlContent += '</style>';
61
+ const htmlString = NSString.stringWithString(htmlContent);
60
62
  const nsData = htmlString.dataUsingEncoding(NSUnicodeStringEncoding);
61
- this.nativeViewProtected.attributedText = NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(nsData, { [NSDocumentTypeDocumentAttribute]: NSHTMLTextDocumentType }, null);
62
- if (majorVersion >= 13 && UIColor.labelColor) {
63
+ const attributes = NSDictionary.dictionaryWithObjectForKey(NSHTMLTextDocumentType, NSDocumentTypeDocumentAttribute);
64
+ this.nativeViewProtected.attributedText = NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(nsData, attributes, null);
65
+ if (!this.style.color && majorVersion >= 13 && UIColor.labelColor) {
63
66
  this.nativeViewProtected.textColor = UIColor.labelColor;
64
67
  }
65
68
  }
@@ -67,7 +70,6 @@ export class HtmlView extends HtmlViewBase {
67
70
  return '';
68
71
  }
69
72
  [htmlProperty.setNative](value) {
70
- this.currentHtml = value;
71
73
  this.renderWithStyles();
72
74
  }
73
75
  [selectableProperty.getDefault]() {
@@ -84,13 +86,8 @@ export class HtmlView extends HtmlViewBase {
84
86
  this.nativeViewProtected.textColor = color;
85
87
  this.renderWithStyles();
86
88
  }
87
- [linkColorProperty.getDefault]() {
88
- return this.nativeViewProtected.linkTextAttributes[NSForegroundColorAttributeName];
89
- }
90
89
  [linkColorProperty.setNative](value) {
91
- const color = value instanceof Color ? value.ios : value;
92
- const linkTextAttributes = NSDictionary.dictionaryWithObjectForKey(color, NSForegroundColorAttributeName);
93
- this.nativeViewProtected.linkTextAttributes = linkTextAttributes;
90
+ this.renderWithStyles();
94
91
  }
95
92
  [fontInternalProperty.getDefault]() {
96
93
  return this.nativeViewProtected.font;
@@ -1 +1 @@
1
- {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/html-view/index.ios.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/html-view/index.ios.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { Property, CssProperty, InheritedCssProperty } from '../core/properties'
6
6
  import { CoreTypes } from '../../core-types';
7
7
  import { ShadowCSSValues } from '../styling/css-shadow';
8
8
  import { StrokeCSSValues } from '../styling/css-stroke';
9
+ import { FontStyleType, FontWeightType } from '../styling/font-interfaces';
9
10
 
10
11
  /**
11
12
  * @nsView TextBase
@@ -31,6 +32,13 @@ export class TextBase extends View implements AddChildFromBuilder {
31
32
  */
32
33
  formattedText: FormattedString;
33
34
 
35
+ /**
36
+ * Gets or sets font-family style property.
37
+ *
38
+ * @nsProperty
39
+ */
40
+ fontFamily: string;
41
+
34
42
  /**
35
43
  * Gets or sets font-size style property.
36
44
  *
@@ -38,6 +46,20 @@ export class TextBase extends View implements AddChildFromBuilder {
38
46
  */
39
47
  fontSize: number;
40
48
 
49
+ /**
50
+ * Gets or sets font-style style property.
51
+ *
52
+ * @nsProperty
53
+ */
54
+ fontStyle: FontStyleType;
55
+
56
+ /**
57
+ * Gets or sets font-weight style property.
58
+ *
59
+ * @nsProperty
60
+ */
61
+ fontWeight: FontWeightType;
62
+
41
63
  /**
42
64
  * Gets or sets letterSpace style property.
43
65
  *