@torpor/ui 0.1.7 → 0.2.1

package/dist/Popover/PopoverContent.torp

@@ -1,12 +1,23 @@
 import { addDocumentEvent, removeDocumentEvent } from "../utils/documentEvents";
 import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
 
+interface PopoverContentProps {
+	/** An ID for the root element */
+	id?: string;
+	/** Class name(s) for the root element */
+	class?: string,
+}
+
 /**
  * The content that is displayed for a Popover when it is open, such as a Dialog
  * in the middle of the screen or a div that slides in from the side.
  */
-export default function PopoverContent($props: any) {
+export default function PopoverContent($props: PopoverContentProps) {
+	$props ??= $watch({});
+
 	let div: HTMLDivElement;
+	let shown = false;
+	let closeOnClick = false;
 
 	// Get stuff out of the PopoverContext
 	const context = $context[PopoverContextName] as PopoverContext;
@@ -15,37 +26,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();
+		}
+	});
 
-		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);
+
+		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 +76,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/dist/Popover/PopoverContentAnchored.torp

@@ -3,21 +3,28 @@ import getScrollParent from "../utils/getScrollParent";
 import setPopoverPosition from "../utils/setPopoverPosition";
 import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
 
+interface PopoverContentAnchoredProps {
+	/** An ID for the root element */
+	id?: string;
+	/** Class name(s) for the root element */
+	class?: string,
+	/** Where the popover will be shown, relative to the popover button */
+	side?: "top" | "right" | "bottom" | "left",
+	/** How the popover will be aligned, relative to the popover button */
+	alignment?: "start" | "center" | "end",
+}
+
 /**
  * The content that is displayed for a Popover when it is open, displayed
  * alongside an element.
- *
- * @prop {"top" | "right" | "bottom" | "left"} site -- Where the popover will be
- * shown, relative to the popover button
- * @prop {"start" | "center" | "end"} alignment -- How the popover will be
- * aligned, relative to the popover button
  */
-export default function PopoverContentAnchored($props: any) {
+export default function PopoverContentAnchored($props: PopoverContentAnchoredProps) {
+	$props ??= $watch({});
 	$props.side ??= "bottom";
 	$props.alignment ??= "center";
 
 	let div: HTMLDivElement;
-
+	let shown = false;
 	let closeOnClick = false;
 
 	// Get stuff out of the PopoverContext
@@ -27,42 +34,45 @@ export default function PopoverContentAnchored($props: any) {
 	}
 	let $state = context.state;
 
-	let first = true;
 	$run(() => {
-		let visible = $state.visible;
+		if (!$state.visible) {
+			hide();
+		}
+	});
+
+	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);
 
-		if (first) {
-			first = false;
-			return;
+		// 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();
 		}
+	}
+
+	function hide() {
+		if (!shown) return;
+
+		removeDocumentEvent("mousedown", handleDocumentMouseDown);
+		removeDocumentEvent("click", handleDocumentClick);
 
-		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();
-			}
+		// 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 +95,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>
 		}
 	}

package/dist/Popover/PopoverContentContextual.torp

@@ -4,13 +4,22 @@ import getScrollParent from "../utils/getScrollParent";
 import setContextPosition from "../utils/setContextPosition";
 import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
 
+interface PopoverContentContextualProps {
+	/** An ID for the root element */
+	id?: string;
+	/** Class name(s) for the root element */
+	class?: string,
+}
+
 /**
  * The content that is displayed for a Popover when it is open, displayed at the
  * position that the user right-clicked.
  */
