Merge remote-tracking branch 'origin/master'

farfromrefug · farfromrefug · commit ab30fd96a6aa · 2023-07-05T17:29:05.000+02:00
# Conflicts:
#	yarn.lock
diff --git a/demo-snippets/vue/CanvasLabel.vue b/demo-snippets/vue/CanvasLabel.vue
@@ -1,27 +1,26 @@
 <template>
     <Page>
         <StackLayout>
-            <canvaslabel backgroundColor="red" rippleColor="green" borderRadius="10" paddingTop="0" height="80" widht="80">
-            <CGroup verticalAlignment="middle" textAlignment="center">
-                <cspan :fontFamily="mdiFontFamily" text="mdi-cellphone-screenshot" fontSize="30" />
-                <cspan :text="'\n' + 'share screenshot'" fontSize="12" />
-            </CGroup>
-        </canvaslabel>
-            <canvaslabel backgroundColor="yellow" rippleColor="green" borderRadius="10" paddingTop="0" height="80" width="80" lineBreak="middle">
-            <CGroup>
-                <cspan text="this is a tesxt to test lineBreak" fontSize="12" />
-                <cspan :text="'\n' + 'another piece of text which is going to be ellipsized'" fontSize="16" />
-            </CGroup>
-        </canvaslabel>
-            <label backgroundColor="green" rippleColor="green" borderRadius="10" paddingTop="0" height="80" width="80" lineBreak="end" >
+            <!-- <canvaslabel backgroundColor="red" rippleColor="green" borderRadius="10" paddingTop="0" height="80" widht="80" color="black">
+                <CGroup verticalAlignment="middle" textAlignment="center">
+                    <cspan :fontFamily="mdiFontFamily" text="mdi-cellphone-screenshot" fontSize="30" />
+                    <cspan :text="'\n' + 'share screenshot'" fontSize="12" />
+                </CGroup>
+            </canvaslabel> -->
+            <canvaslabel backgroundColor="yellow" rippleColor="green" borderRadius="10" paddingTop="0" height="80" width="80" lineBreak="end" color="red">
+                <CGroup>
+                    <cspan :text="'this is a tesxt to test lineBreak' +'\n' +'test'" fontSize="12" color="blue"/>
+                    <cspan :text="'\n' + 'another piece of text which is going to be ellipsized'" fontSize="16" />
+                </CGroup>
+            </canvaslabel>
+            <label backgroundColor="green" rippleColor="green" borderRadius="10" paddingTop="0" height="80" width="80" lineBreak="end" color="black">
                 <span text="this is a tesxt to test lineBreak" fontSize="12" />
                 <span :text="'\n' + 'another piece of text which is going to be ellipsized'" fontSize="16" />
-        </label>
-            <HTMLLabel backgroundColor="blue" rippleColor="green" borderRadius="10" paddingTop="0" height="80" width="80" lineBreak="end" maxLines="4">
+            </label>
+            <HTMLLabel backgroundColor="blue" rippleColor="green" borderRadius="10" paddingTop="0" height="80" width="80" lineBreak="end" maxLines="4" color="black">
                 <span text="this is a tesxt to test lineBreak" fontSize="12" />
                 <span :text="'\n' + 'another piece of text which is going to be ellipsized'" fontSize="16" />
-        </HTMLLabel>
-            
+            </HTMLLabel>
         </StackLayout>
     </Page>
 </template>
@@ -64,7 +63,7 @@ export default {
         return {
             mdiFontFamily: 'materialdesignicons-webfont,Material Design Icons',
             itemList: items,
-            item:null
+            item: null
         };
     },
     methods: {
diff --git a/demo-vue b/demo-vue
@@ -1 +1 @@
-Subproject commit ed1615348cffc5ecad93394953e14767a95bd5a9
+Subproject commit 1cd8bfd9ab07d7176f1b8367f946a3e1c92dcb9e
diff --git a/packages/ui-canvas/CHANGELOG.md b/packages/ui-canvas/CHANGELOG.md
@@ -3,71 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.4.13](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.12...@nativescript-community/ui-canvas@4.4.13) (2023-05-16)
-
-**Note:** Version bump only for package @nativescript-community/ui-canvas
+# [4.5.0](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.13...@nativescript-community/ui-canvas@4.5.0) (2023-07-05)
 
