more progress

Author: huntabyte

packages/floating-ui-svelte/src/hooks/use-click.svelte.ts

@@ -52,7 +52,7 @@ function isSpaceIgnored(element: ReferenceType | null) {
 	return isTypeableElement(element);
 }
 
-class ClickState {
+class ClickInteraction {
 	#enabled = $derived.by(() => this.options.enabled ?? "true");
 	#eventOption = $derived.by(() => this.options.event ?? "click");
 	#toggle = $derived.by(() => this.options.toggle ?? true);
@@ -175,10 +175,14 @@ class ClickState {
 			onkeyup: this.#onkeyup,
 		};
 	});
+
+	get enabled() {
+		return this.#enabled;
+	}
 }
 
 function useClick(context: FloatingContext, options: UseClickOptions = {}) {
-	return new ClickState(context, options);
+	return new ClickInteraction(context, options);
 }
 
 export type { UseClickOptions };

packages/floating-ui-svelte/src/hooks/use-dismiss.svelte.ts

@@ -114,7 +114,7 @@ interface UseDismissOptions {
 	capture?: boolean | { escapeKey?: boolean; outsidePress?: boolean };
 }
 
-class DismissState {
+class DismissInteraction {
 	#enabled = $derived.by(() => this.options.enabled ?? true);
 	#escapeKey = $derived.by(() => this.options.escapeKey ?? true);
 	#unstable_outsidePress = $derived.by(() => this.options.outsidePress ?? true);
@@ -486,8 +486,8 @@ class DismissState {
 }
 
 function useDismiss(context: FloatingContext, options: UseDismissOptions = {}) {
-	return new DismissState(context, options);
+	return new DismissInteraction(context, options);
 }
 
 export type { UseDismissOptions };
-export { useDismiss, DismissState };
+export { useDismiss, DismissInteraction as DismissState };

packages/floating-ui-svelte/src/hooks/use-floating.svelte.ts

@@ -1,7 +1,9 @@
 import { isElement } from "@floating-ui/utils/dom";
 import { useFloatingTree } from "../components/floating-tree/hooks.svelte.js";
 import type {
+	ContextData,
 	ExtendedElements,
+	FloatingEvents,
 	FloatingTreeType,
 	NarrowedElement,
 	OpenChangeReason,
@@ -12,6 +14,8 @@ import {
 	PositionState,
 	type UsePositionOptions,
 } from "./use-position.svelte.js";
+import type { Placement, Strategy } from "@floating-ui/utils";
+import type { MiddlewareData } from "@floating-ui/dom";
 
 interface UseFloatingOptions<RT extends ReferenceType = ReferenceType>
 	extends Omit<UsePositionOptions<RT>, "elements"> {
@@ -47,9 +51,59 @@ type FloatingContextOptions<RT extends ReferenceType = ReferenceType> = {
 	getElements: (state: FloatingState<RT>) => ExtendedElements<RT>;
 };
 
-class FloatingContext<RT extends ReferenceType = ReferenceType> {
+interface FloatingContextData<RT extends ReferenceType = ReferenceType> {
+	elements: ExtendedElements<RT>;
+	x: number;
+	y: number;
+	placement: Placement;
+	strategy: Strategy;
+	middlewareData: MiddlewareData;
+	isPositioned: boolean;
+	update: () => Promise<void>;
+	floatingStyles: string;
+	onOpenChange: (
+		open: boolean,
+		event?: Event,
+		reason?: OpenChangeReason,
+	) => void;
+	open: boolean;
+	data: ContextData<RT>;
+	floatingId: string;
+	events: FloatingEvents;
+	nodeId: string | undefined;
+}
+
+class FloatingContext<RT extends ReferenceType = ReferenceType>
+	implements FloatingContextData<RT>
+{
 	constructor(private readonly opts: FloatingContextOptions<RT>) {}
 
+	/**
+	 * INTERNAL ONLY. DO NOT USE.
+	 *
+	 * @internal
+	 */
+	// prefix with `z` to push to bottom of intellisense
+	readonly z_internal_current: FloatingContextData<RT> = $derived.by(() => {
+		return {
+			elements: this.opts.getElements(this.opts.floating),
+			x: this.opts.floating.x,
+			y: this.opts.floating.y,
+			placement: this.opts.floating.placement,
+			strategy: this.opts.floating.strategy,
+			middlewareData: this.opts.floating.middlewareData,
+			isPositioned: this.opts.floating.isPositioned,
+			update: this.opts.floating.update,
+			floatingStyles: this.opts.floating.floatingStyles,
+			onOpenChange: this.opts.rootContext.onOpenChange,
+			open: this.opts.rootContext.open,
+			data: this.opts.rootContext.data,
+			floatingId: this.opts.rootContext.floatingId,
+			events: this.opts.rootContext.events,
+			nodeId: this.opts.floatingOptions.nodeId,
+		};
+	});
+
 	get elements() {
 		return this.opts.getElements(this.opts.floating);
 	}
@@ -251,4 +305,4 @@ function useFloating<RT extends ReferenceType = ReferenceType>(
 }
 
 export { FloatingState, FloatingContext, useFloating };
-export type { UseFloatingOptions };
+export type { UseFloatingOptions, FloatingContextData };

packages/floating-ui-svelte/src/hooks/use-focus.svelte.ts

@@ -29,7 +29,7 @@ interface UseFocusOptions {
 	visibleOnly?: boolean;
 }
 
-class FocusState {
+class FocusInteraction {
 	#enabled = $derived.by(() => this.options.enabled ?? true);
 	#visibleOnly = $derived.by(() => this.options.visibleOnly ?? true);
 	#blockFocus = false;
@@ -173,11 +173,15 @@ class FocusState {
 			onblur: this.#onblur,
 		};
 	});
+
+	get enabled() {
+		return this.#enabled;
+	}
 }
 
 function useFocus(context: FloatingContext, options: UseFocusOptions = {}) {
-	return new FocusState(context, options);
+	return new FocusInteraction(context, options);
 }
 
 export type { UseFocusOptions };
-export { useFocus, FocusState };
+export { useFocus, FocusInteraction as FocusState };