@torpor/ui 0.1.6 → 0.2.0

package/src/NavMenu/NavMenuButton.torp

@@ -27,7 +27,7 @@ export default function NavMenuButton($props: any) {
 
 	@render {
 		<button
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-button ${$props.class ?? ""}`.trim()}
 			type="button"
 			{$props.disabled}
@@ -40,7 +40,7 @@ export default function NavMenuButton($props: any) {
 			onfocus={() => handleItemFocus(index)}
 			&ref={button}
 		>
-			<:slot />
+			<slot />
 		</button>
 	}
 }

package/src/NavMenu/NavMenuElement.torp

@@ -26,7 +26,7 @@ export default function NavMenuElement($props: any) {
 
 	@render {
 		<div
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-div ${$props.class ?? ""}`.trim()}
 			type="div"
 			role="menuitem"
@@ -37,7 +37,7 @@ export default function NavMenuElement($props: any) {
 			onclick
 			onfocus={() => handleItemFocus(index)}
 		>
-			<:slot />
+			<slot />
 		</div>
 	}
 }

package/src/NavMenu/NavMenuGroup.torp

@@ -18,13 +18,13 @@ export default function NavMenuGroup($props: any) {
 
 	@render {
 		<div
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-group ${$props.class ?? ""}`.trim()}
 			role="group"
 			aria-label={$props.ariaLabel}
 			aria-labelledby={$state.headerId}
 		>
-			<:slot />
+			<slot />
 		</div>
 	}
 }

package/src/NavMenu/NavMenuGroupHeader.torp

@@ -21,10 +21,10 @@ export default function NavMenuGroupHeader($props: any) {
 	@render {
 		<h4
 			@// TODO: self={$props.as}
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-group-header ${$props.class ?? ""}`.trim()}
 		>
-			<:slot />
+			<slot />
 		</h4>
 	}
 }

package/src/NavMenu/NavMenuLink.torp

@@ -32,7 +32,7 @@ export default function NavMenuLink($props: any) {
 
 	@render {
 		<a
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-link ${$props.class ?? ""}`.trim()}
 			href={$props.href}
 			{$props.disabled}
@@ -46,7 +46,7 @@ export default function NavMenuLink($props: any) {
 			onfocus={() => handleItemFocus(index)}
 			&ref={link}
 		>
-			<:slot />
+			<slot />
 		</a>
 	}
 }

package/src/NavMenu/NavMenuPopout.torp

@@ -59,11 +59,11 @@ export default function NavMenuPopout($props: any) {
 
 	@render {
 		<div
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-popout ${$props.class ?? ""}`.trim()}
 			onmouseleave={handleMouseLeave}
 		>
-			<:slot />
+			<slot />
 		</div>
 	}
 }

package/src/NavMenu/NavMenuPopoutButton.torp

