ropav 0.1.5 → 0.1.7

package/dist/tooltip.js

@@ -1,13 +1,20 @@
 import './tooltip.css';
+import { t as useControllableValue } from "./useControllableValue.js";
+import { t as useStylesApi } from "./styles-api.js";
+import { n as toPresenceAttribute } from "./attributes.js";
 import { t as bem } from "./bem.js";
-import { n as useStylesApi, t as presence } from "./styles-api.js";
-import { i as getComponentVariantColorRoles } from "./componentColors.js";
+import { t as isElement } from "./query.js";
 import { t as _plugin_vue_export_helper_default } from "./_plugin-vue_export-helper.js";
+import { r as normalizeDelay } from "./number.js";
+import { a as getComponentVariantColorRoles } from "./componentColors.js";
+import { a as snapshotAttributes, i as restoreAttributes } from "./attributes2.js";
+import { n as mergeAriaIdRefs } from "./aria.js";
 import { n as useOverlayZIndex } from "./useOverlayZIndex.js";
-import { n as useFloatingPosition, r as useFloatingTarget, t as isElementReference } from "./useFloatingPosition.js";
-import { n as useTeleportPositioningKey, r as useTeleportTarget } from "./useTeleportTarget.js";
-import { VaporTeleport, VaporTransition, applyVShow, computed, createComponent, createIf, createSlot, createTemplateRefSetter, defineVaporComponent, extend, onBeforeUnmount, ref, renderEffect, setAttr, setDynamicProps, setInsertionState, setStaticTemplateRef, setStyle, setText, template, toDisplayString, unref, useId, useSlots, watch } from "vue";
-//#region src/composables/useDelayedOpen.ts
+import { t as getFloatingOffsetStyle } from "./floatingOffset.js";
+import { n as useFloatingTarget, t as useFloatingPosition } from "./useFloatingPosition.js";
+import { n as useTeleportTarget } from "./useTeleportTarget.js";
+import { VaporTeleport, VaporTransition, applyVShow, computed, createComponent, createIf, createSlot, createTemplateRefSetter, defineVaporComponent, extend, onBeforeUnmount, ref, renderEffect, setAttr, setDynamicProps, setInsertionState, setStyle, setTemplateRefBinding, setText, template, toDisplayString, unref, useId, useSlots, watch } from "vue";
+//#region src/internal/composables/useDelayedOpen.ts
 function readOption(value, fallback) {
 	return typeof value === "function" ? value() ?? fallback : value ?? fallback;
 }
