From 9a60788cfb5fcc165f7e61fa4a1fe2d836da4651 Mon Sep 17 00:00:00 2001
From: Itay Levy <levyitay@gmail.com>
Date: Sun, 26 May 2024 20:38:03 +0200
Subject: [PATCH 1/3] fix(rtl): support better rtl in view mode (#1236)

---
 .../src/app/pages/home/home.page.html         |  8 +++-
 .../frontend/src/app/pages/home/home.page.ts  |  5 +++
 .../recipe-components/recipe/recipe.page.html | 27 +++++++----
 .../recipe-components/recipe/recipe.page.ts   | 34 ++++++++++++--
 .../src/app/services/recipe.service.ts        |  3 ++
 packages/util/shared/src/parsers.ts           | 45 +++++++++++++++++++
 6 files changed, 110 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/app/pages/home/home.page.html b/packages/frontend/src/app/pages/home/home.page.html
index 7c5e05f0a..04f0af7d5 100644
--- a/packages/frontend/src/app/pages/home/home.page.html
+++ b/packages/frontend/src/app/pages/home/home.page.html
@@ -120,8 +120,14 @@
                 *ngIf="!preferences[preferenceKeys.ShowImages]"
                 class="no-image-padding"
               ></div>
-              <h2 [title]="recipe.title">{{ recipe.title }}</h2>
+              <h2
+                [style.text-align]="isRtlText(recipe.title) ? 'right' : 'left'"
+                [title]="recipe.title"
+              >
+                {{ recipe.title }}
+              </h2>
               <p
+                [style.text-align]="isRtlText(recipe.description) ? 'right' : 'left'"
                 *ngIf="recipe.description?.length && preferences[preferenceKeys.ShowRecipeDescription]"
                 [title]="recipe.description"
               >
diff --git a/packages/frontend/src/app/pages/home/home.page.ts b/packages/frontend/src/app/pages/home/home.page.ts
index 32e4e4818..25e8562d0 100644
--- a/packages/frontend/src/app/pages/home/home.page.ts
+++ b/packages/frontend/src/app/pages/home/home.page.ts
@@ -25,6 +25,7 @@ import { PreferencesService } from "~/services/preferences.service";
 import {
   MyRecipesPreferenceKey,
   GlobalPreferenceKey,
+  isRtlText,
 } from "@recipesage/util/shared";
 import { HomePopoverPage } from "~/pages/home-popover/home-popover.page";
 import { HomeSearchFilterPopoverPage } from "~/pages/home-search-popover/home-search-filter-popover.page";
@@ -498,6 +499,10 @@ export class HomePage {
     this.selectedRecipeIds = [];
   }
 
+  isRtlText(text: string, firstWordOnly = false): boolean {
+    return isRtlText(text, firstWordOnly);
+  }
+
   async addLabelToSelectedRecipes() {
     const header = await this.translate
       .get("pages.home.addLabel.header")
diff --git a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html
index f190fce32..21969b418 100644
--- a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html
+++ b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html
@@ -29,7 +29,7 @@
         <img src="{{ sortedRecipeImages()[0].image.location }}" />
       </ion-thumbnail>
 
-      <ion-label>
+      <ion-label [dir]="isTitleRtl ? 'rtl' : 'ltr'">
         <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
 
         <ion-grid
@@ -91,7 +91,12 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
             </ion-col>
           </ion-row>
         </ion-grid>
-        <p class="ion-text-wrap">{{ recipe.description }}</p>
+        <p
+          [style.text-align]="isDescriptionRtl ? 'right' : 'left'"
+          class="ion-text-wrap"
+        >
+          {{ recipe.description }}
+        </p>
       </ion-label>
     </ion-item>
 
@@ -170,10 +175,11 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
           </ion-label>
         </ion-item>
         <ion-item class="ingredients ion-text-wrap" lines="none">
-          <ion-label>
+          <ion-label [dir]="isIngredientsRtl ? 'rtl' : 'ltr'">
             <p
               *ngFor="let ingredient of ingredients; index as ingredientIdx"
               [innerHTML]="ingredient.content"
+              [style.text-align]="ingredient.isRtl ? 'right' : 'left'"
               class="ingredient ion-text-wrap"
               [ngClass]="{ ingredientContent: !ingredient.isHeader, complete: getIngredientComplete(ingredientIdx) }"
               (click)="ingredientClicked($event, ingredient, ingredientIdx)"
@@ -199,24 +205,28 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
           </ion-label>
         </ion-item>
         <ion-item class="instructions ion-text-wrap" lines="none">
-          <ion-label>
+          <ion-label [dir]="isInstructionRtl ? 'rtl' : 'ltr'">
             <p
               *ngFor="let instruction of instructions; index as instructionIdx"
               class="instruction ion-text-wrap"
+              [style.text-align]="instruction.isRtl ? 'right' : 'left'"
             >
-              <span *ngIf="instruction.isHeader"
-                ><b class="sectionHeader">{{instruction.content}}</b></span
-              >
+              <span *ngIf="instruction.isHeader">
+                <b class="sectionHeader">{{instruction.content}}</b>
+              </span>
               <span
                 *ngIf="!instruction.isHeader"
                 (click)="instructionClicked($event, instruction, instructionIdx)"
                 [ngClass]="{ complete: getInstructionComplete(instructionIdx) }"
+                [style.text-align]="instruction.isRtl ? 'right' : 'left'"
               >
                 <b>{{instruction.count}} &nbsp;</b>
                 <span
                   class="instructionContent"
                   [innerHTML]="instruction.content"
+                  [style.text-align]="instruction.isRtl ? 'right' : 'left'"
                 ></span>
+                <!-- <b *ngIf="instruction.isRtl">&nbsp; {{instruction.count}}</b> -->
               </span>
             </p>
             <p *ngIf="!instructions || instructions.length === 0">
@@ -235,9 +245,10 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
         </ion-label>
       </ion-item>
       <ion-item lines="none" class="ion-text-wrap">
-        <ion-label>
+        <ion-label [dir]="isNotesRtl ? 'rtl' : 'ltr'">
           <p
             *ngFor="let note of notes; index as noteIdx"
+            [style.text-align]="note.isRtl ? 'right' : 'left'"
             [innerHTML]="note.content"
             [ngClass]="{ header: note.isHeader }"
             class="ion-text-wrap"
diff --git a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts
index fc2f2fa11..fcffbe10f 100644
--- a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts
+++ b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts
@@ -25,7 +25,7 @@ import { UtilService, RouteMap } from "~/services/util.service";
 import { CapabilitiesService } from "~/services/capabilities.service";
 import { WakeLockService } from "~/services/wakelock.service";
 import { PreferencesService } from "~/services/preferences.service";
-import { RecipeDetailsPreferenceKey } from "@recipesage/util/shared";
+import { RecipeDetailsPreferenceKey, isRtlText } from "@recipesage/util/shared";
 import { RecipeCompletionTrackerService } from "~/services/recipe-completion-tracker.service";
 
 import { AddRecipeToShoppingListModalPage } from "../add-recipe-to-shopping-list-modal/add-recipe-to-shopping-list-modal.page";
@@ -63,7 +63,11 @@ export class RecipePage {
   ingredients?: ParsedIngredient[];
   instructions?: ParsedInstruction[];
   notes?: ParsedNote[];
-
+  isInstructionRtl?: boolean;
+  isIngredientsRtl?: boolean;
+  isTitleRtl?: boolean;
+  isDescriptionRtl?: boolean;
+  isNotesRtl?: boolean;
   scale = 1;
 
   labelGroupIds: string[] = [];
@@ -156,7 +160,10 @@ export class RecipePage {
     if (!response) return;
 
     this.recipe = response;
-
+    this.isTitleRtl =
+      this.recipe.title != "" && isRtlText(this.recipe.title, true);
+    this.isDescriptionRtl =
+      this.recipe.description != "" && isRtlText(this.recipe.description, true);
     if (this.recipe.url && !this.recipe.url.trim().startsWith("http")) {
       this.recipe.url = "http://" + this.recipe.url.trim();
     }
@@ -165,6 +172,13 @@ export class RecipePage {
       this.instructions = this.recipeService.parseInstructions(
         this.recipe.instructions,
       );
+      let rtlCount = 0;
+      this.instructions.forEach((instruction) => {
+        if (instruction.isRtl) {
+          rtlCount++;
+        }
+      });
+      this.isInstructionRtl = rtlCount > this.instructions.length / 2;
     }
 
     if (this.recipe.notes && this.recipe.notes.length > 0) {
@@ -174,6 +188,13 @@ export class RecipePage {
           ...note,
           content: linkifyStr(note.content),
         }));
+      let count = 0;
+      this.notes.forEach((note) => {
+        if (note.isRtl) {
+          count++;
+        }
+      });
+      this.isNotesRtl = count > this.notes.length / 2;
     }
 
     const groupIdsSet = new Set<string>();
@@ -343,6 +364,13 @@ export class RecipePage {
       this.scale,
       true,
     );
+    let rtlCount = 0;
+    this.ingredients.forEach((ingredient) => {
+      if (ingredient.isRtl) {
+        rtlCount++;
+      }
+    });
+    this.isIngredientsRtl = rtlCount > this.ingredients.length / 2;
   }
 
   editRecipe() {
diff --git a/packages/frontend/src/app/services/recipe.service.ts b/packages/frontend/src/app/services/recipe.service.ts
index 57feb133e..6623e86c3 100644
--- a/packages/frontend/src/app/services/recipe.service.ts
+++ b/packages/frontend/src/app/services/recipe.service.ts
@@ -49,6 +49,7 @@ export interface ParsedIngredient {
   originalContent: string;
   isHeader: boolean;
   complete: boolean;
+  isRtl: boolean;
 }
 
 export interface ParsedInstruction {
@@ -56,11 +57,13 @@ export interface ParsedInstruction {
   isHeader: boolean;
   complete: boolean;
   count: number;
+  isRtl: boolean;
 }
 
 export interface ParsedNote {
   content: string;
   isHeader: boolean;
+  isRtl: boolean;
 }
 
 export enum ExportFormat {
diff --git a/packages/util/shared/src/parsers.ts b/packages/util/shared/src/parsers.ts
index a367b8789..f4bf2704e 100644
--- a/packages/util/shared/src/parsers.ts
+++ b/packages/util/shared/src/parsers.ts
@@ -136,6 +136,7 @@ export const parseIngredients = (
   originalContent: string;
   complete: boolean;
   isHeader: boolean;
+  isRtl: boolean;
 }[] => {
   if (!ingredients) return [];
 
@@ -147,6 +148,7 @@ export const parseIngredients = (
       originalContent: match,
       complete: false,
       isHeader: false,
+      isRtl: isRtlText(match),
     })) || [];
 
   for (let i = 0; i < lines.length; i++) {
@@ -226,8 +228,10 @@ export const parseIngredients = (
             acc + ingredientPart + (ingredientPartDelimiters[idx] || ""),
           "",
         );
+        lines[i].isRtl = isRtlText(lines[i].originalContent);
       } else {
         lines[i].content = updatedIngredientParts.join(" + ");
+        lines[i].isRtl = isRtlText(lines[i].originalContent);
       }
 
       lines[i].isHeader = false;
@@ -244,6 +248,7 @@ export const parseInstructions = (
   isHeader: boolean;
   count: number;
   complete: boolean;
+  isRtl: boolean;
 }[] => {
   instructions = replaceFractionsInText(instructions);
 
@@ -269,6 +274,7 @@ export const parseInstructions = (
           isHeader: true,
           count: 0,
           complete: false,
+          isRtl: isRtlText(headerContent, true),
         };
       } else {
         return {
@@ -276,6 +282,7 @@ export const parseInstructions = (
           isHeader: false,
           count: stepCount++,
           complete: false,
+          isRtl: isRtlText(line, true),
         };
       }
     });
@@ -286,6 +293,7 @@ export const parseNotes = (
 ): {
   content: string;
   isHeader: boolean;
+  isRtl: boolean;
 }[] => {
   // Starts with [, anything inbetween, ends with ]
   const headerRegexp = /^\[.*\]$/;
@@ -301,12 +309,49 @@ export const parseNotes = (
       return {
         content: headerContent,
         isHeader: true,
+        isRtl: isRtlText(headerContent),
       };
     } else {
       return {
         content: line,
         isHeader: false,
+        isRtl: isRtlText(line),
       };
     }
   });
 };
