bug fix with limiting conjugation viewer forms
This commit is contained in:
parent
198bae9f07
commit
2a16468f52
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@lingdocs/pashto-inflector",
|
||||
"version": "0.8.0",
|
||||
"version": "0.8.1",
|
||||
"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",
|
||||
|
|
|
@ -301,6 +301,7 @@ function App() {
|
|||
entry={v?.verb.entry}
|
||||
complement={v?.verb.complement}
|
||||
textOptions={textOptions}
|
||||
showOnly={["Perfective Future"]}
|
||||
/>}
|
||||
</div>
|
||||
</main>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
import { useEffect, useReducer } from "react";
|
||||
import VerbInfo, { RootsAndStems } from "./verb-info/VerbInfo";
|
||||
import VerbInfo from "./verb-info/VerbInfo";
|
||||
import VerbFormDisplay from "./VerbFormDisplay";
|
||||
import ButtonSelect from "./ButtonSelect";
|
||||
import Hider from "./Hider";
|
||||
|
@ -224,7 +224,7 @@ function ConjugationViewer({ entry, complement, textOptions, showOnly, highlight
|
|||
} : undefined;
|
||||
|
||||
const filterDifficulty = (f: T.DisplayForm): boolean => (
|
||||
state.difficulty === "advanced" || !f.advanced
|
||||
state.difficulty === "advanced" || !!showOnly || !f.advanced
|
||||
);
|
||||
const limitTo = !showOnly
|
||||
? undefined
|
||||
|
@ -235,7 +235,8 @@ function ConjugationViewer({ entry, complement, textOptions, showOnly, highlight
|
|||
conj: verbConj,
|
||||
filterFunc: [
|
||||
filterDifficulty,
|
||||
...limitTo ? [(f: T.DisplayForm): boolean => limitTo.includes(f.label)] : [],
|
||||
...limitTo ? [(f: T.DisplayForm): boolean => limitTo.includes(f.label)
|
||||
] : [],
|
||||
],
|
||||
mode: state.mode,
|
||||
subject: state.subject,
|
||||
|
@ -294,23 +295,15 @@ function ConjugationViewer({ entry, complement, textOptions, showOnly, highlight
|
|||
/>
|
||||
</div>
|
||||
</div>}
|
||||
{!limitTo ?
|
||||
<VerbInfo
|
||||
info={verbConj.info}
|
||||
textOptions={textOptions}
|
||||
showingStemsAndRoots={state.showingStemsAndRoots}
|
||||
highlightInRootsAndStems={highlightInRootsAndStems}
|
||||
toggleShowingSar={() => dispatch({ type: "toggle showingStemsAndRoots" })}
|
||||
hidePastParticiple={hidePastParticiple}
|
||||
/>
|
||||
:
|
||||
<RootsAndStems
|
||||
textOptions={textOptions}
|
||||
info={verbConj.info}
|
||||
highlighted={highlightInRootsAndStems}
|
||||
hidePastParticiple={hidePastParticiple}
|
||||
/>
|
||||
}
|
||||
<VerbInfo
|
||||
info={verbConj.info}
|
||||
textOptions={textOptions}
|
||||
showingStemsAndRoots={state.showingStemsAndRoots}
|
||||
highlightInRootsAndStems={highlightInRootsAndStems}
|
||||
toggleShowingSar={() => dispatch({ type: "toggle showingStemsAndRoots" })}
|
||||
hidePastParticiple={hidePastParticiple}
|
||||
hideTypeInfo={!!limitTo}
|
||||
/>
|
||||
<div className="d-flex flex-row align-items-center justify-content-around flex-wrap mt-4 mb-2">
|
||||
<div className="mb-3">
|
||||
<ButtonSelect
|
||||
|
|
|
@ -173,21 +173,22 @@ export function RootsAndStems({ textOptions, info, hidePastParticiple, highlight
|
|||
);
|
||||
}
|
||||
|
||||
function VerbInfo({ info, textOptions, showingStemsAndRoots, toggleShowingSar, highlightInRootsAndStems, hidePastParticiple }: {
|
||||
function VerbInfo({ info, textOptions, showingStemsAndRoots, toggleShowingSar, highlightInRootsAndStems, hidePastParticiple, hideTypeInfo }: {
|
||||
info: T.NonComboVerbInfo,
|
||||
textOptions: T.TextOptions,
|
||||
showingStemsAndRoots: boolean,
|
||||
highlightInRootsAndStems?: T.RootsOrStemsToHighlight,
|
||||
toggleShowingSar: () => void,
|
||||
hidePastParticiple?: boolean,
|
||||
hideTypeInfo?: boolean,
|
||||
}) {
|
||||
const inf = noPersInfs(info.root.imperfective).long;
|
||||
return (
|
||||
<div className="my-3">
|
||||
<VerbTypeInfo
|
||||
{!hideTypeInfo && <VerbTypeInfo
|
||||
info={info}
|
||||
textOptions={textOptions}
|
||||
/>
|
||||
/>}
|
||||
<Hider
|
||||
showing={showingStemsAndRoots}
|
||||
label={`🌳 Roots and Stems for ${inf.p}`}
|
||||
|
|
Loading…
Reference in New Issue