pierre/GeneIT
1
0
Fork 0
Code Issues Pull Requests 7 Packages Projects Releases Wiki Activity

Typed data

Browse Source
This commit is contained in:
Pierre HUBERT 2023-08-22 17:17:36 +02:00
parent 6630037ac0
commit 911d59cddb
2 changed files with 189 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
geneit_app/src/widgets/complex_family_tree/ComplexFamilyTree.tsx
View File

@ -1,5 +1,5 @@
import React from "react";
import f3 from "family-chart";
import f3, { f3Data } from "family-chart";
import "./family-chart.css";
export function ComplexFamilyTree(): React.ReactElement {
@ -29,7 +29,7 @@ export function ComplexFamilyTree(): React.ReactElement {
img_y: 5,
},
card_display: [
(d) => `${d.data["first name"] || ""} ${d.data["last name"] || ""}`,
(d) => `${d.data.first_name || ""} ${d.data.last_name || ""}`,
(d) => `${d.data["birthday"] || ""}`,
],
mini_tree: true,
@ -44,8 +44,7 @@ export function ComplexFamilyTree(): React.ReactElement {
return <div className="f3" id="FamilyChart" ref={refCb}></div>;
}
const data = () =>
structuredClone([
const data: () => f3Data[] = () => [
{
id: "0",
rels: {
@ -58,8 +57,8 @@ const data = () =>
],
},
data: {
"first name": "Agnus",
"last name": "",
first_name: "Agnus",
last_name: "",
birthday: "1970",
avatar:
"https://static8.depositphotos.com/1009634/988/v/950/depositphotos_9883921-stock-illustration-no-user-profile-picture.jpg",
@ -70,8 +69,8 @@ const data = () =>
id: "8c92765f-92d3-4120-90dd-85a28302504c",
data: {
gender: "F",
"first name": "Andrea",
"last name": "",
first_name: "Andrea",
last_name: "",
birthday: "",
avatar: "",
},
@ -87,8 +86,8 @@ const data = () =>
id: "0c09cfa0-5e7c-4073-8beb-94f6c69ada19",
data: {
gender: "M",
"first name": "Zen",
"last name": "",
first_name: "Zen",
last_name: "",
birthday: "",
avatar: "",
},
@ -101,8 +100,8 @@ const data = () =>
id: "0fa5c6bc-5b58-40f5-a07e-d787e26d8b56",
data: {
gender: "F",
"first name": "Zebra",
"last name": "",
first_name: "Zebra",
last_name: "",
birthday: "",
avatar: "",
},
@ -117,8 +116,8 @@ const data = () =>
id: "ce2fcb9a-6058-4326-b56a-aced35168561",
data: {
gender: "M",
"first name": "Ben",
"last name": "",
first_name: "Ben",
last_name: "",
birthday: "",
avatar: "",
},
@ -136,8 +135,8 @@ const data = () =>
id: "f626d086-e2d6-4722-b4f3-ca4f15b109ab",
data: {
gender: "F",
"first name": "Becky",
"last name": "",
first_name: "Becky",
last_name: "",
birthday: "",
avatar: "",
},
@ -150,8 +149,8 @@ const data = () =>
id: "eabd40c9-4518-4485-af5e-e4bc3ffd27fb",
data: {
gender: "M",
"first name": "Carlos",
"last name": "",
first_name: "Carlos",
last_name: "",
birthday: "",
avatar: "",
},
@ -164,8 +163,8 @@ const data = () =>
id: "b4e33c68-20a7-47ba-9dcc-1168a07d5b52",
data: {
gender: "F",
"first name": "Branka",
"last name": "",
first_name: "Branka",
last_name: "",
birthday: "",
avatar: "",
},
@ -181,8 +180,8 @@ const data = () =>
id: "240a3f71-c921-42d7-8a13-dec5e1acc4fd",
data: {
gender: "F",
"first name": "Carla",
"last name": "",
first_name: "Carla",
last_name: "",
birthday: "",
avatar: "",
},
@ -195,8 +194,8 @@ const data = () =>
id: "12a9bddf-855a-4583-a695-c73fa8c0e9b2",
data: {
gender: "M",
"first name": "Yvo",
"last name": "",
first_name: "Yvo",
last_name: "",
birthday: "",
avatar: "",
},
@ -209,8 +208,8 @@ const data = () =>
id: "bd56a527-b613-474d-9f38-fcac0aae218b",
data: {
gender: "F",
"first name": "Yva",
"last name": "",
first_name: "Yva",
last_name: "",
birthday: "",
avatar: "",
},
@ -219,7 +218,7 @@ const data = () =>
children: ["0fa5c6bc-5b58-40f5-a07e-d787e26d8b56"],
},
},
]);
];
/*
import { jsPDF } from "jspdf";

25
geneit_app/src/widgets/complex_family_tree/family_chart.d.ts vendored
View File

@ -2,8 +2,29 @@ declare module "family-chart" {
type f3data = any;
type f3tree = any;
interface f3Rels {
spouses?: string[];
father?: string;
mother?: string;
children?: string[];
}
interface f3DataData {
gender: "M" | "F";
avatar?: string;
birthday?: string;
first_name: string;
last_name: string;
}
interface f3Data {
id: string;
rels: f3Rels;
data: f3DataData;
}
type f3State = {
data: any;
data: f3Data[];
main_id?: any;
tree?: f3tree;
node_separation?: number;
@ -60,7 +81,7 @@ declare module "family-chart" {
img_x: number;
img_y: number;
};
card_display: ((data: any) => string)[];
card_display: ((data: f3Data) => string)[];
}) => (p: { node; d }) => HTMLElement;
};
const elements: F3elements;