+
+/* eslint-disable no-control-regex */
+export const isRtlText = (
+  text: string,
+  onlyFirstWord: boolean = true,
+): boolean => {
+  const rtlChars = new RegExp("[\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC]");
+  const ltrChars = new RegExp(
+    "[\u0000-\u0590\u2000-\u202E\u202A-\u202E\uFB00-\uFB4F]",
+  );
+  const aToZ = new RegExp("[a-zA-Z]");
+  let rtlCount = 0;
+  let ltrCount = 0;
+  if (onlyFirstWord) {
+    const splits = text.split(" ");
+    for (let i = 0; i < splits.length; i++) {
+      if (
+        rtlChars.test(splits[i].charAt(0)) ||
+        aToZ.test(splits[i].charAt(0))
+      ) {
+        text = splits[i];
+        break;
+      }
+    }
+  }
+  for (let i = 0; i < text.length; i++) {
+    if (rtlChars.test(text[i])) {
+      rtlCount++;
+    } else if (ltrChars.test(text[i])) {
+      ltrCount++;
+    }
+  }
+
+  return rtlCount > ltrCount;
+};

From 1e2b3c17314a20cfb236d18092b768436af144d7 Mon Sep 17 00:00:00 2001
From: Itay Levy <levyitay@gmail.com>
Date: Tue, 25 Jun 2024 15:14:30 +0200
Subject: [PATCH 2/3] using dir=auto instead of forcing direction

