From 08899c89fd785334f82a55a02f0190a66e5f7826 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Fri, 25 Aug 2023 13:55:06 -0700
Subject: [PATCH 1/3] feat(css): support for text-overflow

---
 apps/toolbox/src/pages/labels.xml             | 11 +++++++
 packages/core/core-types/index.ts             |  8 +++++
 packages/core/ui/button/index.ios.ts          | 31 +++++++++++++++--
 packages/core/ui/label/index.ios.ts           | 33 ++++++++++++++++---
 packages/core/ui/styling/style/index.ts       |  1 +
 packages/core/ui/text-base/index.android.ts   | 28 +++++++++++++---
 packages/core/ui/text-base/index.d.ts         |  6 ++++
 .../core/ui/text-base/text-base-common.ts     | 17 ++++++++++
 8 files changed, 124 insertions(+), 11 deletions(-)

diff --git a/apps/toolbox/src/pages/labels.xml b/apps/toolbox/src/pages/labels.xml
index 36c9966361..6d6175529f 100644
--- a/apps/toolbox/src/pages/labels.xml
+++ b/apps/toolbox/src/pages/labels.xml
@@ -14,6 +14,17 @@
 		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
 			<Label text="Test Label 3: should be aligned top" verticalAlignment="top" />
 		</GridLayout>
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+			<Label text="Test Label text-overflow: ellipsis, this should be long sentence and clipped at very end." textOverflow="ellipsis" whiteSpace="nowrap" />
+		</GridLayout>
+
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+			<Button text="Test Button text-overflow: ellipsis, this should be long sentence and clipped at very end." textOverflow="ellipsis" whiteSpace="nowrap" />
+		</GridLayout>
+
+		<GridLayout marginTop="10" borderWidth="1" borderColor="#efefef" height="60" paddingLeft="5">
+			<Button text="Test Button text-overflow: initial, this should be long sentence and truncated in the middle with ellipsis." textOverflow="initial" whiteSpace="nowrap" />
+		</GridLayout>
         <Label text="maxLines 2" fontWeight="bold" marginTop="10" />
         <Label
 				text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
diff --git a/packages/core/core-types/index.ts b/packages/core/core-types/index.ts
index 2b8f1ddc86..c1807272f3 100644
--- a/packages/core/core-types/index.ts
+++ b/packages/core/core-types/index.ts
@@ -94,6 +94,14 @@ export namespace CoreTypes {
 		export const nowrap = 'nowrap';
 	}
 
+	export type TextOverflowType = 'clip' | 'ellipsis' | 'initial' | 'unset';
+	export namespace TextOverflow {
+		export const clip = 'clip';
+		export const ellipsis = 'ellipsis';
+		export const initial = 'initial';
+		export const unset = 'unset';
+	}
+
 	export type MaxLinesType = number;
 
 	export type OrientationType = 'horizontal' | 'vertical';
