@lattice-ui/tooltip 0.3.2 → 0.4.1

package/out/Tooltip/TooltipContent.luau

@@ -36,7 +36,6 @@ local function TooltipContentImpl(props)
 			enabled = props.enabled,
 			modal = false,
 			onDismiss = props.onDismiss,
-			onEscapeKeyDown = props.onEscapeKeyDown,
 			onInteractOutside = props.onInteractOutside,
 			onPointerDownOutside = props.onPointerDownOutside,
 		}, React.createElement(Slot, {
@@ -50,7 +49,6 @@ local function TooltipContentImpl(props)
 		enabled = props.enabled,
 		modal = false,
 		onDismiss = props.onDismiss,
-		onEscapeKeyDown = props.onEscapeKeyDown,
 		onInteractOutside = props.onInteractOutside,
 		onPointerDownOutside = props.onPointerDownOutside,
 	}, React.createElement("frame", {
@@ -79,7 +77,6 @@ local function TooltipContent(props)
 			enabled = open,
 			offset = props.offset,
 			onDismiss = handleDismiss,
-			onEscapeKeyDown = props.onEscapeKeyDown,
 			onInteractOutside = props.onInteractOutside,
 			onPointerDownOutside = props.onPointerDownOutside,
 			padding = props.padding,
@@ -96,7 +93,6 @@ local function TooltipContent(props)
 				enabled = state.isPresent,
 				offset = props.offset,
 				onDismiss = handleDismiss,
-				onEscapeKeyDown = props.onEscapeKeyDown,
 				onInteractOutside = props.onInteractOutside,
 				onPointerDownOutside = props.onPointerDownOutside,
 				padding = props.padding,

package/out/Tooltip/TooltipTrigger.luau

@@ -3,6 +3,9 @@ local TS = _G[script]
 local _core = TS.import(script, TS.getModule(script, "@lattice-ui", "core").out)
 local React = _core.React
 local Slot = _core.Slot
+local _activity = TS.import(script, script.Parent, "activity")
+local DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE = _activity.DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE
+local updateTooltipTriggerActivity = _activity.updateTooltipTriggerActivity
 local useTooltipContext = TS.import(script, script.Parent, "context").useTooltipContext
 local function toGuiObject(instance)
 	if not instance or not instance:IsA("GuiObject") then
@@ -12,33 +15,59 @@ local function toGuiObject(instance)
 end
 local function TooltipTrigger(props)
 	local tooltipContext = useTooltipContext()
+	local activityStateRef = React.useRef(DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE)
 	local setTriggerRef = React.useCallback(function(instance)
 		tooltipContext.triggerRef.current = toGuiObject(instance)
 	end, { tooltipContext.triggerRef })
-	local handleOpen = React.useCallback(function()
+	local applyActivity = React.useCallback(function(kind, active)
+		local result = updateTooltipTriggerActivity(activityStateRef.current, kind, active)
+		activityStateRef.current = result.state
 		if props.disabled then
+			if not active then
+				tooltipContext.close()
+			end
 			return nil
 		end
-		tooltipContext.openWithDelay()
+		if result.action == "open" then
+			tooltipContext.openWithDelay()
+			return nil
+		end
+		if result.action == "close" then
+			tooltipContext.close()
+		end
 	end, { props.disabled, tooltipContext })
-	local handleClose = React.useCallback(function()
+	React.useEffect(function()
+		if not props.disabled then
+			return nil
+		end
+		activityStateRef.current = DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE
 		tooltipContext.close()
-	end, { tooltipContext })
+	end, { props.disabled, tooltipContext })
 	local eventHandlers = React.useMemo(function()
 		return {
-			MouseEnter = handleOpen,
-			MouseLeave = handleClose,
-			SelectionGained = handleOpen,
-			SelectionLost = handleClose,
+			MouseEnter = function()
+				return applyActivity("hover", true)
+			end,
+			MouseLeave = function()
+				return applyActivity("hover", false)
+			end,
+			SelectionGained = function()
+				return applyActivity("focus", true)
+			end,
+			SelectionLost = function()
+				return applyActivity("focus", false)
+			end,
 		}
-	end, { handleClose, handleOpen })
+	end, { applyActivity })
 	if props.asChild then
 		local child = props.children
 		if not child then
 			error("[TooltipTrigger] `asChild` requires a child element.")
 		end
 		return React.createElement(Slot, {
+			Active = props.disabled ~= true,
 			Event = eventHandlers,
+			Selectable = props.disabled ~= true,
 			ref = setTriggerRef,
 		}, child)
 	end

package/out/Tooltip/activity.d.ts

@@ -0,0 +1,11 @@
+export type TooltipTriggerActivityKind = "hover" | "focus";
+export type TooltipTriggerActivityState = {
+    hover: boolean;
+    focus: boolean;
+};
+export type TooltipTriggerActivityResult = {
+    action: "open" | "close" | "none";
+    state: TooltipTriggerActivityState;
+};
+export declare const DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE: TooltipTriggerActivityState;
+export declare function updateTooltipTriggerActivity(state: TooltipTriggerActivityState, kind: TooltipTriggerActivityKind, active: boolean): TooltipTriggerActivityResult;

package/out/Tooltip/activity.luau

@@ -0,0 +1,33 @@
+-- Compiled with roblox-ts v3.0.0
+local DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE = {
+	hover = false,
+	focus = false,
+}
+local function updateTooltipTriggerActivity(state, kind, active)
+	local _object = table.clone(state)
+	setmetatable(_object, nil)
+	_object[kind] = active
+	local nextState = _object
+	local wasActive = state.hover or state.focus
+	local isActive = nextState.hover or nextState.focus
+	if not wasActive and isActive then
+		return {
+			action = "open",
+			state = nextState,
+		}
+	end
+	if wasActive and not isActive then
+		return {
+			action = "close",
+			state = nextState,
+		}
+	end
+	return {
+		action = "none",
+		state = nextState,
+	}
+end
+return {
+	updateTooltipTriggerActivity = updateTooltipTriggerActivity,
+	DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE = DEFAULT_TOOLTIP_TRIGGER_ACTIVITY_STATE,
+}

package/out/Tooltip/types.d.ts

@@ -44,7 +44,6 @@ export type TooltipContentProps = {
     placement?: PopperPlacement;
     offset?: Vector2;
     padding?: number;
-    onEscapeKeyDown?: (event: LayerInteractEvent) => void;
     onPointerDownOutside?: (event: LayerInteractEvent) => void;
     onInteractOutside?: (event: LayerInteractEvent) => void;
     children?: React.ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lattice-ui/tooltip",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "private": false,
   "main": "out/init.luau",
   "types": "out/index.d.ts",
@@ -9,9 +9,9 @@
     "README.md"
   ],
   "dependencies": {
-    "@lattice-ui/core": "0.3.2",
-    "@lattice-ui/popper": "0.3.2",
-    "@lattice-ui/layer": "0.3.2"
+    "@lattice-ui/core": "0.4.1",
+    "@lattice-ui/popper": "0.4.1",
+    "@lattice-ui/layer": "0.4.1"
   },
   "devDependencies": {
     "@rbxts/react": "17.3.7-ts.1",