diff --git a/docs/addons/addons-api.md b/docs/addons/addons-api.md
index 14bc9a186449..8208bf0f7c2c 100644
--- a/docs/addons/addons-api.md
+++ b/docs/addons/addons-api.md
@@ -2,9 +2,14 @@
title: 'Addon API'
---
+Storybook's API allows developers to interact programmatically with Storybook. With the API, developers can build and deploy custom addons and other tools that enhance Storybook's functionality.
+
## Core Addon API
-This is the core addon API. This is how to get the addon API:
+Our API is exposed via two distinct packages, each one with a different purpose:
+
+- `@storybook/manager-api` used to interact with the Storybook manager UI or access the Storybook API.
+- `@storybook/preview-api` used to control and configure the addon's behavior.
@@ -16,16 +21,31 @@ This is the core addon API. This is how to get the addon API:
-### addons.getChannel()
+### addons.add()
-Get an instance to the channel to communicate with the manager and the preview. You can find this in both the addon register code and your addon’s wrapper component (where used inside a story).
+The `add` method allows you to register the type of UI component associated with the addon (e.g., panels, toolbars, tabs). For a minimum viable Storybook addon, you should provide the following arguments:
+
+- `type`: The type of UI component to register.
+- `title`: The title to feature in the Addon Panel.
+- `render`: The function that renders the addon's UI component.
+
+
+
+
-It has a NodeJS [EventEmitter](https://nodejs.org/api/events.html) compatible API. So, you can use it to emit events and listen for events.
+
+
+
+ℹ️ The render function is called with `active` and `key`. The `active` value will be true when the panel is focused on the UI.
+
### addons.register()
-This method allows you to register an addon and get the storybook API. You can do this only in the Manager App.
-See how we can use this:
+Serves as the entry point for all addons. It allows you to register an addon and access the Storybook [API](#storybook-api). For example:
@@ -39,27 +59,23 @@ See how we can use this:
Now you'll get an instance to our StorybookAPI. See the [api docs](#storybook-api) for Storybook API regarding using that.
-### addons.add()
+### addons.getChannel()
-This method allows you to add a panel to Storybook. (Storybook's Action Logger is a panel). You can do this only in the Manager App.
-See how you can use this method:
+Get an instance to the channel to communicate with the manager and the preview. You can find this in both the addon register code and your addon’s wrapper component (where used inside a story).
+
+It has a NodeJS [EventEmitter](https://nodejs.org/api/events.html) compatible API. So, you can use it to emit events and listen to events.
-The render function is called with `active` and `key`. The `active` value will be true when the panel is focused on the UI.
-
-As you can see, you can set any React Component as the panel. Currently, it's one line of text. But you can do anything you want.
-It's a good practice to specify the panel title with the `title` key. You can use any plain text with it.
-
-## makeDecorator API
+### makeDecorator
Use the `makeDecorator` API to create decorators in the style of the official addons. Like so:
@@ -73,317 +89,288 @@ Use the `makeDecorator` API to create decorators in the style of the official ad
-The options to `makeDecorator` are:
-
-- `name`: The name of the export (e.g. `withFoo`)
-- `parameterName`: The name of the parameter your addon uses. This should be unique.
-- `skipIfNoParametersOrOptions`: Don't run your decorator if the user hasn't set options (via `.addDecorator(withFoo(options)))`) or parameters (`.add('story', () => , { foo: 'param' })`, or `.addParameters({ foo: 'param' })`).
-- `allowDeprecatedUsage`: support the deprecated "wrapper" usage (`.add('story', () => withFoo(options)(() => ))`).
-- `wrapper`: your decorator function. Takes the `storyFn`, `context`, and both the `options` and `parameters` (as defined in `skipIfNoParametersOrOptions` above).
-
-💡 If the story's parameters include `{ foo: { disable: true } }` (where `foo` is the `parameterName` of your addon), your decorator will not be called.
+ℹ️ If the story's parameters include `{ exampleParameter: { disable: true } }` (where `exampleParameter` is the `parameterName` of your addon), your decorator will not be called.
+The `makeDecorator` API requires the following arguments:
+
+- `name`: Unique name to identify the custom addon decorator.
+- `parameterName`: Sets a unique parameter to be consumed by the addon.
+- `skipIfNoParametersOrOptions`: (Optional) Doesn't run the decorator if the user hasn't options either via [decorators](../writing-stories/decorators.md) or [parameters](../writing-stories/parameters.md).
+- `wrapper`: your decorator function. Takes the `getStory`, `context`, and both the `options` and `parameters` (as defined in `skipIfNoParametersOrOptions` above).
+
---
-## Storybook hooks
+## Storybook API
-Writing addons can be simplified a lot by using these Storybook hooks:
+Storybook's API allows you to access different functionalities of Storybook UI.
-### useStorybookState
+### api.selectStory()
+
+The `selectStory` API method allows you to select a single story. It accepts the following two parameters; story kind name and an optional story name. For example:
-It allows full access to the entire storybook state.
-Your component will re-render whenever the storybook state changes.
-
-If you use this, remember your component will be re-rendered a lot, and you may need to optimize for that using [`React.memo`](https://reactjs.org/docs/react-api.html#reactmemo) or [`useMemo`](https://reactjs.org/docs/hooks-reference.html#usememo) or [`PureComponent`](https://reactjs.org/docs/react-api.html#reactpurecomponent).
-
-### useStorybookApi
+This is how you can select the above story:
-It allows full access to the storybook API.
-
-Details on the Storybook API are further down.
+### api.selectInCurrentKind()
-### useChannel
+Similar to the `selectStory` API method, but it only accepts the story as the only parameter.
-Allows both setting subscriptions to events and getting the emitter for emitting custom events to the channel.
-
-The messages can be listened to on both the iframe and the manager side.
+### api.setQueryParams()
-### useAddonState
+This method allows you to set query string parameters. You can use that as temporary storage for addons. Here's how you define query params:
-Extremely useful for addons that need to persist in some form of state.
-
-Storybook may unmount your addon component, so keeping local state might not work well.
-
-Also, some addons consist of multiple parts, some parts in a panel, some in the toolbar, etc.
-
-With this hook, addons can access the same portion of the state, persisted even if the components are unmounted.
-
-### useParameter
+Additionally, if you need to remove a query parameter, set it as `null` instead of removing them from the addon. For example:
-This hook gets you the current story's parameter.
+### api.getQueryParam()
-If the parameter isn't set, the default value (second argument) is returned instead.
-
-### useGlobals
+Allows retrieval of a query parameter enabled via the `setQueryParams` API method. For example:
-Extremely useful hook for addons that rely on Storybook [Globals](../essentials/toolbars-and-globals.md).
-
-It allows you to retrieve and update any Storybook Globals you want.
+### api.getUrlState(overrideParams)
-If you use this hook, remember that your component will render a lot, and you may need to optimize for that using [`React.memo`](https://reactjs.org/docs/react-api.html#reactmemo) or [`useMemo`](https://reactjs.org/docs/hooks-reference.html#usememo) or [`useCallback`](https://reactjs.org/docs/hooks-reference.html#usecallback).
-
-### useArgs
+This method allows you to get the application URL state, including any overridden or custom parameter values. For example:
-You can use this handy Storybook hook in your addon if you need to read or update [`args`](../writing-stories/args.md).
-
----
-
-## Storybook API
-
-Storybook API allows you to access different functionalities of Storybook UI. You can move an instance to the Storybook API when registering an addon.
-
-Let's have a look at API methods.
-
-### api.selectStory()
-
-With this method, you can select a story via an API. This method accepts two parameters.
-
-1. story kind name
-2. story name (optional)
+### api.on(eventName, fn)
-Let's say you've got a story like this:
+This method allows you to register a handler function called whenever the user navigates between stories.
-This is how you can select the above story:
+### addons.setConfig(config)
+
+This method allows you to override the default Storybook UI configuration (e.g., set up a [theme](../configure/theming.md) or hide UI elements):
-### api.selectInCurrentKind()
+The following table details how to use the API values:
+
+| Name | Type | Description | Example Value |
+| ------------------- | :-----------: | :------------------------------------------------: | :-----------------------------------: |
+| **isFullscreen** | Boolean | Show story component as full screen | `false` |
+| **showNav** | Boolean | Display panel that shows a list of stories | `true` |
+| **showPanel** | Boolean | Display panel that shows addon configurations | `true` |
+| **panelPosition** | String/Object | Where to show the addon panel | `bottom` or `right` |
+| **enableShortcuts** | Boolean | Enable/disable shortcuts | `true` |
+| **showToolbar** | Boolean | Show/hide toolbar | `true` |
+| **theme** | Object | Storybook Theme, see next section | `undefined` |
+| **selectedPanel** | String | Id to select an addon panel | `storybook/actions/panel` |
+| **initialActive** | String | Select the default active tab on Mobile | `sidebar` or `canvas` or `addons` |
+| **sidebar** | Object | Sidebar options, see below | `{ showRoots: false }` |
+| **toolbar** | Object | Modify the tools in the toolbar using the addon id | `{ fullscreen: { hidden: false } } }` |
-Same as `selectStory`, but accepts a story inside current kind as the only parameter:
+The following options are configurable under the `sidebar` namespace:
+
+| Name | Type | Description | Example Value |
+| ------------------ | :------: | :-----------------------------------------------------------: | :----------------------------------------------: |
+| **showRoots** | Boolean | Display the top-level nodes as a "root" in the sidebar | `false` |
+| **collapsedRoots** | Array | Set of root node IDs to visually collapse by default | `['misc', 'other']` |
+| **renderLabel** | Function | Create a custom label for tree nodes; must return a ReactNode | `(item) => {item.name}` |
+
+The following options are configurable under the `toolbar` namespace:
+
+| Name | Type | Description | Example Value |
+| ------ | :----: | :--------------------------------: | :-----------------: |
+| **id** | String | Toggle visibility for toolbar item | `{ hidden: false }` |
+
+---
+
+## Storybook hooks
+
+To help streamline addon development and reduce boilerplate code, the API exposes a set of hooks to access Storybook's internals. These hooks are an extension of the `@storybook/manager-api` package.
+
+### useStorybookState
+
+It allows access to Storybook's internal state. Similar to the [`useglobals`](#useglobals) hook, we recommend optimizing your addon to rely on [`React.memo`](https://reactjs.org/docs/react-api.html#reactmemo), or the following hooks; [`useMemo`](https://reactjs.org/docs/hooks-reference.html#usememo), [`useCallback`](https://reactjs.org/docs/hooks-reference.html#usecallback) to prevent a high volume of re-render cycles.
-### api.setQueryParams()
+### useStorybookApi
-This method allows you to set query string parameters. You can use that as temporary storage for addons. Here's how you define query params:
+The `useStorybookApi` hook is a convenient helper to allow you full access to the [Storybook API](#storybook-api) methods.
-
+### useChannel
-💡 If you need to remove a query param, use `null` for that. For example, we need to remove the `bbc` query param. See below how to do it:
+Allows setting subscriptions to events and getting the emitter to emit custom events to the channel.
-
+The messages can be listened to on both the iframe and the manager.
-### api.getQueryParam()
+### useAddonState
-This method allows you to get a query param set by the above API `setQueryParams`. For example, we need to get the `bbc` query param. Then this is how we do it:
+The `useAddonState` is a useful hook for addons that require data persistence, either due to Storybook's UI lifecycle or for more complex addons involving multiple types (e.g., toolbars, panels).
-### api.getUrlState(overrideParams)
+### useParameter
-This method allows you to get the application URL state with some changed params. For example, if you want to get a link to a particular story:
+The `useParameter` retrieves the current story's parameters. If the parameter's value is not defined, it will automatically default to the second value defined.
-### api.on(eventName, fn)
+### useGlobals
-This method allows you to register a handler function called whenever the user navigates between stories.
+Extremely useful hook for addons that rely on Storybook [Globals](../essentials/toolbars-and-globals.md). It allows you to obtain and update `global` values. We also recommend optimizing your addon to rely on [`React.memo`](https://reactjs.org/docs/react-api.html#reactmemo), or the following hooks; [`useMemo`](https://reactjs.org/docs/hooks-reference.html#usememo), [`useCallback`](https://reactjs.org/docs/hooks-reference.html#usecallback) to prevent a high volume of re-render cycles.
-### addons.setConfig(config)
+### useArgs
-This method allows you to override the default Storybook UI configuration (e.g., set up a [theme](../configure/theming.md) or hide UI elements):
+Hook that allows you to retrieve or update a story's [`args`](../writing-stories/args.md).
-
-The following table details how to use the API values:
-
-| Name | Type | Description | Example Value |
-| ------------------- | :-----------: | :------------------------------------------------: | :-----------------------------------: |
-| **isFullscreen** | Boolean | Show story component as full screen | `false` |
-| **showNav** | Boolean | Display panel that shows a list of stories | `true` |
-| **showPanel** | Boolean | Display panel that shows addon configurations | `true` |
-| **panelPosition** | String/Object | Where to show the addon panel | `bottom` or `right` |
-| **enableShortcuts** | Boolean | Enable/disable shortcuts | `true` |
-| **showToolbar** | Boolean | Show/hide tool bar | `true` |
-| **theme** | Object | Storybook Theme, see next section | `undefined` |
-| **selectedPanel** | String | Id to select an addon panel | `storybook/actions/panel` |
-| **initialActive** | String | Select the default active tab on Mobile | `sidebar` or `canvas` or `addons` |
-| **sidebar** | Object | Sidebar options, see below | `{ showRoots: false }` |
-| **toolbar** | Object | Modify the tools in the toolbar using the addon id | `{ fullscreen: { hidden: false } } }` |
-
-The following options are configurable under the `sidebar` namespace:
-
-| Name | Type | Description | Example Value |
-| ------------------ | :------: | :-----------------------------------------------------------: | :----------------------------------------------: |
-| **showRoots** | Boolean | Display the top-level nodes as a "root" in the sidebar | `false` |
-| **collapsedRoots** | Array | Set of root node IDs to visually collapse by default | `['misc', 'other']` |
-| **renderLabel** | Function | Create a custom label for tree nodes; must return a ReactNode | `(item) => {item.name}` |
-
-The following options are configurable under the `toolbar` namespace:
-
-| Name | Type | Description | Example Value |
-| ------ | :----: | :--------------------------------: | :-----------------: |
-| **id** | String | Toggle visibility for toolbar item | `{ hidden: false }` |
diff --git a/docs/snippets/common/args-usage-with-addons.js.mdx b/docs/snippets/common/args-usage-with-addons.js.mdx
index 3a5f6b34c006..650b25d62148 100644
--- a/docs/snippets/common/args-usage-with-addons.js.mdx
+++ b/docs/snippets/common/args-usage-with-addons.js.mdx
@@ -1,5 +1,5 @@
```js
-// your-addon/manager.js
+// my-addon/src/manager.js|ts
import { useArgs } from '@storybook/manager-api';
diff --git a/docs/snippets/common/storybook-addon-panel-initial.js.mdx b/docs/snippets/common/storybook-addon-panel-initial.js.mdx
index dd1278823434..707e8bb199a7 100644
--- a/docs/snippets/common/storybook-addon-panel-initial.js.mdx
+++ b/docs/snippets/common/storybook-addon-panel-initial.js.mdx
@@ -1,25 +1,22 @@
```js
-// .storybook/my-addon/manager.js
+// my-addon/src/manager.js|ts
import React from 'react';
-import { addons, types } from '@storybook/manager-api';
+import { addons, types } from '@storybook/preview-api';
import { AddonPanel } from '@storybook/components';
const ADDON_ID = 'myaddon';
const PANEL_ID = `${ADDON_ID}/panel`;
-// give a unique name for the panel
-const MyPanel = () =>