+### Features
 
+* **canvas:** ellipsize support for StaticLayout ([2b22e82](https://github.com/nativescript-community/ui-canvas/commit/2b22e82b1b2ef06dcf20162cf8798f60c2bcb2de))
 
+## [4.4.13](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.12...@nativescript-community/ui-canvas@4.4.13) (2023-05-16)
 
+**Note:** Version bump only for package @nativescript-community/ui-canvas
 
 ## [4.4.12](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.11...@nativescript-community/ui-canvas@4.4.12) (2023-02-26)
 
 **Note:** Version bump only for package @nativescript-community/ui-canvas
 
-
-
-
-
 ## [4.4.11](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.10...@nativescript-community/ui-canvas@4.4.11) (2023-01-28)
 
 **Note:** Version bump only for package @nativescript-community/ui-canvas
 
-
-
-
-
 ## [4.4.10](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.9...@nativescript-community/ui-canvas@4.4.10) (2023-01-24)
 
-
 ### Bug Fixes
 
 * **android:** native-api-usage fix ([3f82275](https://github.com/nativescript-community/ui-canvas/commit/3f82275755fe4f03bed8efc345379abe90f2baa7))
 
-
-
-
-
 ## [4.4.9](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.8...@nativescript-community/ui-canvas@4.4.9) (2023-01-24)
 
 **Note:** Version bump only for package @nativescript-community/ui-canvas
 
-
-
-
-
 ## [4.4.8](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.4.7...@nativescript-community/ui-canvas@4.4.8) (2023-01-24)
 
-
 ### Bug Fixes
 
 * **android:** native-api-usage fix ([d47baa7](https://github.com/nativescript-community/ui-canvas/commit/d47baa7437a8f3efcf4a30af1bea31fb4afb4a66))
 
-
-
-
-
 ## 4.4.7 (2023-01-23)
 
-
 ### Bug Fixes
 
 * **android:** improved native-api-usage ([ac262b9](https://github.com/nativescript-community/ui-canvas/commit/ac262b977fa84d2d4a1c1b089822fa38a4601d16))
 
-
-
-
-
 ## [4.4.6](https://github.com/nativescript-community/ui-canvas/compare/v4.4.5...v4.4.6) (2022-12-16)
 
 **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.4.13",
+    "version": "4.5.0",
     "description": "Implement Canvas into your NativeScript apps.",
     "main": "./index",
     "sideEffects": false,
diff --git a/packages/ui-canvas/platforms/ios/src/Drawing-Text.h b/packages/ui-canvas/platforms/ios/src/Drawing-Text.h
@@ -36,6 +36,7 @@ UIFont *FontForWrappedString(NSString *string, NSString *fontFace, CGRect rect,
 + (void) drawAttributedStringInRect: (NSAttributedString *)string x:(CGFloat)x y:(CGFloat)y width:(CGFloat)width height:(CGFloat)height font:(UIFont*)font alignment:(NSTextAlignment)alignment  color:(UIColor*)color;
 + (void) drawString: (NSString *)string x:(CGFloat)x y:(CGFloat)y withAttributes:(NSDictionary*)attributes;
 + (void) drawAttributedString: (NSAttributedString *)string x:(CGFloat)x y:(CGFloat)y withAttributes:(NSDictionary*)attributes;
++ (void) drawAttributedString: (NSAttributedString *)string x:(CGFloat)x y:(CGFloat)y width:(CGFloat)width height:(CGFloat)height withAttributes:(NSDictionary*)attributes;
 + (CGRect)getTextBounds:(NSString*)text from:(NSUInteger)from to:(NSUInteger)to attributes:(NSDictionary*)attributes;
 + (CGFloat)measureText:(NSString*)text from:(NSUInteger)from to:(NSUInteger)to attributes:(NSDictionary*)attributes;
 @end
diff --git a/packages/ui-canvas/platforms/ios/src/Drawing-Text.m b/packages/ui-canvas/platforms/ios/src/Drawing-Text.m
@@ -119,9 +119,9 @@ void DrawAttributedStringInRectWithAttrs(NSAttributedString *string, CGRect rect
     NSRange range = NSMakeRange(0, string.length);
     [attributedString addAttributes:attributes range:range];
     
-    CGRect destRect = [string boundingRectWithSize:CGSizeMake(rect.size.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil];
-    CGRect outputRect = RectCenteredInRect(destRect, rect);
-    [attributedString drawInRect:outputRect];
+    // CGRect destRect = [string boundingRectWithSize:CGSizeMake(rect.size.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading context:nil];
+    // CGRect outputRect = RectCenteredInRect(destRect, rect);
+    [attributedString drawWithRect:rect options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading context:nil] ;
 }
 
 #pragma mark - Unwrapped
@@ -286,6 +286,9 @@ + (void) drawString: (NSString *)string x:(CGFloat)x y:(CGFloat)y withAttributes
 + (void) drawAttributedString: (NSAttributedString *)string x:(CGFloat)x y:(CGFloat)y withAttributes:(NSDictionary*)attributes{
     DrawAttributedStringAtPosWithAttrs(string, x, y, attributes);
 }
++ (void) drawAttributedString: (NSAttributedString *)string x:(CGFloat)x y:(CGFloat)y width:(CGFloat)width height:(CGFloat)height withAttributes:(NSDictionary*)attributes {
+    DrawAttributedStringInRectWithAttrs(string, CGRectMake (x, y, width, height), attributes);
+}
 
 + (CGRect)getTextBounds:(NSString*)text from:(NSUInteger)from to:(NSUInteger)to attributes:(NSDictionary*)attributes {
   
diff --git a/packages/ui-canvaslabel/CHANGELOG.md b/packages/ui-canvaslabel/CHANGELOG.md
@@ -3,17 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# 1.2.0 (2023-05-16)
+## [1.2.1](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.0...@nativescript-community/ui-canvaslabel@1.2.1) (2023-07-05)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvaslabel
 
+# 1.2.0 (2023-05-16)
 
 ### Features
 
 * moved `@nativescript-community/ui-canvaslabel` here ([900538b](https://github.com/nativescript-community/ui-canvas/commit/900538b0f8f7eeac1285fcf001a4dd1e6e67f49a))
 
-
-
-
-
 ## [1.1.8](https://github.com/nativescript-community/ui-canvaslabel/compare/v1.1.7...v1.1.8) (2022-12-01)
 
 **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.0",
+    "version": "1.2.1",
     "description": "Alternative to the built-in NativeScript Label but uses canvas which allows extreme complexity and customization.",
     "main": "./canvaslabel",
     "sideEffects": false,
@@ -41,6 +41,6 @@
     },
     "dependencies": {
         "@nativescript-community/text": "^1.5.31",
-        "@nativescript-community/ui-canvas": "^4.4.13"
+        "@nativescript-community/ui-canvas": "^4.5.0"
     }
 }
diff --git a/packages/ui-svg/CHANGELOG.md b/packages/ui-svg/CHANGELOG.md
@@ -3,68 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.1.9](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.8...@nativescript-community/ui-svg@0.1.9) (2023-05-16)
+## [0.1.10](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.9...@nativescript-community/ui-svg@0.1.10) (2023-07-05)
 
 **Note:** Version bump only for package @nativescript-community/ui-svg
 
+## [0.1.9](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.8...@nativescript-community/ui-svg@0.1.9) (2023-05-16)
 
-
-
+**Note:** Version bump only for package @nativescript-community/ui-svg
 
 ## [0.1.8](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.7...@nativescript-community/ui-svg@0.1.8) (2023-02-26)
 
 **Note:** Version bump only for package @nativescript-community/ui-svg
 
-
-
-
-
 ## [0.1.7](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.6...@nativescript-community/ui-svg@0.1.7) (2023-01-28)
 
-
 ### Bug Fixes
 
 * **ui-svg:** android fix native-api-usage ([e7df868](https://github.com/nativescript-community/ui-canvas/commit/e7df868526761be7611731c41111b82138fc939c))
 
-
-
-
-
 ## [0.1.6](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.5...@nativescript-community/ui-svg@0.1.6) (2023-01-24)
 
 **Note:** Version bump only for package @nativescript-community/ui-svg
 
-
-
-
-
 ## [0.1.5](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.4...@nativescript-community/ui-svg@0.1.5) (2023-01-24)
 
 **Note:** Version bump only for package @nativescript-community/ui-svg
 
-
-
-
-
 ## [0.1.4](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.1.3...@nativescript-community/ui-svg@0.1.4) (2023-01-24)
 
 **Note:** Version bump only for package @nativescript-community/ui-svg
 
-
-
-
-
 ## 0.1.3 (2023-01-23)
 
-
 ### Bug Fixes
 
 * **android:** improved native-api-usage ([ac262b9](https://github.com/nativescript-community/ui-canvas/commit/ac262b977fa84d2d4a1c1b089822fa38a4601d16))
 
-
-
-
-
 ## [0.1.2](https://github.com/nativescript-community/ui-svg/compare/v0.1.1...v0.1.2) (2022-12-01)
 
 **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.9",
+    "version": "0.1.10",
     "description": "Adds support for SVGs in your NativeScript apps.",
     "main": "./index",
     "sideEffects": false,
@@ -40,6 +40,6 @@
         "url": "https://github.com/nativescript-community/ui-canvas/issues"
     },
     "dependencies": {
-        "@nativescript-community/ui-canvas": "^4.4.13"
+        "@nativescript-community/ui-canvas": "^4.5.0"
     }
 }
diff --git a/src/ui-canvas/index.ios.ts b/src/ui-canvas/index.ios.ts
@@ -2261,7 +2261,6 @@ function lineBreakToLineBreakMode(value: string) {
 export class StaticLayout {
     rect: CGRect;
     nsAttributedString: NSAttributedString;
-    lineBreak: string;
     mToDraw: NSMutableAttributedString;
     public constructor(
         private text: any,
@@ -2301,23 +2300,57 @@ export class StaticLayout {
                 break;
         }
 
-        if (this.lineBreak) {
-            paragraphStyle.lineBreakMode = lineBreakToLineBreakMode(this.lineBreak);
+        if (this.ellipsize) {
+            // for now we only support end because we cant get NSLineBreakStrategy.Standard to work with
+            // others
+            // paragraphStyle.lineBreakMode = lineBreakToLineBreakMode(this.ellipsize);
+            paragraphStyle.lineBreakStrategy = NSLineBreakStrategy.Standard;
         }
         const fullRange = { location: 0, length: nsAttributedString.length };
-        nsAttributedString.addAttributeValueRange(NSParagraphStyleAttributeName, paragraphStyle, fullRange);
         this.mToDraw = nsAttributedString;
         this.nsAttributedString.enumerateAttributesInRangeOptionsUsingBlock(fullRange, 0 as any, (attributes: NSDictionary<string, any>, range: NSRange, p3: any) => {
             nsAttributedString.addAttributesRange(attributes, range);
         });
+        nsAttributedString.addAttributeValueRange(NSParagraphStyleAttributeName, paragraphStyle, fullRange);
     }
     draw(canvas: Canvas, maxHeight = Number.MAX_VALUE) {
         canvas.startApplyPaint(this.paint);
         const ctx = canvas.ctx;
         this.createAttributedStringToDraw();
+        // const attributes = this.paint.getDrawTextAttribs();
+        // if (this.align || this.ellipsize) {
+        //     let paragraphStyle = attributes.objectForKey(NSParagraphStyleAttributeName) as NSMutableParagraphStyle;
+        //     if (!paragraphStyle) {
+        //         paragraphStyle = NSMutableParagraphStyle.alloc().init();
+        //         attributes.setObjectForKey(paragraphStyle, NSParagraphStyleAttributeName);
+        //     }
+        //     switch (this.align) {
+        //         case LayoutAlignment.ALIGN_CENTER:
+        //             paragraphStyle.alignment = NSTextAlignment.Center;
+        //             break;
+        //         case LayoutAlignment.ALIGN_NORMAL:
+        //             paragraphStyle.alignment = NSTextAlignment.Left;
+        //             break;
+        //         case LayoutAlignment.ALIGN_OPPOSITE:
+        //             paragraphStyle.alignment = NSTextAlignment.Right;
+        //             break;
+        //     }
+        //     if (this.ellipsize) {
+        //         paragraphStyle.lineBreakMode = lineBreakToLineBreakMode(this.ellipsize);
+        //     }
+        // }
+        // console.log('this.nsAttributedString', this.nsAttributedString);
+        // console.log('attributes', attributes);
+        // UIGraphicsPushContext(ctx);
+        // UIDrawingText.drawAttributedStringXYWidthHeightWithAttributes(this.nsAttributedString, 0, 0, this.width, maxHeight, attributes);
 
         UIGraphicsPushContext(ctx);
-        this.mToDraw.drawWithRectOptionsContext(CGRectMake(0, 0, this.width, maxHeight), NSStringDrawingOptions.UsesLineFragmentOrigin | NSStringDrawingOptions.UsesFontLeading, null);
+
+        this.mToDraw.drawWithRectOptionsContext(
+            CGRectMake(0, 0, this.width, maxHeight),
+            NSStringDrawingOptions.UsesLineFragmentOrigin | NSStringDrawingOptions.TruncatesLastVisibleLine | NSStringDrawingOptions.UsesFontLeading,
+            null
+        );
         UIGraphicsPopContext();
         canvas.finishApplyPaint(this.paint);
     }
diff --git a/src/ui-canvas/typings/ios.d.ts b/src/ui-canvas/typings/ios.d.ts
@@ -14,6 +14,7 @@ declare namespace UIDrawingText {
 
     function drawStringXYWithAttributes(text: string, x: number, y: number, attributes: NSDictionary<any, any>);
     function drawAttributedStringXYWithAttributes(text: NSAttributedString, x: number, y: number, attributes: NSDictionary<any, any>);
+    function drawAttributedStringXYWidthHeightWithAttributes(text: NSAttributedString, x: number, y: number, w: number, h: number, attributes: NSDictionary<any, any>);
     function getTextBoundsFromToAttributes(text: string, start: number, end: number, attributes: NSDictionary<any, any>): CGRect;
     function measureTextFromToAttributes(text: string, start: number, end: number, attributes: NSDictionary<any, any>): number;
 }
diff --git a/tools b/tools
@@ -1 +1 @@
-Subproject commit f86a900d46cdf5f776591d4fd70145661e4e844b
+Subproject commit aa4d9153720478a2f473b845ee4bea35b4c979f4

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript-community/ui-canvas",`
`3`		`- "version": "4.4.13",`
	`3`	`+ "version": "4.5.0",`
`4`	`4`	`"description": "Implement Canvas into your NativeScript apps.",`
`5`	`5`	`"main": "./index",`
`6`	`6`	`"sideEffects": false,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript-community/ui-canvaslabel",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"description": "Alternative to the built-in NativeScript Label but uses canvas which allows extreme complexity and customization.",`
`5`	`5`	`"main": "./canvaslabel",`
`6`	`6`	`"sideEffects": false,`
`@@ -41,6 +41,6 @@`
`41`	`41`	`},`
`42`	`42`	`"dependencies": {`
`43`	`43`	`"@nativescript-community/text": "^1.5.31",`
`44`		`- "@nativescript-community/ui-canvas": "^4.4.13"`
	`44`	`+ "@nativescript-community/ui-canvas": "^4.5.0"`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript-community/ui-svg",`
`3`		`- "version": "0.1.9",`
	`3`	`+ "version": "0.1.10",`
`4`	`4`	`"description": "Adds support for SVGs in your NativeScript apps.",`
`5`	`5`	`"main": "./index",`
`6`	`6`	`"sideEffects": false,`
`@@ -40,6 +40,6 @@`
`40`	`40`	`"url": "https://github.com/nativescript-community/ui-canvas/issues"`
`41`	`41`	`},`
`42`	`42`	`"dependencies": {`
`43`		`- "@nativescript-community/ui-canvas": "^4.4.13"`
	`43`	`+ "@nativescript-community/ui-canvas": "^4.5.0"`
`44`	`44`	`}`
`45`	`45`	`}`