Merge remote-tracking branch 'origin/master'

src/app/pages/danka-detail/danka-detail.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { ChangeDetectorRef, Component } from '@angular/core';
 import {
   ElementRef,
   ViewChild,
@@ -93,6 +93,7 @@ export class DankaDetail implements OnInit, AfterViewInit {
     private familyTreeLayout: FamilyTreeLayoutService,
     private familyUnitLayout: FamilyUnitLayoutService,
     private eventService: EventService,
+    private cdr: ChangeDetectorRef,
   ) {
 
     const tab = this.route.snapshot.queryParams['tab'];
@@ -112,6 +113,7 @@ export class DankaDetail implements OnInit, AfterViewInit {
   }
   async init(): Promise<void> {
     const id = this.route.snapshot.params['id'];
+
     if (!id) return;
 
     this.danka = (await this.dankaService.getDankaById(id)) ?? undefined;
@@ -188,6 +190,12 @@ export class DankaDetail implements OnInit, AfterViewInit {
       this.kakochoByNameMap.set(key, k);
     });
 
+    // Angularへ反映
+    this.cdr.detectChanges();
+
+    // DOM描画完了待ち
+    await new Promise(resolve => setTimeout(resolve));
+
   }
 
   ngAfterViewInit(): void {