From 17de7e8f4e13492b691b416184a0ce3e01c9bab8 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sun, 13 Jun 2021 16:27:42 +0300
Subject: [PATCH] RTL: Fix some minor issues (#1153)

---
 src/components/left/main/Chat.scss | 3 +++
 src/components/left/main/Chat.tsx  | 6 +++---
 src/components/ui/Radio.scss       | 4 +++-
 src/components/ui/Radio.tsx        | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/left/main/Chat.scss b/src/components/left/main/Chat.scss
index a9a404cff..72efa7be9 100644
--- a/src/components/left/main/Chat.scss
+++ b/src/components/left/main/Chat.scss
@@ -83,6 +83,9 @@
       flex-grow: 1;
       color: var(--color-text-secondary);
       unicode-bidi: plaintext;
+      &[dir=ltr] {
+        text-align: left;
+      }
 
       .sender-name {
         color: var(--color-text);
diff --git a/src/components/left/main/Chat.tsx b/src/components/left/main/Chat.tsx
index c1e46f5ce..eaa838493 100644
--- a/src/components/left/main/Chat.tsx
+++ b/src/components/left/main/Chat.tsx
@@ -192,7 +192,7 @@ const Chat: FC<OwnProps & StateProps & DispatchProps> = ({
 
     if (draft && draft.text.length) {
       return (
-        <p className="last-message" dir="auto">
+        <p className="last-message" dir={lang.isRtl ? 'auto' : 'ltr'}>
           <span className="draft">{lang('Draft')}</span>
           {renderText(draft.text)}
         </p>
@@ -209,7 +209,7 @@ const Chat: FC<OwnProps & StateProps & DispatchProps> = ({
         : lastMessageSender;
 
       return (
-        <p className="last-message" dir="auto">
+        <p className="last-message" dir={lang.isRtl ? 'auto' : 'ltr'}>
           {renderText(renderActionMessageText(
             lang,
             lastMessage,
@@ -226,7 +226,7 @@ const Chat: FC<OwnProps & StateProps & DispatchProps> = ({
     const senderName = getMessageSenderName(lang, chatId, lastMessageSender);
 
     return (
-      <p className="last-message" dir="auto">
+      <p className="last-message" dir={lang.isRtl ? 'auto' : 'ltr'}>
         {senderName && (
           <>
             <span className="sender-name">{renderText(senderName)}</span>
diff --git a/src/components/ui/Radio.scss b/src/components/ui/Radio.scss
index 8ba8710ce..b67f491c4 100644
--- a/src/components/ui/Radio.scss
+++ b/src/components/ui/Radio.scss
@@ -60,7 +60,8 @@
     .label {
       display: block;
       word-break: break-word;
-      text-align: initial;
+      unicode-bidi: plaintext;
+      text-align: left;
     }
 
     .subLabel {
@@ -68,6 +69,7 @@
       font-size: 0.875rem;
       line-height: 1rem;
       color: var(--color-text-secondary);
+      unicode-bidi: plaintext;
     }
   }
 
diff --git a/src/components/ui/Radio.tsx b/src/components/ui/Radio.tsx
index ba19bcba2..f15d659a1 100644
--- a/src/components/ui/Radio.tsx
+++ b/src/components/ui/Radio.tsx
@@ -53,8 +53,8 @@ const Radio: FC<OwnProps> = ({
         disabled={disabled || hidden}
       />
       <div className="Radio-main">
-        <span className="label" dir="auto">{label}</span>
-        {subLabel && <span className="subLabel" dir="auto">{subLabel}</span>}
+        <span className="label" dir={lang.isRtl ? 'auto' : undefined}>{label}</span>
+        {subLabel && <span className="subLabel" dir={lang.isRtl ? 'auto' : undefined}>{subLabel}</span>}
       </div>
       {isLoading && <Spinner />}
     </label>