pronoun clash protection

src/components/np-picker/NPPicker.tsx

@@ -10,7 +10,7 @@ import { nouns, verbs } from "../../words/words";
 
 const npTypes: NPType[] = ["noun", "pronoun", "participle"];
 
-function NPPicker({ np, onChange }: { onChange: (nps: NPSelection | undefined) => void, np: NPSelection | undefined }) {
+function NPPicker({ np, onChange, counterPart }: { onChange: (nps: NPSelection | undefined) => void, np: NPSelection | undefined, counterPart: NPSelection | VerbObject | undefined }) {
     // eslint-disable-next-line
     const [npType, setNpType] = useState<NPType | undefined>(np ? np.type : undefined);
     function handleClear() {
@@ -19,7 +19,9 @@ function NPPicker({ np, onChange }: { onChange: (nps: NPSelection | undefined) =
     }
     function handleNPTypeChange(ntp: NPType) {
         if (ntp === "pronoun") {
-            const person = randomPerson();
+            const person = ((typeof counterPart === "object") && (counterPart.type === "pronoun"))
+                ? randomPerson({ counterPart: counterPart.person })
+                : randomPerson();
             const pronoun: PronounSelection = {
                 type: "pronoun",
                 person,

src/components/phrase-builder/ObjectDisplay.tsx

@@ -1,9 +1,9 @@
 import NPPicker from "../np-picker/NPPicker";
 
-function ObjectDisplay({ object, onChange }: { object: Exclude<VerbObject, "none">, onChange: (o: NPSelection | undefined) => void }) {
+function ObjectDisplay({ object, onChange, counterPart }: { object: Exclude<VerbObject, "none">, onChange: (o: NPSelection | undefined) => void, counterPart: NPSelection | undefined }) {
     return (typeof object === "number")
         ? <div className="text-muted">Unspoken 3rd Pers. Masc. Plur.</div>
-        : <NPPicker np={object} onChange={onChange} />;
+        : <NPPicker np={object} counterPart={counterPart} onChange={onChange} />;
 }
 
 export default ObjectDisplay;

src/components/phrase-builder/PhraseBuilder.tsx

@@ -4,6 +4,9 @@ import VerbPicker from "../VerbPicker";
 import VPDisplay from "./VPDisplay";
 import ObjectDisplay from "./ObjectDisplay";
 import { verbs } from "../../words/words";
+import {
+    isInvalidSubjObjCombo,
+} from "../../lib/np-tools";
 
 function verbPhraseComplete({ subject, verb }: { subject: NPSelection | undefined, verb: VerbSelection | undefined }): VPSelection | undefined {
     if (!subject) return undefined;
@@ -20,9 +23,33 @@ function verbPhraseComplete({ subject, verb }: { subject: NPSelection | undefine
 export function PhraseBuilder() {
     const [subject, setSubject] = useState<NPSelection | undefined>(undefined);
     const [verb, setVerb] = useState<VerbSelection | undefined>(undefined);
+    function handleSubjectChange(subject: NPSelection | undefined) {
+        const objPronoun = (typeof verb?.object === "object" && verb.object.type === "pronoun")
+            ? verb.object.person
+            : undefined;
+        if (subject?.type === "pronoun" && objPronoun && isInvalidSubjObjCombo(subject.person, objPronoun)) {
+            alert("That combination of pronouns is not allowed");
+            return;
+            // let newP = 0;
+            // do {
+            //     newP = randomPerson();
+            // } while (isInvalidSubjObjCombo(newP, object.person));
+            // return setSubject({ ...incoming, person: newP });
+        }
+        setSubject(subject);
+    }
     function handleObjectChange(object: NPSelection | undefined) {
         if (!verb) return;
         if ((verb.object === "none") || (typeof verb.object === "number")) return;
+        if (object?.type === "pronoun" && subject?.type === "pronoun" && isInvalidSubjObjCombo(object.person, subject.person)) {
+            alert("That combination of pronouns is not allowed");
+            return;
+            // let newP = 0;
+            // do {
+            //     newP = randomPerson();
+            // } while (isInvalidSubjObjCombo(newP, object.person));
+            // return setSubject({ ...incoming, person: newP });
+        }
         setVerb({
             ...verb,
             object,
@@ -33,11 +60,15 @@ export function PhraseBuilder() {
         <div className="d-flex flex-row justify-content-between">
             <div className="mr-2">
                 <div className="h5">Subject</div>
-                <NPPicker np={subject} onChange={setSubject} />
+                <NPPicker
+                    np={subject}
+                    counterPart={verb ? verb.object : undefined}
+                    onChange={handleSubjectChange}
+                />
             </div>
             {verb && (verb.object !== "none") && <div className="mr-2">
                 <div className="h5">Object</div>
-                <ObjectDisplay object={verb.object} onChange={handleObjectChange} />
+                <ObjectDisplay object={verb.object} counterPart={subject} onChange={handleObjectChange} />
             </div>}
             <div>
                 <div className="h5">Verb</div>

src/lib/np-tools.ts

@@ -15,11 +15,25 @@ function getRandPers(): T.Person {
     return Math.floor(Math.random() * 12);
 }
 
-export function randomPerson(p?: T.Person) {
+export function randomPerson(a?: { old?: T.Person, counterPart?: T.Person | VerbObject }) {
     let newP = 0;
     do {
         newP = getRandPers();
-    } while (newP === p);
+    } while (
+        a &&
+        (
+            ((a.old !== undefined) && newP === a.old) ||
+            (a.counterPart && (
+                (
+                    (typeof a.counterPart === "object")
+                    && a.counterPart.type === "pronoun"
+                    && isInvalidSubjObjCombo(a.counterPart.person, newP)
+                )
+                ||
+                ((typeof a?.counterPart === "number") && isInvalidSubjObjCombo(a.counterPart, newP))
+            ))
+        )
+    );
     return newP;
 }