feat: adds new IfElse block, new Collapse block

javalent · Mar 4, 2023 · 66fad70 · 66fad70
1 parent 161d113
commit 66fad70
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 28 deletions.
diff --git a/src/layouts/types.ts b/src/layouts/types.ts
@@ -37,12 +37,12 @@ export type StatblockItemType = typeof StatblockItemTypes[number];
 
 type RequiredProps = {
     type: StatblockItemType;
+    conditioned?: boolean;
     id: string;
 };
 
 export type CommonProps = RequiredProps & {
     properties: Array<keyof Monster>;
-    conditioned?: boolean;
     fallback?: string;
     hasRule?: boolean;
     dice?: boolean;
@@ -114,15 +114,15 @@ type TextProps = {
 };
 export type IfElseCondition = {
     condition: string;
-    blocks: [GroupItem];
+    nested: [GroupItem];
 };
 type IfElseProps = {
     type: "ifelse";
     conditions: IfElseCondition[];
 };
 type CollapseProps = {
     type: "collapse";
-    blocks: [GroupItem];
+    nested: [GroupItem];
     heading?: string;
     hasRule?: boolean;
 };

diff --git a/src/main.ts b/src/main.ts
@@ -473,7 +473,6 @@ export default class StatBlockPlugin extends Plugin {
 
             /** Get Parameters */
             let params: StatblockParameters = parseYaml(source);
-            console.log("🚀 ~ file: main.ts:476 ~ params:", params);
 
             el.addClass("statblock-plugin-container");
             el.parentElement?.addClass("statblock-plugin-parent");

diff --git a/src/settings/add.ts b/src/settings/add.ts
@@ -101,7 +101,8 @@ export function blockGenerator(type: string): StatblockItem {
                 id: nanoid(),
                 heading: null,
                 hasRule: false,
-                blocks: [blockGenerator("group")]
+                conditioned: false,
+                nested: [blockGenerator("group")]
             };
         }
     }

diff --git a/src/settings/ui/Block.svelte b/src/settings/ui/Block.svelte
@@ -49,7 +49,7 @@
 <div class="statblock-creator-container">
     {#key block}
         <div class="statblock-creator-block">
-            {#if block.type != "ifelse"}
+            {#if block.type != "ifelse" && block.type != "collapse"}
                 <PropertyBlock {block} />
             {/if}
         </div>

diff --git a/src/settings/ui/Creator.svelte b/src/settings/ui/Creator.svelte
@@ -214,7 +214,7 @@
                                                 <span>Collapse</span>
                                             {/if}
                                             <svelte:self
-                                                bind:blocks={block.blocks}
+                                                bind:blocks={block.nested}
                                                 bind:plugin
                                                 draggable={false}
                                             />
@@ -239,7 +239,7 @@
                                 <div class="statblock-creator-container">
                                     <div class="statblock-creator-block">
                                         <div class="if-else-block-container">
-                                            {#each block.conditions as { condition, blocks: ifElseBlocks } (condition)}
+                                            {#each block.conditions as { condition, nested: ifElseBlocks } (condition)}
                                                 <div
                                                     class="condition-container"
                                                 >
@@ -312,9 +312,6 @@
         padding: 2px;
         margin: 2px;
     }
-    :global(body:not(.is-mobile)) .ifelse:not(:hover) > .icons {
-        visibility: hidden;
-    }
     .group {
         display: grid;
         grid-template-columns: 1fr;

diff --git a/src/settings/ui/IfElseProperties.svelte b/src/settings/ui/IfElseProperties.svelte
@@ -86,7 +86,7 @@
                     ...items,
                     {
                         prop: {
-                            blocks: [blockGenerator("group")],
+                            nested: [blockGenerator("group")],
                             condition: null
                         },
                         id

diff --git a/src/view/ui/Content.svelte b/src/view/ui/Content.svelte
@@ -27,11 +27,11 @@
     const monster = getContext<Monster>("monster");
 
     const checkConditioned = (item: StatblockItem): boolean => {
-        if (item.type == "ifelse" || item.type == "collapse") return true;
         if (item.conditioned == null || !item.conditioned) return true;
         if ("nested" in item) {
             return item.nested.some((prop) => checkConditioned(prop));
         }
+        if (item.type == "ifelse") return true;
         if (!item.properties.length) return true;
         return item.properties.some((prop) => {
             if (prop in monster) {
@@ -85,7 +85,7 @@
             }
             case "collapse": {
                 const elements = [];
-                for (const nested of item.blocks) {
+                for (const nested of item.nested) {
                     const element = getElementForStatblockItem(nested);
                     elements.push(...element);
                 }
@@ -96,18 +96,7 @@
                         elements
                     }
                 });
-                /* const details = target.createEl("details");
-                const summary = details.createEl("summary", {
-                    text: item.heading ?? null
-                });
-                summary.createDiv("collapser").createDiv("handle");
-                for (const nested of item.blocks) {
-                    const element = getElementForStatblockItem(nested, details);
-                    for (const el of element) {
-                        details.appendChild(el);
-                    }
-                }
-                targets.push(details); */
+                
                 break;
             }
             case "heading": {
@@ -125,7 +114,7 @@
             }
             case "ifelse": {
                 for (let i = 0; i < item.conditions.length; i++) {
-                    const { condition, blocks } = item.conditions[i];
+                    const { condition, nested } = item.conditions[i];
                     const frame = document.body.createEl("iframe");
                     const funct = (frame.contentWindow as any).Function;
                     let parsed: boolean = false;
@@ -141,7 +130,7 @@
                         parsed == true ||
                         (i == item.conditions.length - 1 && !condition?.length)
                     ) {
-                        for (const block of blocks) {
+                        for (const block of nested) {
                             const element = getElementForStatblockItem(
                                 block,
                                 target