From d8009a52cb3bed66ac381154717235cf3301faac Mon Sep 17 00:00:00 2001
From: Oliver Wilks <ollywilks@googlemail.com>
Date: Fri, 7 Jul 2023 16:39:31 +0100
Subject: [PATCH 1/4] Move text within and apply styles to Pressable

---
 .../Pressable/PressableWithDelayToggle.js        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/Pressable/PressableWithDelayToggle.js b/src/components/Pressable/PressableWithDelayToggle.js
index f4fb77ce7845..b3b004112696 100644
--- a/src/components/Pressable/PressableWithDelayToggle.js
+++ b/src/components/Pressable/PressableWithDelayToggle.js
@@ -90,18 +90,10 @@ function PressableWithDelayToggle(props) {
     return (
         <PressableView
             ref={props.innerRef}
-            style={[styles.flexRow, ...props.styles]}
             onPress={updatePressState}
             accessibilityLabel={tooltipText}
         >
             <>
-                <Text
-                    suppressHighlighting
-                    style={props.textStyles}
-                >
-                    {props.isDelayButtonStateComplete && props.textChecked ? props.textChecked : props.text}
-                    &nbsp;
-                </Text>
                 <Tooltip
                     containerStyles={[styles.flexRow]}
                     text={tooltipText}
@@ -110,9 +102,17 @@ function PressableWithDelayToggle(props) {
                         focusable={false}
                         accessible={false}
                         onPress={updatePressState}
+                        style={[styles.flexRow, ...props.styles]}
                     >
                         {({hovered, pressed}) => (
                             <>
+                                <Text
+                                    suppressHighlighting
+                                    style={props.textStyles}
+                                >
+                                    {props.isDelayButtonStateComplete && props.textChecked ? props.textChecked : props.text}
+                                    &nbsp;
+                                </Text>
                                 {props.icon && (
                                     <Icon
                                         src={props.isDelayButtonStateComplete ? props.iconChecked : props.icon}

From 1b2f4fcd45898370223a485157eb1d3c2b456a25 Mon Sep 17 00:00:00 2001
From: Oliver Wilks <ollywilks@googlemail.com>
Date: Fri, 7 Jul 2023 17:58:34 +0100
Subject: [PATCH 2/4] Render text inside pressable if inline

---
 .../Pressable/PressableWithDelayToggle.js      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/Pressable/PressableWithDelayToggle.js b/src/components/Pressable/PressableWithDelayToggle.js
index b3b004112696..2df0e6d3145c 100644
--- a/src/components/Pressable/PressableWithDelayToggle.js
+++ b/src/components/Pressable/PressableWithDelayToggle.js
@@ -86,6 +86,15 @@ function PressableWithDelayToggle(props) {
     // of a Pressable
     const PressableView = props.inline ? Text : PressableWithoutFeedback;
     const tooltipText = props.isDelayButtonStateComplete ? props.tooltipTextChecked : props.tooltipText;
+    const labelText = (
+        <Text
+            suppressHighlighting
+            style={props.textStyles}
+        >
+            {props.isDelayButtonStateComplete && props.textChecked ? props.textChecked : props.text}
+            &nbsp;
+        </Text>
+    );
 
     return (
         <PressableView
@@ -94,6 +103,7 @@ function PressableWithDelayToggle(props) {
             accessibilityLabel={tooltipText}
         >
             <>
+                {props.inline && labelText}
                 <Tooltip
                     containerStyles={[styles.flexRow]}
                     text={tooltipText}
@@ -106,13 +116,7 @@ function PressableWithDelayToggle(props) {
                     >
                         {({hovered, pressed}) => (
                             <>
-                                <Text
-                                    suppressHighlighting
-                                    style={props.textStyles}
-                                >
-                                    {props.isDelayButtonStateComplete && props.textChecked ? props.textChecked : props.text}
-                                    &nbsp;
-                                </Text>
+                                {!props.inline && labelText}
                                 {props.icon && (
                                     <Icon
                                         src={props.isDelayButtonStateComplete ? props.iconChecked : props.icon}

From 674da246d01b83dcd8f620aa48f92d68c9513054 Mon Sep 17 00:00:00 2001
From: Olly Wilks <ollywilks@googlemail.com>
Date: Mon, 17 Jul 2023 22:18:26 +0100
Subject: [PATCH 3/4] Oops, remove extra tooltipText

---
 src/components/Pressable/PressableWithDelayToggle.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Pressable/PressableWithDelayToggle.js b/src/components/Pressable/PressableWithDelayToggle.js
index c43fbf419837..acca7b7fd262 100644
--- a/src/components/Pressable/PressableWithDelayToggle.js
+++ b/src/components/Pressable/PressableWithDelayToggle.js
@@ -84,7 +84,6 @@ function PressableWithDelayToggle(props) {
     // for elements that are supposed to be inline, we need to use a Text element instead
     // of a Pressable
     const PressableView = props.inline ? Text : PressableWithoutFeedback;
-    const tooltipText = props.isDelayButtonStateComplete ? props.tooltipTextChecked : props.tooltipText;
     const tooltipText = !isActive ? props.tooltipTextChecked : props.tooltipText;
     const labelText = (
         <Text

From 374d5942cd0c242bb8e6353afeca368784144a65 Mon Sep 17 00:00:00 2001
From: Olly Wilks <ollywilks@googlemail.com>
Date: Mon, 17 Jul 2023 22:25:04 +0100
Subject: [PATCH 4/4] Replace isDelayButtonStateComplete with !isActive

---
 src/components/Pressable/PressableWithDelayToggle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pressable/PressableWithDelayToggle.js b/src/components/Pressable/PressableWithDelayToggle.js
index acca7b7fd262..42d4e3460125 100644
--- a/src/components/Pressable/PressableWithDelayToggle.js
+++ b/src/components/Pressable/PressableWithDelayToggle.js
@@ -90,7 +90,7 @@ function PressableWithDelayToggle(props) {
             suppressHighlighting
             style={props.textStyles}
         >
-            {props.isDelayButtonStateComplete && props.textChecked ? props.textChecked : props.text}
+            {!isActive && props.textChecked ? props.textChecked : props.text}
             &nbsp;
         </Text>
     );