intelliwaketssveltekitv25 0.1.121 → 0.1.123

package/dist/Definitions.d.ts

@@ -1,6 +1,7 @@
 import type { Writable } from 'svelte/store';
 import { type TDateAny } from '@solidbasisventures/intelliwaketsfoundation';
 import type { IconDefinition } from '@fortawesome/fontawesome-common-types';
+import type { Snippet } from 'svelte';
 export interface IFAProps {
     icon: IconDefinition;
     size?: 'xs' | 'sm' | 'lg' | '1x' | '2x' | '3x' | '4x' | '5x' | '6x' | '7x' | '8x' | '9x' | '10x';
@@ -62,8 +63,8 @@ export interface ISpinItem<T = number> {
     classItem?: string | null;
 }
 export type TListGroupItem = {
-    title: string;
-    sub_title?: string;
+    title: string | Snippet;
+    sub_title?: string | Snippet;
     hover_title?: string;
     hidden?: boolean;
     faProps?: IFAProps;

package/dist/DisplayHTML.svelte

@@ -1,5 +1,6 @@
 <script lang='ts'>
 	import { IncludesHTML, ReplaceLinks, TextToHTML } from '@solidbasisventures/intelliwaketsfoundation'
+	import type { Snippet } from 'svelte'
 
 	let {
 		value,
@@ -9,7 +10,7 @@
 		 */
 		noLinkReplace = false
 	}: {
-		value: string | null | undefined
+		value: string | null | undefined | Snippet
 		anchorClasses?: string
 		/**
 		 * Use the noLinkReplace property to not try to change a URL into an anchor link
@@ -17,15 +18,23 @@
 		noLinkReplace?: boolean
 	} = $props()
 
-	let valueLink = $derived(((noLinkReplace ? (value ?? '') : ReplaceLinks(TextToHTML((value ?? '').toString()), anchorClasses)) ?? '').toString())
+	let isSnippet = $derived(!!value && typeof value === 'function')
 
-	let isHTML = $derived(IncludesHTML((valueLink ?? '').toString()))
+	let valueLink = $derived(isSnippet ? null : ((noLinkReplace ? (value ?? '') : ReplaceLinks(TextToHTML((value ?? '').toString()), anchorClasses)) ?? '').toString())
+
+	let isHTML = $derived(!isSnippet && IncludesHTML((valueLink ?? '').toString()))
 </script>
 
-{#if valueLink}
-	{#if isHTML}
-		{@html valueLink}
+{#if !!value}
+	{#if typeof value === 'function'}
+		{@render value()}
 	{:else}
-		{valueLink}
+		{#if valueLink}
+			{#if isHTML}
+				{@html valueLink}
+			{:else}
+				{valueLink}
+			{/if}
+		{/if}
 	{/if}
 {/if}

package/dist/DisplayHTML.svelte.d.ts

@@ -1,5 +1,6 @@
+import type { Snippet } from 'svelte';
 type $$ComponentProps = {
-    value: string | null | undefined;
+    value: string | null | undefined | Snippet;
     anchorClasses?: string;
     /**
      * Use the noLinkReplace property to not try to change a URL into an anchor link

package/dist/ListGroupItems.svelte

@@ -130,19 +130,20 @@
 	{:else}
 		{#each subItems as listItem, idx (getKey(listItem))}
 			{#if listItem?.section && listItem.section !== subItems[idx - 1]?.section}
-				<li class='listGroupHeader block w-full select-none font-bold p-1 cursor-pointer sticky top-0 bg-primary-main text-white'
-						class:mt-4={rounded}
-						class:overflow-x-hidden={wrapText || ellipses}
-						class:whitespace-nowrap={!wrapText}
-						class:mt-1={idx > 0}
-						class:roundedListGroupItem={rounded}
-						class:rounded-lg={rounded}
-						class:px-2={rounded}
-						title={listItem.hover_title}
-						role='menuitem'
-						tabindex={-1}
-						onkeydown={e => doKeyExecute(e, () => sectionClick(listItem.section ?? ""))}
-						onclick={() => sectionClick(listItem?.section ?? "")}>
+				<li
+					class='listGroupHeader block w-full select-none font-bold p-1 cursor-pointer sticky top-0 bg-primary-main text-white'
+					class:mt-4={rounded}
+					class:overflow-x-hidden={wrapText || ellipses}
+					class:whitespace-nowrap={!wrapText}
+					class:mt-1={idx > 0}
+					class:roundedListGroupItem={rounded}
+					class:rounded-lg={rounded}
+					class:px-2={rounded}
+					title={listItem.hover_title}
+					role='menuitem'
+					tabindex={-1}
+					onkeydown={e => doKeyExecute(e, () => sectionClick(listItem.section ?? ""))}
+					onclick={() => sectionClick(listItem?.section ?? "")}>
 					<DisplayHTML noLinkReplace={listItem.noLinkReplace ?? noLinkReplace}
 											 value={listItem.section} />
 				</li>
@@ -229,7 +230,7 @@
 									<Icon fw
 												scale={!listItem.bigIcon ? 1 : 2}
 												{...listItem.faProps}
-												class={`mr-2 inline-block ${!listItem.bigIcon ? '' : 'ml-2'} ${listItem.faProps.class ?? ''}`.trim()}/>
+												class={`mr-2 inline-block ${!listItem.bigIcon ? '' : 'ml-2'} ${listItem.faProps.class ?? ''}`.trim()} />
 								{/if}
 								{#if !!listItem.icon}
 									<Icon fw
@@ -241,7 +242,7 @@
 							<div class='overflow-hidden'
 									 class:whitespace-nowrap={!wrapText}
 									 class:text-ellipsis={!wrapText && ellipses}
-									 title={!ellipses ? undefined : listItem.title}>
+									 title={!ellipses ? undefined : typeof listItem.title === 'string' ? listItem.title : ''}>
 								<DisplayHTML noLinkReplace={listItem.noLinkReplace ?? noLinkReplace}
 														 value={listItem.title} />
 								{#if listItem.sub_title && !rounded}
@@ -313,7 +314,7 @@
 							<div class='overflow-hidden'
 									 class:whitespace-nowrap={!wrapText}
 									 class:text-ellipsis={!wrapText && ellipses}
-									 title={!ellipses ? undefined : listItem.title}>
+									 title={!ellipses ? undefined : typeof listItem.title === 'string' ? listItem.title : ''}>
 								<DisplayHTML noLinkReplace={listItem.noLinkReplace ?? noLinkReplace}
 														 value={listItem.title} />
 								{#if listItem.sub_title}

package/dist/PathAnalyzer.js

@@ -101,6 +101,15 @@ export class PathAnalyzer {
             return BuildPath('/', ...this.predecessorComponents);
         let components = [...this.preComponents, ...this.activePageComponents];
         if (!components[components.length - 1]?.toLowerCase().startsWith('tab')) {
+            const indexOfBase = components.findIndex(comp => comp === this.base);
+            const indexOfTab = components.findIndex(comp => comp.toLowerCase().startsWith('tab'));
+            if (indexOfBase > 0 && indexOfBase >= indexOfTab) {
+                const indexOfTilde = components.findIndex(comp => comp === '~');
+                if (indexOfTilde > 0) {
+                    return BuildPath('/', ...components.slice(0, indexOfBase + 1), ...components.slice(indexOfTilde, components.length - 1));
+                }
+                return BuildPath('/', ...components.slice(0, indexOfBase + 1));
+            }
             return BuildPath('/', ...components.slice(0, components.length - 1));
         }
         while (components[components.length - 1]?.toLowerCase().startsWith('tab')) {
@@ -163,16 +172,16 @@ export class PathAnalyzer {
         if (closeIfOpen) {
             // const pathNoDigits = path.replace(/[0-9]/g, '')
             if (this.isOpen(path)) {
-                if (path.includes('/')) {
-                    return BuildPath(this.basePath, path.substring(0, path.indexOf('/')));
-                }
-                else {
-                    // if (path === pathNoDigits) {
-                    return this.basePath;
-                    // } else {
-                    // 	return BuildPath(this.basePath, pathNoDigits)
-                    // }
-                }
+                // if (path.includes('/')) {
+                // console.log(this.base, this.basePath, path)
+                // 	return BuildPath(this.basePath, path.substring(0, path.indexOf('/')))
+                // } else {
+                // if (path === pathNoDigits) {
+                return this.basePath;
+                // } else {
+                // 	return BuildPath(this.basePath, pathNoDigits)
+                // }
+                // }
                 // } else if (pathNoDigits !== path && path === this.activePageSlug) {
                 // 	return BuildPath(this.basePath, pathNoDigits)
                 // } else if (pathNoDigits === path && path === (this.activePageSlug ?? '').replace(/[0-9]/g, '') && pathNoDigits !== this.activePage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelliwaketssveltekitv25",
-  "version": "0.1.121",
+  "version": "0.1.123",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",