Fixes #18: NAME without "//" is misalinged and breaks the layout

magicsunday · Dec 13, 2021 · 5b5df75 · 5b5df75
1 parent 2f5e651
commit 5b5df75
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/resources/js/descendants-chart.min.js b/resources/js/descendants-chart.min.js
diff --git a/resources/js/modules/tree.js b/resources/js/modules/tree.js
@@ -628,6 +628,14 @@ export default class Tree
             this.addFirstNames(text1, datum);
             this.addLastNames(text2, datum);
 
+            if (!datum.data.firstNames.length
+                && !datum.data.lastNames.length
+            ) {
+                // If both first and last names are empty, add the full name as alternative
+                text1.append("tspan")
+                    .text(datum.data.name);
+            }
+
             this.truncateNames(text1);
             this.truncateNames(text2);
 
@@ -640,6 +648,15 @@ export default class Tree
 
             this.addFirstNames(text1, datum);
             this.addLastNames(text1, datum, 0.25);
+
+            if (!datum.data.firstNames.length
+                && !datum.data.lastNames.length
+            ) {
+                // If both first and last names are empty, add the full name as alternative
+                text1.append("tspan")
+                    .text(datum.data.name);
+            }
+
             this.truncateNames(text1);
         }
     }

diff --git a/src/Traits/IndividualTrait.php b/src/Traits/IndividualTrait.php
@@ -28,29 +28,30 @@ trait IndividualTrait
      *
      * @var string
      */
-    private $xpathFirstNames = '//text()[following::span[@class="SURN"]][normalize-space()]';
+    private $xpathFirstNames
+        = '//span[@class="NAME"]//text()[parent::*[not(@class="wt-nickname")]][following::span[@class="SURN"]]';
 
     /**
-     * The XPath identifier to extract the last name parts.
+     * The XPath identifier to extract the last name parts (surname + surname suffix).
      *
      * @var string
      */
     private $xpathLastNames
-        = '//text()[parent::*[not(@class="wt-nickname")]][not(following::span[@class="SURN"])][normalize-space()]';
+        = '//span[@class="NAME"]//span[@class="SURN"]/text()|//span[@class="SURN"]/following::text()';
 
     /**
-     * The XPath identifier to extract the nick name part.
+     * The XPath identifier to extract the nickname part.
      *
      * @var string
      */
-    private $xpathNickname = '//q[@class="wt-nickname"]';
+    private $xpathNickname = '//span[@class="NAME"]//q[@class="wt-nickname"]/text()';
 
     /**
      * The XPath identifier to extract the starred name part.
      *
      * @var string
      */
-    private $xpathPreferredName = '//span[@class="starredname"]';
+    private $xpathPreferredName = '//span[@class="NAME"]//span[@class="starredname"]/text()';
 
     /**
      * The XPath identifier to extract the alternative name parts.
@@ -65,7 +66,7 @@ trait IndividualTrait
      * @param Individual $individual The current individual
      * @param int        $generation The generation the person belongs to
      *
-     * @return array<string, string|int|bool|string[]>
+     * @return array<string, array<string>|bool|int|string>
      */
     private function getIndividualData(Individual $individual, int $generation): array
     {

diff --git a/src/Traits/ModuleCustomTrait.php b/src/Traits/ModuleCustomTrait.php
@@ -40,11 +40,6 @@ public function customModuleLatestVersionUrl(): string
         return self::CUSTOM_LATEST_VERSION;
     }
 
-    /**
-     * Fetch the latest version of this module.
-     *
-     * @return string
-     */
     public function customModuleLatestVersion(): string
     {
         // No update URL provided.