diff --git a/bun.lockb b/bun.lockb
index 30526693bc..b3e6522a87 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/packages/react/package.json b/packages/react/package.json
index fc66c6ca3d..40c3e1b0a1 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -187,6 +187,7 @@
     "@zag-js/dom-query": "0.81.0",
     "@zag-js/editable": "0.81.0",
     "@zag-js/file-upload": "0.81.0",
+    "@zag-js/focus-trap": "0.81.0",
     "@zag-js/file-utils": "0.81.0",
     "@zag-js/highlight-word": "0.81.0",
     "@zag-js/hover-card": "0.81.0",
diff --git a/packages/react/src/components/focus-trap/examples/autofocus.tsx b/packages/react/src/components/focus-trap/examples/autofocus.tsx
new file mode 100644
index 0000000000..b2e14fae78
--- /dev/null
+++ b/packages/react/src/components/focus-trap/examples/autofocus.tsx
@@ -0,0 +1,34 @@
+import { useRef, useState } from 'react'
+import { FocusTrap } from '../focus-trap'
+
+export const Autofocus = () => {
+  const [trapped, setTrapped] = useState(false)
+  const toggle = () => setTrapped((c) => !c)
+
+  const buttonRef = useRef<HTMLButtonElement | null>(null)
+  const getButtonNode = () => {
+    const node = buttonRef.current
+    if (!node) throw new Error('Button not found')
+    return node
+  }
+
+  return (
+    <div>
+      <button ref={buttonRef} onClick={toggle}>
+        {trapped ? 'End Trap' : 'Start Trap'}
+      </button>
+      {trapped && (
+        <FocusTrap disabled={!trapped} setReturnFocus={getButtonNode}>
+          <div
+            style={{ display: 'flex', flexDirection: 'column', gap: '1rem', paddingBlock: '1rem' }}
+          >
+            <input type="text" placeholder="Regular input" />
+            {/* biome-ignore lint/a11y/noAutofocus: <explanation> */}
+            <input type="text" placeholder="Autofocused input" autoFocus />
+            <button onClick={() => setTrapped(false)}>End Trap</button>
+          </div>
+        </FocusTrap>
+      )}
+    </div>
+  )
+}
diff --git a/packages/react/src/components/focus-trap/examples/basic.tsx b/packages/react/src/components/focus-trap/examples/basic.tsx
new file mode 100644
index 0000000000..1a625d4724
--- /dev/null
+++ b/packages/react/src/components/focus-trap/examples/basic.tsx
@@ -0,0 +1,20 @@
+import { useState } from 'react'
+import { FocusTrap } from '../focus-trap'
+
+export const Basic = () => {
+  const [trapped, setTrapped] = useState(false)
+  return (
+    <>
+      <button onClick={() => setTrapped(true)}>Start Trap</button>
+      <FocusTrap returnFocusOnDeactivate={false} disabled={!trapped}>
+        <div
+          style={{ display: 'flex', flexDirection: 'column', gap: '1rem', paddingBlock: '1rem' }}
+        >
+          <input type="text" placeholder="input" />
+          <textarea placeholder="textarea" />
+          <button onClick={() => setTrapped(false)}>End Trap</button>
+        </div>
+      </FocusTrap>
+    </>
+  )
+}
diff --git a/packages/react/src/components/focus-trap/examples/initial-focus.tsx b/packages/react/src/components/focus-trap/examples/initial-focus.tsx
new file mode 100644
index 0000000000..e3c116a7f7
--- /dev/null
+++ b/packages/react/src/components/focus-trap/examples/initial-focus.tsx
@@ -0,0 +1,25 @@
+import { useState, useRef } from 'react'
+import { FocusTrap } from '../focus-trap'
+
+export const InitialFocus = () => {
+  const [trapped, setTrapped] = useState(false)
+  const toggle = () => setTrapped((c) => !c)
+
+  const inputRef = useRef<HTMLInputElement>(null)
+
+  return (
+    <div>
+      <button onClick={toggle}>{trapped ? 'End Trap' : 'Start Trap'}</button>
+      <FocusTrap disabled={!trapped} initialFocus={() => inputRef.current}>
+        <div
+          style={{ display: 'flex', flexDirection: 'column', gap: '1rem', paddingBlock: '1rem' }}
+        >
+          <input type="text" placeholder="First input" />
+          <input ref={inputRef} type="text" placeholder="Second input (initial focus)" />
+          <textarea placeholder="textarea" />
+          <button onClick={() => setTrapped(false)}>End Trap</button>
+        </div>
+      </FocusTrap>
+    </div>
+  )
+}
diff --git a/packages/react/src/components/focus-trap/focus-trap.stories.tsx b/packages/react/src/components/focus-trap/focus-trap.stories.tsx
new file mode 100644
index 0000000000..6690d6f932
--- /dev/null
+++ b/packages/react/src/components/focus-trap/focus-trap.stories.tsx
@@ -0,0 +1,11 @@
+import type { Meta } from '@storybook/react'
+
+const meta: Meta = {
+  title: 'Components / Focus Trap',
+}
+
+export default meta
+
+export { Basic } from './examples/basic'
+export { InitialFocus } from './examples/initial-focus'
+export { Autofocus } from './examples/autofocus'
diff --git a/packages/react/src/components/focus-trap/focus-trap.tsx b/packages/react/src/components/focus-trap/focus-trap.tsx
new file mode 100644
index 0000000000..2d79ef1755
--- /dev/null
+++ b/packages/react/src/components/focus-trap/focus-trap.tsx
@@ -0,0 +1,51 @@
+import { forwardRef, useRef } from 'react'
+import { type HTMLProps, type PolymorphicProps, ark } from '../factory'
+import { trapFocus, type FocusTrapOptions } from '@zag-js/focus-trap'
+import { useSafeLayoutEffect } from '../../utils/use-safe-layout-effect'
+import { composeRefs } from '../../utils/compose-refs'
+import type { Assign } from '../../types'
+import { createSplitProps } from '../../utils/create-split-props'
+
+export interface TrapOptions extends Omit<FocusTrapOptions, 'document' | 'trapStack'> {
+  disabled?: boolean
+}
+
+export interface FocusTrapBaseProps extends PolymorphicProps, TrapOptions {}
+
+export interface FocusTrapProps extends Assign<HTMLProps<'div'>, FocusTrapBaseProps> {}
+
+export const FocusTrap = forwardRef<HTMLDivElement, FocusTrapProps>((props, ref) => {
+  const localRef = useRef<HTMLDivElement | null>(null)
+  const [trapProps, localProps] = createSplitProps<TrapOptions>()(props, [
+    'disabled',
+    'onActivate',
+    'onPostActivate',
+    'onPause',
+    'onPostPause',
+    'onUnpause',
+    'onPostUnpause',
+    'checkCanFocusTrap',
+    'onDeactivate',
+    'onPostDeactivate',
+    'checkCanReturnFocus',
+    'initialFocus',
+    'fallbackFocus',
+    'returnFocusOnDeactivate',
+    'setReturnFocus',
+    'escapeDeactivates',
+    'clickOutsideDeactivates',
+    'allowOutsideClick',
+    'preventScroll',
+    'delayInitialFocus',
+    'isKeyForward',
+    'isKeyBackward',
+  ])
+
+  useSafeLayoutEffect(() => {
+    const node = localRef.current
+    if (!node || trapProps.disabled) return
+    return trapFocus(node, trapProps)
+  }, [ref, trapProps])
+
+  return <ark.div ref={composeRefs(localRef, ref)} {...localProps} />
+})
diff --git a/packages/react/src/components/focus-trap/index.ts b/packages/react/src/components/focus-trap/index.ts
new file mode 100644
index 0000000000..849d82c129
--- /dev/null
+++ b/packages/react/src/components/focus-trap/index.ts
@@ -0,0 +1,2 @@
+export { FocusTrap } from './focus-trap'
+export type { FocusTrapBaseProps, FocusTrapProps } from './focus-trap'
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 351d6c7672..629733dd10 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -146,6 +146,7 @@
     "@zag-js/dialog": "0.81.0",
     "@zag-js/dom-query": "0.81.0",
     "@zag-js/editable": "0.81.0",
