From e25e91eb834579cb7f15c0af5d668b6e0c7eebbf Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Mon, 10 Jan 2022 10:45:18 +0530
Subject: [PATCH 1/3] Revert "[fix] numberOfLines=1 on Safari"

This reverts commit 562db69a0f3305b07f252ad26b4661bb92bcb72c.
---
 .../Text/__tests__/__snapshots__/index-test.js.snap   |  2 +-
 packages/react-native-web/src/exports/Text/index.js   | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
index 7c1a743be..d9790bb13 100644
--- a/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
+++ b/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
@@ -159,7 +159,7 @@ exports[`components/Text prop "numberOfLines" value is set 1`] = `
 
 exports[`components/Text prop "numberOfLines" value is set to one 1`] = `
 <div
-  class="css-text-901oao css-textMultiLine-cens5h"
+  class="css-text-901oao css-textOneLine-vcwn7f"
   dir="auto"
 />
 `;
diff --git a/packages/react-native-web/src/exports/Text/index.js b/packages/react-native-web/src/exports/Text/index.js
index a2a74ce47..e87af4c95 100644
--- a/packages/react-native-web/src/exports/Text/index.js
+++ b/packages/react-native-web/src/exports/Text/index.js
@@ -73,11 +73,12 @@ const Text: React.AbstractComponent<TextProps, HTMLElement & PlatformMethods> =
     const classList = [
       classes.text,
       hasTextAncestor === true && classes.textHasAncestor,
-      numberOfLines != null && classes.textMultiLine
+      numberOfLines === 1 && classes.textOneLine,
+      numberOfLines != null && numberOfLines > 1 && classes.textMultiLine
     ];
     const style = [
       props.style,
-      numberOfLines != null && { WebkitLineClamp: numberOfLines },
+      numberOfLines != null && numberOfLines > 1 && { WebkitLineClamp: numberOfLines },
       selectable === true && styles.selectable,
       selectable === false && styles.notSelectable,
       onPress && styles.pressable
@@ -179,6 +180,12 @@ const classes = css.create({
     font: 'inherit',
     whiteSpace: 'inherit'
   },
+  textOneLine: {
+    maxWidth: '100%',
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'pre'
+  },
   // See #13
   textMultiLine: {
     display: '-webkit-box',

From 9f71d4e783eea78384db390b10bbdf461c355cb4 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Mon, 10 Jan 2022 10:46:33 +0530
Subject: [PATCH 2/3] fix: text ellipsis issue for Safari

---
 packages/react-native-web/src/exports/Text/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-native-web/src/exports/Text/index.js b/packages/react-native-web/src/exports/Text/index.js
index e87af4c95..a9f08c15d 100644
--- a/packages/react-native-web/src/exports/Text/index.js
+++ b/packages/react-native-web/src/exports/Text/index.js
@@ -184,7 +184,8 @@ const classes = css.create({
     maxWidth: '100%',
     overflow: 'hidden',
     textOverflow: 'ellipsis',
-    whiteSpace: 'pre'
+    whiteSpace: 'pre',
+    wordWrap: 'normal'
   },
   // See #13
   textMultiLine: {

From f226d357575830074d744902f03fcde365bd9ba7 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Tue, 11 Jan 2022 01:41:59 +0530
Subject: [PATCH 3/3] fix snapshot tests

---
 .../src/exports/Text/__tests__/__snapshots__/index-test.js.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
index d9790bb13..da9988b41 100644
--- a/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
+++ b/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
@@ -159,7 +159,7 @@ exports[`components/Text prop "numberOfLines" value is set 1`] = `
 
 exports[`components/Text prop "numberOfLines" value is set to one 1`] = `
 <div
-  class="css-text-901oao css-textOneLine-vcwn7f"
+  class="css-text-901oao css-textOneLine-nfaoni"
   dir="auto"
 />
 `;