Merge pull request #48 from emargareten/main

Fix RTL Phone Number Display
ysfkaya · Aug 22, 2024 · b991c51 · b991c51
2 parents 8bb4529 + a9bfe51
commit b991c51
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/src/Infolists/PhoneEntry.php b/src/Infolists/PhoneEntry.php
@@ -46,33 +46,33 @@ public function displayFormat(PhoneInputNumberType $format)
 
                 $format = $format->toLibPhoneNumberFormat();
 
-                if ($format === PhoneNumberFormat::RFC3966) {
-                    $formatted = phone(
-                        number: $state,
-                        country: $country,
-                        format: $format
-                    );
+                $formatted = phone(
+                    number: $state,
+                    country: $country,
+                    format: $format
+                );
 
+                if ($format === PhoneNumberFormat::RFC3966) {
                     $national = phone(
                         number: $state,
                         country: $country,
                         format: PhoneNumberFormat::NATIONAL
                     );
 
                     $html = <<<HTML
-                        <a href="$formatted">
+                        <a href="$formatted" dir="ltr">
                             $national
                         </a>
                     HTML;
-
-                    return new HtmlString($html);
+                } else {
+                    $html = <<<HTML
+                        <span dir="ltr">
+                            $formatted
+                        </span>
+                    HTML;
                 }
 
-                return phone(
-                    number: $state,
-                    country: $country,
-                    format: $format
-                );
+                return new HtmlString($html);
             } catch (NumberParseException $e) {
                 return $state;
             }

diff --git a/src/Tables/PhoneColumn.php b/src/Tables/PhoneColumn.php
@@ -46,33 +46,36 @@ public function displayFormat(PhoneInputNumberType $format)
 
                 $format = $format->toLibPhoneNumberFormat();
 
-                if ($format === PhoneNumberFormat::RFC3966) {
-                    $formatted = phone(
-                        number: $state,
-                        country: $country,
-                        format: $format
-                    );
+                $formatted = phone(
+                    number: $state,
+                    country: $country,
+                    format: $format
+                );
 
+                if ($format === PhoneNumberFormat::RFC3966) {
                     $national = phone(
                         number: $state,
                         country: $country,
                         format: PhoneNumberFormat::NATIONAL
                     );
 
                     $html = <<<HTML
-                        <a href="$formatted">
+                        <a href="$formatted" dir="ltr">
                             $national
                         </a>
                     HTML;
 
-                    return new HtmlString($html);
+
+                } else {
+                    $html = <<<HTML
+                        <span dir="ltr">
+                            $formatted
+                        </span>
+                    HTML;
                 }
 
-                return phone(
-                    number: $state,
-                    country: $country,
-                    format: $format
-                );
+
+                return new HtmlString($html);
             } catch (NumberParseException $e) {
                 return $state;
             }