@@ -96,7 +96,7 @@ export default function NavMenuPopoutButton($props: any) {
 
 	@render {
 		<button
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-popout-button ${$props.class ?? ""}`.trim()}
 			type="button"
 			{$props.disabled}
@@ -112,9 +112,9 @@ export default function NavMenuPopoutButton($props: any) {
 			onmouseleave={handleMouseLeave}
 			onmousemove={handleMouseMove}
 			&ref={button}
-			:onmount={(el) => popoutContext.anchorElement = el }
+			onmount={(el) => popoutContext.anchorElement = el }
 		>
-			<:slot />
+			<slot />
 		</button>
 	}
 }

package/src/NavMenu/NavMenuPopoutContent.torp

@@ -14,6 +14,7 @@ export default function NavMenuPopoutContent($props: any) {
 	$props.alignment ??= "start";
 
 	let div: HTMLDivElement;
+	let shown = false;
 
 	// Get stuff out of the NavMenuPopoutContext
 	const context = $context[NavMenuPopoutContextName] as NavMenuPopoutContext;
@@ -22,35 +23,36 @@ export default function NavMenuPopoutContent($props: any) {
 	}
 	let $state = context.state;
 
-	let first = true;
 	$run(() => {
-		let visible = $state.visible;
+		if (!$state.visible) {
+			hide();
+		}
+	});
 
-		if (first) {
-			first = false;
-			return;
+	function show() {
+		shown = true;
+
+		// Set the position and listen for window resize and scroll to reset the position
+		setPosition();
+		const scrollParent = getScrollParent(context.anchorElement)
+		scrollParent.addEventListener("resize", setPosition);
+		scrollParent.addEventListener("scroll", setPosition);
+		if (context.focusFirstElement) {
+			context.focusFirstElement();
 		}
+	}
 
-		if (visible) {
-			// Wait for the content div to be shown, set its position, and listen for window resize to re-position
-			//await tick();
-			setPosition();
-			if (context.focusFirstElement) {
-				context.focusFirstElement();
-			}
-			const scrollParent = getScrollParent(context.anchorElement)
-			scrollParent.addEventListener("resize", setPosition);
-			scrollParent.addEventListener("scroll", setPosition);
-		} else {
-			// Stop listening for window resize and focus the anchor element per WAI guidelines
-			const scrollParent = getScrollParent(context.anchorElement)
-			scrollParent.removeEventListener("resize", setPosition);
-			scrollParent.removeEventListener("scroll", setPosition);
-			if (context.anchorElement?.focus) {
-				context.anchorElement.focus();
-			}
+	function hide() {
+		if (!shown) return;
+
+		// Stop listening for window resize and focus the anchor element per WAI guidelines
+		const scrollParent = getScrollParent(context.anchorElement)
+		scrollParent.removeEventListener("resize", setPosition);
+		scrollParent.removeEventListener("scroll", setPosition);
+		if (context.anchorElement?.focus) {
+			context.anchorElement.focus();
 		}
-	});
+	}
 
 	function setPosition() {
 		if (!context.anchorElement) {
@@ -65,12 +67,12 @@ export default function NavMenuPopoutContent($props: any) {
 	@render {
 		@if ($state.visible) {
 			<div
-				id={$props.id}
+				{$props.id}
 				class={`torp-nav-menu-popout-content ${$props.class ?? ""}`.trim()}
 				&ref={div}
-				:onmount={(el) => setPopoverPosition(context.anchorElement, el, $props.side, $props.alignment)}
+				onmount={show}
 			>
-				<:slot />
+				<slot />
 			</div>
 		}
 	}

package/src/NavMenu/NavMenuSeparator.torp

@@ -5,10 +5,10 @@
 export default function NavMenuSeparator($props: any) {
 	@render {
 		<div
-			id={$props.id}
+			{$props.id}
 			class={`torp-nav-menu-separator ${$props.class ?? ""}`.trim()} role="separator"
 		>
-			<:slot />
+			<slot />
 		</div>
 	}
 }

package/src/Notification/Notification.torp

@@ -0,0 +1,48 @@
+import { NotificationContextName, type NotificationContext } from "./NotificationTypes";
+
+/**
+ * An element that displays a brief, important message in a way that attracts
+ * the user's attention without interrupting the user's task.
+ *
+ * See [the WAI ARIA guidelines for Alerts](https://www.w3.org/WAI/ARIA/apg/patterns/alert/).
+ *
+ * @prop {boolean} visible -- Whether the notification is visible
+ * @prop {number | undefined} duration -- The duration, in milliseconds, to keep the notification visible
+ * @prop {() => void} onclose -- Raised when the notification has closed, either after the duration has elapsed, or when the user has pressed the close button
+ */
+export default function Notification($props) {
+	$props.visible ??= true;
+	$props.duration ??= 5000;
+
+	// Set the context to pass down to items
+	let context: NotificationContext = {
+		closeNotification
+	};
+	$context[NotificationContextName] = context;
+
+	$mount(() => {
+		if ($props.duration) {
+			setTimeout(closeNotification, $props.duration);
+		}
+	});
+
+	function closeNotification() {
+		$props.visible = false;
+
+		if ($props.onclose) {
+			$props.onclose();
+		}
+	}
+
+	@render {
+		@if ($props.visible) {
+			<div 
+				{$props.id}
+				class={`torp-notification ${$props.class ?? ""}`.trim()}
+				role="alert"
+			>
+				<slot />
+			</div>
+		}
+	}
+}

package/src/Notification/NotificationClose.torp

@@ -0,0 +1,28 @@
+import { NotificationContextName, type NotificationContext } from "./NotificationTypes";
+
+/**
+ * The button that a user can press to close this Notification.
+ */
+export default function NotificationClose() {
+	// Get stuff out of the NotificationContext
+	const context = $context[NotificationContextName] as NotificationContext;
+	if (!context) {
+		throw new Error("NotificationClose must be contained within a Notification");
+	}
+	const { closeNotification } = context;
+
+	function handleClick() {
+		closeNotification();
+	}
+
+	@render {
+		<button
+			{$props.id}
+			class={`torp-notification-close ${$props.class ?? ""}`.trim()}
+			type="button"
+			onclick={handleClick}
+		>
+			<slot />
+		</button>
+	}
+}

package/src/Notification/NotificationContainer.torp

@@ -0,0 +1,14 @@
+/**
+ * The container for one or more Notifications, which can be used to position
+ * the notifications inside the viewport.
+ */
+export default function NotificationContainer() {
+	@render {
+		<div
+			{$props.id}
+			class={`torp-notification-container ${$props.class ?? ""}`.trim()}
+		>
+			<slot />
+		</div>
+	}
+}

package/src/Notification/NotificationContent.torp

@@ -0,0 +1,13 @@
+/**
+ * The content to display within a Notification.
+ */
+export default function NotificationContent() {
+	@render {
+		<div 
+			{$props.id}
+			class={`torp-notification-content ${$props.class ?? ""}`.trim()}
+		>
+			<slot />
+		</div>
+	}
+}

package/src/Notification/NotificationTypes.ts

@@ -0,0 +1,5 @@
+export const NotificationContextName = 'Notification';
+
+export interface NotificationContext {
+	closeNotification: () => void;
+}

package/src/Notification/index.ts

@@ -0,0 +1,13 @@
+import Notification from "./Notification.torp";
+import NotificationClose from "./NotificationClose.torp";
+import NotificationContainer from "./NotificationContainer.torp";
+import NotificationContent from "./NotificationContent.torp";
+import showNotification from "./showNotification";
+
+export {
+	Notification,
+	NotificationContainer,
+	NotificationContent,
+	NotificationClose,
+	showNotification,
+};

package/src/Notification/showNotification.ts

@@ -0,0 +1,30 @@
+import { mount } from "@torpor/view";
+
+/**
+ * Shows a notification component in code.
+ * @param notification The notification component
+ * @param props The properties for the notification component
+ * @param target The target element to show the notification in
+ */
+export default function showNotification(notification: any, props: any, target?: Element): void {
+	if (!target) {
+		// Put the notification in the first NotificationContainer, or the
+		// document body if there are no NotificationContainers
+		target = document.getElementsByClassName("torp-notification-container")[0];
+		if (!target) {
+			throw new Error("No notification container found");
+		}
+	}
+
+	// HACK: Should allow mounting in a non-empty container
+	// Move existing nodes into a fragment, and add them back after mounting
+	var fragment = document.createDocumentFragment();
+	while (target.firstChild) {
+		fragment.append(target.firstChild);
+	}
+
+	// Create the notification
+	mount(target, notification, props);
+
+	target.prepend(fragment);
+}

package/src/Popover/Popover.torp

@@ -96,10 +96,10 @@ export default function Popover($props: any) {
 
 	@render {
 		<div
-			id={$props.id}
+			{$props.id}
 			class={`torp-popover ${$props.class ?? ""}`.trim()}
 		>
-			<:slot />
+			<slot />
 		</div>
 	}
 }

package/src/Popover/PopoverContent.torp

@@ -7,6 +7,8 @@ import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
  */
 export default function PopoverContent($props: any) {
 	let div: HTMLDivElement;
+	let shown = false;
+	let closeOnClick = false;
 
 	// Get stuff out of the PopoverContext
 	const context = $context[PopoverContextName] as PopoverContext;
@@ -15,37 +17,37 @@ export default function PopoverContent($props: any) {
 	}
 	let $state = context.state;
 
-	let closeOnClick = false;
-
-	let first = true;
 	$run(() => {
-		let visible = $state.visible;
+		if (!$state.visible) {
+			hide();
+		}
+	});
+
+	function show() {
+		shown = true;
 
-		if (first) {
-			first = false;
-			return;
+		// HACK: Because this Popover could be shown with a click, we need to wait for another mousedown
+		// before we close on click. Otherwise the click immediately bubbles to the document
+		closeOnClick = false;
+		addDocumentEvent("mousedown", handleDocumentMouseDown);
+		addDocumentEvent("click", handleDocumentClick);
+
+		if (context.focusFirstElement) {
+			context.focusFirstElement();
 		}
+	}
+
+	function hide() {
+		if (!shown) return;
 
-		if (visible) {
-			// HACK: Because this Popover could be shown with a click, we need to wait for another mousedown
-			// before we close on click. Otherwise the click immediately bubbles to the document
-			closeOnClick = false;
-			addDocumentEvent("mousedown", handleDocumentMouseDown);
-			addDocumentEvent("click", handleDocumentClick);
-			// Wait for the content div to be shown, set its position, and listen for window resize to re-position
-			//await tick();
-			if (context.focusFirstElement) {
-				context.focusFirstElement();
-			}
-		} else {
-			removeDocumentEvent("mousedown", handleDocumentMouseDown);
-			removeDocumentEvent("click", handleDocumentClick);
-			// Focus the anchor element per WAI guidelines
-			if (context.anchorElement?.focus) {
-				context.anchorElement.focus();
-			}
+		removeDocumentEvent("mousedown", handleDocumentMouseDown);
+		removeDocumentEvent("click", handleDocumentClick);
+
+		// Focus the anchor element per WAI guidelines
+		if (context.anchorElement?.focus) {
+			context.anchorElement.focus();
 		}
-	});
+	}
 
 	function handleDocumentMouseDown() {
 		closeOnClick = true;
@@ -65,11 +67,12 @@ export default function PopoverContent($props: any) {
 	@render {
 		@if ($state.visible) {
 			<div
-				id={$props.id}
+				{$props.id}
 				class={`torp-popover-content ${$props.class ?? ""}`.trim()}
 				&ref={div}
+				onmount={show}
 			>
-				<:slot />
+				<slot />
 			</div>
 		}
 	}

package/src/Popover/PopoverContentAnchored.torp

@@ -17,7 +17,7 @@ export default function PopoverContentAnchored($props: any) {
 	$props.alignment ??= "center";
 
 	let div: HTMLDivElement;
-
+	let shown = false;
 	let closeOnClick = false;
 
 	// Get stuff out of the PopoverContext
@@ -27,42 +27,45 @@ export default function PopoverContentAnchored($props: any) {
 	}
 	let $state = context.state;
 
-	let first = true;
 	$run(() => {
-		let visible = $state.visible;
+		if (!$state.visible) {
+			hide();
+		}
+	});
 
-		if (first) {
-			first = false;
-			return;
+	function show() {
+		shown = true;
+
+		// HACK: Because this Popover could be shown with a click, we need to wait for another mousedown
+		// before we close on click. Otherwise the click immediately bubbles to the document
+		closeOnClick = false;
+		addDocumentEvent("mousedown", handleDocumentMouseDown);
+		addDocumentEvent("click", handleDocumentClick);
+
+		// Set the position and listen for window resize and scroll to reset the position
+		setPosition();
+		const scrollParent = getScrollParent(context.anchorElement)
+		scrollParent.addEventListener("resize", setPosition);
+		scrollParent.addEventListener("scroll", setPosition);
+		if (context.focusFirstElement) {
+			context.focusFirstElement();
 		}
+	}
 
-		if (visible) {
-			// HACK: Because this Popover could be shown with a click, we need to wait for another mousedown
-			// before we close on click. Otherwise the click immediately bubbles to the document
-			closeOnClick = false;
-			addDocumentEvent("mousedown", handleDocumentMouseDown);
-			addDocumentEvent("click", handleDocumentClick);
-			// Wait for the content div to be shown, set its position, and listen for window resize to re-position
-			//await tick();
-			setPosition();
-			if (context.focusFirstElement) {
-				context.focusFirstElement();
-			}
-			const scrollParent = getScrollParent(context.anchorElement)
-			scrollParent.addEventListener("resize", setPosition);
-			scrollParent.addEventListener("scroll", setPosition);
-		} else {
-			removeDocumentEvent("mousedown", handleDocumentMouseDown);
-			removeDocumentEvent("click", handleDocumentClick);
-			// Stop listening for window resize and focus the anchor element per WAI guidelines
-			const scrollParent = getScrollParent(context.anchorElement)
-			scrollParent.removeEventListener("resize", setPosition);
-			scrollParent.removeEventListener("scroll", setPosition);
-			if (context.anchorElement?.focus) {
-				context.anchorElement.focus();
-			}
+	function hide() {
+		if (!shown) return;
+
+		removeDocumentEvent("mousedown", handleDocumentMouseDown);
+		removeDocumentEvent("click", handleDocumentClick);
+
+		// Stop listening for window resize and focus the anchor element per WAI guidelines
+		const scrollParent = getScrollParent(context.anchorElement)
+		scrollParent.removeEventListener("resize", setPosition);
+		scrollParent.removeEventListener("scroll", setPosition);
+		if (context.anchorElement?.focus) {
+			context.anchorElement.focus();
 		}
-	});
+	}
 
 	function handleDocumentMouseDown() {
 		closeOnClick = true;
@@ -85,20 +88,18 @@ export default function PopoverContentAnchored($props: any) {
 			throw new Error("PopoverContentAnchored must have an anchor element");
 		}
 
-		if (div) {
-			setPopoverPosition(context.anchorElement, div, $props.side, $props.alignment);
-		}
+		setPopoverPosition(context.anchorElement, div, $props.side, $props.alignment);
 	}
 
 	@render {
 		@if ($state.visible) {
 			<div
-				id={$props.id}
+				{$props.id}
 				class={`torp-popover-content-anchored ${$props.class ?? ""}`.trim()}
 				&ref={div}
-				:onmount={(el) => setPopoverPosition(context.anchorElement, el, $props.side, $props.alignment)}
+				onmount={show}
 			>
-				<:slot />
+				<slot />
 			</div>
 		}
 	}