From 55d1d57c654847d32d0db02de8c33c74e506e083 Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 16:25:42 +0300
Subject: [PATCH 1/8] refactor: replace TokenProvider with TokenContext for
 improved context management

## Summary
- Refactored the context management by replacing `TokenProvider` with `TokenContext` across multiple components.
- Updated imports and usage in `MarkedInput`, `MarkRenderer`, `TextSpan`, and `Token` components to utilize the new context.
- Removed the deprecated `TokenProvider` and associated utility functions.

## Changes
- Updated context provider usage in `MarkedInput.tsx`, `MarkRenderer.tsx`, `TextSpan.tsx`, and `Token.tsx`.
- Introduced `TokenContext.ts` for the new context implementation.
- Deleted `TokenProvider.ts` and `createContext.ts` as they are no longer needed.
---
 .../markput/src/components/MarkRenderer.tsx      |  2 +-
 .../react/markput/src/components/MarkedInput.tsx |  4 ++--
 .../react/markput/src/components/TextSpan.tsx    |  2 +-
 packages/react/markput/src/components/Token.tsx  | 10 +++++-----
 packages/react/markput/src/lib/hooks/useMark.tsx |  2 +-
 .../markput/src/lib/providers/TokenContext.ts    | 13 +++++++++++++
 .../markput/src/lib/providers/TokenProvider.ts   |  5 -----
 .../react/markput/src/lib/utils/createContext.ts | 16 ----------------
 8 files changed, 23 insertions(+), 31 deletions(-)
 create mode 100644 packages/react/markput/src/lib/providers/TokenContext.ts
 delete mode 100644 packages/react/markput/src/lib/providers/TokenProvider.ts
 delete mode 100644 packages/react/markput/src/lib/utils/createContext.ts

diff --git a/packages/react/markput/src/components/MarkRenderer.tsx b/packages/react/markput/src/components/MarkRenderer.tsx
index eff995c5..5714b889 100644
--- a/packages/react/markput/src/components/MarkRenderer.tsx
+++ b/packages/react/markput/src/components/MarkRenderer.tsx
@@ -2,7 +2,7 @@ import type {MarkToken} from '@markput/core'
 
 import {useSlot} from '../lib/hooks/useSlot'
 import {useStore} from '../lib/hooks/useStore'
-import {useToken} from '../lib/providers/TokenProvider'
+import {useToken} from '../lib/providers/TokenContext'
 import type {MarkProps} from '../types'
 // eslint-disable-next-line import/no-cycle
 import {Token} from './Token'
diff --git a/packages/react/markput/src/components/MarkedInput.tsx b/packages/react/markput/src/components/MarkedInput.tsx
index 60c526c7..a291b285 100644
--- a/packages/react/markput/src/components/MarkedInput.tsx
+++ b/packages/react/markput/src/components/MarkedInput.tsx
@@ -118,9 +118,9 @@ export function MarkedInput<TMarkProps = MarkProps, TOverlayProps = OverlayProps
 	const ContainerImpl = block ? BlockContainer : Container
 
 	return (
-		<StoreContext.Provider value={store}>
+		<StoreContext value={store}>
 			<ContainerImpl />
 			<OverlayRenderer />
-		</StoreContext.Provider>
+		</StoreContext>
 	)
 }
\ No newline at end of file
diff --git a/packages/react/markput/src/components/TextSpan.tsx b/packages/react/markput/src/components/TextSpan.tsx
index fa6705f0..6609d5d6 100644
--- a/packages/react/markput/src/components/TextSpan.tsx
+++ b/packages/react/markput/src/components/TextSpan.tsx
@@ -1,7 +1,7 @@
 import {useLayoutEffect, useMemo, useRef} from 'react'
 
 import {useStore} from '../lib/hooks/useStore'