@@ -15,9 +22,13 @@ function readOptional(value) {
 	return typeof value === "function" ? value() : value;
 }
 function useDelayedOpen(options = {}) {
-	const uncontrolledOpen = ref(false);
+	const controllableOpen = useControllableValue({
+		modelValue: () => readOptional(options.open),
+		defaultValue: () => false,
+		onChange: (nextOpen) => options.onOpenChange?.(nextOpen)
+	});
 	let openTimer = null;
-	const isOpen = computed(() => readOptional(options.open) ?? uncontrolledOpen.value);
+	const isOpen = controllableOpen.value;
 	function clearTimers() {
 		if (openTimer) {
 			clearTimeout(openTimer);
@@ -28,13 +39,11 @@ function useDelayedOpen(options = {}) {
 		return readOption(options.disabled, false);
 	}
 	function setOpen(nextOpen) {
-		const previousOpen = isOpen.value;
-		if (readOptional(options.open) === void 0) uncontrolledOpen.value = nextOpen;
-		if (previousOpen !== nextOpen) options.onOpenChange?.(nextOpen);
+		if (isOpen.value !== nextOpen) controllableOpen.setValue(nextOpen);
 	}
 	function open() {
 		if (isDisabled()) return;
-		const delay = readOption(options.openDelay, 0);
+		const delay = normalizeDelay(readOption(options.openDelay, 0));
 		if (delay <= 0) {
 			setOpen(true);
 			return;
@@ -58,14 +67,10 @@ function useDelayedOpen(options = {}) {
 }
 //#endregion
 //#region src/components/tooltip/useTooltip.ts
-function resolveTooltipOffsetStyle(offset) {
-	if (offset == null) return void 0;
-	if (typeof offset === "number") return { "--_rp-tooltip-main-axis-offset": `${offset}px` };
-	const style = {};
-	if (offset.mainAxis != null) style["--_rp-tooltip-main-axis-offset"] = `${offset.mainAxis}px`;
-	if (offset.crossAxis != null) style["--_rp-tooltip-cross-axis-offset"] = `${offset.crossAxis}px`;
-	return Object.keys(style).length > 0 ? style : void 0;
-}
+var TOOLTIP_OFFSET_PROPERTIES = {
+	mainAxis: "--_rp-tooltip-main-axis-offset",
+	crossAxis: "--_rp-tooltip-cross-axis-offset"
+};
 function resolveTooltipColorStyleWithContrast(color, autoContrast, contrastColor) {
 	if (!color) return void 0;
 	const roles = getComponentVariantColorRoles({
@@ -94,9 +99,8 @@ function useTooltip(props, emitOpenChange) {
 	const shouldRenderContent = computed(() => !isDisabled.value);
 	const shouldDescribeContent = computed(() => shouldRenderContent.value && !isDecorative.value);
 	const teleportTo = useTeleportTarget(() => props.teleportTo);
-	const teleportPositioningKey = useTeleportPositioningKey();
 	const { isExplicitTarget, reference, resolvedTarget } = useFloatingTarget(() => props.target, rootRef);
-	const targetElement = computed(() => isElementReference(resolvedTarget.value) ? resolvedTarget.value : null);
+	const targetElement = computed(() => isElement(resolvedTarget.value) ? resolvedTarget.value : null);
 	const zIndex = useOverlayZIndex({
 		baseZIndex: () => props.baseZIndex,
 		defaultBaseZIndex: 1e3
@@ -120,12 +124,7 @@ function useTooltip(props, emitOpenChange) {
 		flipOptions: () => props.flipOptions,
 		shift: () => props.shift !== false,
 		collisionPadding: () => props.collisionPadding ?? 8,
-		autoUpdateOptions: () => props.autoUpdateOptions,
-		restartKey: () => [
-			Boolean(props.teleport),
-			teleportTo.value,
-			teleportPositioningKey.value
-		]
+		autoUpdateOptions: () => props.autoUpdateOptions
 	});
 	const placementSide = computed(() => floating.actualPlacement.value.split("-")[0]);
 	const rootClass = computed(() => bem("rp-tooltip", {
@@ -140,7 +139,7 @@ function useTooltip(props, emitOpenChange) {
 	const contentAriaHidden = computed(() => isDecorative.value ? "true" : void 0);
 	const contentStyle = computed(() => ({
 		...floating.floatingStyle.value,
-		...resolveTooltipOffsetStyle(props.offset),
+		...getFloatingOffsetStyle(props.offset, TOOLTIP_OFFSET_PROPERTIES),
 		...resolveTooltipColorStyleWithContrast(props.color, props.autoContrast, props.contrastColor),
 		zIndex: zIndex.value
 	}));
@@ -178,14 +177,9 @@ function useTooltip(props, emitOpenChange) {
 		tooltipId
 	], ([explicit, target, shouldDescribe, id], _previous, onCleanup) => {
 		if (!explicit || !target || !shouldDescribe) return;
-		const previous = target.getAttribute("aria-describedby");
-		const ids = (previous ?? "").split(/\s+/).filter(Boolean);
-		if (!ids.includes(id)) ids.push(id);
-		target.setAttribute("aria-describedby", ids.join(" "));
-		onCleanup(() => {
-			if (previous == null) target.removeAttribute("aria-describedby");
-			else target.setAttribute("aria-describedby", previous);
-		});
+		const snapshot = snapshotAttributes(target, ["aria-describedby"]);
+		target.setAttribute("aria-describedby", mergeAriaIdRefs(snapshot.get("aria-describedby"), id) ?? "");
+		onCleanup(() => restoreAttributes(target, snapshot));
 	}, { flush: "sync" });
 	return {
 		rootRef,
@@ -213,10 +207,10 @@ function useTooltip(props, emitOpenChange) {
 }
 //#endregion
 //#region src/components/tooltip/tooltip.vue?vue&type=script&setup=true&vapor=true&lang.ts
-var t0 = template("<span data-v-9457a843 class=rp-tooltip__arrow aria-hidden=true>");
+var t0 = template("<span data-v-19aad69c class=rp-tooltip__arrow aria-hidden=true>");
 var t1 = template(" ");
-var t2 = template("<span data-v-9457a843>");
-var t3 = template("<span data-v-9457a843>", 1);
+var t2 = template("<span data-v-19aad69c>");
+var t3 = template("<span data-v-19aad69c>", 1);
 //#endregion
 //#region src/components/tooltip/tooltip.vue
 var tooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PURE__ */ defineVaporComponent({
@@ -280,12 +274,17 @@ var tooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PURE
 		const { rootRef, contentRef, arrowRef, tooltipId, isDisabled, isVisible, isTargetMode, shouldRenderContent, rootClass, triggerProps, contentRole, contentAriaHidden, contentStyle, actualPlacement, placementSide, arrowStyle, teleportTo, openTooltip, closeTooltip, onKeydown } = useTooltip(props, (open) => {
 			emit("update:open", open);
 		});
+		const templateRefs = {
+			root: rootRef,
+			content: contentRef,
+			arrow: arrowRef
+		};
 		const { getPartAttrs, getRootAttrs } = useStylesApi(props, "root");
 		const state = computed(() => isVisible.value ? "open" : "closed");
 		const rootAttrs = computed(() => getRootAttrs({
 			class: rootClass.value,
 			"data-state": state.value,
-			"data-disabled": presence(isDisabled.value),
+			"data-disabled": toPresenceAttribute(isDisabled.value),
 			onMouseenter: openTooltip,
 			onMouseleave: closeTooltip,
 			onFocusin: openTooltip,
@@ -299,7 +298,7 @@ var tooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PURE
 				...props.classNames?.trigger !== void 0 ? { class: partAttrs.class } : {},
 				...props.styles?.trigger !== void 0 ? { style: partAttrs.style } : {},
 				"data-state": state.value,
-				"data-disabled": presence(isDisabled.value)
+				"data-disabled": toPresenceAttribute(isDisabled.value)
 			};
 		});
 		const contentAttrs = computed(() => ({
@@ -337,10 +336,10 @@ var tooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PURE
 					setInsertionState(n11, null, 0);
 					createIf(() => __props.arrow, () => {
 						const n7 = t0();
-						_setTemplateRef(n7, arrowRef, null, "arrowRef");
 						renderEffect(() => {
 							setAttr(n7, "data-side", unref(placementSide));
 							setStyle(n7, unref(arrowStyle));
+							_setTemplateRef(n7, templateRefs.arrow);
 						});
 						return n7;
 					});
@@ -351,14 +350,14 @@ var tooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PURE
 						return n10;
 					}, 1);
 					applyVShow(n11, () => unref(isVisible));
-					_setTemplateRef(n11, contentRef, null, "contentRef");
+					setTemplateRefBinding(n11, () => templateRefs.content, _setTemplateRef);
 					return n11;
 				}, null, 129);
 			}, { _: 8 }));
 		});
-		setStaticTemplateRef(n14, rootRef, null, "rootRef");
+		setTemplateRefBinding(n14, () => templateRefs.root);
 		return n14;
 	}
-}), [["__scopeId", "data-v-9457a843"]]);
+}), [["__scopeId", "data-v-19aad69c"]]);
 //#endregion
-export { useDelayedOpen as i, resolveTooltipColorStyleWithContrast as n, resolveTooltipOffsetStyle as r, tooltip_default as t };
+export { resolveTooltipColorStyleWithContrast as n, useDelayedOpen as r, tooltip_default as t };

package/dist/useCollapse.js

@@ -1,19 +1,23 @@
+import { t as useControllableValue } from "./useControllableValue.js";
 import { t as bem } from "./bem.js";
-import { computed, ref, toValue, useId } from "vue";
+import { computed, toValue, useId } from "vue";
 //#region src/components/collapse/useCollapse.ts
 var DEFAULT_ROLE = "region";
-function optionValue(value) {
-	return toValue(value);
-}
 function useCollapse(options = {}, emitOpenChange) {
 	const generatedId = useId();
-	const uncontrolledOpen = ref(false);
-	const id = computed(() => optionValue(options.id) ?? `${generatedId}-collapse`);
-	const controlledOpen = computed(() => optionValue(options.open));
-	const isDisabled = computed(() => Boolean(optionValue(options.disabled)));
-	const isOpen = computed(() => Boolean(controlledOpen.value ?? uncontrolledOpen.value));
+	const id = computed(() => toValue(options.id) ?? `${generatedId}-collapse`);
+	const isDisabled = computed(() => Boolean(toValue(options.disabled)));
+	const controllableOpen = useControllableValue({
+		modelValue: () => toValue(options.open),
+		defaultValue: () => false,
+		onChange: (nextOpen) => {
+			options.onOpenChange?.(nextOpen);
+			emitOpenChange?.(nextOpen);
+		}
+	});
+	const isOpen = controllableOpen.value;
 	const state = computed(() => isOpen.value ? "open" : "closed");
-	const shouldRenderContent = computed(() => !optionValue(options.unmountOnExit) || isOpen.value);
+	const shouldRenderContent = computed(() => !toValue(options.unmountOnExit) || isOpen.value);
 	const rootClass = computed(() => bem("rp-collapse", {
 		open: isOpen.value,
 		closed: !isOpen.value,
@@ -41,12 +45,12 @@ function useCollapse(options = {}, emitOpenChange) {
 	const contentProps = computed(() => ({
 		class: "rp-collapse__content",
 		id: id.value,
-		role: optionValue(options.role) ?? DEFAULT_ROLE,
+		role: toValue(options.role) ?? DEFAULT_ROLE,
 		"data-state": state.value,
 		"aria-hidden": isOpen.value ? void 0 : "true",
-		"aria-label": optionValue(options.ariaLabel) || void 0,
-		"aria-labelledby": optionValue(options.ariaLabelledby) || void 0,
-		"aria-describedby": optionValue(options.ariaDescribedby) || void 0
+		"aria-label": toValue(options.ariaLabel) || void 0,
+		"aria-labelledby": toValue(options.ariaLabelledby) || void 0,
+		"aria-describedby": toValue(options.ariaDescribedby) || void 0
 	}));
 	const triggerSlotProps = computed(() => ({
 		triggerProps: triggerProps.value,
@@ -54,9 +58,7 @@ function useCollapse(options = {}, emitOpenChange) {
 	}));
 	function setOpen(nextOpen) {
 		if (isDisabled.value || nextOpen === isOpen.value) return;
-		if (controlledOpen.value === void 0) uncontrolledOpen.value = nextOpen;
-		options.onOpenChange?.(nextOpen);
-		emitOpenChange?.(nextOpen);
+		controllableOpen.setValue(nextOpen);
 	}
 	function open() {
 		setOpen(true);

package/dist/useControlState.js

@@ -1,9 +1,6 @@
+import { n as mergeAriaIdRefs } from "./aria.js";
 import { computed } from "vue";
-//#region src/composables/useControlState.ts
-function mergeIds(...values) {
-	const ids = values.flatMap((value) => value?.split(/\s+/) ?? []).filter(Boolean);
-	return ids.length > 0 ? Array.from(new Set(ids)).join(" ") : void 0;
-}
+//#region src/internal/composables/useControlState.ts
 function useControlState(options = {}) {
 	const id = computed(() => options.id);
 	const form = computed(() => options.form);
@@ -11,8 +8,8 @@ function useControlState(options = {}) {
 	const required = computed(() => options.required ?? false);
 	const invalid = computed(() => options.invalid ?? false);
 	const valid = computed(() => options.valid ?? false);
-	const ariaDescribedby = computed(() => mergeIds(options.describedby));
-	const ariaLabelledby = computed(() => mergeIds(options.labelledby));
+	const ariaDescribedby = computed(() => mergeAriaIdRefs(options.describedby));
+	const ariaLabelledby = computed(() => mergeAriaIdRefs(options.labelledby));
 	return {
 		get id() {
 			return id.value;

package/dist/useControllableValue.js

@@ -6,8 +6,14 @@ function useControllableValue(options) {
 	const isControlled = computed(() => options.modelValue() !== void 0);
 	watch(options.modelValue, (value) => {
 		if (value !== void 0) uncontrolledValue.value = value;
-	}, { immediate: true });
-	const value = computed(() => options.modelValue() ?? uncontrolledValue.value);
+	}, {
+		flush: "sync",
+		immediate: true
+	});
+	const value = computed(() => {
+		const modelValue = options.modelValue();
+		return modelValue === void 0 ? uncontrolledValue.value : modelValue;
+	});
 	function setValue(nextValue) {
 		if (!isControlled.value) uncontrolledValue.value = nextValue;
 		options.onChange(nextValue);