From 7542a42fa6b6a0b4f783c28b349e742eb1af69a9 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Mon, 26 Jun 2023 17:30:35 +1000
Subject: [PATCH] feat: started adding rtl support to composition input

updated buttons, emoji panel, @mentions
---
 ts/components/basic/Flex.tsx                  |  2 +-
 .../conversation/SessionEmojiPanel.tsx        |  6 +++-
 .../composition/CompositionBox.tsx            | 30 +++++++++++++------
 ts/state/selectors/user.ts                    |  5 ++++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ts/components/basic/Flex.tsx b/ts/components/basic/Flex.tsx
index 18386c20c..11b7db2c3 100644
--- a/ts/components/basic/Flex.tsx
+++ b/ts/components/basic/Flex.tsx
@@ -6,7 +6,7 @@ export interface FlexProps {
   container?: boolean;
   dataTestId?: string;
   /****** Container Props ********/
-  flexDirection?: 'row' | 'column';
+  flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse';
   justifyContent?:
     | 'flex-start'
     | 'flex-end'
diff --git a/ts/components/conversation/SessionEmojiPanel.tsx b/ts/components/conversation/SessionEmojiPanel.tsx
index 315776103..109a1c8ba 100644
--- a/ts/components/conversation/SessionEmojiPanel.tsx
+++ b/ts/components/conversation/SessionEmojiPanel.tsx
@@ -16,8 +16,10 @@ import {
 import { hexColorToRGB } from '../../util/hexColorToRGB';
 import { getPrimaryColor } from '../../state/selectors/primaryColor';
 import { i18nEmojiData } from '../../util/emoji';
+import { getWritingDirection } from '../../state/selectors/user';
 
 export const StyledEmojiPanel = styled.div<{
+  dir: string;
   isModal: boolean;
   primaryColor: PrimaryColorStateType;
   theme: ThemeStateType;
@@ -68,7 +70,7 @@ export const StyledEmojiPanel = styled.div<{
         content: '';
         position: absolute;
         top: calc(100% - 40px);
-        left: calc(100% - 79px);
+        left: ${props.dir === 'rtl' ? '75px' : 'calc(100% - 106px)'};
         width: 22px;
         height: 22px;
         transform: rotate(45deg);
@@ -102,6 +104,7 @@ export const SessionEmojiPanel = forwardRef<HTMLDivElement, Props>((props: Props
   const primaryColor = useSelector(getPrimaryColor);
   const theme = useSelector(getTheme);
   const isDarkMode = useSelector(isDarkTheme);
+  const writingDirection = useSelector(getWritingDirection);
 
   let panelBackgroundRGB = hexColorToRGB(THEMES.CLASSIC_DARK.COLOR1);
   let panelTextRGB = hexColorToRGB(THEMES.CLASSIC_DARK.COLOR6);
@@ -134,6 +137,7 @@ export const SessionEmojiPanel = forwardRef<HTMLDivElement, Props>((props: Props
       theme={theme}
       panelBackgroundRGB={panelBackgroundRGB}
       panelTextRGB={panelTextRGB}
+      dir={writingDirection}
       className={classNames(show && 'show')}
       ref={ref}
     >
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index 7a0547e5e..c4488bda8 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -57,6 +57,7 @@ import {
   getSelectedConversationKey,
 } from '../../../state/selectors/selectedConversation';
 import { SettingsKey } from '../../../data/settings-key';
+import { isRtlBody } from '../../menu/Menu';
 
 export interface ReplyingToMessageProps {
   convoId: string;
@@ -205,21 +206,22 @@ const getSelectionBasedOnMentions = (draft: string, index: number) => {
   return Number.MAX_SAFE_INTEGER;
 };
 
-const StyledEmojiPanelContainer = styled.div`
+const StyledEmojiPanelContainer = styled.div<{ dir: string }>`
   ${StyledEmojiPanel} {
     position: absolute;
     bottom: 68px;
-    right: 0px;
+    ${props => (props.dir === 'rtl' ? 'left: 0px' : 'right: 0px;')}
   }
 `;
 
-const StyledSendMessageInput = styled.div`
+const StyledSendMessageInput = styled.div<{ dir: string }>`
   cursor: text;
   display: flex;
   align-items: center;
   flex-grow: 1;
   min-height: var(--composition-container-height);
   padding: var(--margins-xs) 0;
+  ${props => (props.dir = 'rtl' && 'margin-right: var(--margins-sm);')}
   z-index: 1;
   background-color: inherit;
 
@@ -409,8 +411,16 @@ class CompositionBoxInner extends React.Component<Props, State> {
     const { showEmojiPanel } = this.state;
     const { typingEnabled } = this.props;
 
+    const rtl = isRtlBody();
+    const writingDirection = rtl ? 'rtl' : 'ltr';
+
     return (
-      <>
+      <Flex
+        container={true}
+        flexDirection={rtl ? 'row-reverse' : 'row'}
+        alignItems={'center'}
+        width={'100%'}
+      >
         {typingEnabled && <AddStagedAttachmentButton onClick={this.onChooseAttachment} />}
 
         <input
@@ -426,13 +436,14 @@ class CompositionBoxInner extends React.Component<Props, State> {
 
         <StyledSendMessageInput
           role="main"
+          dir={writingDirection}
           onClick={this.focusCompositionBox} // used to focus on the textarea when clicking in its container
           ref={el => {
             this.container = el;
           }}
           data-testid="message-input"
         >
-          {this.renderTextArea()}
+          {this.renderTextArea(writingDirection)}
         </StyledSendMessageInput>
 
         {typingEnabled && (
@@ -441,7 +452,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
         <SendMessageButton onClick={this.onSendMessage} />
 
         {typingEnabled && showEmojiPanel && (
-          <StyledEmojiPanelContainer role="button">
+          <StyledEmojiPanelContainer role="button" dir={writingDirection}>
             <SessionEmojiPanel
               ref={this.emojiPanel}
               show={showEmojiPanel}
@@ -450,11 +461,11 @@ class CompositionBoxInner extends React.Component<Props, State> {
             />
           </StyledEmojiPanelContainer>
         )}
-      </>
+      </Flex>
     );
   }
 
-  private renderTextArea() {
+  private renderTextArea(dir: string) {
     const { i18n } = window;
     const { draft } = this.state;
 
@@ -491,6 +502,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
         onKeyUp={this.onKeyUp}
         placeholder={messagePlaceHolder}
         spellCheck={true}
+        dir={dir}
         inputRef={this.textarea}
         disabled={!typingEnabled}
         rows={1}
@@ -505,7 +517,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
           markup="@ￒ__id__ￗ__display__ￒ" // ￒ = \uFFD2 is one of the forbidden char for a display name (check displayNameRegex)
           trigger="@"
           // this is only for the composition box visible content. The real stuff on the backend box is the @markup
-          displayTransform={(_id, display) => `@${display}`}
+          displayTransform={(_id, display) => (dir === 'rtl' ? `${display}@` : `@${display}`)}
           data={this.fetchUsersForGroup}
           renderSuggestion={renderUserMentionRow}
         />
diff --git a/ts/state/selectors/user.ts b/ts/state/selectors/user.ts
index 69535cfda..400144cbc 100644
--- a/ts/state/selectors/user.ts
+++ b/ts/state/selectors/user.ts
@@ -4,6 +4,7 @@ import { LocalizerType } from '../../types/Util';
 
 import { StateType } from '../reducer';
 import { UserStateType } from '../ducks/user';
+import { isRtlBody } from '../../components/menu/Menu';
 
 export const getUser = (state: StateType): UserStateType => state.user;
 
@@ -13,3 +14,7 @@ export const getOurNumber = createSelector(
 );
 
 export const getIntl = createSelector(getUser, (): LocalizerType => window.i18n);
+
+export const getWritingDirection = createSelector(getUser, (): string =>
+  isRtlBody() ? 'rtl' : 'ltr'
+);