From 58818a2c80a41594d003b06e2c25340380e01961 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Sun, 10 Jul 2022 23:48:07 -0500 Subject: [PATCH] more --- package.json | 2 +- .../phrase-diagram/EditableVPEx.tsx | 6 +- src/content/compound-verbs/helper-verbs.mdx | 57 +++++++++++++++---- yarn.lock | 8 +-- 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 0179041..2d16564 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@formkit/auto-animate": "^1.0.0-beta.1", "@fortawesome/fontawesome-free": "^5.15.4", "@lingdocs/lingdocs-main": "^0.3.1", - "@lingdocs/pashto-inflector": "^3.3.5", + "@lingdocs/pashto-inflector": "^3.3.8", "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", diff --git a/src/components/phrase-diagram/EditableVPEx.tsx b/src/components/phrase-diagram/EditableVPEx.tsx index d1aeeda..a4fc366 100644 --- a/src/components/phrase-diagram/EditableVPEx.tsx +++ b/src/components/phrase-diagram/EditableVPEx.tsx @@ -16,10 +16,11 @@ function EditableVPEx({ children, opts, formChoice, noEdit, length, mode }: { opts: T.TextOptions, formChoice?: boolean, noEdit?: boolean, - length: "long" | "short", + length?: "long" | "short", mode?: "text" | "blocks", }) { const [editing, setEditing] = useState(false); + const [selectedLength, setSelectedLength] = useState<"long" | "short">(length || "short"); const [vps, setVps] = useState({ ...children }); function handleReset() { // TODO: this is crazy, how does children get changed after calling setVps ??? @@ -51,7 +52,8 @@ function EditableVPEx({ children, opts, formChoice, noEdit, length, mode }: { justify="left" onlyOne="concat" setForm={formChoice ? handleSetForm : "disable"} - length={length} + onLengthChange={setSelectedLength} + length={selectedLength} mode={mode} /> ; diff --git a/src/content/compound-verbs/helper-verbs.mdx b/src/content/compound-verbs/helper-verbs.mdx index 62b5265..c39e136 100644 --- a/src/content/compound-verbs/helper-verbs.mdx +++ b/src/content/compound-verbs/helper-verbs.mdx @@ -9,7 +9,7 @@ import { RootsAndStems, getVerbInfo, } from "@lingdocs/pashto-inflector"; -import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead } from "../../components/terms-links"; +import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead, Camera, Video } from "../../components/terms-links"; import psmd from "../../lib/psmd"; import Link from "../../components/Link"; import Formula from "../../components/formula/Formula"; @@ -132,9 +132,20 @@ So with this verb we add a complement - something that the subject is *becoming* {"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":5,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527812792,"i":5826,"p":"خوشاله","f":"khoshaala","g":"khoshaala","e":"happy, glad","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}} } -But that's not all... Here's something suuuuuper interesting and important about this verb! +But that's not all... Here's something **suuuuuper interesting and important** about this verb! -👩🏻‍🏭 ‼️ **With the imperfective aspect, the complement is JOINED TO THE VERB IN ONE BLOCK** ‼️ 👨🏻‍🏭 +#### Welding / splitting the complement 👨🏻‍🏭 ⛏️ + +Depending on which part of the verb tree we're using (imperfective