From 2615e5f10411e4dccd99e75379b622dab2981624 Mon Sep 17 00:00:00 2001
From: Bill D <clay@mailbox.org>
Date: Sat, 17 Apr 2021 13:40:34 +0300
Subject: [PATCH] improve inflection tables

---
 package.json                        |  2 +-
 src/App.css                         |  4 ---
 src/App.tsx                         |  2 +-
 src/components/InflectionsTable.tsx | 46 +++++--------------------
 src/components/TableCell.tsx        | 50 +++++++++++++++++++++++++++
 src/components/VerbTable.tsx        | 53 +++--------------------------
 6 files changed, 64 insertions(+), 93 deletions(-)
 create mode 100644 src/components/TableCell.tsx

diff --git a/package.json b/package.json
index fb323a1..25718d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingdocs/pashto-inflector",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "author": "lingdocs.com",
   "description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
   "homepage": "https://verbs.lingdocs.com",
diff --git a/src/App.css b/src/App.css
index 8a12cf3..72801e4 100644
--- a/src/App.css
+++ b/src/App.css
@@ -91,10 +91,6 @@ hr {
     max-width: 700px;
 }
 
-.thin-column {
-    max-width: 1rem;
-}
-
 .word {
     margin-bottom: 1.25rem;
 }
diff --git a/src/App.tsx b/src/App.tsx
index 24a7488..bbe7969 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -191,7 +191,7 @@ function App() {
     console.log(textOptions);
     return <>
         <main className="flex-shrink-0 mb-4">
-            <div className="container">
+            <div className="container" style={{ maxWidth: "800px" }}>
             <div style={{ position: "absolute", top: "1.5rem", right: "1.5rem", display: "flex", flexDirection: "row" }}>
                 <div
                     className="clickable mr-3"
diff --git a/src/components/InflectionsTable.tsx b/src/components/InflectionsTable.tsx
index 6381370..2ff6710 100644
--- a/src/components/InflectionsTable.tsx
+++ b/src/components/InflectionsTable.tsx
@@ -8,8 +8,8 @@
 
 import { useState } from "react";
 import Pashto from "./Pashto";
-import Phonetics from "./Phonetics";
 import { Modal } from "react-bootstrap";
+import TableCell from "./TableCell";
 import * as T from "../types";
 
 const explanation = (inf: T.Inflections, textOptions: T.TextOptions) => {
@@ -49,50 +49,20 @@ const InflectionTable = ({ inf, textOptions }: {
                     <i className={`fa fa-question-circle`}></i>
                 </div>
             </div>
-            <table className="table">
+            <table className="table" style={{ tableLayout: "fixed" }}>
                 <thead>
                     <tr>
-                        <th></th>
-                        {"masc" in inf && <th>Masculine</th>}
-                        {"fem" in inf && <th>Feminine</th>}
+                        <th scope="col" style={{ width: "3.5rem" }}></th>
+                        {"masc" in inf && <th scope="col" style={{ maxWidth: "10rem" }}>Masculine</th>}
+                        {"fem" in inf && <th scope="col" style={{ maxWidth: "10rem" }}>Feminine</th>}
                     </tr>
                 </thead>
                 <tbody>
                     {["Plain", "1st", "2nd"].map((title, i) => (
                         <tr key={title}>
-                            <th scope="row" className="thin-column">{title}</th>
-                            {"masc" in inf && <td>
-                                {inf.masc[i].map((w, j) => (
-                                    <div key={`${i}-${j}-inflection-result`}>
-                                        <div>
-                                            <Pashto opts={textOptions}>
-                                                {w}
-                                            </Pashto>
-                                        </div>
-                                        <div>
-                                            <Phonetics opts={textOptions}>
-                                                {w}
-                                            </Phonetics>
-                                        </div>
-                                    </div>
-                                ))}
-                            </td>}
-                            {"fem" in inf && <td>
-                                {inf.fem[i].map((w, j) => (
-                                    <div key={`${i}-${j}-inflection-result`}>
-                                        <div>
-                                            <Pashto opts={textOptions}>
-                                                {w}
-                                            </Pashto>
-                                        </div>
-                                        <div>
-                                            <Phonetics opts={textOptions}>
-                                                {w}
-                                            </Phonetics>
-                                        </div>
-                                    </div>
-                                ))}
-                            </td>}
+                            <th scope="row">{title}</th>
+                            {"masc" in inf && <TableCell item={inf.masc[i]} textOptions={textOptions} />}
+                            {"fem" in inf && <TableCell item={inf.fem[i]} textOptions={textOptions} />}
                         </tr>
                     ))}
                 </tbody>
diff --git a/src/components/TableCell.tsx b/src/components/TableCell.tsx
new file mode 100644
index 0000000..5498c91
--- /dev/null
+++ b/src/components/TableCell.tsx
@@ -0,0 +1,50 @@
+import { useState, useEffect } from "react";
+import * as T from "../types";
+import Pashto from "./Pashto";
+import Phonetics from "./Phonetics";
+
+const arrowDown = <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" className="bi bi-caret-down" viewBox="0 0 20 20">
+    <path fillRule="evenodd" d="M3.204 5L8 10.481 12.796 5H3.204zm-.753.659l4.796 5.48a1 1 0 0 0 1.506 0l4.796-5.48c.566-.647.106-1.659-.753-1.659H3.204a1 1 0 0 0-.753 1.659z"/>
+</svg>;
+
+function TableCell({ item, textOptions, center, noBorder }: {
+    item: T.ArrayOneOrMore<T.PsString>,
+    textOptions: T.TextOptions,
+    center?: boolean,
+    noBorder?: boolean,
+}) {
+    const [version, setVersion] = useState(0);
+    useEffect(() => setVersion(0), [item]);
+    function advanceVersion() {
+        setVersion((version + 1) % item.length);
+    }
+    const w = item[version] || item[0];
+    return (
+        <td style={{ ...noBorder ? { border: "none" } : {} }}>
+            <div style={{ 
+                display: "flex",
+                flexDirection: "row",
+                flexWrap: "wrap",
+                justifyContent: center ? "center" : "space-between",
+                alignItems: "center",
+            }}>
+                <div>
+                    <div>
+                        <Pashto opts={textOptions}>{w}</Pashto>
+                    </div>
+                    <div>
+                        <Phonetics opts={textOptions}>{w}</Phonetics>
+                    </div>
+                    {w.e && <div className="text-muted">{w.e}</div>}
+                </div>
+                {item.length > 1 &&
+                    <button className="btn btn-sm btn-light mx-2 my-2" onClick={advanceVersion}>
+                        ver. {version + 1}/{item.length} {arrowDown}
+                    </button>
+                }
+            </div>
+        </td>
+    );
+}
+
+export default TableCell;
\ No newline at end of file
diff --git a/src/components/VerbTable.tsx b/src/components/VerbTable.tsx
index c37f8e1..0469d93 100644
--- a/src/components/VerbTable.tsx
+++ b/src/components/VerbTable.tsx
@@ -6,9 +6,7 @@
  *
  */
 
-import { useState, useEffect } from "react";
-import Pashto from "./Pashto";
-import Phonetics from "./Phonetics";
+import TableCell from "./TableCell";
 import {
     psStringEquals,
     isAllOne,
@@ -17,9 +15,6 @@ import {
 import { isSentenceForm } from "../lib/misc-helpers";
 import * as T from "../types";
 
-const arrowDown = <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" className="bi bi-caret-down" viewBox="0 0 20 20">
-    <path fillRule="evenodd" d="M3.204 5L8 10.481 12.796 5H3.204zm-.753.659l4.796 5.48a1 1 0 0 0 1.506 0l4.796-5.48c.566-.647.106-1.659-.753-1.659H3.204a1 1 0 0 0-.753 1.659z"/>
-</svg>;
 
 const genderAbbrev = (gender: "masc" | "fem" | undefined): " m." | " f." | "" => (
     gender === "masc"
@@ -54,46 +49,6 @@ const minifyTableGender = (block: T.VerbBlock | T.ImperativeBlock): Array<T.Pers
     }, []);
 };
 
-function Cell({ item, textOptions, center, noBorder }: {
-    item: T.ArrayOneOrMore<T.PsString>,
-    textOptions: T.TextOptions,
-    center?: boolean,
-    noBorder?: boolean,
-}) {
-    const [version, setVersion] = useState(0);
-    useEffect(() => setVersion(0), [item]);
-    function advanceVersion() {
-        setVersion((version + 1) % item.length);
-    }
-    const w = item[version] || item[0];
-    return (
-        <td style={noBorder ? { border: "none" } : {}}>
-            <div style={{ 
-                display: "flex",
-                flexDirection: "row",
-                flexWrap: "wrap",
-                justifyContent: center ? "center" : "space-between",
-                alignItems: "center",
-            }}>
-                <div>
-                    <div>
-                        <Pashto opts={textOptions}>{w}</Pashto>
-                    </div>
-                    <div>
-                        <Phonetics opts={textOptions}>{w}</Phonetics>
-                    </div>
-                    {w.e && <div className="text-muted">{w.e}</div>}
-                </div>
-                {item.length > 1 &&
-                    <button className="btn btn-sm btn-light mx-2" onClick={advanceVersion}>
-                        ver. {version + 1}/{item.length} {arrowDown}
-                    </button>
-                }
-            </div>
-        </td>
-    );
-}
-
 function VerbTable({ block, textOptions, english }: {
     block: T.VerbBlock | T.ImperativeBlock | T.ArrayOneOrMore<T.PsString>,
     english?: T.EnglishBlock | string,
@@ -110,7 +65,7 @@ function VerbTable({ block, textOptions, english }: {
         return <table className="table text-center">
             <tbody>
                 <tr>
-                    <Cell item={item} textOptions={textOptions} center noBorder />
+                    <TableCell item={item} textOptions={textOptions} center noBorder />
                 </tr>
             </tbody>
         </table>
@@ -139,8 +94,8 @@ function VerbTable({ block, textOptions, english }: {
                     return (
                         <tr key={`${i}${gender}`}>
                             <th scope="row" style={{ color }}>{rowLabel}</th>
-                            <Cell item={line[0]} textOptions={textOptions} />
-                            <Cell item={line[1]} textOptions={textOptions} />
+                            <TableCell item={line[0]} textOptions={textOptions} />
+                            <TableCell item={line[1]} textOptions={textOptions} />
                         </tr>
                     );
                 }