---
 .../src/app/pages/home/home.page.html         |  9 ++---
 .../recipe-components/recipe/recipe.page.html | 26 ++++++---------
 .../recipe-components/recipe/recipe.page.ts   | 33 ++-----------------
 3 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/packages/frontend/src/app/pages/home/home.page.html b/packages/frontend/src/app/pages/home/home.page.html
index 04f0af7d5..cd1dd3039 100644
--- a/packages/frontend/src/app/pages/home/home.page.html
+++ b/packages/frontend/src/app/pages/home/home.page.html
@@ -120,14 +120,9 @@
                 *ngIf="!preferences[preferenceKeys.ShowImages]"
                 class="no-image-padding"
               ></div>
-              <h2
-                [style.text-align]="isRtlText(recipe.title) ? 'right' : 'left'"
-                [title]="recipe.title"
-              >
-                {{ recipe.title }}
-              </h2>
+              <h2 dir="auto" [title]="recipe.title">{{ recipe.title }}</h2>
               <p
-                [style.text-align]="isRtlText(recipe.description) ? 'right' : 'left'"
+                dir="auto"
                 *ngIf="recipe.description?.length && preferences[preferenceKeys.ShowRecipeDescription]"
                 [title]="recipe.description"
               >
diff --git a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html
index 21969b418..c9ea19973 100644
--- a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html
+++ b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.html
@@ -29,7 +29,7 @@
         <img src="{{ sortedRecipeImages()[0].image.location }}" />
       </ion-thumbnail>
 
