Merge pull request #62 from l0drex/beta

Bug fixes
l0drex · Aug 15, 2022 · f389ec9 · f389ec9
2 parents 9411e3d + 0712ea0
commit f389ec9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/backend/graph.ts b/src/backend/graph.ts
@@ -31,7 +31,7 @@ export class GraphPerson extends GedcomX.DisplayProperties implements GraphObjec
   equals = (person: GedcomX.Person | GraphPerson | GedcomX.DisplayProperties) => {
     if (person instanceof GedcomX.DisplayProperties) {
       return person.getName() === this.getName()
-        && person.getBirthDate() === this.getBirthDate();
+        && person.getAscendancyNumber() === this.getAscendancyNumber();
     }
 
     if (person instanceof GraphPerson) {

diff --git a/src/components/InfoPanel.tsx b/src/components/InfoPanel.tsx
@@ -21,6 +21,7 @@ class InfoPanel extends Component<Props, null> {
         <SearchField onRefocus={this.props.onRefocus} person={person}/>
         {person.getMarriedName() && <h2 className="birth-name">{person.getBirthName()}</h2>}
         {person.getAlsoKnownAs() && <h2 className="alsoKnownAs">{person.getAlsoKnownAs()}</h2>}
+        {person.getNickname() && <h2 className="nickname">{person.getNickname()}</h2>}
 
         <ul id="factView">
           {person.getFacts().sort((a, b) => {

diff --git a/src/components/Uploader.tsx b/src/components/Uploader.tsx
@@ -55,6 +55,16 @@ class Uploader extends React.Component<any, any> {
       </>
     );
   }
+
+  componentDidUpdate(prevProps: Readonly<any>, prevState: Readonly<any>, snapshot?: any) {
+    let root = document.getElementById("root");
+    root.classList.remove("sidebar-visible");
+  }
+
+  componentDidMount() {
+    let root = document.getElementById("root");
+    root.classList.remove("sidebar-visible");
+  }
 }
 
 export default Uploader;
diff --git a/src/components/View.tsx b/src/components/View.tsx
@@ -102,9 +102,6 @@ class View extends Component<any, State> {
   }
 
   componentDidUpdate(prevProps: Readonly<any>, prevState: Readonly<any>, snapshot?: any) {
-    if (prevState.focusId !== this.state.focusId) {
-      //this.onViewChanged(this.state.activeView);
-    }
     let root = document.querySelector<HTMLDivElement>("#root");
     if (this.state.focusHidden) {
       root.classList.remove("sidebar-visible");