From 0467080343a5053ed4cdd5e35005fa919ed84307 Mon Sep 17 00:00:00 2001
From: lingdocs <71590811+lingdocs@users.noreply.github.com>
Date: Mon, 4 Apr 2022 16:35:51 +0500
Subject: [PATCH] oops

---
 src/components/VerbPicker.tsx                 |  1 +
 src/components/np-picker/NPPicker.tsx         | 27 +++++++++++--------
 .../phrase-builder/ObjectDisplay.tsx          | 21 ---------------
 .../phrase-builder/PhraseBuilder.tsx          | 14 +++++-----
 4 files changed, 25 insertions(+), 38 deletions(-)
 delete mode 100644 src/components/phrase-builder/ObjectDisplay.tsx

diff --git a/src/components/VerbPicker.tsx b/src/components/VerbPicker.tsx
index eed361b..a7b756c 100644
--- a/src/components/VerbPicker.tsx
+++ b/src/components/VerbPicker.tsx
@@ -181,6 +181,7 @@ function VerbPicker({ onChange, subject, changeSubject, verb, verbs }: {
             value={verb?.verb}
             onChange={onVerbSelect}
             name="Verb"
+            isVerbSelect
         />
         {/* <Select
             value={verb && verb.verb.entry.ts.toString()}
diff --git a/src/components/np-picker/NPPicker.tsx b/src/components/np-picker/NPPicker.tsx
index 0552ea5..f60b8e0 100644
--- a/src/components/np-picker/NPPicker.tsx
+++ b/src/components/np-picker/NPPicker.tsx
@@ -43,17 +43,22 @@ function NPPicker({ np, onChange, counterPart, asObject }: {
     const isDynamicComplement = np && np.type === "noun" && np.dynamicComplement;
     const clearButton = <button className="btn btn-sm btn-light mb-2" onClick={handleClear}>X</button>;
     return <div>
-        {!npType && <div className="text-center mt-3">
-            {npTypes.map((npt) => <div className="mb-2">
-                <button
-                    key={npt}
-                    type="button"
-                    className="mr-2 btn btn-sm btn-outline-secondary"
-                    onClick={() => handleNPTypeChange(npt)}
-                >
-                    {npt}
-                </button>
-            </div>)}
+        {!npType && <div className="d-flex flex-row align-items-center text-center mt-3">
+            <div className="h4 mr-3">
+                NP
+            </div>
+            <div className="ml-3">
+                {npTypes.map((npt) => <div className="mb-2">
+                    <button
+                        key={npt}
+                        type="button"
+                        className="mr-2 btn btn-sm btn-outline-secondary"
+                        onClick={() => handleNPTypeChange(npt)}
+                    >
+                        {npt}
+                    </button>
+                </div>)}
+            </div>
         </div>}
         {(npType === "pronoun" && np?.type === "pronoun")
             ? <PronounPicker
diff --git a/src/components/phrase-builder/ObjectDisplay.tsx b/src/components/phrase-builder/ObjectDisplay.tsx
deleted file mode 100644
index 2ee9409..0000000
--- a/src/components/phrase-builder/ObjectDisplay.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import NPPicker from "../np-picker/NPPicker";
-
-function ObjectDisplay({ object, onChange, counterPart }: {
-    object: Exclude<VerbObject, "none">,
-    onChange: (o: NPSelection | undefined) => void,
-    counterPart: NPSelection | undefined ,
-}) {
-    return <div>
-        {(typeof object === "number")
-            ? <div className="text-muted">Unspoken 3rd Pers. Masc. Plur.</div>
-            : <NPPicker
-                asObject
-                np={object}
-                counterPart={counterPart}
-                onChange={onChange}
-            />}
-    </div>;
-}
-
-export default ObjectDisplay;
-
diff --git a/src/components/phrase-builder/PhraseBuilder.tsx b/src/components/phrase-builder/PhraseBuilder.tsx
index 42985f8..3789962 100644
--- a/src/components/phrase-builder/PhraseBuilder.tsx
+++ b/src/components/phrase-builder/PhraseBuilder.tsx
@@ -2,7 +2,6 @@ import { useState } from "react";
 import NPPicker from "../np-picker/NPPicker";
 import VerbPicker from "../VerbPicker";
 import VPDisplay from "./VPDisplay";
-import ObjectDisplay from "./ObjectDisplay";
 import { verbs } from "../../words/words";
 import { renderVP } from "../../lib/phrase-building";
 import {
@@ -66,11 +65,14 @@ export function PhraseBuilder() {
             </div>
             {verb && (verb.object !== "none") && <div className="my-2">
                 <div className="h4">Object {showRole(VPRendered, "object")}</div>
-                <ObjectDisplay
-                    object={verb.object}
-                    counterPart={subject}
-                    onChange={handleObjectChange}
-                />
+                {(typeof verb.object === "number")
+                    ? <div className="text-muted">Unspoken 3rd Pers. Masc. Plur.</div>
+                    : <NPPicker
+                        asObject
+                        np={verb.object}
+                        counterPart={subject}
+                        onChange={handleObjectChange}
+                    />}
             </div>}
             <div className="my-2">
                 <div className="h4">Verb</div>