+    "@zag-js/focus-trap": "0.81.0",
     "@zag-js/file-upload": "0.81.0",
     "@zag-js/file-utils": "0.81.0",
     "@zag-js/highlight-word": "0.81.0",
diff --git a/packages/solid/src/components/focus-trap/examples/autofocus.tsx b/packages/solid/src/components/focus-trap/examples/autofocus.tsx
new file mode 100644
index 0000000000..8ce88c7e55
--- /dev/null
+++ b/packages/solid/src/components/focus-trap/examples/autofocus.tsx
@@ -0,0 +1,31 @@
+import { FocusTrap } from '@ark-ui/solid/focus-trap'
+import { createSignal } from 'solid-js'
+
+export const Autofocus = () => {
+  const [trapped, setTrapped] = createSignal(false)
+  let buttonRef: HTMLButtonElement | undefined
+
+  return (
+    <div>
+      <button ref={buttonRef} onClick={() => setTrapped((v) => !v)}>
+        {trapped() ? 'End Trap' : 'Start Trap'}
+      </button>
+      {trapped() && (
+        <FocusTrap disabled={!trapped()} setReturnFocus={buttonRef}>
+          <div
+            style={{
+              display: 'flex',
+              'flex-direction': 'column',
+              gap: '1rem',
+              'padding-block': '1rem',
+            }}
+          >
+            <input type="text" placeholder="Regular input" />
+            <input type="text" placeholder="Autofocused input" autofocus />
+            <button onClick={() => setTrapped(false)}>End Trap</button>
+          </div>
+        </FocusTrap>
+      )}
+    </div>
+  )
+}
diff --git a/packages/solid/src/components/focus-trap/examples/basic.tsx b/packages/solid/src/components/focus-trap/examples/basic.tsx
new file mode 100644
index 0000000000..1e2de5c8fe
--- /dev/null
+++ b/packages/solid/src/components/focus-trap/examples/basic.tsx
@@ -0,0 +1,26 @@
+import { FocusTrap } from '@ark-ui/solid/focus-trap'
+import { createSignal } from 'solid-js'
+
+export const Basic = () => {
+  const [trapped, setTrapped] = createSignal(false)
+
+  return (
+    <>
+      <button onClick={() => setTrapped(true)}>Start Trap</button>
+      <FocusTrap returnFocusOnDeactivate={false} disabled={!trapped()}>
+        <div
+          style={{
+            display: 'flex',
+            'flex-direction': 'column',
+            gap: '1rem',
+            'padding-block': '1rem',
+          }}
+        >
+          <input type="text" placeholder="input" />
+          <textarea placeholder="textarea" />
+          <button onClick={() => setTrapped(false)}>End Trap</button>
+        </div>
+      </FocusTrap>
+    </>
+  )
+}
diff --git a/packages/solid/src/components/focus-trap/examples/initial-focus.tsx b/packages/solid/src/components/focus-trap/examples/initial-focus.tsx
new file mode 100644
index 0000000000..758d534ffe
--- /dev/null
+++ b/packages/solid/src/components/focus-trap/examples/initial-focus.tsx
@@ -0,0 +1,28 @@
+import { FocusTrap } from '@ark-ui/solid/focus-trap'
+import { createSignal } from 'solid-js'
+
+export const InitialFocus = () => {
+  const [trapped, setTrapped] = createSignal(false)
+  let inputRef: HTMLInputElement | undefined
+
+  return (
+    <div>
+      <button onClick={() => setTrapped((v) => !v)}>{trapped() ? 'End Trap' : 'Start Trap'}</button>
+      <FocusTrap disabled={!trapped()} initialFocus={() => inputRef}>
+        <div
+          style={{
+            display: 'flex',
+            'flex-direction': 'column',
+            gap: '1rem',
+            'padding-block': '1rem',
+          }}
+        >
+          <input type="text" placeholder="First input" />
+          <input ref={inputRef} type="text" placeholder="Second input (initial focus)" />
+          <textarea placeholder="textarea" />
+          <button onClick={() => setTrapped(false)}>End Trap</button>
+        </div>
+      </FocusTrap>
+    </div>
+  )
+}
diff --git a/packages/solid/src/components/focus-trap/focus-trap.stories.tsx b/packages/solid/src/components/focus-trap/focus-trap.stories.tsx
new file mode 100644
index 0000000000..7f889ef950
--- /dev/null
+++ b/packages/solid/src/components/focus-trap/focus-trap.stories.tsx
@@ -0,0 +1,11 @@
+import type { Meta } from 'storybook-solidjs'
+
+const meta: Meta = {
+  title: 'Components / Focus Trap',
+}
+
+export default meta
+
+export { Basic } from './examples/basic'
+export { InitialFocus } from './examples/initial-focus'
+export { Autofocus } from './examples/autofocus'
diff --git a/packages/solid/src/components/focus-trap/focus-trap.tsx b/packages/solid/src/components/focus-trap/focus-trap.tsx
new file mode 100644
index 0000000000..43df2d638a
--- /dev/null
+++ b/packages/solid/src/components/focus-trap/focus-trap.tsx
@@ -0,0 +1,49 @@
+import { type FocusTrapOptions, trapFocus } from '@zag-js/focus-trap'
+import type { Assign } from '../../types'
+import { createSplitProps } from '../../utils/create-split-props'
+import { type HTMLProps, type PolymorphicProps, ark } from '../factory'
+import { createEffect } from 'solid-js'
+import { composeRefs } from '../../utils/compose-refs'
+
+export interface TrapOptions extends Omit<FocusTrapOptions, 'document' | 'trapStack'> {
+  disabled?: boolean
+}
+
+export interface FocusTrapBaseProps extends PolymorphicProps<'div'>, TrapOptions {}
+export interface FocusTrapProps extends Assign<HTMLProps<'div'>, FocusTrapBaseProps> {}
+
+export const FocusTrap = (props: FocusTrapProps) => {
+  let localRef: HTMLDivElement | undefined
+
+  const [trapProps, localProps] = createSplitProps<TrapOptions>()(props, [
+    'disabled',
+    'onActivate',
+    'onPostActivate',
+    'onPause',
+    'onPostPause',
+    'onUnpause',
+    'onPostUnpause',
+    'checkCanFocusTrap',
+    'onDeactivate',
+    'onPostDeactivate',
+    'checkCanReturnFocus',
+    'initialFocus',
+    'fallbackFocus',
+    'returnFocusOnDeactivate',
+    'setReturnFocus',
+    'escapeDeactivates',
+    'clickOutsideDeactivates',
+    'allowOutsideClick',
+    'preventScroll',
+    'delayInitialFocus',
+    'isKeyForward',
+    'isKeyBackward',
+  ])
+
+  createEffect(() => {
+    if (!localRef || trapProps.disabled) return
+    return trapFocus(localRef, trapProps)
+  })
+
+  return <ark.div ref={composeRefs(localRef, props.ref)} {...localProps} />
+}
diff --git a/packages/solid/src/components/focus-trap/index.tsx b/packages/solid/src/components/focus-trap/index.tsx
new file mode 100644
index 0000000000..849d82c129
--- /dev/null
+++ b/packages/solid/src/components/focus-trap/index.tsx
@@ -0,0 +1,2 @@
+export { FocusTrap } from './focus-trap'
+export type { FocusTrapBaseProps, FocusTrapProps } from './focus-trap'
diff --git a/packages/solid/src/components/index.tsx b/packages/solid/src/components/index.tsx
index d25e4d9554..f5ee2aff16 100644
--- a/packages/solid/src/components/index.tsx
+++ b/packages/solid/src/components/index.tsx
@@ -14,6 +14,7 @@ export * from './factory'
 export * from './field'
 export * from './fieldset'
 export * from './file-upload'
+export * from './focus-trap'
 export * from './format'
 export * from './frame'
 export * from './highlight'