finished passive voice page

This commit is contained in:
lingdocs 2022-07-26 16:32:42 -05:00
parent a31ca4e93b
commit 02b6c6d00d
4 changed files with 18 additions and 16 deletions

View File

@ -6,7 +6,7 @@
"@formkit/auto-animate": "^1.0.0-beta.1", "@formkit/auto-animate": "^1.0.0-beta.1",
"@fortawesome/fontawesome-free": "^5.15.4", "@fortawesome/fontawesome-free": "^5.15.4",
"@lingdocs/lingdocs-main": "^0.3.1", "@lingdocs/lingdocs-main": "^0.3.1",
"@lingdocs/pashto-inflector": "^3.5.6", "@lingdocs/pashto-inflector": "^3.5.8",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",

View File

@ -65,16 +65,7 @@ function BasicVerbChart({ verb, opts, tense, passive }: {
<div> <div>
{getEnglishVerb(verb.entry)} {getEnglishVerb(verb.entry)}
</div> </div>
<RootsAndStems {passive && <div className="my-2">
textOptions={opts}
info={voice === "passive"
? (getPassiveRootsAndStems(conjugations.info) || /* type safety */ conjugations.info)
: conjugations.info
}
hidePastParticiple={isPerfectTense(tense) ? false : true}
highlighted={[tenseToStem(tense)]}
/>
{passive && <div className="mt-2">
<ButtonSelect <ButtonSelect
options={[{ options={[{
label: "Active", label: "Active",
@ -87,6 +78,15 @@ function BasicVerbChart({ verb, opts, tense, passive }: {
handleChange={setVoice} handleChange={setVoice}
/> />
</div>} </div>}
<RootsAndStems
textOptions={opts}
info={voice === "passive"
? (getPassiveRootsAndStems(conjugations.info) || /* type safety */ conjugations.info)
: conjugations.info
}
hidePastParticiple={isPerfectTense(tense) ? false : true}
highlighted={[tenseToStem(tense)]}
/>
<div className="my-3 d-flex flex-row justify-content-center"> <div className="my-3 d-flex flex-row justify-content-center">
{isPastTense(tense) && !isPerfectTense(tense) && <div className="mx-2"> {isPastTense(tense) && !isPerfectTense(tense) && <div className="mx-2">
<ButtonSelect <ButtonSelect

View File

@ -208,7 +208,7 @@ And then we take the roots and stems for <Link to="/compound-verbs/helper-verbs/
info={leedulInfo} info={leedulInfo}
/> />
And add that to our roots and stems we made in <Link to="/verbs/passive-verbs/#1-copy-the-roots-up-to-the-stems">the previous step</Link> and we're done! And add that to our roots and stems we made in <Link to="/verbs/passive-verbs/#1-copy-the-roots-up-to-the-stems">the previous step</Link>.
<div className="text-center lead">Passive Roots/Stems of <InlinePs opts={opts} ps={{ p: "لیدل", f: "leedúl", e: "to see" }} /></div> <div className="text-center lead">Passive Roots/Stems of <InlinePs opts={opts} ps={{ p: "لیدل", f: "leedúl", e: "to see" }} /></div>
@ -217,6 +217,8 @@ And add that to our roots and stems we made in <Link to="/verbs/passive-verbs/#1
info={passiveLeedulInfo} info={passiveLeedulInfo}
/> />
**Watch the accent!** It's important to note that except for in the perfective aspect, the helper verb takes over the accent and the roots/stems from the previous step lose their accents.
Try flipping through these other verbs and see how the the active stems are transformed into the passive stems, following this recipe. Try flipping through these other verbs and see how the the active stems are transformed into the passive stems, following this recipe.
<BasicVerbShowCase opts={opts} tense="presentVerb" passive /> <BasicVerbShowCase opts={opts} tense="presentVerb" passive />

View File

@ -1803,10 +1803,10 @@
rambda "^6.7.0" rambda "^6.7.0"
react-select "^5.2.2" react-select "^5.2.2"
"@lingdocs/pashto-inflector@^3.5.5": "@lingdocs/pashto-inflector@^3.5.8":
version "3.5.5" version "3.5.8"
resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.5.5.tgz#5934cb7b9c3dcbf60b1f74a1e699b54c485d3ea6" resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.5.8.tgz#5023372360916c023a5d90ee9cbd82294e198931"
integrity sha512-nq9hx4SZNmzaD+V9Zn5Qj36yaHyeV5jpIWvTpj1Q+EVFeHMXcguglnqmkf49gRLuFCvBMW9WW3dgz2noUozx7A== integrity sha512-cq8HkhBM5IcazZDLs8qThAf7+QhsDS8VkyzjecRAB3M6OVyyR4IwFRJWzn107r/xGu/YHxyMWsDWnxiePBn+RA==
dependencies: dependencies:
"@formkit/auto-animate" "^1.0.0-beta.1" "@formkit/auto-animate" "^1.0.0-beta.1"
classnames "^2.2.6" classnames "^2.2.6"