fixed sandwich issue

Author: adueck

package.json

@@ -17,7 +17,7 @@
     "@formkit/auto-animate": "^1.0.0-beta.6",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@lingdocs/lingdocs-main": "^0.3.3",
-    "@lingdocs/ps-react": "7.8.4",
+    "@lingdocs/ps-react": "7.8.7",
     "@mdx-js/rollup": "^2.2.1",
     "@stefanprobst/rehype-extract-toc": "^2.2.0",
     "@types/mdx": "^2.0.3",

src/components/phrase-diagram/BlockDiagram.tsx

@@ -18,7 +18,15 @@ function BlockDiagram({
     const rendered =
       children.type === "AP"
         ? renderAPSelection(children, 0)
-        : renderNPSelection(children, false, false, "subject", "none", false);
+        : renderNPSelection(
+            children,
+            false,
+            false,
+            "subject",
+            "none",
+            false,
+            "no"
+          );
     const english = getEnglishFromRendered(rendered);
     return (
       <div className="mb-3">

src/games/sub-cores/NPAdjGame.tsx

@@ -46,7 +46,7 @@ const NPAdjWriting: GameSubCore<Level> = ({
     const rendered: T.Rendered<T.NPSelection> | T.Rendered<T.APSelection> =
       selection.type === "AP"
         ? renderAPSelection(selection, 0) // WOULD BE CLEANER IF THIS WAS JUST A PURE SANDWICH, NOT AT AP
-        : renderNPSelection(np, false, false, "subject", "none", false);
+        : renderNPSelection(np, false, false, "subject", "none", false, "no");
     const answer = getPashtoFromRendered(rendered, false);
     return {
       selection,

src/lib/block-generators/sandwich-generator.ts

@@ -1,83 +1,11 @@
-import {
-    Types as T,
-    randFromArray,
-} from "@lingdocs/ps-react";
-
-export const sandwiches: T.Sandwich[] = [ 
-    {
-        type: "sandwich",
-        before: { p: "له", f: "la" },
-        after: { p: "نه", f: "na" },
-        e: "from",
-    },
-    {
-        type: "sandwich",
-        before: { p: "له", f: "la" },
-        after: { p: "څخه", f: "tsuxa" },
-        e: "from",
-    },
-    {
-        type: "sandwich",
-        before: { p: "له", f: "la" },
-        after: { p: "سره", f: "sara" },
-        e: "with",
-    },
-    {
-        type: "sandwich",
-        before: undefined,
-        after: { p: "ته", f: "ta" },
-        e: "to",
-    },
-    {
-        type: "sandwich",
-        before: { p: "د", f: "du" },
-        after: { p: "لپاره", f: "lapaara" },
-        e: "for",
-    },
-    {
-        type: "sandwich",
-        before: { p: "د", f: "du" },
-        after: { p: "په څانګ", f: "pu tsaang" },
-        e: "beside",
-    },
-    // {
-    //     type: "sandwich",
-    //     before: { p: "په", f: "pu" },
-    //     after: { p: "کې", f: "ke" },
-    //     e: "in",
-    // },
-    {
-        type: "sandwich",
-        before: { p: "د", f: "du" },
-        after: { p: "لاندې", f: "laande" },
-        e: "under",
-    },
-    {
-        type: "sandwich",
-        before: { p: "د", f: "du" },
-        after: { p: "په شان", f: "pu shaan" },
-        e: "like",
-    },
-    {
-        type: "sandwich",
-        before: { p: "د", f: "du" },
-        after: { p: "غوندې", f: "ghwunde" },
-        e: "like",
-    },
-    // {
-    //     type: "sandwich",
-    //     before: { p: "د", f: "du" },
-    //     after: { p: "په اړه", f: "pu aRa" },
-    //     e: "about",
-    // },
-];
+import { Types as T, randFromArray, sandwiches } from "@lingdocs/ps-react";
 
 export function makeSandwich(np: T.NPSelection): T.APSelection {
-    return {
-        type: "AP",
-        selection: {
-            ...randFromArray(sandwiches),
-            inside: np,
-        },
-    };
+  return {
+    type: "AP",
+    selection: {
+      ...randFromArray(sandwiches),
+      inside: np,
+    },
+  };
 }

yarn.lock

@@ -1367,10 +1367,10 @@
     rambda "^6.7.0"
     react-select "^5.2.2"
 
-"@lingdocs/[email protected].4":
-  version "7.8.4"
-  resolved "https://npm.lingdocs.com/@lingdocs/ps-react/-/ps-react-7.8.4.tgz#f46eaa535041495cbabc01484ee930ad48a47149"
-  integrity sha512-nclWIyzpJqqEMZB8OVW/WQepUqHqu5WyeEmwTxpLHqVs3RLhE52giwUjK+xRdXaaOcjI9K2Itkfl+nMa1GlSlw==
+"@lingdocs/[email protected].7":
+  version "7.8.7"
+  resolved "https://npm.lingdocs.com/@lingdocs/ps-react/-/ps-react-7.8.7.tgz#bb84422162761ee5868868f6e9628d49c87b4a32"
+  integrity sha512-J9IQUvrmI+IFGaMcsxgECNt8OXUUtkOU0PtB+tCHl0ok8XXHIsoeNpxCWqQ+cp/VApKdfefWRhR2iZirTRp2Kg==
   dependencies:
     "@formkit/auto-animate" "^1.0.0-beta.3"
     classnames "^2.5.1"