-      <ion-label [dir]="isTitleRtl ? 'rtl' : 'ltr'">
+      <ion-label dir="auto">
         <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
 
         <ion-grid
@@ -91,12 +91,7 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
             </ion-col>
           </ion-row>
         </ion-grid>
-        <p
-          [style.text-align]="isDescriptionRtl ? 'right' : 'left'"
-          class="ion-text-wrap"
-        >
-          {{ recipe.description }}
-        </p>
+        <p dir="auto" class="ion-text-wrap">{{ recipe.description }}</p>
       </ion-label>
     </ion-item>
 
@@ -175,11 +170,11 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
           </ion-label>
         </ion-item>
         <ion-item class="ingredients ion-text-wrap" lines="none">
-          <ion-label [dir]="isIngredientsRtl ? 'rtl' : 'ltr'">
+          <ion-label dir="auto">
             <p
               *ngFor="let ingredient of ingredients; index as ingredientIdx"
               [innerHTML]="ingredient.content"
-              [style.text-align]="ingredient.isRtl ? 'right' : 'left'"
+              dir="auto"
               class="ingredient ion-text-wrap"
               [ngClass]="{ ingredientContent: !ingredient.isHeader, complete: getIngredientComplete(ingredientIdx) }"
               (click)="ingredientClicked($event, ingredient, ingredientIdx)"
@@ -205,11 +200,11 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
           </ion-label>
         </ion-item>
         <ion-item class="instructions ion-text-wrap" lines="none">
-          <ion-label [dir]="isInstructionRtl ? 'rtl' : 'ltr'">
+          <ion-label dir="auto">
             <p
               *ngFor="let instruction of instructions; index as instructionIdx"
               class="instruction ion-text-wrap"
-              [style.text-align]="instruction.isRtl ? 'right' : 'left'"
+              dir="auto"
             >
               <span *ngIf="instruction.isHeader">
                 <b class="sectionHeader">{{instruction.content}}</b>
@@ -218,15 +213,14 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
                 *ngIf="!instruction.isHeader"
                 (click)="instructionClicked($event, instruction, instructionIdx)"
                 [ngClass]="{ complete: getInstructionComplete(instructionIdx) }"
-                [style.text-align]="instruction.isRtl ? 'right' : 'left'"
+                dir="auto"
               >
                 <b>{{instruction.count}} &nbsp;</b>
                 <span
                   class="instructionContent"
                   [innerHTML]="instruction.content"
-                  [style.text-align]="instruction.isRtl ? 'right' : 'left'"
+                  dir="auto"
                 ></span>
-                <!-- <b *ngIf="instruction.isRtl">&nbsp; {{instruction.count}}</b> -->
               </span>
             </p>
             <p *ngIf="!instructions || instructions.length === 0">
@@ -245,10 +239,10 @@ <h2 class="recipeTitle ion-text-wrap">{{ recipe.title }}</h2>
         </ion-label>
       </ion-item>
       <ion-item lines="none" class="ion-text-wrap">