-import {useToken} from '../lib/providers/TokenProvider'
+import {useToken} from '../lib/providers/TokenContext'
 import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
 
 export const TextSpan = () => {
diff --git a/packages/react/markput/src/components/Token.tsx b/packages/react/markput/src/components/Token.tsx
index 19b8b364..8b376b62 100644
--- a/packages/react/markput/src/components/Token.tsx
+++ b/packages/react/markput/src/components/Token.tsx
@@ -1,7 +1,7 @@
 import type {Token as TokenType} from '@markput/core'
 import {memo} from 'react'
 
-import {TokenProvider} from '../lib/providers/TokenProvider'
+import {TokenContext} from '../lib/providers/TokenContext'
 // eslint-disable-next-line import/no-cycle
 import {MarkRenderer} from './MarkRenderer'
 import {TextSpan} from './TextSpan'
@@ -10,9 +10,9 @@ import {TextSpan} from './TextSpan'
 export const Token = memo(({mark, isNested = false}: {mark: TokenType; isNested?: boolean}) => {
 	if (mark.type === 'mark') {
 		return (
-			<TokenProvider value={mark}>
+			<TokenContext value={mark}>
 				<MarkRenderer />
-			</TokenProvider>
+			</TokenContext>
 		)
 	}
 
@@ -21,9 +21,9 @@ export const Token = memo(({mark, isNested = false}: {mark: TokenType; isNested?
 	}
 
 	return (
-		<TokenProvider value={mark}>
+		<TokenContext value={mark}>
 			<TextSpan />
-		</TokenProvider>
+		</TokenContext>
 	)
 })
 
diff --git a/packages/react/markput/src/lib/hooks/useMark.tsx b/packages/react/markput/src/lib/hooks/useMark.tsx
index 44e963b7..ce7655b5 100644
--- a/packages/react/markput/src/lib/hooks/useMark.tsx
+++ b/packages/react/markput/src/lib/hooks/useMark.tsx
@@ -3,7 +3,7 @@ import {MarkHandler} from '@markput/core'
 import type {RefObject} from 'react'
 import {useEffect, useRef, useState} from 'react'
 
-import {useToken} from '../providers/TokenProvider'
+import {useToken} from '../providers/TokenContext'
 import {useStore} from './useStore'
 
 export interface MarkOptions {
diff --git a/packages/react/markput/src/lib/providers/TokenContext.ts b/packages/react/markput/src/lib/providers/TokenContext.ts
new file mode 100644
index 00000000..9666bba9
--- /dev/null
+++ b/packages/react/markput/src/lib/providers/TokenContext.ts
@@ -0,0 +1,13 @@
+import type {Token} from '@markput/core'
+import {createContext, useContext} from 'react'
+
+export const TokenContext = createContext<Token | undefined>(undefined)
+TokenContext.displayName = 'TokenProvider'
+
+export function useToken(): Token {
+	const value = useContext(TokenContext)
+	if (value === undefined) {
+		throw new Error('Token not found. Make sure to wrap component in TokenContext.Provider.')
+	}
+	return value
+}
\ No newline at end of file
diff --git a/packages/react/markput/src/lib/providers/TokenProvider.ts b/packages/react/markput/src/lib/providers/TokenProvider.ts
deleted file mode 100644
index da16ad8d..00000000
--- a/packages/react/markput/src/lib/providers/TokenProvider.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type {Token} from '@markput/core'
-
-import {createContext} from '../utils/createContext'
-
-export const [useToken, TokenProvider] = createContext<Token>('NodeProvider')
\ No newline at end of file
diff --git a/packages/react/markput/src/lib/utils/createContext.ts b/packages/react/markput/src/lib/utils/createContext.ts
deleted file mode 100644
index f962f975..00000000
--- a/packages/react/markput/src/lib/utils/createContext.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {createContext as createReactContext, useContext} from 'react'
-
-export const createContext = <T>(name: string) => {
-	const context = createReactContext<T | undefined>(undefined)
-	context.displayName = name
-
-	const useHook = () => {
-		const value = useContext(context)
-		if (value === undefined) {
-			throw new Error(`Context "${name}" not found. Make sure to wrap component in its Provider.`)
-		}
-		return value
-	}
-
-	return [useHook, context.Provider, context] as const
-}
\ No newline at end of file

From b47a3ad236e59b1f660a1fc79e116a31754f5451 Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 16:28:39 +0300
Subject: [PATCH 2/8] refactor: update useStore imports to use StoreContext
 provider

## Summary
- Replaced imports of `useStore` from the deprecated `hooks` directory to the new `providers/StoreContext` across multiple components.
- Removed the old `useStore` hook implementation as it is now integrated within the `StoreContext`.

## Changes
- Updated imports in `BlockContainer`, `Container`, `MarkRenderer`, `OverlayRenderer`, `TextSpan`, `Suggestions`, `useMark`, `useOverlay`, and `useSlot` components.
- Deleted the `useStore.ts` file from the `hooks` directory.
- Enhanced `StoreContext.ts` to include a new `useStore` implementation with error handling.
---
 .../react/markput/src/components/BlockContainer.tsx  |  2 +-
 packages/react/markput/src/components/Container.tsx  |  2 +-
 .../react/markput/src/components/MarkRenderer.tsx    |  2 +-
 .../react/markput/src/components/OverlayRenderer.tsx |  2 +-
 .../src/components/Suggestions/Suggestions.tsx       |  2 +-
 packages/react/markput/src/components/TextSpan.tsx   |  2 +-
 packages/react/markput/src/lib/hooks/useMark.tsx     |  2 +-
 packages/react/markput/src/lib/hooks/useOverlay.tsx  |  2 +-
 packages/react/markput/src/lib/hooks/useSlot.ts      |  2 +-
 packages/react/markput/src/lib/hooks/useStore.ts     | 11 -----------
 .../react/markput/src/lib/providers/StoreContext.ts  | 12 ++++++++++--
 11 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 packages/react/markput/src/lib/hooks/useStore.ts

diff --git a/packages/react/markput/src/components/BlockContainer.tsx b/packages/react/markput/src/components/BlockContainer.tsx
index 195995c3..0f5974fc 100644
--- a/packages/react/markput/src/components/BlockContainer.tsx
+++ b/packages/react/markput/src/components/BlockContainer.tsx
@@ -1,7 +1,7 @@
 import {splitTokensIntoBlocks, reorderBlocks, parseWithParser, type Block} from '@markput/core'
 import {memo, useCallback, useMemo, useRef} from 'react'
 
-import {useStore} from '../lib/hooks/useStore'
+import {useStore} from '../lib/providers/StoreContext'
 import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
 import {DraggableBlock} from './DraggableBlock'
 import {Token} from './Token'
diff --git a/packages/react/markput/src/components/Container.tsx b/packages/react/markput/src/components/Container.tsx
index f73c38a7..de31f934 100644
--- a/packages/react/markput/src/components/Container.tsx
+++ b/packages/react/markput/src/components/Container.tsx
@@ -1,6 +1,6 @@
 import {memo, useMemo} from 'react'
 
-import {useStore} from '../lib/hooks/useStore'
+import {useStore} from '../lib/providers/StoreContext'
 import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
 import {Token} from './Token'
 
diff --git a/packages/react/markput/src/components/MarkRenderer.tsx b/packages/react/markput/src/components/MarkRenderer.tsx
index 5714b889..ea2a9fa7 100644
--- a/packages/react/markput/src/components/MarkRenderer.tsx
+++ b/packages/react/markput/src/components/MarkRenderer.tsx
@@ -1,7 +1,7 @@
 import type {MarkToken} from '@markput/core'
 
 import {useSlot} from '../lib/hooks/useSlot'
-import {useStore} from '../lib/hooks/useStore'
+import {useStore} from '../lib/providers/StoreContext'
 import {useToken} from '../lib/providers/TokenContext'
 import type {MarkProps} from '../types'
 // eslint-disable-next-line import/no-cycle
diff --git a/packages/react/markput/src/components/OverlayRenderer.tsx b/packages/react/markput/src/components/OverlayRenderer.tsx
index 05fa4ed7..f17d5d98 100644
--- a/packages/react/markput/src/components/OverlayRenderer.tsx
+++ b/packages/react/markput/src/components/OverlayRenderer.tsx
@@ -1,7 +1,7 @@
 import {memo, useMemo} from 'react'
 
 import {useSlot} from '../lib/hooks/useSlot'
-import {useStore} from '../lib/hooks/useStore'
+import {useStore} from '../lib/providers/StoreContext'
 import {Suggestions} from './Suggestions'
 
 export const OverlayRenderer = memo(() => {
diff --git a/packages/react/markput/src/components/Suggestions/Suggestions.tsx b/packages/react/markput/src/components/Suggestions/Suggestions.tsx
index 2e63ea53..f7af8355 100644
--- a/packages/react/markput/src/components/Suggestions/Suggestions.tsx
+++ b/packages/react/markput/src/components/Suggestions/Suggestions.tsx
@@ -3,7 +3,7 @@ import type {RefObject} from 'react'
 import {useEffect, useMemo, useState} from 'react'
 
 import {useOverlay} from '../../lib/hooks/useOverlay'
-import {useStore} from '../../lib/hooks/useStore'
+import {useStore} from '../../lib/providers/StoreContext'
 
 import styles from '@markput/core/styles.module.css'
 
diff --git a/packages/react/markput/src/components/TextSpan.tsx b/packages/react/markput/src/components/TextSpan.tsx
index 6609d5d6..b163a5ed 100644
--- a/packages/react/markput/src/components/TextSpan.tsx
+++ b/packages/react/markput/src/components/TextSpan.tsx
@@ -1,6 +1,6 @@
 import {useLayoutEffect, useMemo, useRef} from 'react'
 
-import {useStore} from '../lib/hooks/useStore'
+import {useStore} from '../lib/providers/StoreContext'
 import {useToken} from '../lib/providers/TokenContext'
 import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
 
diff --git a/packages/react/markput/src/lib/hooks/useMark.tsx b/packages/react/markput/src/lib/hooks/useMark.tsx
index ce7655b5..82a27425 100644
--- a/packages/react/markput/src/lib/hooks/useMark.tsx
+++ b/packages/react/markput/src/lib/hooks/useMark.tsx
@@ -3,8 +3,8 @@ import {MarkHandler} from '@markput/core'
 import type {RefObject} from 'react'
 import {useEffect, useRef, useState} from 'react'
 
+import {useStore} from '../providers/StoreContext'
 import {useToken} from '../providers/TokenContext'
-import {useStore} from './useStore'
 
 export interface MarkOptions {
 	controlled?: boolean
diff --git a/packages/react/markput/src/lib/hooks/useOverlay.tsx b/packages/react/markput/src/lib/hooks/useOverlay.tsx
index 0b735ac4..5eca0bb7 100644
--- a/packages/react/markput/src/lib/hooks/useOverlay.tsx
+++ b/packages/react/markput/src/lib/hooks/useOverlay.tsx
@@ -4,7 +4,7 @@ import type {RefObject} from 'react'
 import {useCallback, useMemo} from 'react'
 
 import type {Option} from '../../types'
-import {useStore} from './useStore'
+import {useStore} from '../providers/StoreContext'
 
 export interface OverlayHandler {
 	style: {
diff --git a/packages/react/markput/src/lib/hooks/useSlot.ts b/packages/react/markput/src/lib/hooks/useSlot.ts
index ea48f585..2b7d3829 100644
--- a/packages/react/markput/src/lib/hooks/useSlot.ts
+++ b/packages/react/markput/src/lib/hooks/useSlot.ts
@@ -1,7 +1,7 @@
 import type {ComponentType} from 'react'
 
 import type {MarkProps, Option, OverlayProps} from '../../types'
-import {useStore} from './useStore'
+import {useStore} from '../providers/StoreContext'
 
 export type SlotType = 'mark' | 'overlay'
 
diff --git a/packages/react/markput/src/lib/hooks/useStore.ts b/packages/react/markput/src/lib/hooks/useStore.ts
deleted file mode 100644
index 72d361e3..00000000
--- a/packages/react/markput/src/lib/hooks/useStore.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type {Store} from '@markput/core'
-import {assertNonNullable} from '@markput/core'
-import {useContext} from 'react'
-
-import {StoreContext} from '../providers/StoreContext'
-
-export function useStore(): Store {
-	const store = useContext(StoreContext)
-	assertNonNullable(store)
-	return store
-}
\ No newline at end of file
diff --git a/packages/react/markput/src/lib/providers/StoreContext.ts b/packages/react/markput/src/lib/providers/StoreContext.ts
index 0cc51ed2..573fd434 100644
--- a/packages/react/markput/src/lib/providers/StoreContext.ts
+++ b/packages/react/markput/src/lib/providers/StoreContext.ts
@@ -1,5 +1,13 @@
 import type {Store} from '@markput/core'
-import {createContext} from 'react'
+import {createContext, useContext} from 'react'
 
 export const StoreContext = createContext<Store | undefined>(undefined)
-StoreContext.displayName = 'StoreContext'
\ No newline at end of file
+StoreContext.displayName = 'StoreContext'
+
+export function useStore(): Store {
+	const store = useContext(StoreContext)
+	if (store === undefined) {
+		throw new Error('Store not found. Make sure to wrap component in StoreContext.')
+	}
+	return store
+}
\ No newline at end of file

From abbe430c842a765fc2c6f46bc7a7e4e3fcac0f3f Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 16:45:38 +0300
Subject: [PATCH 3/8] feat: introduce slot resolution utilities for React and
 Vue

## Summary
- Added new utility functions `resolveSlot` and `resolveSlotProps` to handle slot resolution in both React and Vue components.
- Updated existing components to utilize the new slot utilities, improving code organization and maintainability.
- Removed the old slot resolution implementation from the `utils` directory.

## Changes
- Created `slots.ts` in both React and Vue libraries to encapsulate slot resolution logic.
- Updated imports in `BlockContainer`, `Container`, and `TextSpan` components to use the new slot utilities.
- Enhanced type definitions for better TypeScript support.
---
 packages/common/core/index.ts                 |  2 +-
 .../common/core/src/shared/utils/index.ts     |  3 ++-
 .../core/src/shared}/utils/resolveSlot.ts     | 17 +++++-------
 .../markput/src/components/BlockContainer.tsx |  2 +-
 .../markput/src/components/Container.tsx      |  2 +-
 .../react/markput/src/components/TextSpan.tsx |  2 +-
 packages/react/markput/src/lib/slots.ts       | 14 ++++++++++
 .../markput/src/lib/utils/resolveSlot.ts      | 26 -------------------
 .../markput/src/components/BlockContainer.vue |  4 +--
 .../vue/markput/src/components/Container.vue  |  4 +--
 .../vue/markput/src/components/TextSpan.vue   |  3 +--
 packages/vue/markput/src/lib/slots.ts         | 14 ++++++++++
 12 files changed, 45 insertions(+), 48 deletions(-)
 rename packages/{vue/markput/src/lib => common/core/src/shared}/utils/resolveSlot.ts (51%)
 create mode 100644 packages/react/markput/src/lib/slots.ts
 delete mode 100644 packages/react/markput/src/lib/utils/resolveSlot.ts
 create mode 100644 packages/vue/markput/src/lib/slots.ts

diff --git a/packages/common/core/index.ts b/packages/common/core/index.ts
index 234ff880..559e25ca 100644
--- a/packages/common/core/index.ts
+++ b/packages/common/core/index.ts
@@ -1,6 +1,6 @@
 // Shared exports
 export {assertNonNullable} from './src/shared/checkers/assertNonNullable'
-export {convertDataAttrs, cx, merge} from './src/shared/utils'
+export {convertDataAttrs, cx, merge, resolveSlot, resolveSlotProps, type SlotName} from './src/shared/utils'
 export {KEYBOARD, DEFAULT_MARKUP, DEFAULT_OVERLAY_TRIGGER} from './src/shared/constants'
 export type {
 	OverlayMatch,
diff --git a/packages/common/core/src/shared/utils/index.ts b/packages/common/core/src/shared/utils/index.ts
index 82c0c37b..3bbc5117 100644
--- a/packages/common/core/src/shared/utils/index.ts
+++ b/packages/common/core/src/shared/utils/index.ts
@@ -1,3 +1,4 @@
 export {convertDataAttrs} from './dataAttributes'
 export {cx} from './cx'
-export {merge} from './merge'
\ No newline at end of file
+export {merge} from './merge'
+export {resolveSlot, resolveSlotProps, type SlotName} from './resolveSlot'
\ No newline at end of file
diff --git a/packages/vue/markput/src/lib/utils/resolveSlot.ts b/packages/common/core/src/shared/utils/resolveSlot.ts
similarity index 51%
rename from packages/vue/markput/src/lib/utils/resolveSlot.ts
rename to packages/common/core/src/shared/utils/resolveSlot.ts
index 86e3af2c..47ca92ce 100644
--- a/packages/vue/markput/src/lib/utils/resolveSlot.ts
+++ b/packages/common/core/src/shared/utils/resolveSlot.ts
@@ -1,6 +1,5 @@
-import type {CoreSlotProps, CoreSlots} from '@markput/core'
-import {convertDataAttrs} from '@markput/core'
-import type {Component} from 'vue'
+import type {CoreSlotProps, CoreSlots, GenericAttributes, GenericElement} from '../types'
+import {convertDataAttrs} from './dataAttributes'
 
 export type SlotName = 'container' | 'span'
 
@@ -9,18 +8,14 @@ const defaultSlots: Record<SlotName, string> = {
 	span: 'span',
 }
 
-export function resolveSlot(slotName: SlotName, slots: CoreSlots | undefined): string | Component {
-	if (slots?.[slotName]) {
-		return slots[slotName] as string | Component
-	}
-
-	return defaultSlots[slotName]
+export function resolveSlot(slotName: SlotName, slots: CoreSlots | undefined): GenericElement {
+	return slots?.[slotName] ?? defaultSlots[slotName]
 }
 
 export function resolveSlotProps(
 	slotName: SlotName,
 	slotProps: CoreSlotProps | undefined
-): Record<string, unknown> | undefined {
+): GenericAttributes | undefined {
 	const props = slotProps?.[slotName]
-	return props ? (convertDataAttrs(props as Record<string, unknown>) as Record<string, unknown>) : undefined
+	return props ? (convertDataAttrs(props as Record<string, unknown>) as GenericAttributes) : undefined
 }
\ No newline at end of file
diff --git a/packages/react/markput/src/components/BlockContainer.tsx b/packages/react/markput/src/components/BlockContainer.tsx
index 0f5974fc..52740cef 100644
--- a/packages/react/markput/src/components/BlockContainer.tsx
+++ b/packages/react/markput/src/components/BlockContainer.tsx
@@ -2,7 +2,7 @@ import {splitTokensIntoBlocks, reorderBlocks, parseWithParser, type Block} from
 import {memo, useCallback, useMemo, useRef} from 'react'
 
 import {useStore} from '../lib/providers/StoreContext'
-import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
+import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import {DraggableBlock} from './DraggableBlock'
 import {Token} from './Token'
 
diff --git a/packages/react/markput/src/components/Container.tsx b/packages/react/markput/src/components/Container.tsx
index de31f934..e58f0e0c 100644
--- a/packages/react/markput/src/components/Container.tsx
+++ b/packages/react/markput/src/components/Container.tsx
@@ -1,7 +1,7 @@
 import {memo, useMemo} from 'react'
 
 import {useStore} from '../lib/providers/StoreContext'
-import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
+import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import {Token} from './Token'
 
 export const Container = memo(() => {
diff --git a/packages/react/markput/src/components/TextSpan.tsx b/packages/react/markput/src/components/TextSpan.tsx
index b163a5ed..2bbe3dc9 100644
--- a/packages/react/markput/src/components/TextSpan.tsx
+++ b/packages/react/markput/src/components/TextSpan.tsx
@@ -2,7 +2,7 @@ import {useLayoutEffect, useMemo, useRef} from 'react'
 
 import {useStore} from '../lib/providers/StoreContext'
 import {useToken} from '../lib/providers/TokenContext'
-import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
+import {resolveSlot, resolveSlotProps} from '../lib/slots'
 
 export const TextSpan = () => {
 	const token = useToken()
diff --git a/packages/react/markput/src/lib/slots.ts b/packages/react/markput/src/lib/slots.ts
new file mode 100644
index 00000000..d0081f65
--- /dev/null
+++ b/packages/react/markput/src/lib/slots.ts
@@ -0,0 +1,14 @@
+import type {SlotName} from '@markput/core'
+import {resolveSlot as resolveSlotCore, resolveSlotProps as resolveSlotPropsCore} from '@markput/core'
+import type {ElementType, HTMLAttributes} from 'react'
+
+export function resolveSlot(slotName: SlotName, slots: Parameters<typeof resolveSlotCore>[1]): ElementType {
+	return resolveSlotCore(slotName, slots) as ElementType
+}
+
+export function resolveSlotProps(
+	slotName: SlotName,
+	slotProps: Parameters<typeof resolveSlotPropsCore>[1]
+): HTMLAttributes<HTMLElement> | undefined {
+	return resolveSlotPropsCore(slotName, slotProps) as HTMLAttributes<HTMLElement> | undefined
+}
\ No newline at end of file
diff --git a/packages/react/markput/src/lib/utils/resolveSlot.ts b/packages/react/markput/src/lib/utils/resolveSlot.ts
deleted file mode 100644
index d14fba42..00000000
--- a/packages/react/markput/src/lib/utils/resolveSlot.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type {CoreSlotProps, CoreSlots} from '@markput/core'
-import {convertDataAttrs} from '@markput/core'
-import type {ElementType, HTMLAttributes} from 'react'
-
-export type SlotName = 'container' | 'span'
-
-const defaultSlots: Record<SlotName, ElementType> = {
-	container: 'div',
-	span: 'span',
-}
-
-export function resolveSlot(slotName: SlotName, slots: CoreSlots | undefined): ElementType {
-	if (slots?.[slotName]) {
-		return slots[slotName] as ElementType
-	}
-
-	return defaultSlots[slotName]
-}
-
-export function resolveSlotProps(
-	slotName: SlotName,
-	slotProps: CoreSlotProps | undefined
-): HTMLAttributes<HTMLElement> | undefined {
-	const props = slotProps?.[slotName]
-	return props ? (convertDataAttrs(props as Record<string, unknown>) as HTMLAttributes<HTMLElement>) : undefined
-}
\ No newline at end of file
diff --git a/packages/vue/markput/src/components/BlockContainer.vue b/packages/vue/markput/src/components/BlockContainer.vue
index 22742133..74592f43 100644
--- a/packages/vue/markput/src/components/BlockContainer.vue
+++ b/packages/vue/markput/src/components/BlockContainer.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type {CoreSlotProps, CoreSlots, Token as CoreToken} from '@markput/core'
+import type {Token as CoreToken} from '@markput/core'
 import {splitTokensIntoBlocks, reorderBlocks, parseWithParser} from '@markput/core'
 import {computed} from 'vue'
 
 import {useStore} from '../lib/hooks/useStore'
-import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
+import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import DraggableBlock from './DraggableBlock.vue'
 import Token from './Token.vue'
 
diff --git a/packages/vue/markput/src/components/Container.vue b/packages/vue/markput/src/components/Container.vue
index 03fc3c27..843efbfc 100644
--- a/packages/vue/markput/src/components/Container.vue
+++ b/packages/vue/markput/src/components/Container.vue
@@ -1,9 +1,9 @@
 <script lang="ts">
-import type {CoreSlotProps, CoreSlots, StyleProperties, Token as CoreToken} from '@markput/core'
+import type {StyleProperties, Token as CoreToken} from '@markput/core'
 import {computed, defineComponent, h} from 'vue'
 
 import {useStore} from '../lib/hooks/useStore'
-import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
+import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import Token from './Token.vue'
 
 export default defineComponent({
diff --git a/packages/vue/markput/src/components/TextSpan.vue b/packages/vue/markput/src/components/TextSpan.vue
index e54ab14c..517d693a 100644
--- a/packages/vue/markput/src/components/TextSpan.vue
+++ b/packages/vue/markput/src/components/TextSpan.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import type {CoreSlotProps, CoreSlots} from '@markput/core'
 import {inject, ref, computed, watch, onMounted} from 'vue'
 
 import {useStore} from '../lib/hooks/useStore'
 import {TOKEN_KEY} from '../lib/providers/tokenKey'
-import {resolveSlot, resolveSlotProps} from '../lib/utils/resolveSlot'
+import {resolveSlot, resolveSlotProps} from '../lib/slots'
 
 const store = useStore()
 const tokenRef = inject(TOKEN_KEY)!
diff --git a/packages/vue/markput/src/lib/slots.ts b/packages/vue/markput/src/lib/slots.ts
new file mode 100644
index 00000000..d9ac2676
--- /dev/null
+++ b/packages/vue/markput/src/lib/slots.ts
@@ -0,0 +1,14 @@
+import type {CoreSlotProps, CoreSlots, SlotName} from '@markput/core'
+import {resolveSlot as resolveSlotCore, resolveSlotProps as resolveSlotPropsCore} from '@markput/core'
+import type {Component} from 'vue'
+
+export function resolveSlot(slotName: SlotName, slots: CoreSlots | undefined): string | Component {
+	return resolveSlotCore(slotName, slots) as string | Component
+}
+
+export function resolveSlotProps(
+	slotName: SlotName,
+	slotProps: CoreSlotProps | undefined
+): Record<string, unknown> | undefined {
+	return resolveSlotPropsCore(slotName, slotProps)
+}
\ No newline at end of file

From bd9f4865578673bb5bb41953264045270b51ee43 Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 16:51:13 +0300
Subject: [PATCH 4/8] refactor: enhance slot resolution with generic type
 support

## Summary
- Updated `resolveSlot` and `resolveSlotProps` functions to support generic types, improving type safety and flexibility in component implementations.
- Removed the old slot resolution implementation from the `lib/slots` directory in both React and Vue packages.
- Adjusted component imports and usages in `BlockContainer`, `Container`, and `TextSpan` to utilize the updated slot resolution utilities.

## Changes
- Enhanced type definitions for `resolveSlot` and `resolveSlotProps` to allow for more specific return types.
- Updated components to reflect the new generic type usage, ensuring better integration with TypeScript's type system.
---
 .../common/core/src/shared/utils/resolveSlot.ts    | 12 ++++++------
 .../markput/src/components/BlockContainer.tsx      | 13 ++++++++++---
 .../react/markput/src/components/Container.tsx     |  5 +++--
 packages/react/markput/src/components/TextSpan.tsx |  5 +++--
 packages/react/markput/src/lib/slots.ts            | 14 --------------
 .../vue/markput/src/components/BlockContainer.vue  |  6 +++---
 packages/vue/markput/src/components/Container.vue  |  5 +++--
 packages/vue/markput/src/components/TextSpan.vue   |  5 +++--
 packages/vue/markput/src/lib/slots.ts              | 14 --------------
 9 files changed, 31 insertions(+), 48 deletions(-)
 delete mode 100644 packages/react/markput/src/lib/slots.ts
 delete mode 100644 packages/vue/markput/src/lib/slots.ts

diff --git a/packages/common/core/src/shared/utils/resolveSlot.ts b/packages/common/core/src/shared/utils/resolveSlot.ts
index 47ca92ce..7accd878 100644
--- a/packages/common/core/src/shared/utils/resolveSlot.ts
+++ b/packages/common/core/src/shared/utils/resolveSlot.ts
@@ -1,4 +1,4 @@
-import type {CoreSlotProps, CoreSlots, GenericAttributes, GenericElement} from '../types'
+import type {CoreSlotProps, CoreSlots} from '../types'
 import {convertDataAttrs} from './dataAttributes'
 
 export type SlotName = 'container' | 'span'
@@ -8,14 +8,14 @@ const defaultSlots: Record<SlotName, string> = {
 	span: 'span',
 }
 
-export function resolveSlot(slotName: SlotName, slots: CoreSlots | undefined): GenericElement {
-	return slots?.[slotName] ?? defaultSlots[slotName]
+export function resolveSlot<T = string>(slotName: SlotName, slots: CoreSlots | undefined): T {
+	return (slots?.[slotName] ?? defaultSlots[slotName]) as T
 }
 
-export function resolveSlotProps(
+export function resolveSlotProps<T = Record<string, unknown>>(
 	slotName: SlotName,
 	slotProps: CoreSlotProps | undefined
-): GenericAttributes | undefined {
+): T | undefined {
 	const props = slotProps?.[slotName]
-	return props ? (convertDataAttrs(props as Record<string, unknown>) as GenericAttributes) : undefined
+	return props ? (convertDataAttrs(props as Record<string, unknown>) as T) : undefined
 }
\ No newline at end of file
diff --git a/packages/react/markput/src/components/BlockContainer.tsx b/packages/react/markput/src/components/BlockContainer.tsx
index 52740cef..18b4486d 100644
--- a/packages/react/markput/src/components/BlockContainer.tsx
+++ b/packages/react/markput/src/components/BlockContainer.tsx
@@ -1,8 +1,15 @@
-import {splitTokensIntoBlocks, reorderBlocks, parseWithParser, type Block} from '@markput/core'
+import {
+	resolveSlot,
+	resolveSlotProps,
+	splitTokensIntoBlocks,
+	reorderBlocks,
+	parseWithParser,
+	type Block,
+} from '@markput/core'
+import type {ElementType} from 'react'
 import {memo, useCallback, useMemo, useRef} from 'react'
 
 import {useStore} from '../lib/providers/StoreContext'
-import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import {DraggableBlock} from './DraggableBlock'
 import {Token} from './Token'
 
@@ -19,7 +26,7 @@ export const BlockContainer = memo(() => {
 	const key = store.key
 	const refs = store.refs
 
-	const ContainerComponent = useMemo(() => resolveSlot('container', slots), [slots])
+	const ContainerComponent = useMemo(() => resolveSlot<ElementType>('container', slots), [slots])
 	const containerProps = useMemo(() => resolveSlotProps('container', slotProps), [slotProps])
 
 	const blocks = useMemo(() => splitTokensIntoBlocks(tokens), [tokens])
diff --git a/packages/react/markput/src/components/Container.tsx b/packages/react/markput/src/components/Container.tsx
index e58f0e0c..8373ad25 100644
--- a/packages/react/markput/src/components/Container.tsx
+++ b/packages/react/markput/src/components/Container.tsx
@@ -1,7 +1,8 @@
+import {resolveSlot, resolveSlotProps} from '@markput/core'
+import type {ElementType} from 'react'
 import {memo, useMemo} from 'react'
 
 import {useStore} from '../lib/providers/StoreContext'
-import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import {Token} from './Token'
 
 export const Container = memo(() => {
@@ -13,7 +14,7 @@ export const Container = memo(() => {
 	const style = store.state.style.use()
 	const key = store.key
 	const refs = store.refs
-	const ContainerComponent = useMemo(() => resolveSlot('container', slots), [slots])
+	const ContainerComponent = useMemo(() => resolveSlot<ElementType>('container', slots), [slots])
 	const containerProps = useMemo(() => resolveSlotProps('container', slotProps), [slotProps])
 
 	return (
diff --git a/packages/react/markput/src/components/TextSpan.tsx b/packages/react/markput/src/components/TextSpan.tsx
index 2bbe3dc9..029cee48 100644
--- a/packages/react/markput/src/components/TextSpan.tsx
+++ b/packages/react/markput/src/components/TextSpan.tsx
@@ -1,8 +1,9 @@
+import {resolveSlot, resolveSlotProps} from '@markput/core'
+import type {ElementType} from 'react'
 import {useLayoutEffect, useMemo, useRef} from 'react'
 
 import {useStore} from '../lib/providers/StoreContext'
 import {useToken} from '../lib/providers/TokenContext'
-import {resolveSlot, resolveSlotProps} from '../lib/slots'
 
 export const TextSpan = () => {
 	const token = useToken()
@@ -12,7 +13,7 @@ export const TextSpan = () => {
 	const readOnly = store.state.readOnly.use()
 	const slots = store.state.slots.use()
 	const slotProps = store.state.slotProps.use()
-	const SpanComponent = useMemo(() => resolveSlot('span', slots), [slots])
+	const SpanComponent = useMemo(() => resolveSlot<ElementType>('span', slots), [slots])
 	const spanProps = useMemo(() => resolveSlotProps('span', slotProps), [slotProps])
 
 	if (token.type !== 'text') {
diff --git a/packages/react/markput/src/lib/slots.ts b/packages/react/markput/src/lib/slots.ts
deleted file mode 100644
index d0081f65..00000000
--- a/packages/react/markput/src/lib/slots.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {SlotName} from '@markput/core'
-import {resolveSlot as resolveSlotCore, resolveSlotProps as resolveSlotPropsCore} from '@markput/core'
-import type {ElementType, HTMLAttributes} from 'react'
-
-export function resolveSlot(slotName: SlotName, slots: Parameters<typeof resolveSlotCore>[1]): ElementType {
-	return resolveSlotCore(slotName, slots) as ElementType
-}
-
-export function resolveSlotProps(
-	slotName: SlotName,
-	slotProps: Parameters<typeof resolveSlotPropsCore>[1]
-): HTMLAttributes<HTMLElement> | undefined {
-	return resolveSlotPropsCore(slotName, slotProps) as HTMLAttributes<HTMLElement> | undefined
-}
\ No newline at end of file
diff --git a/packages/vue/markput/src/components/BlockContainer.vue b/packages/vue/markput/src/components/BlockContainer.vue
index 74592f43..591d4362 100644
--- a/packages/vue/markput/src/components/BlockContainer.vue
+++ b/packages/vue/markput/src/components/BlockContainer.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type {Token as CoreToken} from '@markput/core'
-import {splitTokensIntoBlocks, reorderBlocks, parseWithParser} from '@markput/core'
+import {resolveSlot, resolveSlotProps, splitTokensIntoBlocks, reorderBlocks, parseWithParser} from '@markput/core'
+import type {Component} from 'vue'
 import {computed} from 'vue'
 
 import {useStore} from '../lib/hooks/useStore'
-import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import DraggableBlock from './DraggableBlock.vue'
 import Token from './Token.vue'
 
@@ -19,7 +19,7 @@ const value = store.state.value.use()
 const onChange = store.state.onChange.use()
 const key = store.key
 
-const containerTag = computed(() => resolveSlot('container', slots.value))
+const containerTag = computed(() => resolveSlot<string | Component>('container', slots.value))
 const containerProps = computed(() => resolveSlotProps('container', slotProps.value))
 
 const blocks = computed(() => splitTokensIntoBlocks(tokens.value))
diff --git a/packages/vue/markput/src/components/Container.vue b/packages/vue/markput/src/components/Container.vue
index 843efbfc..f913853a 100644
--- a/packages/vue/markput/src/components/Container.vue
+++ b/packages/vue/markput/src/components/Container.vue
@@ -1,9 +1,10 @@
 <script lang="ts">
 import type {StyleProperties, Token as CoreToken} from '@markput/core'
+import {resolveSlot, resolveSlotProps} from '@markput/core'
+import type {Component} from 'vue'
 import {computed, defineComponent, h} from 'vue'
 
 import {useStore} from '../lib/hooks/useStore'
-import {resolveSlot, resolveSlotProps} from '../lib/slots'
 import Token from './Token.vue'
 
 export default defineComponent({
@@ -16,7 +17,7 @@ export default defineComponent({
 		const style = store.state.style.use()
 		const key = store.key
 
-		const containerTag = computed(() => resolveSlot('container', slots.value))
+		const containerTag = computed(() => resolveSlot<string | Component>('container', slots.value))
 		const containerProps = computed(() => resolveSlotProps('container', slotProps.value))
 
 		return () =>
diff --git a/packages/vue/markput/src/components/TextSpan.vue b/packages/vue/markput/src/components/TextSpan.vue
index 517d693a..47190d1f 100644
--- a/packages/vue/markput/src/components/TextSpan.vue
+++ b/packages/vue/markput/src/components/TextSpan.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
+import {resolveSlot, resolveSlotProps} from '@markput/core'
+import type {Component} from 'vue'
 import {inject, ref, computed, watch, onMounted} from 'vue'
 
 import {useStore} from '../lib/hooks/useStore'
 import {TOKEN_KEY} from '../lib/providers/tokenKey'
-import {resolveSlot, resolveSlotProps} from '../lib/slots'
 
 const store = useStore()
 const tokenRef = inject(TOKEN_KEY)!
@@ -13,7 +14,7 @@ const elRef = ref<HTMLSpanElement | null>(null)
 const readOnly = store.state.readOnly.use()
 const slots = store.state.slots.use()
 const slotProps = store.state.slotProps.use()
-const spanTag = computed(() => resolveSlot('span', slots.value))
+const spanTag = computed(() => resolveSlot<string | Component>('span', slots.value))
 const spanProps = computed(() => resolveSlotProps('span', slotProps.value))
 
 if (token.type !== 'text') {
diff --git a/packages/vue/markput/src/lib/slots.ts b/packages/vue/markput/src/lib/slots.ts
deleted file mode 100644
index d9ac2676..00000000
--- a/packages/vue/markput/src/lib/slots.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {CoreSlotProps, CoreSlots, SlotName} from '@markput/core'
-import {resolveSlot as resolveSlotCore, resolveSlotProps as resolveSlotPropsCore} from '@markput/core'
-import type {Component} from 'vue'
-
-export function resolveSlot(slotName: SlotName, slots: CoreSlots | undefined): string | Component {
-	return resolveSlotCore(slotName, slots) as string | Component
-}
-
-export function resolveSlotProps(
-	slotName: SlotName,
-	slotProps: CoreSlotProps | undefined
-): Record<string, unknown> | undefined {
-	return resolveSlotPropsCore(slotName, slotProps)
-}
\ No newline at end of file

From 8ae592235a3b3c2a69b7bb5e768dc37649d0ee60 Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 16:57:09 +0300
Subject: [PATCH 5/8] refactor: simplify slot resolution in MarkRenderer and
 OverlayRenderer components

## Summary
- Updated `MarkRenderer` and `OverlayRenderer` components to utilize the new `useSlot` utility for improved slot resolution.
- Removed unnecessary component references and streamlined the computed properties for better readability and maintainability.

## Changes
- Refactored the `resolved` computed property in both components to leverage the `useSlot` function, enhancing type safety and reducing complexity.
- Adjusted template bindings to align with the new slot resolution structure.
---
 .../markput/src/components/MarkRenderer.vue   | 46 +++++--------------
 .../src/components/OverlayRenderer.vue        | 13 ++----
 2 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/packages/vue/markput/src/components/MarkRenderer.vue b/packages/vue/markput/src/components/MarkRenderer.vue
index 676a930f..2bc0ddba 100644
--- a/packages/vue/markput/src/components/MarkRenderer.vue
+++ b/packages/vue/markput/src/components/MarkRenderer.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import type {MarkToken} from '@markput/core'
-import {inject, computed, type Ref, type Component} from 'vue'
+import {inject, computed, type Ref} from 'vue'
 
+import {useSlot} from '../lib/hooks/useSlot'
 import {useStore} from '../lib/hooks/useStore'
 import {TOKEN_KEY} from '../lib/providers/tokenKey'
 import type {MarkProps, Option} from '../types'
@@ -12,46 +13,23 @@ const store = useStore()
 const tokenRef = inject(TOKEN_KEY)!
 const node = tokenRef.value as MarkToken
 const optionsRef = store.state.options.use() as Ref<Option[] | undefined>
-const MarkRef = store.state.Mark.use() as Ref<Component | undefined>
 const key = store.key
 
-const resolved = computed(() => {
-	const options = optionsRef.value
-	const option = options?.[node.descriptor.index]
-
-	const markPropsData: MarkProps = {
-		value: node.value,
-		meta: node.meta,
-		nested: node.nested?.content,
-	}
-
-	const optionConfig = option?.mark
-	let props: any
-
-	if (optionConfig !== undefined) {
-		if (typeof optionConfig === 'function') {
-			props = optionConfig(markPropsData)
-		} else {
-			props = optionConfig
-		}
-	} else {
-		props = markPropsData
-	}
+const markPropsData: MarkProps = {
+	value: node.value,
+	meta: node.meta,
+	nested: node.nested?.content,
+}
 
-	const globalComponent = MarkRef.value
-	const Comp = (props.slot || globalComponent) as Component
-
-	if (!Comp) {
-		throw new Error('No mark component found. Provide either option.mark.slot or global Mark component.')
-	}
-
-	return {Comp, props}
+const resolved = computed(() => {
+	const option = optionsRef.value?.[node.descriptor.index]
+	return useSlot('mark', option, markPropsData)
 })
 </script>
 
 <template>
-	<component v-if="node.children.length > 0" :is="resolved.Comp" v-bind="resolved.props">
+	<component v-if="node.children.length > 0" :is="resolved[0]" v-bind="resolved[1]">
 		<Token v-for="child in node.children" :key="key.get(child)" :mark="child" :is-nested="true" />
 	</component>
-	<component v-else :is="resolved.Comp" v-bind="resolved.props" />
+	<component v-else :is="resolved[0]" v-bind="resolved[1]" />
 </template>
diff --git a/packages/vue/markput/src/components/OverlayRenderer.vue b/packages/vue/markput/src/components/OverlayRenderer.vue
index b5a43579..e23360ea 100644
--- a/packages/vue/markput/src/components/OverlayRenderer.vue
+++ b/packages/vue/markput/src/components/OverlayRenderer.vue
@@ -1,29 +1,24 @@
 <script setup lang="ts">
 import type {OverlayMatch} from '@markput/core'
-import {computed, type Ref, type Component} from 'vue'
+import {computed, type Ref} from 'vue'
 
+import {useSlot} from '../lib/hooks/useSlot'
 import {useStore} from '../lib/hooks/useStore'
 import type {Option} from '../types'
 import Suggestions from './Suggestions/Suggestions.vue'
 
 const store = useStore()
 const overlayMatchRef = store.state.overlayMatch.use() as Ref<OverlayMatch<Option> | undefined>
-const OverlayRef = store.state.Overlay.use() as Ref<Component | undefined>
 
 const overlayKey = computed(() => (overlayMatchRef.value ? store.key.get(overlayMatchRef.value.option) : undefined))
 
 const resolved = computed(() => {
 	const match = overlayMatchRef.value
 	if (!match) return null
-
-	const optionOverlay = match.option?.overlay as any
-	const Comp = (optionOverlay?.slot || OverlayRef.value || Suggestions) as Component
-	const props = optionOverlay ?? {}
-
-	return {Comp, props}
+	return useSlot('overlay', match.option, undefined, Suggestions)
 })
 </script>
 
 <template>
-	<component v-if="overlayKey && resolved" :is="resolved.Comp" :key="overlayKey" v-bind="resolved.props" />
+	<component v-if="overlayKey && resolved" :is="resolved[0]" :key="overlayKey" v-bind="resolved[1]" />
 </template>

From 62b5383eca1a1a85d4ffe2308d86920d21d76711 Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 17:20:36 +0300
Subject: [PATCH 6/8] refactor: move DEFAULT_OPTIONS and createMarkFromOverlay
 to core

- Move DEFAULT_OPTIONS constant from React/Vue to @markput/core
- Create createMarkFromOverlay utility for token creation from overlay matches
- Remove duplicated constants.ts files from both framework packages
- Update useOverlay hooks to use new core utility
---
 packages/common/core/index.ts                 | 11 +++++--
 .../features/overlay/createMarkFromOverlay.ts | 26 ++++++++++++++++
 .../common/core/src/features/overlay/index.ts |  3 +-
 packages/common/core/src/shared/constants.ts  | 22 +++++++++++++-
 .../markput/src/components/MarkedInput.tsx    |  3 +-
 packages/react/markput/src/constants.ts       | 24 ---------------
 .../markput/src/lib/hooks/useOverlay.tsx      | 18 ++---------
 .../markput/src/components/MarkedInput.vue    |  3 +-
 packages/vue/markput/src/constants.ts         | 13 --------
 .../vue/markput/src/lib/hooks/useOverlay.ts   | 18 ++---------
 .../content/docs/api/functions/MarkedInput.md |  2 +-
 .../docs/api/interfaces/MarkedInputProps.md   | 30 +++++++++----------
 12 files changed, 82 insertions(+), 91 deletions(-)
 create mode 100644 packages/common/core/src/features/overlay/createMarkFromOverlay.ts
 delete mode 100644 packages/react/markput/src/constants.ts
 delete mode 100644 packages/vue/markput/src/constants.ts

diff --git a/packages/common/core/index.ts b/packages/common/core/index.ts
index 559e25ca..617101c4 100644
--- a/packages/common/core/index.ts
+++ b/packages/common/core/index.ts
@@ -1,7 +1,14 @@
 // Shared exports
 export {assertNonNullable} from './src/shared/checkers/assertNonNullable'
 export {convertDataAttrs, cx, merge, resolveSlot, resolveSlotProps, type SlotName} from './src/shared/utils'
-export {KEYBOARD, DEFAULT_MARKUP, DEFAULT_OVERLAY_TRIGGER} from './src/shared/constants'
+export {
+	KEYBOARD,
+	DEFAULT_MARKUP,
+	DEFAULT_OVERLAY_TRIGGER,
+	DEFAULT_OPTIONS,
+	type DefaultOption,
+	type DefaultOverlayConfig,
+} from './src/shared/constants'
 export type {
 	OverlayMatch,
 	EventKey,
@@ -43,7 +50,7 @@ export {findGap, getClosestIndexes} from './src/features/preparsing'
 export {toString} from './src/features/parsing'
 export {shallow, createNewSpan, deleteMark} from './src/features/text-manipulation'
 export {Store, type StoreOptions} from './src/features/store'
-export {OverlayController} from './src/features/overlay'
+export {OverlayController, createMarkFromOverlay} from './src/features/overlay'
 export {FocusController} from './src/features/focus'
 export {KeyDownController} from './src/features/input'
 export {SystemListenerController} from './src/features/events'
diff --git a/packages/common/core/src/features/overlay/createMarkFromOverlay.ts b/packages/common/core/src/features/overlay/createMarkFromOverlay.ts
new file mode 100644
index 00000000..eaebc043
--- /dev/null
+++ b/packages/common/core/src/features/overlay/createMarkFromOverlay.ts
@@ -0,0 +1,26 @@
+import type {OverlayMatch} from '../../shared/types'
+import type {MarkToken} from '../parsing'
+
+export function createMarkFromOverlay(match: OverlayMatch, value: string, meta?: string): MarkToken {
+	return {
+		type: 'mark',
+		value,
+		meta,
+		content: '',
+		position: {
+			start: match.index,
+			end: match.index + match.span.length,
+		},
+		descriptor: {
+			markup: match.option.markup!,
+			index: 0,
+			segments: [],
+			gapTypes: [],
+			hasNested: false,
+			hasTwoValues: false,
+			segmentGlobalIndices: [],
+		},
+		children: [],
+		nested: undefined,
+	}
+}
\ No newline at end of file
diff --git a/packages/common/core/src/features/overlay/index.ts b/packages/common/core/src/features/overlay/index.ts
index 61edbdf6..c50ac646 100644
--- a/packages/common/core/src/features/overlay/index.ts
+++ b/packages/common/core/src/features/overlay/index.ts
@@ -1 +1,2 @@
-export {OverlayController} from './OverlayController'
\ No newline at end of file
+export {OverlayController} from './OverlayController'
+export {createMarkFromOverlay} from './createMarkFromOverlay'
\ No newline at end of file
diff --git a/packages/common/core/src/shared/constants.ts b/packages/common/core/src/shared/constants.ts
index 780f4ab5..0a36d9a2 100644
--- a/packages/common/core/src/shared/constants.ts
+++ b/packages/common/core/src/shared/constants.ts
@@ -1,4 +1,14 @@
 import type {Markup} from '../features/parsing/ParserV2/types'
+import type {CoreOption} from './types'
+
+export interface DefaultOverlayConfig {
+	trigger?: string
+	data?: string[]
+}
+
+export interface DefaultOption extends CoreOption {
+	overlay?: DefaultOverlayConfig
+}
 
 export enum KEYBOARD {
 	// Navigation Keys
@@ -27,4 +37,14 @@ export enum KEYBOARD {
 
 export const DEFAULT_OVERLAY_TRIGGER = '@'
 
-export const DEFAULT_MARKUP: Markup = '@[__value__](__meta__)'
\ No newline at end of file
+export const DEFAULT_MARKUP: Markup = '@[__value__](__meta__)'
+
+export const DEFAULT_OPTIONS: DefaultOption[] = [
+	{
+		markup: DEFAULT_MARKUP,
+		overlay: {
+			trigger: DEFAULT_OVERLAY_TRIGGER,
+			data: [],
+		},
+	},
+]
\ No newline at end of file
diff --git a/packages/react/markput/src/components/MarkedInput.tsx b/packages/react/markput/src/components/MarkedInput.tsx
index a291b285..56630581 100644
--- a/packages/react/markput/src/components/MarkedInput.tsx
+++ b/packages/react/markput/src/components/MarkedInput.tsx
@@ -1,9 +1,8 @@
 import type {CoreSlotProps, CoreSlots, MarkputHandler, OverlayTrigger, StyleProperties} from '@markput/core'
-import {cx, merge, Store} from '@markput/core'
+import {cx, DEFAULT_OPTIONS, merge, Store} from '@markput/core'
 import type {ComponentType, CSSProperties, Ref} from 'react'
 import {useState} from 'react'
 
-import {DEFAULT_OPTIONS} from '../constants'
 import {createUseHook} from '../lib/hooks/createUseHook'
 import {useCoreFeatures} from '../lib/hooks/useCoreFeatures'
 import {StoreContext} from '../lib/providers/StoreContext'
diff --git a/packages/react/markput/src/constants.ts b/packages/react/markput/src/constants.ts
deleted file mode 100644
index 7ee76d14..00000000
--- a/packages/react/markput/src/constants.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {DEFAULT_MARKUP, DEFAULT_OVERLAY_TRIGGER} from '@markput/core'
-
-import type {Option} from './types'
-
-/**
- * React-specific default options for MarkedInput.
- * Extends core DEFAULT_OPTIONS with framework-specific configuration:
- * - Includes trigger configuration via overlay.trigger
- * - Provides empty data array for overlay suggestions
- *
- * Architecture:
- * - Core maintains framework-agnostic DEFAULT_OPTIONS (markup only)
- * - React layer extends with trigger and overlay configuration
- * - This keeps separation of concerns: core focuses on parsing, React on UI
- */
-export const DEFAULT_OPTIONS: Option[] = [
-	{
-		markup: DEFAULT_MARKUP,
-		overlay: {
-			trigger: DEFAULT_OVERLAY_TRIGGER,
-			data: [],
-		},
-	},
-]
\ No newline at end of file
diff --git a/packages/react/markput/src/lib/hooks/useOverlay.tsx b/packages/react/markput/src/lib/hooks/useOverlay.tsx
index 5eca0bb7..0db2ddd4 100644
--- a/packages/react/markput/src/lib/hooks/useOverlay.tsx
+++ b/packages/react/markput/src/lib/hooks/useOverlay.tsx
@@ -1,5 +1,5 @@
-import type {OverlayMatch, Token} from '@markput/core'
-import {Caret} from '@markput/core'
+import type {OverlayMatch} from '@markput/core'
+import {Caret, createMarkFromOverlay} from '@markput/core'
 import type {RefObject} from 'react'
 import {useCallback, useMemo} from 'react'
 
@@ -25,19 +25,7 @@ export function useOverlay(): OverlayHandler {
 	const close = useCallback(() => store.events.clearOverlay(), [])
 	const select = useCallback(
 		(value: {value: string; meta?: string}) => {
-			const mark: Token = {
-				type: 'mark',
-				value: value.value,
-				meta: value.meta,
-				content: '',
-				position: {start: match.index, end: match.index + match.span.length},
-				descriptor: {
-					index: 0,
-					markup: match.option.markup,
-				} as any,
-				children: [],
-				nested: undefined,
-			}
+			const mark = createMarkFromOverlay(match, value.value, value.meta)
 			store.events.select({mark, match})
 			store.events.clearOverlay()
 		},
diff --git a/packages/vue/markput/src/components/MarkedInput.vue b/packages/vue/markput/src/components/MarkedInput.vue
index a103d124..025d8882 100644
--- a/packages/vue/markput/src/components/MarkedInput.vue
+++ b/packages/vue/markput/src/components/MarkedInput.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import type {CoreSlotProps, CoreSlots, MarkputHandler, StyleProperties} from '@markput/core'
-import {cx, merge, Store} from '@markput/core'
+import {cx, DEFAULT_OPTIONS, merge, Store} from '@markput/core'
 import {computed, provide, shallowRef, watch} from 'vue'
 
-import {DEFAULT_OPTIONS} from '../constants'
 import {createUseHook} from '../lib/hooks/createUseHook'
 import {useCoreFeatures} from '../lib/hooks/useCoreFeatures'
 import {STORE_KEY} from '../lib/providers/storeKey'
diff --git a/packages/vue/markput/src/constants.ts b/packages/vue/markput/src/constants.ts
deleted file mode 100644
index 8e686e01..00000000
--- a/packages/vue/markput/src/constants.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {DEFAULT_MARKUP, DEFAULT_OVERLAY_TRIGGER} from '@markput/core'
-
-import type {Option} from './types'
-
-export const DEFAULT_OPTIONS: Option[] = [
-	{
-		markup: DEFAULT_MARKUP,
-		overlay: {
-			trigger: DEFAULT_OVERLAY_TRIGGER,
-			data: [],
-		},
-	},
-]
\ No newline at end of file
diff --git a/packages/vue/markput/src/lib/hooks/useOverlay.ts b/packages/vue/markput/src/lib/hooks/useOverlay.ts
index 5d43150e..74696c53 100644
--- a/packages/vue/markput/src/lib/hooks/useOverlay.ts
+++ b/packages/vue/markput/src/lib/hooks/useOverlay.ts
@@ -1,5 +1,5 @@
-import type {OverlayMatch, Token} from '@markput/core'
-import {Caret} from '@markput/core'
+import type {OverlayMatch} from '@markput/core'
+import {Caret, createMarkFromOverlay} from '@markput/core'
 import {computed, type Ref, type ComputedRef} from 'vue'
 
 import type {Option} from '../../types'
@@ -38,19 +38,7 @@ export function useOverlay(): OverlayHandler {
 	const select = (value: {value: string; meta?: string}) => {
 		const match = matchRef.value
 		if (!match) return
-		const mark: Token = {
-			type: 'mark',
-			value: value.value,
-			meta: value.meta,
-			content: '',
-			position: {start: match.index, end: match.index + match.span.length},
-			descriptor: {
-				index: 0,
-				markup: match.option.markup,
-			} as any,
-			children: [],
-			nested: undefined,
-		}
+		const mark = createMarkFromOverlay(match, value.value, value.meta)
 		store.events.select({mark, match})
 		store.events.clearOverlay()
 	}
diff --git a/packages/website/src/content/docs/api/functions/MarkedInput.md b/packages/website/src/content/docs/api/functions/MarkedInput.md
index 9d80cd90..cc33bcdc 100644
--- a/packages/website/src/content/docs/api/functions/MarkedInput.md
+++ b/packages/website/src/content/docs/api/functions/MarkedInput.md
@@ -9,7 +9,7 @@ title: "MarkedInput"
 function MarkedInput<TMarkProps, TOverlayProps>(props): Element;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:78](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L78)
+Defined in: [react/markput/src/components/MarkedInput.tsx:77](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L77)
 
 ## Type Parameters
 
diff --git a/packages/website/src/content/docs/api/interfaces/MarkedInputProps.md b/packages/website/src/content/docs/api/interfaces/MarkedInputProps.md
index 72b2f6e1..546da716 100644
--- a/packages/website/src/content/docs/api/interfaces/MarkedInputProps.md
+++ b/packages/website/src/content/docs/api/interfaces/MarkedInputProps.md
@@ -5,7 +5,7 @@ prev: false
 title: "MarkedInputProps"
 ---
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:34](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L34)
+Defined in: [react/markput/src/components/MarkedInput.tsx:33](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L33)
 
 Props for MarkedInput component.
 
@@ -36,7 +36,7 @@ Props for MarkedInput component.
 optional block: boolean;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:75](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L75)
+Defined in: [react/markput/src/components/MarkedInput.tsx:74](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L74)
 
 Enable Notion-like draggable blocks with drag handles for reordering
 
@@ -48,7 +48,7 @@ Enable Notion-like draggable blocks with drag handles for reordering
 optional className: string;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:48](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L48)
+Defined in: [react/markput/src/components/MarkedInput.tsx:47](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L47)
 
 Additional classes
 
@@ -60,7 +60,7 @@ Additional classes
 optional defaultValue: string;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:69](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L69)
+Defined in: [react/markput/src/components/MarkedInput.tsx:68](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L68)
 
 Initial value for uncontrolled mode
 
@@ -72,7 +72,7 @@ Initial value for uncontrolled mode
 optional Mark: ComponentType<TMarkProps>;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:38](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L38)
+Defined in: [react/markput/src/components/MarkedInput.tsx:37](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L37)
 
 Global component used for rendering markups (fallback for option.mark.slot)
 
@@ -84,7 +84,7 @@ Global component used for rendering markups (fallback for option.mark.slot)
 optional onChange: (value) => void;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:71](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L71)
+Defined in: [react/markput/src/components/MarkedInput.tsx:70](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L70)
 
 Change event handler
 
@@ -106,7 +106,7 @@ Change event handler
 optional options: Option<TMarkProps, TOverlayProps>[];
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:46](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L46)
+Defined in: [react/markput/src/components/MarkedInput.tsx:45](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L45)
 
 Configuration options for markups and overlays.
 Each option can specify its own slot component via mark.slot or overlay.slot.
@@ -120,7 +120,7 @@ Falls back to global Mark/Overlay components when not specified.
 optional Overlay: ComponentType<TOverlayProps>;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:40](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L40)
+Defined in: [react/markput/src/components/MarkedInput.tsx:39](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L39)
 
 Global component used for rendering overlays (fallback for option.overlay.slot)
 
@@ -132,7 +132,7 @@ Global component used for rendering overlays (fallback for option.overlay.slot)
 optional readOnly: boolean;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:73](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L73)
+Defined in: [react/markput/src/components/MarkedInput.tsx:72](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L72)
 
 Read-only mode
 
@@ -144,7 +144,7 @@ Read-only mode
 optional ref: Ref<MarkputHandler>;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:36](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L36)
+Defined in: [react/markput/src/components/MarkedInput.tsx:35](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L35)
 
 Ref to handler
 
@@ -156,7 +156,7 @@ Ref to handler
 optional showOverlayOn: OverlayTrigger;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:65](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L65)
+Defined in: [react/markput/src/components/MarkedInput.tsx:64](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L64)
 
 Events that trigger overlay display
 
@@ -174,7 +174,7 @@ Events that trigger overlay display
 optional slotProps: SlotProps;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:60](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L60)
+Defined in: [react/markput/src/components/MarkedInput.tsx:59](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L59)
 
 Props to pass to slot components
 
@@ -192,7 +192,7 @@ slotProps={{ container: { onKeyDown: handler }, span: { className: 'custom' } }}
 optional slots: Slots;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:55](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L55)
+Defined in: [react/markput/src/components/MarkedInput.tsx:54](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L54)
 
 Override internal components using slots
 
@@ -210,7 +210,7 @@ slots={{ container: 'div', span: 'span' }}
 optional style: CSSProperties;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:50](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L50)
+Defined in: [react/markput/src/components/MarkedInput.tsx:49](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L49)
 
 Additional style
 
@@ -222,6 +222,6 @@ Additional style
 optional value: string;
 ```
 
-Defined in: [react/markput/src/components/MarkedInput.tsx:67](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L67)
+Defined in: [react/markput/src/components/MarkedInput.tsx:66](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/components/MarkedInput.tsx#L66)
 
 Annotated text with markups

From 28bace3533c96adf9a871f30211eaef41e21d60e Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 17:44:42 +0300
Subject: [PATCH 7/8] refactor: move shared logic from framework adapters to
 core

- Add MarkOptions interface to core
- Add resolveOptionSlot utility for slot resolution
- Add filterSuggestions for overlay filtering
- Add suggestionNavigation for keyboard navigation
- Update React/Vue adapters to use core utilities
---
 packages/common/core/index.ts                 | 21 +++++++++++--
 .../common/core/src/features/mark/index.ts    |  3 +-
 .../common/core/src/features/mark/types.ts    |  3 ++
 .../src/features/overlay/filterSuggestions.ts |  4 +++
 .../common/core/src/features/overlay/index.ts |  4 ++-
 .../features/overlay/suggestionNavigation.ts  | 25 +++++++++++++++
 .../common/core/src/shared/utils/index.ts     |  1 +
 .../src/shared/utils/resolveOptionSlot.ts     |  6 ++++
 .../components/Suggestions/Suggestions.tsx    | 31 +++++++------------
 .../react/markput/src/lib/hooks/useMark.tsx   |  6 +---
 .../react/markput/src/lib/hooks/useSlot.ts    | 13 ++------
 .../components/Suggestions/Suggestions.vue    | 29 +++++++----------
 packages/vue/markput/src/lib/hooks/useMark.ts |  6 +---
 packages/vue/markput/src/lib/hooks/useSlot.ts | 13 ++------
 .../src/content/docs/api/functions/useMark.md |  2 +-
 15 files changed, 92 insertions(+), 75 deletions(-)
 create mode 100644 packages/common/core/src/features/mark/types.ts
 create mode 100644 packages/common/core/src/features/overlay/filterSuggestions.ts
 create mode 100644 packages/common/core/src/features/overlay/suggestionNavigation.ts
 create mode 100644 packages/common/core/src/shared/utils/resolveOptionSlot.ts

diff --git a/packages/common/core/index.ts b/packages/common/core/index.ts
index 617101c4..10283288 100644
--- a/packages/common/core/index.ts
+++ b/packages/common/core/index.ts
@@ -1,6 +1,14 @@
 // Shared exports
 export {assertNonNullable} from './src/shared/checkers/assertNonNullable'
-export {convertDataAttrs, cx, merge, resolveSlot, resolveSlotProps, type SlotName} from './src/shared/utils'
+export {
+	convertDataAttrs,
+	cx,
+	merge,
+	resolveOptionSlot,
+	resolveSlot,
+	resolveSlotProps,
+	type SlotName,
+} from './src/shared/utils'
 export {
 	KEYBOARD,
 	DEFAULT_MARKUP,
@@ -50,7 +58,14 @@ export {findGap, getClosestIndexes} from './src/features/preparsing'
 export {toString} from './src/features/parsing'
 export {shallow, createNewSpan, deleteMark} from './src/features/text-manipulation'
 export {Store, type StoreOptions} from './src/features/store'
-export {OverlayController, createMarkFromOverlay} from './src/features/overlay'
+export {
+	OverlayController,
+	createMarkFromOverlay,
+	filterSuggestions,
+	navigateSuggestions,
+	type NavigationAction,
+	type NavigationResult,
+} from './src/features/overlay'
 export {FocusController} from './src/features/focus'
 export {KeyDownController} from './src/features/input'
 export {SystemListenerController} from './src/features/events'
@@ -65,7 +80,7 @@ export {createCoreFeatures} from './src/features/coreFeatures'
 export {Lifecycle, type LifecycleOptions} from './src/features/lifecycle'
 
 // Mark Handler
-export {MarkHandler, type RefAccessor} from './src/features/mark'
+export {MarkHandler, type MarkOptions, type RefAccessor} from './src/features/mark'
 
 // Blocks
 export {splitTokensIntoBlocks, reorderBlocks, type Block} from './src/features/blocks'
diff --git a/packages/common/core/src/features/mark/index.ts b/packages/common/core/src/features/mark/index.ts
index 853c291c..2894b39a 100644
--- a/packages/common/core/src/features/mark/index.ts
+++ b/packages/common/core/src/features/mark/index.ts
@@ -1 +1,2 @@
-export {MarkHandler, type RefAccessor} from './MarkHandler'
\ No newline at end of file
+export {MarkHandler, type RefAccessor} from './MarkHandler'
+export type {MarkOptions} from './types'
\ No newline at end of file
diff --git a/packages/common/core/src/features/mark/types.ts b/packages/common/core/src/features/mark/types.ts
new file mode 100644
index 00000000..5e8b7d0e
--- /dev/null
+++ b/packages/common/core/src/features/mark/types.ts
@@ -0,0 +1,3 @@
+export interface MarkOptions {
+	controlled?: boolean
+}
\ No newline at end of file
diff --git a/packages/common/core/src/features/overlay/filterSuggestions.ts b/packages/common/core/src/features/overlay/filterSuggestions.ts
new file mode 100644
index 00000000..08d13974
--- /dev/null
+++ b/packages/common/core/src/features/overlay/filterSuggestions.ts
@@ -0,0 +1,4 @@
+export function filterSuggestions(data: string[], search: string): string[] {
+	const query = search.toLowerCase()
+	return data.filter(s => s.toLowerCase().indexOf(query) > -1)
+}
\ No newline at end of file
diff --git a/packages/common/core/src/features/overlay/index.ts b/packages/common/core/src/features/overlay/index.ts
index c50ac646..5dacd73b 100644
--- a/packages/common/core/src/features/overlay/index.ts
+++ b/packages/common/core/src/features/overlay/index.ts
@@ -1,2 +1,4 @@
+export {filterSuggestions} from './filterSuggestions'
+export {createMarkFromOverlay} from './createMarkFromOverlay'
 export {OverlayController} from './OverlayController'
-export {createMarkFromOverlay} from './createMarkFromOverlay'
\ No newline at end of file
+export {navigateSuggestions, type NavigationAction, type NavigationResult} from './suggestionNavigation'
\ No newline at end of file
diff --git a/packages/common/core/src/features/overlay/suggestionNavigation.ts b/packages/common/core/src/features/overlay/suggestionNavigation.ts
new file mode 100644
index 00000000..f32f01fb
--- /dev/null
+++ b/packages/common/core/src/features/overlay/suggestionNavigation.ts
@@ -0,0 +1,25 @@
+import {KEYBOARD} from '../../shared/constants'
+
+export type NavigationAction = 'up' | 'down' | 'select' | 'none'
+
+export interface NavigationResult {
+	action: NavigationAction
+	index: number
+}
+
+export function navigateSuggestions(key: string, activeIndex: number, length: number): NavigationResult {
+	if (length === 0) return {action: 'none', index: activeIndex}
+
+	const hasActive = !isNaN(activeIndex)
+
+	switch (key) {
+		case KEYBOARD.UP:
+			return {action: 'up', index: hasActive ? (length + ((activeIndex - 1) % length)) % length : 0}
+		case KEYBOARD.DOWN:
+			return {action: 'down', index: hasActive ? (activeIndex + 1) % length : 0}
+		case KEYBOARD.ENTER:
+			return hasActive ? {action: 'select', index: activeIndex} : {action: 'none', index: activeIndex}
+		default:
+			return {action: 'none', index: activeIndex}
+	}
+}
\ No newline at end of file
diff --git a/packages/common/core/src/shared/utils/index.ts b/packages/common/core/src/shared/utils/index.ts
index 3bbc5117..938097d2 100644
--- a/packages/common/core/src/shared/utils/index.ts
+++ b/packages/common/core/src/shared/utils/index.ts
@@ -1,4 +1,5 @@
 export {convertDataAttrs} from './dataAttributes'
 export {cx} from './cx'
 export {merge} from './merge'
+export {resolveOptionSlot} from './resolveOptionSlot'
 export {resolveSlot, resolveSlotProps, type SlotName} from './resolveSlot'
\ No newline at end of file
diff --git a/packages/common/core/src/shared/utils/resolveOptionSlot.ts b/packages/common/core/src/shared/utils/resolveOptionSlot.ts
new file mode 100644
index 00000000..cec69d86
--- /dev/null
+++ b/packages/common/core/src/shared/utils/resolveOptionSlot.ts
@@ -0,0 +1,6 @@
+export function resolveOptionSlot<T extends object>(optionConfig: T | ((base: T) => T) | undefined, baseProps: T): T {
+	if (optionConfig !== undefined) {
+		return typeof optionConfig === 'function' ? optionConfig(baseProps) : optionConfig
+	}
+	return baseProps ?? {}
+}
\ No newline at end of file
diff --git a/packages/react/markput/src/components/Suggestions/Suggestions.tsx b/packages/react/markput/src/components/Suggestions/Suggestions.tsx
index f7af8355..857ce5ef 100644
--- a/packages/react/markput/src/components/Suggestions/Suggestions.tsx
+++ b/packages/react/markput/src/components/Suggestions/Suggestions.tsx
@@ -1,4 +1,4 @@
-import {KEYBOARD} from '@markput/core'
+import {filterSuggestions, navigateSuggestions} from '@markput/core'
 import type {RefObject} from 'react'
 import {useEffect, useMemo, useState} from 'react'
 
@@ -12,10 +12,7 @@ export const Suggestions = () => {
 	const {match, select, style, ref} = useOverlay()
 	const [active, setActive] = useState(NaN)
 	const data = match.option.overlay?.data || []
-	const filtered = useMemo(
-		() => data.filter(s => s.toLowerCase().indexOf(match.value.toLowerCase()) > -1),
-		[match.value, data]
-	)
+	const filtered = useMemo(() => filterSuggestions(data, match.value), [match.value, data])
 	const length = filtered.length
 
 	useEffect(() => {
@@ -23,30 +20,24 @@ export const Suggestions = () => {
 		if (!container) return
 
 		const handler = (event: KeyboardEvent) => {
-			switch (event.key) {
-				case KEYBOARD.UP:
-					event.preventDefault()
-					setActive(prev => (isNaN(prev) ? 0 : (length + ((prev - 1) % length)) % length))
-					break
-				case KEYBOARD.DOWN:
+			const result = navigateSuggestions(event.key, active, length)
+			switch (result.action) {
+				case 'up':
+				case 'down':
 					event.preventDefault()
-					setActive(prev => (isNaN(prev) ? 0 : (prev + 1) % length))
+					setActive(result.index)
 					break
-				case KEYBOARD.ENTER:
+				case 'select':
 					event.preventDefault()
-					setActive(current => {
-						if (isNaN(current)) return current
-						const suggestion = filtered[current]
-						select({value: suggestion, meta: current.toString()})
-						return current
-					})
+					const suggestion = filtered[result.index]
+					select({value: suggestion, meta: result.index.toString()})
 					break
 			}
 		}
 
 		container.addEventListener('keydown', handler)
 		return () => container.removeEventListener('keydown', handler)
-	}, [length, filtered])
+	}, [length, filtered, active])
 
 	if (!filtered.length) return null
 
diff --git a/packages/react/markput/src/lib/hooks/useMark.tsx b/packages/react/markput/src/lib/hooks/useMark.tsx
index 82a27425..3c06596d 100644
--- a/packages/react/markput/src/lib/hooks/useMark.tsx
+++ b/packages/react/markput/src/lib/hooks/useMark.tsx
@@ -1,4 +1,4 @@
-import type {MarkToken} from '@markput/core'
+import type {MarkOptions, MarkToken} from '@markput/core'
 import {MarkHandler} from '@markput/core'
 import type {RefObject} from 'react'
 import {useEffect, useRef, useState} from 'react'
@@ -6,10 +6,6 @@ import {useEffect, useRef, useState} from 'react'
 import {useStore} from '../providers/StoreContext'
 import {useToken} from '../providers/TokenContext'
 
-export interface MarkOptions {
-	controlled?: boolean
-}
-
 export const useMark = <T extends HTMLElement = HTMLElement>(options: MarkOptions = {}): MarkHandler<T> => {
 	const store = useStore()
 	const token = useToken()
diff --git a/packages/react/markput/src/lib/hooks/useSlot.ts b/packages/react/markput/src/lib/hooks/useSlot.ts
index 2b7d3829..cbcb16ce 100644
--- a/packages/react/markput/src/lib/hooks/useSlot.ts
+++ b/packages/react/markput/src/lib/hooks/useSlot.ts
@@ -1,3 +1,4 @@
+import {resolveOptionSlot} from '@markput/core'
 import type {ComponentType} from 'react'
 
 import type {MarkProps, Option, OverlayProps} from '../../types'
@@ -30,17 +31,7 @@ export function useSlot(
 	const globalComponent = (type === 'mark' ? Mark : Overlay) as ComponentType<any> | undefined
 
 	const optionConfig = type === 'mark' ? option?.mark : option?.overlay
-	let props: any
-
-	if (optionConfig !== undefined) {
-		if (typeof optionConfig === 'function') {
-			props = optionConfig(baseProps)
-		} else {
-			props = optionConfig
-		}
-	} else {
-		props = baseProps ?? {}
-	}
+	const props = resolveOptionSlot(optionConfig as any, baseProps ?? {})
 
 	const Component = (props.slot || globalComponent || defaultComponent) as ComponentType<any>
 
diff --git a/packages/vue/markput/src/components/Suggestions/Suggestions.vue b/packages/vue/markput/src/components/Suggestions/Suggestions.vue
index e8402927..3807028f 100644
--- a/packages/vue/markput/src/components/Suggestions/Suggestions.vue
+++ b/packages/vue/markput/src/components/Suggestions/Suggestions.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {KEYBOARD} from '@markput/core'
+import {filterSuggestions, navigateSuggestions} from '@markput/core'
 import {ref, computed, onMounted, onUnmounted} from 'vue'
 
 import {useOverlay} from '../../lib/hooks/useOverlay'
@@ -13,28 +13,23 @@ const active = ref(NaN)
 
 const data = computed(() => match.value?.option.overlay?.data || [])
 const filtered = computed(() => {
-	const search = match.value?.value.toLowerCase() ?? ''
-	return (data.value as string[]).filter(s => s.toLowerCase().indexOf(search) > -1)
+	const search = match.value?.value ?? ''
+	return filterSuggestions(data.value as string[], search)
 })
 
 function handleKeyDown(event: KeyboardEvent) {
-	const length = filtered.value.length
-	switch (event.key) {
-		case KEYBOARD.UP:
+	const result = navigateSuggestions(event.key, active.value, filtered.value.length)
+	switch (result.action) {
+		case 'up':
+		case 'down':
 			event.preventDefault()
-			active.value = isNaN(active.value) ? 0 : (length + ((active.value - 1) % length)) % length
+			active.value = result.index
 			break
-		case KEYBOARD.DOWN:
+		case 'select':
 			event.preventDefault()
-			active.value = isNaN(active.value) ? 0 : (active.value + 1) % length
-			break
-		case KEYBOARD.ENTER:
-			event.preventDefault()
-			if (!isNaN(active.value)) {
-				const suggestion = filtered.value[active.value]
-				if (suggestion) {
-					select({value: suggestion, meta: active.value.toString()})
-				}
+			const suggestion = filtered.value[result.index]
+			if (suggestion) {
+				select({value: suggestion, meta: result.index.toString()})
 			}
 			break
 	}
diff --git a/packages/vue/markput/src/lib/hooks/useMark.ts b/packages/vue/markput/src/lib/hooks/useMark.ts
index b29ec864..27487186 100644
--- a/packages/vue/markput/src/lib/hooks/useMark.ts
+++ b/packages/vue/markput/src/lib/hooks/useMark.ts
@@ -1,14 +1,10 @@
-import type {MarkToken} from '@markput/core'
+import type {MarkOptions, MarkToken} from '@markput/core'
 import {MarkHandler} from '@markput/core'
 import {inject, ref, watch, onMounted} from 'vue'
 
 import {TOKEN_KEY} from '../providers/tokenKey'
 import {useStore} from './useStore'
 
-export interface MarkOptions {
-	controlled?: boolean
-}
-
 export const useMark = <T extends HTMLElement = HTMLElement>(options: MarkOptions = {}): MarkHandler<T> => {
 	const store = useStore()
 	const tokenRef = inject(TOKEN_KEY)
diff --git a/packages/vue/markput/src/lib/hooks/useSlot.ts b/packages/vue/markput/src/lib/hooks/useSlot.ts
index acfe8745..2d897aa9 100644
--- a/packages/vue/markput/src/lib/hooks/useSlot.ts
+++ b/packages/vue/markput/src/lib/hooks/useSlot.ts
@@ -1,3 +1,4 @@
+import {resolveOptionSlot} from '@markput/core'
 import type {Component, Ref} from 'vue'
 
 import type {MarkProps, Option, OverlayProps} from '../../types'
@@ -30,17 +31,7 @@ export function useSlot(
 	const globalComponent = type === 'mark' ? MarkRef.value : OverlayRef.value
 
 	const optionConfig = type === 'mark' ? option?.mark : option?.overlay
-	let props: any
-
-	if (optionConfig !== undefined) {
-		if (typeof optionConfig === 'function') {
-			props = optionConfig(baseProps)
-		} else {
-			props = optionConfig
-		}
-	} else {
-		props = baseProps ?? {}
-	}
+	const props = resolveOptionSlot(optionConfig as any, baseProps ?? {})
 
 	const Comp = (props.slot || globalComponent || defaultComponent) as Component
 
diff --git a/packages/website/src/content/docs/api/functions/useMark.md b/packages/website/src/content/docs/api/functions/useMark.md
index a6798c8f..c2986a46 100644
--- a/packages/website/src/content/docs/api/functions/useMark.md
+++ b/packages/website/src/content/docs/api/functions/useMark.md
@@ -9,7 +9,7 @@ title: "useMark"
 function useMark<T>(options?): MarkHandler<T>;
 ```
 
-Defined in: [react/markput/src/lib/hooks/useMark.tsx:13](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/lib/hooks/useMark.tsx#L13)
+Defined in: [react/markput/src/lib/hooks/useMark.tsx:9](https://github.com/Nowely/marked-input/blob/next/packages/react/markput/src/lib/hooks/useMark.tsx#L9)
 
 ## Type Parameters
 

From 19631f449b94936e801f716e7e861ee230205667 Mon Sep 17 00:00:00 2001
From: Nowely <ilyin-r@mail.ru>
Date: Sat, 7 Mar 2026 17:51:38 +0300
Subject: [PATCH 8/8] refactor: move DataAttributes type to core

---
 packages/common/core/index.ts                        |  1 +
 packages/common/core/src/shared/types.ts             |  2 ++
 packages/react/markput/src/types.ts                  | 12 +-----------
 packages/vue/markput/src/types.ts                    |  4 +---
 .../content/docs/api/interfaces/MarkputHandler.md    |  8 ++++----
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/packages/common/core/index.ts b/packages/common/core/index.ts
index 10283288..2dfe7f06 100644
--- a/packages/common/core/index.ts
+++ b/packages/common/core/index.ts
@@ -31,6 +31,7 @@ export type {
 	GenericAttributes,
 	CoreSlots,
 	CoreSlotProps,
+	DataAttributes,
 } from './src/shared/types'
 
 // Parsing exports (modern API)
diff --git a/packages/common/core/src/shared/types.ts b/packages/common/core/src/shared/types.ts
index fdcc21dc..60d8ebd7 100644
--- a/packages/common/core/src/shared/types.ts
+++ b/packages/common/core/src/shared/types.ts
@@ -110,6 +110,8 @@ export type OverlayTrigger = Array<'change' | 'selectionChange'> | 'change' | 's
 
 export type StyleProperties = Record<string, string | number>
 
+export type DataAttributes = Record<`data${Capitalize<string>}`, string | number | boolean | undefined>
+
 export type GenericComponent = unknown
 export type GenericElement = unknown
 export type GenericAttributes = Record<string, unknown>
diff --git a/packages/react/markput/src/types.ts b/packages/react/markput/src/types.ts
index c5b5560f..0c4c121e 100644
--- a/packages/react/markput/src/types.ts
+++ b/packages/react/markput/src/types.ts
@@ -1,4 +1,4 @@
-import type {CoreOption} from '@markput/core'
+import type {CoreOption, DataAttributes} from '@markput/core'
 import type {ComponentType, ElementType, HTMLAttributes, ReactNode} from 'react'
 
 /**
@@ -67,17 +67,7 @@ export interface Slots {
 	span?: ElementType<HTMLAttributes<HTMLSpanElement>>
 }
 
-/**
- * Data attributes with automatic camelCase to kebab-case conversion
- */
-export type DataAttributes = Record<`data${Capitalize<string>}`, string | number | boolean | undefined>
-
-/**
- * Props for each slot component
- */
 export interface SlotProps {
-	/** Props to pass to the container slot */
 	container?: HTMLAttributes<HTMLDivElement> & DataAttributes
-	/** Props to pass to the span slot */
 	span?: HTMLAttributes<HTMLSpanElement> & DataAttributes
 }
\ No newline at end of file
diff --git a/packages/vue/markput/src/types.ts b/packages/vue/markput/src/types.ts
index bc28d644..df98e5cb 100644
--- a/packages/vue/markput/src/types.ts
+++ b/packages/vue/markput/src/types.ts
@@ -1,4 +1,4 @@
-import type {CoreOption, OverlayTrigger} from '@markput/core'
+import type {CoreOption, DataAttributes, OverlayTrigger} from '@markput/core'
 import type {Component, CSSProperties} from 'vue'
 
 export interface MarkProps {
@@ -41,8 +41,6 @@ export interface Slots {
 	span?: string | Component
 }
 
-export type DataAttributes = Record<`data${Capitalize<string>}`, string | number | boolean | undefined>
-
 export interface SlotProps {
 	container?: Record<string, unknown> & DataAttributes
 	span?: Record<string, unknown> & DataAttributes
diff --git a/packages/website/src/content/docs/api/interfaces/MarkputHandler.md b/packages/website/src/content/docs/api/interfaces/MarkputHandler.md
index d726551f..eaaf1b61 100644
--- a/packages/website/src/content/docs/api/interfaces/MarkputHandler.md
+++ b/packages/website/src/content/docs/api/interfaces/MarkputHandler.md
@@ -5,7 +5,7 @@ prev: false
 title: "MarkputHandler"
 ---
 
-Defined in: [common/core/src/shared/types.ts:127](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L127)
+Defined in: [common/core/src/shared/types.ts:129](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L129)
 
 ## Properties
 
@@ -15,7 +15,7 @@ Defined in: [common/core/src/shared/types.ts:127](https://github.com/Nowely/mark
 readonly container: HTMLDivElement | null;
 ```
 
-Defined in: [common/core/src/shared/types.ts:128](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L128)
+Defined in: [common/core/src/shared/types.ts:130](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L130)
 
 ***
 
@@ -25,7 +25,7 @@ Defined in: [common/core/src/shared/types.ts:128](https://github.com/Nowely/mark
 readonly overlay: HTMLElement | null;
 ```
 
-Defined in: [common/core/src/shared/types.ts:129](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L129)
+Defined in: [common/core/src/shared/types.ts:131](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L131)
 
 ## Methods
 
@@ -35,7 +35,7 @@ Defined in: [common/core/src/shared/types.ts:129](https://github.com/Nowely/mark
 focus(): void;
 ```
 
-Defined in: [common/core/src/shared/types.ts:130](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L130)
+Defined in: [common/core/src/shared/types.ts:132](https://github.com/Nowely/marked-input/blob/next/packages/common/core/src/shared/types.ts#L132)
 
 #### Returns