oops take out modal stuff cause the negative is not ready yet

This commit is contained in:
lingdocs 2022-03-29 16:50:07 +05:00
parent 40794345b7
commit ac538bce64
1 changed files with 23 additions and 23 deletions

View File

@ -34,7 +34,7 @@ const tenseOptions: { label: string | JSX.Element, value: VerbTense }[] = [{
value: "habitualImperfectivePast", value: "habitualImperfectivePast",
}, { }, {
label: <div><i className="fas fa-camera mr-2" />habitual simp. past.</div>, label: <div><i className="fas fa-camera mr-2" />habitual simp. past.</div>,
value: "habitualPerfectivePast", value: "habitualPerfectivePast",
}]; }];
// type Filters = { // type Filters = {
@ -74,18 +74,18 @@ function VerbPicker({ onChange, verb, verbs }: { verbs: VerbEntry[], verb: VerbS
if (verb) { if (verb) {
onChange({ onChange({
...verb, ...verb,
negative: value === "true", negative: value === "true",
});
}
}
function onTenseCategorySelect(value: "basic" | "modal") {
if (verb) {
onChange({
...verb,
tenseCategory: value,
}); });
} }
} }
// function onTenseCategorySelect(value: "basic" | "modal") {
// if (verb) {
// onChange({
// ...verb,
// tenseCategory: value,
// });
// }
// }
function notInstransitive(t: "transitive" | "intransitive" | "grammatically transitive"): "transitive" | "grammatically transitive" { function notInstransitive(t: "transitive" | "intransitive" | "grammatically transitive"): "transitive" | "grammatically transitive" {
return t === "intransitive" ? "transitive" : t; return t === "intransitive" ? "transitive" : t;
} }
@ -113,7 +113,7 @@ function VerbPicker({ onChange, verb, verbs }: { verbs: VerbEntry[], verb: VerbS
placeholder={verb ? options.find(o => o.value === (verb.verb.entry).ts.toString())?.label : "Select Verb..."} placeholder={verb ? options.find(o => o.value === (verb.verb.entry).ts.toString())?.label : "Select Verb..."}
{...zIndexProps} {...zIndexProps}
/> />
{verb && <div className="text-center my-3"> {/* {verb && <div className="text-center my-3">
<ButtonSelect <ButtonSelect
small small
value={verb.tenseCategory} value={verb.tenseCategory}
@ -126,7 +126,7 @@ function VerbPicker({ onChange, verb, verbs }: { verbs: VerbEntry[], verb: VerbS
}]} }]}
handleChange={onTenseCategorySelect} handleChange={onTenseCategorySelect}
/> />
</div>} </div>} */}
<div>Tense:</div> <div>Tense:</div>
<Select <Select
isSearchable={false} isSearchable={false}
@ -192,7 +192,7 @@ function makeVerbSelection(verb: VerbEntry, oldVerbSelection?: VerbSelection): V
oldVerbSelection.object === "none" || oldVerbSelection.object === "none" ||
typeof oldVerbSelection.object === "number" || typeof oldVerbSelection.object === "number" ||
oldVerbSelection.isCompound === "dynamic" || oldVerbSelection.isCompound === "dynamic" ||
(oldVerbSelection.object?.type === "noun" && oldVerbSelection.object.dynamicComplement) (oldVerbSelection.object?.type === "noun" && oldVerbSelection.object.dynamicComplement)
) return undefined; ) return undefined;
return oldVerbSelection.object; return oldVerbSelection.object;
} }
@ -202,23 +202,23 @@ function makeVerbSelection(verb: VerbEntry, oldVerbSelection?: VerbSelection): V
const object = (transitivity === "grammatically transitive") const object = (transitivity === "grammatically transitive")
? T.Person.ThirdPlurMale ? T.Person.ThirdPlurMale
: info.type === "dynamic compound" : info.type === "dynamic compound"
? makeNounSelection(info.objComplement.entry as NounEntry, true) ? makeNounSelection(info.objComplement.entry as NounEntry, true)
: (transitivity === "transitive") : (transitivity === "transitive")
? getTransObjFromOldVerbSelection() ? getTransObjFromOldVerbSelection()
: "none"; : "none";
const isCompound = "stative" in info const isCompound = "stative" in info
? "stative" ? "stative"
: info.type === "dynamic compound" : info.type === "dynamic compound"
? "dynamic" ? "dynamic"
: false; : false;
// TODO: here and below in the changeStatDyn function ... allow for entries with complement // TODO: here and below in the changeStatDyn function ... allow for entries with complement
const dynAuxVerb: VerbEntry | undefined = isCompound !== "dynamic" const dynAuxVerb: VerbEntry | undefined = isCompound !== "dynamic"
? undefined ? undefined
: info.type === "dynamic compound" : info.type === "dynamic compound"
? { entry: info.auxVerb } as VerbEntry ? { entry: info.auxVerb } as VerbEntry
: "dynamic" in info : "dynamic" in info
? { entry: info.dynamic.auxVerb } as VerbEntry ? { entry: info.dynamic.auxVerb } as VerbEntry
: undefined; : undefined;
return { return {
type: "verb", type: "verb",
verb: verb, verb: verb,