-export default function PopoverContentContextual($props: any) {	
-	let div: HTMLDivElement;
+export default function PopoverContentContextual($props: PopoverContentContextualProps) {	
+	$props ??= $watch({});
 
+	let div: HTMLDivElement;
+	let shown = false;
 	let closeOnClick = false;
 
 	// Get stuff out of the PopoverContext
@@ -20,42 +29,45 @@ export default function PopoverContentContextual($props: any) {
 	}
 	let $state = context.state;
 
-	let first = true;
 	$run(() => {
-		let visible = $state.visible;
+		if (!$state.visible) {
+			hide();
+		}
+	});
+
+	function show() {
+		shown = true;
 
-		if (first) {
-			first = false;
-			return;
+		// HACK: Because this Contextual 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();
 		}
+	}
+
+	function hide() {
+		if (!shown) return;
 
-		if (visible) {
-			// HACK: Because this Contextual 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();
-			}
+		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;
@@ -77,7 +89,7 @@ export default function PopoverContentContextual($props: any) {
 			throw new Error("ContextualContent must have an anchor element");
 		}
 
-		if (div && $state.position) {
+		if ($state.position) {
 			setContextPosition(context.anchorElement, div, $state.position);
 		}
 	}
@@ -85,12 +97,12 @@ export default function PopoverContentContextual($props: any) {
 	@render {
 		@if ($state.visible) {
 			<div
-				id={$props.id}
+				{$props.id}
 				class={`torp-popover-content-contextual ${$props.class ?? ""}`.trim()}
 				&ref={div}
-				:onmount={(el) => setContextPosition(context.anchorElement, el, $state.position)}
+				onmount={show}
 			>
-				<:slot />
+				<slot />
 			</div>
 		}
 	}

package/dist/Popover/PopoverOverlay.torp

@@ -1,10 +1,19 @@
 import { disableScroll } from "../mount/disableScroll";
 import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
 
+interface PopoverOverlayProps {
+	/** An ID for the root element */
+	id?: string;
+	/** Class name(s) for the root element */
+	class?: string,
+}
+
 /**
  * The background overlay for a Popover. Adding an overlay automatically sets the Popover to modal.
  */
-export default function PopoverOverlay($props: any) {
+export default function PopoverOverlay($props: PopoverOverlayProps) {
+	$props ??= $watch({});
+
 	// Get stuff out of the PopoverContext
 	const context = $context[PopoverContextName] as PopoverContext;
 	if (!context) {
@@ -18,12 +27,12 @@ export default function PopoverOverlay($props: any) {
 	@render {
 		@if ($state.visible) {
 			<div
-				id={$props.id}
+				{$props.id}
 				class={`torp-popover-overlay ${$props.class ?? ""}`.trim()}
 				tabindex="-1"
-				:onmount={(el) => disableScroll(el)}
+				onmount={(el) => disableScroll(el)}
 			>
-				<:slot />
+				<slot />
 			</div>
 		}
 	}

package/dist/Popover/PopoverTrigger.torp

@@ -1,9 +1,18 @@
 import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
 
+interface PopoverTriggerProps {
+	/** An ID for the root element */
+	id?: string;
+	/** Class name(s) for the root element */
+	class?: string,
+}
+
 /**
  * The button that causes a Popover to appear or disappear.
  */
-export default function PopoverTrigger($props: any) {
+export default function PopoverTrigger($props: PopoverTriggerProps) {
+	$props ??= $watch({});
+
 	// Get stuff out of the PopoverContext
 	const context = $context[PopoverContextName] as PopoverContext;
 	if (!context) {
@@ -18,12 +27,12 @@ export default function PopoverTrigger($props: any) {
 	@render {
 		<button
 			type="button"
-			id={$props.id}
+			{$props.id}
 			class={`torp-popover-trigger ${$props.class ?? ""}`.trim()}
 			onclick={handleClick}
 			&ref={context.anchorElement}
 		>
-			<:slot />
+			<slot />
 		</button>
 	}
 }

package/dist/Popover/PopoverTriggerContextual.torp

@@ -1,9 +1,18 @@
 import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
 
+interface PopoverTriggerContextualProps {
+	/** An ID for the root element */
+	id?: string;
+	/** Class name(s) for the root element */
+	class?: string,
+}
+
 /**
  * The element that causes a Popover to appear or disappear when right-clicked.
  */
-export default function PopoverTriggerContextual($props: any) {
+export default function PopoverTriggerContextual($props: PopoverTriggerContextualProps) {
+	$props ??= $watch({});
+
 	// Get stuff out of the PopoverContext
 	const context = $context[PopoverContextName] as PopoverContext;
 	if (!context) {
@@ -26,12 +35,12 @@ export default function PopoverTriggerContextual($props: any) {
 
 	@render {
 		<div
-			id={$props.id}
+			{$props.id}
 			class={`torp-popover-trigger-contextual ${$props.class ?? ""}`.trim()}
 			oncontextmenu={handleContextual}
 			&ref={context.anchorElement}
 		>
-			<:slot />
+			<slot />
 		</div>
 	}
 }

package/dist/Popover/PopoverTriggerHover.torp

@@ -2,10 +2,19 @@
 import { PopoverContextName, type PopoverContext } from "./PopoverTypes";
 import hoverTrigger from "../mount/hoverTrigger";
 
+interface PopoverTriggerHoverProps {
+	/** An ID for the root element */
+	id?: string;
+	/** Class name(s) for the root element */
+	class?: string,
+}
+
 /**
  * The div that causes a Popover to appear or disappear when hovered.
  */
-export default function PopoverTriggerHover($props: any) {
+export default function PopoverTriggerHover($props: PopoverTriggerHoverProps) {
+	$props ??= $watch({});
+
 	// Get stuff out of the PopoverContext
 	const context = $context[PopoverContextName] as PopoverContext;
 	if (!context) {
@@ -13,7 +22,7 @@ export default function PopoverTriggerHover($props: any) {
 	}
 	let $state = context.state;
 
-	function handleHover(node, e) {
+	function handleHover(node: HTMLElement, e: TouchEvent | MouseEvent) {
 		if ($state.position) {
 			// Get the position relative to the element, so we can reposition on scroll
 			const rect = node.getBoundingClientRect();
@@ -27,12 +36,12 @@ export default function PopoverTriggerHover($props: any) {
 
 	@render {
 		<div
-			id={$props.id}
+			{$props.id}
 			class={`torp-popover-trigger-hover ${$props.class ?? ""}`.trim()}
-			:onmount={(el) => hoverTrigger(el, { onHover: handleHover, onExit: handleHover })}
+			onmount={(el) => hoverTrigger(el, { onHover: handleHover, onExit: handleHover })}
 			&ref={context.anchorElement}
 		>
-			<:slot />
+			<slot />
 		</div>
 	}
 }