diff --git a/packages/core/ui/button/index.ios.ts b/packages/core/ui/button/index.ios.ts
index c49e812487..1c049de8ea 100644
--- a/packages/core/ui/button/index.ios.ts
+++ b/packages/core/ui/button/index.ios.ts
@@ -2,7 +2,7 @@ import { ControlStateChangeListener } from '../core/control-state-change';
 import { ButtonBase } from './button-common';
 import { View, PseudoClassHandler } from '../core/view';
 import { backgroundColorProperty, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../styling/style-properties';
-import { textAlignmentProperty, whiteSpaceProperty } from '../text-base';
+import { textAlignmentProperty, whiteSpaceProperty, textOverflowProperty } from '../text-base';
 import { layout } from '../../utils';
 import { CoreTypes } from '../../core-types';
 import { Color } from '../../color';
@@ -219,17 +219,42 @@ export class Button extends ButtonBase {
 	}
 
 	[whiteSpaceProperty.setNative](value: CoreTypes.WhiteSpaceType) {
+		this.adjustLineBreak();
+	}
+
+	[textOverflowProperty.setNative](value: CoreTypes.TextOverflowType) {
+		this.adjustLineBreak();
+	}
+
+	private adjustLineBreak() {
+		const whiteSpace = this.whiteSpace;
+		const textOverflow = this.textOverflow;
 		const nativeView = this.nativeViewProtected.titleLabel;
-		switch (value) {
+		switch (whiteSpace) {
 			case 'normal':
 				nativeView.lineBreakMode = NSLineBreakMode.ByWordWrapping;
 				nativeView.numberOfLines = this.maxLines;
 				break;
-			case 'nowrap':
 			case 'initial':
 				nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingMiddle;
 				nativeView.numberOfLines = 1;
 				break;
+			case 'nowrap':
+				switch (textOverflow) {
+					case 'clip':
+						nativeView.lineBreakMode = NSLineBreakMode.ByClipping;
+						nativeView.numberOfLines = this.maxLines;
+						break;
+					case 'ellipsis':
+						nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingTail;
+						nativeView.numberOfLines = 1;
+						break;
+					default:
+						nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingMiddle;
+						nativeView.numberOfLines = 1;
+						break;
+				}
+				break;
 		}
 	}
 
diff --git a/packages/core/ui/label/index.ios.ts b/packages/core/ui/label/index.ios.ts
index 3da67f87ca..5acd7a7563 100644
--- a/packages/core/ui/label/index.ios.ts
+++ b/packages/core/ui/label/index.ios.ts
@@ -4,7 +4,7 @@ import { Length, borderTopWidthProperty, borderRightWidthProperty, borderBottomW
 import { booleanConverter } from '../core/view-base';
 import { View, CSSType } from '../core/view';
 import { CoreTypes } from '../../core-types';
-import { TextBase, whiteSpaceProperty } from '../text-base';
+import { TextBase, whiteSpaceProperty, textOverflowProperty } from '../text-base';
 import { layout } from '../../utils';
 
 import { ios } from '../styling/background';
@@ -113,17 +113,42 @@ export class Label extends TextBase implements LabelDefinition {
 	}
 
 	[whiteSpaceProperty.setNative](value: CoreTypes.WhiteSpaceType) {
-		const nativeView = this.nativeTextViewProtected;
-		switch (value) {
+		this.adjustLineBreak();
+	}
+
+	[textOverflowProperty.setNative](value: CoreTypes.TextOverflowType) {
+		this.adjustLineBreak();
+	}
+
+	private adjustLineBreak() {
+		const whiteSpace = this.whiteSpace;
+		const textOverflow = this.textOverflow;
+		const nativeView = this.nativeViewProtected;
+		switch (whiteSpace) {
 			case 'normal':
 				nativeView.lineBreakMode = NSLineBreakMode.ByWordWrapping;
 				nativeView.numberOfLines = this.maxLines;
 				break;
-			case 'nowrap':
 			case 'initial':
 				nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingTail;
 				nativeView.numberOfLines = 1;
 				break;
+			case 'nowrap':
+				switch (textOverflow) {
+					case 'clip':
+						nativeView.lineBreakMode = NSLineBreakMode.ByClipping;
+						nativeView.numberOfLines = this.maxLines;
+						break;
+					case 'ellipsis':
+						nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingTail;
+						nativeView.numberOfLines = 1;
+						break;
+					default:
+						nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingMiddle;
+						nativeView.numberOfLines = 1;
+						break;
+				}
+				break;
 		}
 	}
 
diff --git a/packages/core/ui/styling/style/index.ts b/packages/core/ui/styling/style/index.ts
index 01b35f26ea..c84b5b4e77 100644
--- a/packages/core/ui/styling/style/index.ts
+++ b/packages/core/ui/styling/style/index.ts
@@ -172,6 +172,7 @@ export class Style extends Observable implements StyleDefinition {
 	public textTransform: CoreTypes.TextTransformType;
 	public textShadow: CSSShadow;
 	public whiteSpace: CoreTypes.WhiteSpaceType;
+	public textOverflow: CoreTypes.TextOverflowType;
 
 	public minWidth: CoreTypes.LengthType;
 	public minHeight: CoreTypes.LengthType;
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
index 4fd681b4f9..fc337fcfef 100644
--- a/packages/core/ui/text-base/index.android.ts
+++ b/packages/core/ui/text-base/index.android.ts
@@ -1,5 +1,5 @@
 // Types
-import { getClosestPropertyValue, maxLinesProperty } from './text-base-common';
+import { getClosestPropertyValue, maxLinesProperty, textOverflowProperty } from './text-base-common';
 import { CSSShadow } from '../styling/css-shadow';
 
 // Requires
@@ -311,16 +311,36 @@ export class TextBase extends TextBaseCommon {
 	// Overridden in TextField because setSingleLine(false) will remove methodTransformation.
 	// and we don't want to allow TextField to be multiline
 	[whiteSpaceProperty.setNative](value: CoreTypes.WhiteSpaceType) {
+		this.adjustLineBreak();
+	}
+
+	[textOverflowProperty.setNative](value: CoreTypes.TextOverflowType) {
+		this.adjustLineBreak();
+	}
+
+	private adjustLineBreak() {
+		const whiteSpace = this.whiteSpace;
+		const textOverflow = this.textOverflow;
 		const nativeView = this.nativeTextViewProtected;
-		switch (value) {
+		switch (whiteSpace) {
 			case 'initial':
 			case 'normal':
 				nativeView.setSingleLine(false);
 				nativeView.setEllipsize(null);
 				break;
 			case 'nowrap':
-				nativeView.setSingleLine(true);
-				nativeView.setEllipsize(android.text.TextUtils.TruncateAt.END);
+				switch (textOverflow) {
+					case 'unset':
+					case 'clip':
+						nativeView.setSingleLine(false);
+						nativeView.setEllipsize(null);
+						break;
+					case 'initial':
+					case 'ellipsis':
+						nativeView.setSingleLine(true);
+						nativeView.setEllipsize(android.text.TextUtils.TruncateAt.END);
+						break;
+				}
 				break;
 		}
 	}
diff --git a/packages/core/ui/text-base/index.d.ts b/packages/core/ui/text-base/index.d.ts
index 75031618b2..e3533e8c47 100644
--- a/packages/core/ui/text-base/index.d.ts
+++ b/packages/core/ui/text-base/index.d.ts
@@ -63,6 +63,11 @@ export class TextBase extends View implements AddChildFromBuilder {
 	 */
 	whiteSpace: CoreTypes.WhiteSpaceType;
 
+	/**
+	 * Gets or sets text-overflow style property.
+	 */
+	textOverflow: CoreTypes.TextOverflowType;
+
 	/**
 	 * Gets or sets white space style property.
 	 */
@@ -134,6 +139,7 @@ export const textDecorationProperty: CssProperty<Style, CoreTypes.TextDecoration
 export const textTransformProperty: CssProperty<Style, CoreTypes.TextTransformType>;
 export const textShadowProperty: CssProperty<Style, CSSShadow>;
 export const whiteSpaceProperty: CssProperty<Style, CoreTypes.WhiteSpaceType>;
+export const textOverflowProperty: CssProperty<Style, CoreTypes.TextOverflowType>;
 export const letterSpacingProperty: CssProperty<Style, number>;
 export const lineHeightProperty: CssProperty<Style, number>;
 
diff --git a/packages/core/ui/text-base/text-base-common.ts b/packages/core/ui/text-base/text-base-common.ts
index bb2d4d6490..ab737a9414 100644
--- a/packages/core/ui/text-base/text-base-common.ts
+++ b/packages/core/ui/text-base/text-base-common.ts
@@ -132,6 +132,13 @@ export abstract class TextBaseCommon extends View implements TextBaseDefinition
 		this.style.whiteSpace = value;
 	}
 
+	get textOverflow(): CoreTypes.TextOverflowType {
+		return this.style.textOverflow;
+	}
+	set textOverflow(value: CoreTypes.TextOverflowType) {
+		this.style.textOverflow = value;
+	}
+
 	get padding(): string | CoreTypes.LengthType {
 		return this.style.padding;
 	}
@@ -291,6 +298,16 @@ export const whiteSpaceProperty = new CssProperty<Style, CoreTypes.WhiteSpaceTyp
 });
 whiteSpaceProperty.register(Style);
 
+const textOverflowConverter = makeParser<CoreTypes.TextOverflowType>(makeValidator<CoreTypes.TextOverflowType>('clip', 'ellipsis', 'initial', 'unset'));
+export const textOverflowProperty = new CssProperty<Style, CoreTypes.TextOverflowType>({
+	name: 'textOverflow',
+	cssName: 'text-overflow',
+	defaultValue: 'initial',
+	affectsLayout: global.isIOS,
+	valueConverter: textOverflowConverter,
+});
+textOverflowProperty.register(Style);
+
 const textDecorationConverter = makeParser<CoreTypes.TextDecorationType>(makeValidator<CoreTypes.TextDecorationType>('none', 'underline', 'line-through', 'underline line-through'));
 export const textDecorationProperty = new CssProperty<Style, CoreTypes.TextDecorationType>({
 	name: 'textDecoration',

From a0b29947c47f226c033a3b414dd48a99460801e6 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Fri, 25 Aug 2023 14:19:08 -0700
Subject: [PATCH 2/3] chore: tests

---
 packages/core/ui/label/index.ios.ts         | 6 +-----
 packages/core/ui/text-base/index.android.ts | 9 ++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/core/ui/label/index.ios.ts b/packages/core/ui/label/index.ios.ts
index 5acd7a7563..680e06d6f1 100644
--- a/packages/core/ui/label/index.ios.ts
+++ b/packages/core/ui/label/index.ios.ts
@@ -139,12 +139,8 @@ export class Label extends TextBase implements LabelDefinition {
 						nativeView.lineBreakMode = NSLineBreakMode.ByClipping;
 						nativeView.numberOfLines = this.maxLines;
 						break;
-					case 'ellipsis':
-						nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingTail;
-						nativeView.numberOfLines = 1;
-						break;
 					default:
-						nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingMiddle;
+						nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingTail;
 						nativeView.numberOfLines = 1;
 						break;
 				}
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
index fc337fcfef..2bb8af5b09 100644
--- a/packages/core/ui/text-base/index.android.ts
+++ b/packages/core/ui/text-base/index.android.ts
@@ -330,16 +330,15 @@ export class TextBase extends TextBaseCommon {
 				break;
 			case 'nowrap':
 				switch (textOverflow) {
-					case 'unset':
-					case 'clip':
-						nativeView.setSingleLine(false);
-						nativeView.setEllipsize(null);
-						break;
 					case 'initial':
 					case 'ellipsis':
 						nativeView.setSingleLine(true);
 						nativeView.setEllipsize(android.text.TextUtils.TruncateAt.END);
 						break;
+					default:
+						nativeView.setSingleLine(false);
+						nativeView.setEllipsize(android.text.TextUtils.TruncateAt.END);
+						break;
 				}
 				break;
 		}

From d37e6e3b383443a614a25cf31ab9709ceb8efe5a Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Fri, 25 Aug 2023 16:39:36 -0700
Subject: [PATCH 3/3] chore: export prop like others

---
 packages/core/ui/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/ui/index.ts b/packages/core/ui/index.ts
index 149f572ab8..658cf9e664 100644
--- a/packages/core/ui/index.ts
+++ b/packages/core/ui/index.ts
@@ -68,7 +68,7 @@ export { CSSHelper } from './styling/css-selector';
 
 export { Switch } from './switch';
 export { TabView, TabViewItem } from './tab-view';
-export { TextBase, getTransformedText, letterSpacingProperty, textAlignmentProperty, textDecorationProperty, textTransformProperty, textShadowProperty, whiteSpaceProperty, lineHeightProperty } from './text-base';
+export { TextBase, getTransformedText, letterSpacingProperty, textAlignmentProperty, textDecorationProperty, textTransformProperty, textShadowProperty, whiteSpaceProperty, textOverflowProperty, lineHeightProperty } from './text-base';
 export { FormattedString } from './text-base/formatted-string';
 export { Span } from './text-base/span';
 export { TextField } from './text-field';