Merge branch 'master' of github.com:nativescript-community/ui-canvas

# Conflicts: # docs/assets/search.js
nativescript-community · Jun 14, 2024 · 3c63b1d · 3c63b1d
2 parents 5f5e30f + 5664d1c
commit 3c63b1d
Show file tree

Hide file tree

Showing 14 changed files with 693 additions and 429 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,17 +43,21 @@ packages/**/*.d.ts
 bin
 build
 Pods
-!packages/platforms
+!packages/*/platforms
 /packages/**/*.aar
+/packages/**/*.framework
+/packages/**/*.xcframework
 /demo-snippets/**/*.aar
 *.xcuserdatad
 /packages/README.md
 packages/**/*js.map
 packages/**/*js
-packages/**/angular/*.json
-packages/*.ngsummary.json
-packages/*.metadata.json
 packages/angular
 packages/typings
+packages/**/angular/*.json
+packages/**/*.ngsummary.json
+packages/**/*.metadata.json
+
+.vscode/settings.json
 
 /blueprint.md
diff --git a/demo-vue b/demo-vue
diff --git a/docs/assets/navigation.js b/docs/assets/navigation.js
diff --git a/lerna.json b/lerna.json
@@ -8,11 +8,7 @@
     "useWorkspaces": true,
     "command": {
         "publish": {
-            "cleanupTempFiles": true,
-            "removePackageFields": [
-                "devDependencies",
-                "scripts"
-            ]
+            "cleanupTempFiles": true
         }
     },
     "npmClientArgs": [

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
         "demo.vue.android": "cd ./demo-vue && ns run android --no-hmr --env.watchNodeModules",
         "demo.vue.clean": "cd ./demo-vue && ns clean",
         "demo.vue.ios": "cd ./demo-vue && ns run ios --no-hmr --env.watchNodeModules",
-        "doc": "node tools/builddoc.mjs",
+        "doc": "node tools/builddoc.js",
         "postinstall": "npm run setup",
         "readme": "lerna run readme && node ./tools/readme.js",
         "start": "./node_modules/.bin/ntl -A -s 15 -o",

diff --git a/packages/ui-canvas/CHANGELOG.md b/packages/ui-canvas/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.25](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/[email protected]...@nativescript-community/[email protected]) (2024-06-06)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvas
+
 ## [4.6.24](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/[email protected]...@nativescript-community/[email protected]) (2024-05-30)
 
 **Note:** Version bump only for package @nativescript-community/ui-canvas

diff --git a/packages/ui-canvas/package.json b/packages/ui-canvas/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-canvas",
-    "version": "4.6.24",
+    "version": "4.6.25",
     "description": "Implement Canvas into your NativeScript apps.",
     "main": "./index",
     "sideEffects": false,

diff --git a/packages/ui-canvaslabel/CHANGELOG.md b/packages/ui-canvaslabel/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.28](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/[email protected]...@nativescript-community/[email protected]) (2024-06-06)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvaslabel
+
 ## [1.2.27](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/[email protected]...@nativescript-community/[email protected]) (2024-05-30)
 
 **Note:** Version bump only for package @nativescript-community/ui-canvaslabel

diff --git a/packages/ui-canvaslabel/package.json b/packages/ui-canvaslabel/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-canvaslabel",
-    "version": "1.2.27",
+    "version": "1.2.28",
     "description": "Alternative to the built-in NativeScript Label but uses canvas which allows extreme complexity and customization.",
     "main": "./canvaslabel",
     "sideEffects": false,

diff --git a/packages/ui-svg/CHANGELOG.md b/packages/ui-svg/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.37](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/[email protected]...@nativescript-community/[email protected]) (2024-06-06)
+
+**Note:** Version bump only for package @nativescript-community/ui-svg
+
 ## [0.1.36](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/[email protected]...@nativescript-community/[email protected]) (2024-05-30)
 
 **Note:** Version bump only for package @nativescript-community/ui-svg

diff --git a/packages/ui-svg/package.json b/packages/ui-svg/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-svg",
-    "version": "0.1.36",
+    "version": "0.1.37",
     "description": "Adds support for SVGs in your NativeScript apps.",
     "main": "./index",
     "sideEffects": false,

diff --git a/src/ui-canvas/canvas.ios.ts b/src/ui-canvas/canvas.ios.ts
@@ -2451,6 +2451,16 @@ export class StaticLayout {
         }
         return result;
     }
+    getLineWidth(lineNumber: number) {
+        // TODO: actually find line used width
+        let result = this.getBounds().size.width;
+        if (isNaN(result)) {
+            result = this.width;
+        } else {
+            result = Math.min(result, this.width);
+        }
+        return result;
+    }
     getHeight() {
         const result = this.getBounds().size.height;
         return result;

diff --git a/tools b/tools
+21 −3		.eslintrc.js
+27 −19		builddoc.js
+1 −5		lerna.template.json
+34 −32		package.json
+4 −1		package.json.template
+16 −9		sync.js
+15 −1		tsconfig.eslint.json
+2 −2		tsconfig.json