-        <ion-label [dir]="isNotesRtl ? 'rtl' : 'ltr'">
+        <ion-label dir="auto">
           <p
             *ngFor="let note of notes; index as noteIdx"
-            [style.text-align]="note.isRtl ? 'right' : 'left'"
+            dir="auto"
             [innerHTML]="note.content"
             [ngClass]="{ header: note.isHeader }"
             class="ion-text-wrap"
diff --git a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts
index fcffbe10f..83a8434a6 100644
--- a/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts
+++ b/packages/frontend/src/app/pages/recipe-components/recipe/recipe.page.ts
@@ -25,7 +25,7 @@ import { UtilService, RouteMap } from "~/services/util.service";
 import { CapabilitiesService } from "~/services/capabilities.service";
 import { WakeLockService } from "~/services/wakelock.service";
 import { PreferencesService } from "~/services/preferences.service";
-import { RecipeDetailsPreferenceKey, isRtlText } from "@recipesage/util/shared";
+import { RecipeDetailsPreferenceKey } from "@recipesage/util/shared";
 import { RecipeCompletionTrackerService } from "~/services/recipe-completion-tracker.service";
 
 import { AddRecipeToShoppingListModalPage } from "../add-recipe-to-shopping-list-modal/add-recipe-to-shopping-list-modal.page";
@@ -63,11 +63,6 @@ export class RecipePage {
   ingredients?: ParsedIngredient[];
   instructions?: ParsedInstruction[];
   notes?: ParsedNote[];
-  isInstructionRtl?: boolean;
-  isIngredientsRtl?: boolean;
-  isTitleRtl?: boolean;
-  isDescriptionRtl?: boolean;
-  isNotesRtl?: boolean;
   scale = 1;
 
   labelGroupIds: string[] = [];
@@ -160,10 +155,7 @@ export class RecipePage {
     if (!response) return;
 
     this.recipe = response;
-    this.isTitleRtl =
-      this.recipe.title != "" && isRtlText(this.recipe.title, true);
-    this.isDescriptionRtl =
-      this.recipe.description != "" && isRtlText(this.recipe.description, true);
+
     if (this.recipe.url && !this.recipe.url.trim().startsWith("http")) {
       this.recipe.url = "http://" + this.recipe.url.trim();
     }
@@ -172,13 +164,6 @@ export class RecipePage {
       this.instructions = this.recipeService.parseInstructions(
         this.recipe.instructions,
       );
-      let rtlCount = 0;
-      this.instructions.forEach((instruction) => {
-        if (instruction.isRtl) {
-          rtlCount++;
-        }
-      });
-      this.isInstructionRtl = rtlCount > this.instructions.length / 2;
     }
 
     if (this.recipe.notes && this.recipe.notes.length > 0) {
@@ -188,13 +173,6 @@ export class RecipePage {
           ...note,
           content: linkifyStr(note.content),
         }));
-      let count = 0;
-      this.notes.forEach((note) => {
-        if (note.isRtl) {
-          count++;
-        }
-      });
-      this.isNotesRtl = count > this.notes.length / 2;
     }
 
     const groupIdsSet = new Set<string>();
@@ -364,13 +342,6 @@ export class RecipePage {
       this.scale,
       true,
     );
-    let rtlCount = 0;
-    this.ingredients.forEach((ingredient) => {
-      if (ingredient.isRtl) {
-        rtlCount++;
-      }
-    });
-    this.isIngredientsRtl = rtlCount > this.ingredients.length / 2;
   }
 
   editRecipe() {

From 4745452cab93f59129271afad5849d54e1acec43 Mon Sep 17 00:00:00 2001
From: Itay Levy <levyitay@gmail.com>
Date: Tue, 25 Jun 2024 15:37:11 +0200
Subject: [PATCH 3/3] fix lint

---
 packages/util/shared/src/parsers.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/util/shared/src/parsers.ts b/packages/util/shared/src/parsers.ts
index f4bf2704e..87427716c 100644
--- a/packages/util/shared/src/parsers.ts
+++ b/packages/util/shared/src/parsers.ts
@@ -322,10 +322,7 @@ export const parseNotes = (
 };
 
 /* eslint-disable no-control-regex */
-export const isRtlText = (
-  text: string,
-  onlyFirstWord: boolean = true,
-): boolean => {
+export const isRtlText = (text: string, onlyFirstWord = true): boolean => {
   const rtlChars = new RegExp("[\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC]");
   const ltrChars = new RegExp(
     "[\u0000-\u0590\u2000-\u202E\u202A-\u202E\uFB00-\uFB4F]",