CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.18](https://github.com/Akylas/nativescript-label/compare/v1.0.17...v1.0.18) (2020-02-14)
+
+
+### Bug Fixes
+
+* span/formattedstring fixes for ios too ([755c612](https://github.com/Akylas/nativescript-label/commit/755c612d9880f4e0d8eca3279ac953aaa686417a))
+* **android:** a lot of improvements ([37c8df8](https://github.com/Akylas/nativescript-label/commit/37c8df8082168f6ebba215584372b0145b9740bd))
+* **ios:** dont use DTCoreText anymore ([9895c56](https://github.com/Akylas/nativescript-label/commit/9895c56e52f1aa76179ffaba1ed83440606e5574))
+
+
+
+
+
 ## [1.0.17](https://github.com/Akylas/nativescript-label/compare/v1.0.16...v1.0.17) (2020-02-12)
 
 

demo-vue/app/examples/Base.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import * as frameModule from 'tns-core-modules/ui/frame';
+import * as frameModule from '@nativescript/core/ui/frame';
 import Vue from 'vue';
 
 export const title = 'ListView sample';

demo-vue/app/examples/VerticalAlignment.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script lang="ts">
-import * as frameModule from 'tns-core-modules/ui/frame';
+import * as frameModule from '@nativescript/core/ui/frame';
 import Vue from 'vue';
 
 export const title = 'verticalAlignment sample';

demo-vue/package.json

@@ -3,34 +3,28 @@
     "license": "SEE LICENSE IN LICENSE.md",
     "readme": "README.md",
     "nativescript": {
-        "id": "org.nativescript.demovuehtmllabel",
-        "tns-ios": {
-            "version": "6.2.0-rc-2019-10-16-131038-01"
-        },
-        "tns-android": {
-            "version": "6.3.1"
-        }
+        "id": "org.nativescript.demovuehtmllabel"
     },
     "dependencies": {
         "nativescript-htmllabel": "../plugin",
         "nativescript-theme-core": "~2.0.24",
         "nativescript-akylas-vue": "~2.3.5",
-        "tns-core-modules": "6.1.2",
+        "@nativescript/core": "6.4.0",
         "tslib": "^1.10.0"
     },
     "devDependencies": {
-        "nativescript-akylas-webpack-template": "^0.3.1",
-        "nativescript-dev-webpack": "~1.2.1",
-        "tns-platform-declarations": "^6.1.2",
-        "tslint": "^5.20.0",
+        "nativescript-akylas-webpack-template": "^1.0.15",
+        "nativescript-dev-webpack": "~1.5.0",
+        "tns-platform-declarations": "^6.4.0",
+        "tslint": "^6.0.0",
         "tslint-config-prettier": "^1.18.0",
-        "tslint-config-standard": "^8.0.1",
-        "typescript": "^3.6.4",
-        "vue": "^2.6.10",
-        "vue-i18n": "^8.14.1",
-        "vue-property-decorator": "^8.2.2",
-        "webpack": "^4.41.1",
-        "webpack-cli": "^3.3.9"
+        "tslint-config-standard": "^9.0.0",
+        "typescript": "^3.7.5",
+        "vue": "^2.6.11",
+        "vue-i18n": "^8.15.3",
+        "vue-property-decorator": "^8.4.0",
+        "webpack": "^4.41.6",
+        "webpack-cli": "^3.3.11"
     },
     "scripts": {
         "tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'"

demo-vue/tsconfig.json

@@ -19,7 +19,7 @@
         "paths": {
             "~/*": ["app/*"],
             "nativescript-vue": ["./node_modules/nativescript-akylas-vue"],
-            "*": ["./node_modules/tns-core-modules/*", "./node_modules/*"]
+            "*": ["./node_modules/@nativescript/core/*", "./node_modules/*"]
         }
     },
     "include": ["app/**/*", "references.d.ts"],

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "plugin"
   ],
-  "version": "1.0.17",
+  "version": "1.0.18",
   "command": {
     "publish": {
       "conventionalCommits": true

package.json

@@ -45,22 +45,22 @@
     "homepage": "https://github.com/Akylas/nativescript-label",
     "readmeFilename": "README.md",
     "devDependencies": {
-        "@commitlint/cli": "^8.2.0",
-        "@commitlint/config-conventional": "^8.2.0",
-        "@angular/core": "^8.2.11",
-        "@types/node": "^12.11.1",
-        "husky": "^3.0.9",
-        "lerna": "^3.18.1",
+        "@commitlint/cli": "^8.3.5",
+        "@commitlint/config-conventional": "^8.3.4",
+        "@angular/core": "^9.0.1",
+        "@types/node": "^13.7.1",
+        "husky": "^4.2.3",
+        "lerna": "^3.20.2",
         "npm-watch": "^0.6.0",
         "prompt": "^1.0.0",
-        "rimraf": "^3.0.0",
-        "tns-core-modules": "6.1.2",
-        "tns-platform-declarations": "^6.1.2",
-        "tslint": "^5.20.0",
+        "rimraf": "^3.0.2",
+        "@nativescript/core": "6.4.0",
+        "tns-platform-declarations": "^6.4.0",
+        "tslint": "^6.0.0",
         "tslint-config-prettier": "^1.18.0",
-        "tslint-config-standard": "^8.0.1",
-        "cpy-cli": "^2.0.0",
-        "typescript": "~3.6.4"
+        "tslint-config-standard": "^9.0.0",
+        "cpy-cli": "^3.1.0",
+        "typescript": "~3.7.5"
     },
     "dependencies": {},
     "bootstrapper": "nativescript-plugin-seed",

plugin/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.18](https://github.com/Akylas/nativescript-label/compare/v1.0.17...v1.0.18) (2020-02-14)
+
+
+### Bug Fixes
+
+* **ios:** dont use DTCoreText anymore ([9895c56](https://github.com/Akylas/nativescript-label/commit/9895c56e52f1aa76179ffaba1ed83440606e5574))
+
+
+
+
+
 ## [1.0.17](https://github.com/Akylas/nativescript-label/compare/v1.0.16...v1.0.17) (2020-02-12)
 
 

plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nativescript-htmllabel",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "description": "Nativescript label implementation supporting HTML",
     "main": "./label",
     "typings": "./label.d.ts",

plugin/platforms/ios/Podfile

@@ -1 +1 @@
-pod 'DTCoreText'
+# pod 'DTCoreText'

src/label-common.ts

@@ -1,10 +1,32 @@
-import { isIOS } from 'tns-core-modules/platform';
-import { CssProperty, InheritedCssProperty, makeParser, makeValidator, Property } from 'tns-core-modules/ui/core/properties';
-import { booleanConverter, Color, CSSType, dip } from 'tns-core-modules/ui/core/view';
-import { Label as TNLabel } from 'tns-core-modules/ui/label';
-import { Style } from 'tns-core-modules/ui/styling/style';
-import { layout } from 'tns-core-modules/utils/utils';
+import { isIOS } from '@nativescript/core/platform';
+import { CssProperty, InheritedCssProperty, makeParser, makeValidator, Property } from '@nativescript/core/ui/core/properties';
+import { booleanConverter, Color, CSSType, dip } from '@nativescript/core/ui/core/view';
+import { Label as TNLabel } from '@nativescript/core/ui/label';
+import { Style } from '@nativescript/core/ui/styling/style';
+import { layout } from '@nativescript/core/utils/utils';
 import { Label as LabelViewDefinition, TextShadow } from './label';
+import { FormattedString } from '@nativescript/core/ui/text-base/formatted-string';
+import { Span } from '@nativescript/core/ui/text-base/span';
+
+
+declare module '@nativescript/core/ui/text-base/formatted-string' {
+    interface FormattedString {
+        addPropertyChangeHandler(): void;
+        removePropertyChangeHandler(): void;
+    }
+}
+declare module '@nativescript/core/ui/text-base/span' {
+    interface Span {
+        addPropertyChangeHandler(): void;
+        removePropertyChangeHandler(): void;
+    }
+}
+
+FormattedString.prototype.addPropertyChangeHandler = function() {}
+FormattedString.prototype.removePropertyChangeHandler = function() {}
+Span.prototype.addPropertyChangeHandler = function() {}
+Span.prototype.removePropertyChangeHandler = function() {}
+
 
 export const cssProperty = (target: Object, key: string | symbol) => {
     // property getter