@turnipxenon/pineapple 3.0.0-alpha.9 → 3.1.0-alpha.1

package/dist/components/blog_template/BlogTemplate.svelte

@@ -3,9 +3,9 @@
 	import { enableBackground } from "../../store";
 	import { onDestroy, onMount } from "svelte";
 	import BlogTemplateInner from "./BlogTemplateInner.svelte";
-	import type { SimplePageMeta } from "../navigation_component/index";
+	import type { SimplePageMeta } from "../../ui/modules/NavigationMenu/index";
 	import { enableDialogueOverlay } from "../dialog_manager/DialogManagerStore";
-	import { Card } from "../index";
+	import { default as Card } from "../Card.svelte";
 
 	// grab page meta from the adjacent meta.json
 	interface Props {

package/dist/components/blog_template/BlogTemplate.svelte.d.ts

@@ -1,5 +1,5 @@
 import "./blog-template.css";
-import type { SimplePageMeta } from "../navigation_component/index";
+import type { SimplePageMeta } from "../../ui/modules/NavigationMenu/index";
 interface Props {
     pageMeta: SimplePageMeta;
     shouldFillWholePage?: boolean;

package/dist/components/blog_template/BlogTemplateInner.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { SimplePageMeta } from "../navigation_component/index";
+	import type { SimplePageMeta } from "../../ui/modules/NavigationMenu/index";
 
 	interface Props {
 		pageMeta: SimplePageMeta;

package/dist/components/blog_template/BlogTemplateInner.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { SimplePageMeta } from "../navigation_component/index";
+import type { SimplePageMeta } from "../../ui/modules/NavigationMenu/index";
 interface Props {
     pageMeta: SimplePageMeta;
     children?: import('svelte').Snippet;

package/dist/components/dialog_manager/DialogManager.d.ts

@@ -4,8 +4,9 @@
 import type { DialogDetail } from "../../types/pineapple_fiber/DialogDetail";
 import { DialogState } from "../../types/pineapple_fiber/DialogState";
 import { DialogProcessor } from "./DialogProcessor";
+import type { IDialogManager } from "./IDialogManager";
 export type OnSetDialogChoiceCallback = (newMessage: DialogDetail) => void;
-export declare class DialogManager {
+export declare class DialogManager implements IDialogManager {
     dialogMessageMap: Map<string, DialogDetail>;
     currentDialogTree: DialogDetail[];
     fullCurrentMessage: string;

package/dist/components/dialog_manager/DialogMangerInit.d.ts

@@ -1,15 +1,2 @@
-import { DialogManager } from "./DialogManager";
-/**
- * strictly must be declared last! or you might receive a weird error that looks like:
- *
- * 2:04:21 AM [vite] Error when evaluating SSR module /src/lib/components/dialog_manager/DialogManagerStore.ts:
- * |- TypeError: Cannot read properties of undefined (reading '0')
- *     at <instance_members_initializer> (/src/lib/components/dialog_manager/DialogManager.ts:38:67)
- *     at new DialogManager (/src/lib/components/dialog_manager/DialogManager.ts:53:14)
- *     at eval (/src/lib/components/dialog_manager/DialogManagerStore.ts:15:23)
- *     at async instantiateModule (file:///C:/Users/Pumpkin/Projects/Web/pineapple/node_modules/vite/dist/node/chunks/dep-934dbc7c.js:54360:9)
- *
- * what this means is that one member of dialogManager cannot be initialized. in our case, it was the
- * defaultDialogMessage not yet being initialized
- */
-export declare const dialogManager: DialogManager;
+import type { IDialogManager } from "./IDialogManager";
+export declare const getDialogManager: () => Promise<IDialogManager | undefined>;

package/dist/components/dialog_manager/DialogMangerInit.js

@@ -1,4 +1,3 @@
-import { DialogManager } from "./DialogManager";
 /**
  * strictly must be declared last! or you might receive a weird error that looks like:
  *
@@ -12,4 +11,11 @@ import { DialogManager } from "./DialogManager";
  * what this means is that one member of dialogManager cannot be initialized. in our case, it was the
  * defaultDialogMessage not yet being initialized
  */
-export const dialogManager = new DialogManager();
+let _dialogManager = undefined;
+export const getDialogManager = async () => {
+    if (_dialogManager === undefined) {
+        const dm = await import('./DialogManager');
+        _dialogManager = new dm.DialogManager();
+    }
+    return _dialogManager;
+};

package/dist/components/dialog_manager/IDialogManager.d.ts

@@ -0,0 +1,39 @@
+import type { DialogDetail } from "../../types/pineapple_fiber/DialogDetail";
+import { type Writable } from "svelte/store";
+import { DialogState } from "../../types/pineapple_fiber/DialogState";
+import { type Tweened } from "svelte/motion";
+import { DialogProcessor } from "./DialogProcessor";
+import type { OnSetDialogChoiceCallback } from "./DialogManager";
+export interface IDialogManager {
+    dialogMessageMap: Map<string, DialogDetail>;
+    currentDialogTree: DialogDetail[];
+    fullCurrentMessage: string;
+    currentMessageMeta: DialogDetail;
+    currentMessage: Writable<string>;
+    currentIndex: number;
+    previousTimestamp: number;
+    isDoneTransition: boolean;
+    currentPortrait: Writable<string>;
+    portraitMap: Map<string, any>;
+    currentState: DialogState;
+    currentReadableState: Writable<DialogState>;
+    hidePercent: Tweened<number>;
+    skipNextActiveTime: number;
+    dialogProcessor: DialogProcessor;
+    _setDialogChoiceQueue: DialogDetail[];
+    _setDialogChoiceMutex: boolean;
+    onSetDialogListeners: OnSetDialogChoiceCallback[];
+    enableDialogueOverlayCache: boolean;
+    skipAnimation: () => void;
+    enableDialog: (shouldEnable: boolean) => void;
+    setDialogTree: (newDialogTree: DialogDetail[]) => void;
+    subscribeToSetDialogChoice: (callback: OnSetDialogChoiceCallback) => void;
+    unsubscribeToSetDialogChoice: (callback: OnSetDialogChoiceCallback) => void;
+    setDialogChoice: (newMessage: (DialogDetail | undefined)) => void;
+    _setDialogChoice: () => void;
+    setDialogToDefault: () => void;
+    update: (timestamp: number) => void;
+    enableDialogOverlay(enable: boolean): void;
+    toggleDialogOverlay(): void;
+    parseAndSetDialogTree(dialogYarn: string): Promise<DialogDetail[]>;
+}

package/dist/components/dialog_manager/IDialogManager.js

@@ -0,0 +1,4 @@
+import {} from "svelte/store";
+import { DialogState } from "../../types/pineapple_fiber/DialogState";
+import {} from "svelte/motion";
+import { DialogProcessor } from "./DialogProcessor";

package/dist/components/dialog_manager/behavior_tree/line_processors/commands/JumpCommand.d.ts

@@ -2,7 +2,10 @@ import type { LineBehaviorNode } from "../../line_core/LineBehaviorNode";
 import type { LineNodeArguments } from "../../line_core/LineNodeArguments";
 import type { LineBehaviorResult } from "../../line_core/LineBehaviorResult";
 import { SetVariableNode } from "../SetVariableNode";
+import type { IDialogManager } from "../../../IDialogManager";
 export declare class JumpCommand implements LineBehaviorNode {
     setVariableNode: SetVariableNode;
+    dialogManager: undefined | IDialogManager;
+    constructor();
     process(nodeArgs: LineNodeArguments): LineBehaviorResult;
 }

package/dist/components/dialog_manager/behavior_tree/line_processors/commands/JumpCommand.js

@@ -1,10 +1,22 @@
 import { BehaviorStatus } from "../../core/BehaviorStatus";
 import { SetVariableNode } from "../SetVariableNode";
 import { btreeUtils } from "../../core/BTreeUtils";
-import { dialogManager } from "../../../DialogMangerInit";
+import { getDialogManager } from "../../../DialogMangerInit";
 export class JumpCommand {
     setVariableNode = new SetVariableNode();
+    dialogManager = undefined;
+    constructor() {
+        getDialogManager().then(dm => this.dialogManager = dm);
+    }
     process(nodeArgs) {
+        if (this.dialogManager === undefined) {
+            console.warn('Dialog Manger not yet initialized');
+            return {
+                renderedLine: "",
+                nextState: nodeArgs.initState,
+                status: BehaviorStatus.Failure
+            };
+        }
         if (!nodeArgs.line.startsWith("<<jump")) {
             return {
                 renderedLine: "",
@@ -23,10 +35,10 @@ export class JumpCommand {
             .slice("<<jump ".length, nodeArgs.line.length - ">>".length)
             .replace(/^\{/, "") // remove possible " at the start: https://stackoverflow.com/a/2182602
             .replace(/}$/, ""); // remove possible " at the end: https://stackoverflow.com/a/12249011;
-        const dialogChoice = dialogManager.dialogMessageMap.get(btreeUtils.simplifyToken(choiceName));
+        const dialogChoice = this.dialogManager.dialogMessageMap.get(btreeUtils.simplifyToken(choiceName));
         if (dialogChoice !== undefined) {
             // force choice
-            dialogManager.setDialogChoice(dialogChoice);
+            this.dialogManager.setDialogChoice(dialogChoice);
         }
         else {
             console.error(`Unknown jump node at line ${nodeArgs.lineIndex + 1}: ${choiceName} or ${btreeUtils.simplifyToken(choiceName)}`);

package/dist/components/dialog_overlay/DialogOverlay.svelte

@@ -2,39 +2,63 @@
 	import AresHappy from "../../assets/characters/ares/ares_happy.webp";
 	import { onMount } from "svelte";
 	import { DialogState } from "../../types/pineapple_fiber/DialogState";
-	import { dialogManager } from "../dialog_manager/DialogMangerInit";
+	import { getDialogManager } from "../dialog_manager/DialogMangerInit";
+	import type { IDialogManager } from "../dialog_manager/IDialogManager";
+	import PinyaCard from "../../ui/elements/PinyaCard/PinyaCard.svelte";
+	import { appState } from "../../ui/templates/index";
+	import CloseIcon from "../../assets/icons/close.svg";
+	import FABIcon from "../../assets/bg_tiled/bg_tiled_turnip.png";
+	import { enableDialogueOverlay } from "../dialog_manager/DialogManagerStore";
+	import { PinyaButton } from "../../ui/elements/index";
+	import { slide } from "svelte/transition";
 
 	let currentMessage = $state("");
-	dialogManager.currentMessage.subscribe((value) => {
-		currentMessage = value;
-	});
-
 	let currentPortrait = $state(AresHappy);
-	dialogManager.currentPortrait.subscribe((value) => {
-		if (value) {
-			currentPortrait = value;
-		}
-	});
+	let isMounted = $state(false);
 
 	let hidePercent = $state(100);
 	let isHidden = $state(true);
+	let dialogManager: IDialogManager | undefined = $state(undefined);
 	onMount(() => {
-		dialogManager.hidePercent.subscribe((value) => {
-			hidePercent = value * 0.4;
-			isHidden = false;
-		});
+		getDialogManager()
+			.then(dm => {
+				dialogManager = dm;
+
+				dialogManager.currentMessage.subscribe((value) => {
+					currentMessage = value;
+				});
+
+				dialogManager.currentPortrait.subscribe((value) => {
+					if (value) {
+						currentPortrait = value;
+					}
+				});
+
+				dialogManager.hidePercent.subscribe((value) => {
+					hidePercent = value * 0.4;
+					isHidden = false;
+				});
 
-		dialogManager.currentReadableState.subscribe((value) => {
-			isHidden = value === DialogState.Invisible;
-		});
+				dialogManager.currentReadableState.subscribe((value) => {
+					isHidden = value === DialogState.Invisible;
+				});
+
+				dialogManager.update(0);
+				isMounted = true;
+			});
 
-		dialogManager.update(0);
 	});
 
 	const onDialogClick = () => {
-		dialogManager.skipAnimation();
+		dialogManager?.skipAnimation();
 	};
 
+	let enableDialogueOverlayValue = $state(true);
+	enableDialogueOverlay.subscribe((value) => {
+		enableDialogueOverlayValue = value;
+	});
+
+	enableDialogueOverlay.set(appState.enableDialogOnByDefault ?? false);
 </script>
 
 <div class="dialog-elements"
@@ -44,18 +68,64 @@
 	<div class="dialog-portrait-container">
 		<img src={currentPortrait} alt="Ares" class="dialog-portrait" />
 	</div>
-	<div class="card dialog-box preset-tonal-primary border border-primary-500" onclick={onDialogClick}>
-		<div class="card dialog-name">
-			<p><b>Turnip</b></p>
-		</div>
-		<section class="dialog-padding">
+	<div
+		tabindex="0"
+		role="button"
+		class="dialog-box"
+		onclick={onDialogClick}
+		onkeyup={(e) => {
+			if (e.key === 'j') {
+				onDialogClick()
+;			}
+		}}
+	>
+		<PinyaCard
+			widthClass=""
+			paddingClass=""
+			className="dialog-name"
+		>
+			<div>
+				<b class="fake-h1">Turnip</b>
+			</div>
+		</PinyaCard>
+		<PinyaCard
+			widthClass="w-full"
+			className="dialog-text"
+		>
 			<!-- Made for 140 characters, like the original tweets -->
 			{@html currentMessage}
-		</section>
+		</PinyaCard>
 	</div>
 </div>
 
+
+{#if appState.allowDialog && isMounted}
+	<div class="fab-container" in:slide>
+		<PinyaButton
+			classes="fab"
+			onclick={()=>{
+	getDialogManager().then(dm => dm.toggleDialogOverlay());
+}}>
+			{#if (enableDialogueOverlayValue)}
+				<img class="turnip-icon" src={CloseIcon} alt="interactive floating action button represented as a turnip">
+			{:else }
+				<img class="turnip-icon" src={FABIcon} alt="interactive floating action button represented as a turnip">
+			{/if}
+		</PinyaButton>
+	</div>
+{/if}
+
 <style>
+    :global(.dialog-text) {
+        height: 100%;
+        padding: 1.2lh 2rem 0.5lh;
+    }
+
+    :global(.dialog-box *,.dialog-name *) {
+        font-size: clamp(1em, 5vw, 1.3em);
+        line-height: 1.5em;
+    }
+
     .dialog-elements {
         position: fixed;
         z-index: 10;
@@ -73,11 +143,6 @@
         transform: translateY(var(--hidePercentHeight));
     }
 
-    .dialog-box *,
-    .dialog-name * {
-        font-size: clamp(1em, 5vw, 1.3em);
-        line-height: 1.5em;
-    }
 
     .dialog-padding :global(p) {
         font-size: clamp(1em, 5vw, 1.3em) !important;
@@ -88,19 +153,18 @@
         padding: clamp(1.5em, 5vw, 1.75em) clamp(0em, 5vw - 0.5em, 2em) 0;
     }
 
-    .dialog-name {
-		    padding-top: 2rem;
-		    padding-left: 4rem;
-		    padding-right: 4rem;
+    :global(.dialog-name) {
+        padding-left: 2rem;
+        padding-right: 2rem;
         position: fixed;
     }
 
-    .dialog-name:dir(ltr) {
+    :global(.dialog-name:dir(ltr)) {
         /* for centering vertically */
         transform: translateX(clamp(0em, 5vw - 0.5em, 1em)) translateY(-50%);
     }
 
-    .dialog-name:dir(rtl) {
+    :global(.dialog-name:dir(rtl)) {
         /* for centering vertically */
         transform: translateX(calc(clamp(0em, 5vw - 0.5em, 1em) * -1)) translateY(-50%);
     }
@@ -129,4 +193,59 @@
     .dialog-portrait:dir(rtl) {
         transform: scaleX(-1);
     }
+
+
+    .dialog-box {
+        background-color: var(--color-surface-500);
+        position: fixed;
+        bottom: 0;
+        width: var(--dialog-box-width); /*75em + 4em padding*/
+        height: var(--dialog-box-height);
+        max-width: calc(100vw - ((var(--fab-margin) * 2) + 4em));
+        border-radius: 1rem;
+    }
+
+    .dark .dialog-box {
+        background-color: rgb(var(--color-surface-900) / 0.95);
+        --tw-ring-color: rgb(var(--color-text-400));
+        /*background-color: red;*/
+    }
+
+    :global(.fab) {
+        /*@apply btn preset-filled-tertiary-500;*/
+        background-color: var(--color-tertiary-500);
+        padding: 0.3rem;
+        width: 4em;
+        border-radius: 50%;
+        z-index: 100;
+        box-shadow: 3px 3px 3px var(--shadow-color);
+        margin-bottom: var(--fab-margin);
+    }
+
+    .fab-container {
+        position: fixed;
+		    bottom: 0;
+    }
+
+    .fab-container:dir(ltr) {
+        right: 0;
+    }
+
+    .fab-container:dir(rtl) {
+        left: 0;
+    }
+
+    :global(.fab > img) {
+        width: 100%;
+        filter: brightness(0) invert(1);
+    }
+
+    :global(.fab:dir(ltr)) {
+        margin-right: var(--fab-margin);
+    }
+
+    :global(.fab:dir(rtl)) {
+        margin-left: var(--fab-margin);
+    }
+
 </style>

package/dist/components/layouts/SeaweedBaseLayout.svelte

@@ -90,12 +90,6 @@
 </div>
 
 <style>
-    :root {
-        --dialog-start-pad: clamp(0em, 5vw, 2em);
-        --dialog-box-width: min(calc(50em + 4em), calc(100vw - var(--dialog-start-pad) - var(--theme-border-base)));
-        --dialog-box-height: clamp(15em, 50vw, 18em);
-    }
-
     .default-page-container {
         max-width: 2100px;
         margin: 4em auto;

package/dist/components/pineapple/PineappleBaseLayout.svelte

@@ -20,7 +20,7 @@
 	import Toast from "./toast/Toast.svelte";
 	import DialogOverlay from "../dialog_overlay/DialogOverlay.svelte";
 	import { fade } from "svelte/transition";
-	import { dialogManager } from "../dialog_manager/DialogMangerInit";
+	import { getDialogManager } from "../dialog_manager/DialogMangerInit";
 
 	interface Props {
 		showDialogByDefault?: boolean;
@@ -77,7 +77,7 @@
 
 <!--todo: turn off hidden when it's time-->
 <button class="fab" onclick={()=>{
-	dialogManager.toggleDialogOverlay()
+	getDialogManager().then(dm => dm.toggleDialogOverlay());
 }}>
 	{#if (enableDialogueOverlayValue)}
 		<img class="turnip-icon" src={CloseIcon} alt="interactive floating action button represented as a turnip">
@@ -137,25 +137,6 @@
 </div>
 
 <style>
-    :root {
-        --dialog-start-pad: clamp(0em, 5vw, 2em);
-        --dialog-box-width: min(calc(50em + 4em), calc(100vw - var(--dialog-start-pad) - var(--theme-border-base)));
-        --dialog-box-height: clamp(15em, 50vw, 18em);
-
-        /** FAB icon margin/position calculation origin:
-						Criteria:
-						- We want at mobile (360px) our margin to be at 1em (16px)
-						- We want at web (1960px) our margin to be at 2em (32px)
-
-						A useful scaling factor might vw. At 360px, 16px would be around 4.44vw (360/16).
-						At 360px: margin is at 16px or 1em.
-						At 1960px: 4.44vw is at 87px but that will be clamped to 32px or 2em.
-						The calculation implies that the natural point that the margin becomes 2em is clamped on
-						wider screens is at 727px.
-				*/
-        --fab-margin: clamp(1em, 4.44vw, 2em);
-    }
-
     /*todo*/
     /*@apply flex justify-center items-center;*/
     .default-page-container {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { default as PineappleLayoutBase } from "./components/pineapple/PineappleBaseLayout.svelte";
 export * from "./components/index";
 export * from "./components/overrideable_meta/index";
-export * from "./components/navigation_component/index";
+export * from "./ui/modules/NavigationMenu/index";
 export * from "./types/api/index";
 export * from "./components/dialog_manager/DialogManagerStore";
 export * from "./components/dialog_manager/DialogManager";
@@ -10,5 +10,5 @@ export * from "./types/pineapple_fiber/PortraitType";
 export * from "./types/pineapple_fiber/DialogDetail";
 export * from "./util/util";
 export * from "./api/index";
-export * from "./template/seaweed/index";
-export { dialogManager } from "./components/dialog_manager/DialogMangerInit";
+export type { IDialogManager } from "./components/dialog_manager/IDialogManager";
+export { getDialogManager } from "./components/dialog_manager/DialogMangerInit";

package/dist/index.js

@@ -2,7 +2,7 @@
 export { default as PineappleLayoutBase } from "./components/pineapple/PineappleBaseLayout.svelte";
 export * from "./components/index";
 export * from "./components/overrideable_meta/index";
-export * from "./components/navigation_component/index";
+export * from "./ui/modules/NavigationMenu/index";
 export * from "./types/api/index";
 export * from "./components/dialog_manager/DialogManagerStore";
 export * from "./components/dialog_manager/DialogManager";
@@ -11,5 +11,4 @@ export * from "./types/pineapple_fiber/PortraitType";
 export * from "./types/pineapple_fiber/DialogDetail";
 export * from "./util/util";
 export * from "./api/index";
-export * from "./template/seaweed/index";
-export { dialogManager } from "./components/dialog_manager/DialogMangerInit";
+export { getDialogManager } from "./components/dialog_manager/DialogMangerInit";

package/dist/styles/app.css

@@ -10,16 +10,25 @@
 
 @custom-variant turnip (&:where([data-theme=turnip], [data-theme=turnip] *));
 
+html {
+    --dialog-start-pad: clamp(0em, 5vw, 2em);
+    --dialog-box-width: min(calc(54em), calc(100vw - var(--dialog-start-pad) - 2px));
+    --dialog-box-height: clamp(15em, 50vw, 18em);
+    --fab-margin: 1rem;
+}
+
 .footer-space {
     width: 100%;
     height: calc(var(--dialog-box-height) + 4em);
 }
 
 a.dialog-choice {
+    font-size: inherit;
     cursor: url("$pkg/assets/icons/chat-cursor.svg"), auto;
 }
 
 a.external-link {
+    font-size: inherit;
     cursor: url("$pkg/assets/icons/external-link.svg"), auto;
 }
 
@@ -37,20 +46,6 @@ a.external-link {
     background: rgba(var(--color-secondary-500));
 }
 
-.dialog-box {
-    background-color: rgb(var(--color-surface-500) / 0.9);
-    position: fixed;
-    bottom: 0;
-    width: var(--dialog-box-width); /*75em + 4em padding*/
-    height: var(--dialog-box-height);
-    max-width: calc(100vw - ((var(--fab-margin) * 2) + 4em));
-}
-
-.dark .dialog-box {
-    background-color: rgb(var(--color-surface-900) / 0.95);
-    --tw-ring-color: rgb(var(--color-text-400));
-    /*background-color: red;*/
-}
 
 @layer base {
     .game-link-section {