storybook 9.1.0-alpha.6 → 9.1.0-alpha.7

package/dist/manager-api/index.cjs

@@ -3084,9 +3084,9 @@ var Ee = Object.freeze({
 }), br = {};
 function Ws(e) {
   let t = e.target;
-  return /input|textarea/i.test(t.tagName) || t.getAttribute("contenteditable") !== null;
+  return !!(/input|textarea/i.test(t.tagName) || t.getAttribute("contenteditable") !== null || t.closest("dialog[open]"));
 }
-n(Ws, "focusInInput");
+n(Ws, "shouldSkipShortcut");
 var Gs = /* @__PURE__ */ n(({ store: e, fullAPI: t, provider: r }) => {
   let o = {
     // Getting and setting shortcuts
@@ -4403,7 +4403,7 @@ U(wr, {
 var kt = require("@storybook/global"), on = L(rr(), 1), $ = L(require("semver"), 1);
 
 // src/manager-api/version.ts
-var tn = "9.1.0-alpha.6";
+var tn = "9.1.0-alpha.7";
 
 // src/manager-api/modules/versions.ts
 var { VERSIONCHECK: Qs } = kt.global, rn = (0, on.default)(1)(() => {

package/dist/manager-api/index.d.ts

@@ -2,7 +2,7 @@ import React, { FC, ReactNode, ReactElement, Component } from 'react';
 import { Channel, Listener as Listener$1 } from 'storybook/internal/channels';
 export { Listener as ChannelListener } from 'storybook/internal/channels';
 import { RouterData, NavigateOptions } from 'storybook/internal/router';
-import { Addon_Types, Addon_TypesEnum, Addon_Collection, Addon_TypesMapping, Addon_BaseType, Addon_TestProviderType, Addon_PageType, Addon_WrapperType, Addon_Config, API_ProviderData, API_StateMerger, API_Provider, Globals, GlobalTypes, API_PanelPositions, API_Layout, API_LayoutCustomisations, API_UI, API_Notification, API_IframeRenderer, API_ComposedRef, API_SetRefData, API_ComposedRefUpdate, API_Refs, StoryId, API_Settings, API_HashEntry, API_ViewMode, API_LeafEntry, API_PreparedStoryIndex, API_StoryEntry, Args, API_IndexHash, API_DocsEntry, API_FilterFunction, API_LoadedRefData, API_Version, API_Versions, API_UnknownEntries, API_OptionsData, Parameters, ArgTypes, NormalizedProjectAnnotations, ProjectAnnotations, ComposedStoryFn } from 'storybook/internal/types';
+import { Addon_Types, Addon_TypesEnum, Addon_Collection, Addon_TypesMapping, Addon_BaseType, Addon_TestProviderType, Addon_PageType, Addon_WrapperType, Addon_Config, API_ProviderData, API_StateMerger, API_Provider, Globals, GlobalTypes, API_PanelPositions, API_Layout, API_LayoutCustomisations, API_UI, API_Notification, API_IframeRenderer, API_ComposedRef, API_SetRefData, API_ComposedRefUpdate, API_Refs, StoryId, API_Settings, API_HashEntry, API_ViewMode, API_LeafEntry, API_PreparedStoryIndex, API_StoryEntry, Args, API_IndexHash, API_DocsEntry, API_FilterFunction, API_LoadedRefData, API_Version, API_Versions, API_UnknownEntries, API_OptionsData, Parameters, ArgTypes } from 'storybook/internal/types';
 export { Addon_Type as Addon, API_ComponentEntry as ComponentEntry, API_ComposedRef as ComposedRef, API_DocsEntry as DocsEntry, API_GroupEntry as GroupEntry, API_HashEntry as HashEntry, API_IndexHash as IndexHash, API_LeafEntry as LeafEntry, API_Refs as Refs, API_RootEntry as RootEntry, API_IndexHash as StoriesHash, API_StoryEntry as StoryEntry } from 'storybook/internal/types';
 import { ThemeVars } from 'storybook/theming';
 import { toId, StoryId as StoryId$1 } from 'storybook/internal/csf';
@@ -388,7 +388,7 @@ interface SubState$5 {
 
 declare const isMacLike: () => boolean;
 declare const controlOrMetaSymbol: () => "⌘" | "ctrl";
-declare const controlOrMetaKey: () => "meta" | "control";
+declare const controlOrMetaKey: () => "control" | "meta";
 declare const optionOrAltSymbol: () => "⌥" | "alt";
 declare const isShortcutTaken: (arr1: string[], arr2: string[]) => boolean;
 type KeyboardEventLike = Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'metaKey' | 'shiftKey' | 'key' | 'code' | 'keyCode' | 'preventDefault'>;
@@ -1222,528 +1222,13 @@ type StatusStoreByTypeId = StatusStore & {
 };
 type UseStatusStore = <T = StatusesByStoryIdAndTypeId>(selector?: (statuses: StatusesByStoryIdAndTypeId) => T) => T;
 
-/**
- * Actions represent the type of change to a location value.
- */
-declare enum Action {
-    /**
-     * A POP indicates a change to an arbitrary index in the history stack, such
-     * as a back or forward navigation. It does not describe the direction of the
-     * navigation, only that the current index changed.
-     *
-     * Note: This is the default action for newly created history objects.
-     */
-    Pop = "POP",
-    /**
-     * A PUSH indicates a new entry being added to the history stack, such as when
-     * a link is clicked and a new page loads. When this happens, all subsequent
-     * entries in the stack are lost.
-     */
-    Push = "PUSH",
-    /**
-     * A REPLACE indicates the entry at the current index in the history stack
-     * being replaced by a new one.
-     */
-    Replace = "REPLACE"
-}
-/**
- * The pathname, search, and hash values of a URL.
- */
-interface Path {
-    /**
-     * A URL pathname, beginning with a /.
-     */
-    pathname: string;
-    /**
-     * A URL search string, beginning with a ?.
-     */
-    search: string;
-    /**
-     * A URL fragment identifier, beginning with a #.
-     */
-    hash: string;
-}
-/**
- * An entry in a history stack. A location contains information about the
- * URL path, as well as possibly some arbitrary state and a key.
- */
-interface Location extends Path {
-    /**
-     * A value of arbitrary data associated with this location.
-     */
-    state: any;
-    /**
-     * A unique string associated with this location. May be used to safely store
-     * and retrieve data in some other storage API, like `localStorage`.
-     *
-     * Note: This value is always "default" on the initial location.
-     */
-    key: string;
-}
-
-/**
- * Map of routeId -> data returned from a loader/action/error
- */
-interface RouteData {
-    [routeId: string]: any;
-}
-declare enum ResultType {
-    data = "data",
-    deferred = "deferred",
-    redirect = "redirect",
-    error = "error"
-}
-/**
- * Successful result from a loader or action
- */
-interface SuccessResult {
-    type: ResultType.data;
-    data: any;
-    statusCode?: number;
-    headers?: Headers;
-}
-/**
- * Successful defer() result from a loader or action
- */
-interface DeferredResult {
-    type: ResultType.deferred;
-    deferredData: DeferredData;
-    statusCode?: number;
-    headers?: Headers;
-}
-/**
- * Redirect result from a loader or action
- */
-interface RedirectResult {
-    type: ResultType.redirect;
-    status: number;
-    location: string;
-    revalidate: boolean;
-    reloadDocument?: boolean;
-}
-/**
- * Unsuccessful result from a loader or action
- */
-interface ErrorResult {
-    type: ResultType.error;
-    error: any;
-    headers?: Headers;
-}
-/**
- * Result from a loader or action - potentially successful or unsuccessful
- */
-type DataResult = SuccessResult | DeferredResult | RedirectResult | ErrorResult;
-type LowerCaseFormMethod = "get" | "post" | "put" | "patch" | "delete";
-type UpperCaseFormMethod = Uppercase<LowerCaseFormMethod>;
-/**
- * Active navigation/fetcher form methods are exposed in lowercase on the
- * RouterState
- */
-type FormMethod = LowerCaseFormMethod;
-/**
- * In v7, active navigation/fetcher form methods are exposed in uppercase on the
- * RouterState.  This is to align with the normalization done via fetch().
- */
-type V7_FormMethod = UpperCaseFormMethod;
-type FormEncType = "application/x-www-form-urlencoded" | "multipart/form-data" | "application/json" | "text/plain";
-type JsonObject = {
-    [Key in string]: JsonValue;
-} & {
-    [Key in string]?: JsonValue | undefined;
-};
-type JsonArray = JsonValue[] | readonly JsonValue[];
-type JsonPrimitive = string | number | boolean | null;
-type JsonValue = JsonPrimitive | JsonObject | JsonArray;
-/**
- * @private
- * Internal interface to pass around for action submissions, not intended for
- * external consumption
- */
-type Submission = {
-    formMethod: FormMethod | V7_FormMethod;
-    formAction: string;
-    formEncType: FormEncType;
-    formData: FormData;
-    json: undefined;
-    text: undefined;
-} | {
-    formMethod: FormMethod | V7_FormMethod;
-    formAction: string;
-    formEncType: FormEncType;
-    formData: undefined;
-    json: JsonValue;
-    text: undefined;
-} | {
-    formMethod: FormMethod | V7_FormMethod;
-    formAction: string;
-    formEncType: FormEncType;
-    formData: undefined;
-    json: undefined;
-    text: string;
-};
-/**
- * @private
- * Arguments passed to route loader/action functions.  Same for now but we keep
- * this as a private implementation detail in case they diverge in the future.
- */
-interface DataFunctionArgs {
-    request: Request;
-    params: Params;
-    context?: any;
-}
-/**
- * Arguments passed to loader functions
- */
-interface LoaderFunctionArgs extends DataFunctionArgs {
-}
-/**
- * Arguments passed to action functions
- */
-interface ActionFunctionArgs extends DataFunctionArgs {
-}
-/**
- * Loaders and actions can return anything except `undefined` (`null` is a
- * valid return value if there is no data to return).  Responses are preferred
- * and will ease any future migration to Remix
- */
-type DataFunctionValue = Response | NonNullable<unknown> | null;
-/**
- * Route loader function signature
- */
-interface LoaderFunction {
-    (args: LoaderFunctionArgs): Promise<DataFunctionValue> | DataFunctionValue;
-}
-/**
- * Route action function signature
- */
-interface ActionFunction {
-    (args: ActionFunctionArgs): Promise<DataFunctionValue> | DataFunctionValue;
-}
-/**
- * Route shouldRevalidate function signature.  This runs after any submission
- * (navigation or fetcher), so we flatten the navigation/fetcher submission
- * onto the arguments.  It shouldn't matter whether it came from a navigation
- * or a fetcher, what really matters is the URLs and the formData since loaders
- * have to re-run based on the data models that were potentially mutated.
- */
-interface ShouldRevalidateFunction {
-    (args: {
-        currentUrl: URL;
-        currentParams: AgnosticDataRouteMatch["params"];
-        nextUrl: URL;
-        nextParams: AgnosticDataRouteMatch["params"];
-        formMethod?: Submission["formMethod"];
-        formAction?: Submission["formAction"];
-        formEncType?: Submission["formEncType"];
-        text?: Submission["text"];
-        formData?: Submission["formData"];
-        json?: Submission["json"];
-        actionResult?: DataResult;
-        defaultShouldRevalidate: boolean;
-    }): boolean;
-}
-/**
- * Keys we cannot change from within a lazy() function. We spread all other keys
- * onto the route. Either they're meaningful to the router, or they'll get
- * ignored.
- */
-type ImmutableRouteKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children";
-type RequireOne<T, Key = keyof T> = Exclude<{
-    [K in keyof T]: K extends Key ? Omit<T, K> & Required<Pick<T, K>> : never;
-}[keyof T], undefined>;
-/**
- * lazy() function to load a route definition, which can add non-matching
- * related properties to a route
- */
-interface LazyRouteFunction<R extends AgnosticRouteObject> {
-    (): Promise<RequireOne<Omit<R, ImmutableRouteKey>>>;
-}
-/**
- * Base RouteObject with common props shared by all types of routes
- */
-type AgnosticBaseRouteObject = {
-    caseSensitive?: boolean;
-    path?: string;
-    id?: string;
-    loader?: LoaderFunction;
-    action?: ActionFunction;
-    hasErrorBoundary?: boolean;
-    shouldRevalidate?: ShouldRevalidateFunction;
-    handle?: any;
-    lazy?: LazyRouteFunction<AgnosticBaseRouteObject>;
-};
-/**
- * Index routes must not have children
- */
-type AgnosticIndexRouteObject = AgnosticBaseRouteObject & {
-    children?: undefined;
-    index: true;
-};
-/**
- * Non-index routes may have children, but cannot have index
- */
-type AgnosticNonIndexRouteObject = AgnosticBaseRouteObject & {
-    children?: AgnosticRouteObject[];
-    index?: false;
-};
-/**
- * A route object represents a logical route, with (optionally) its child
- * routes organized in a tree-like structure.
- */
-type AgnosticRouteObject = AgnosticIndexRouteObject | AgnosticNonIndexRouteObject;
-type AgnosticDataIndexRouteObject = AgnosticIndexRouteObject & {
-    id: string;
-};
-type AgnosticDataNonIndexRouteObject = AgnosticNonIndexRouteObject & {
-    children?: AgnosticDataRouteObject[];
-    id: string;
-};
-/**
- * A data route object, which is just a RouteObject with a required unique ID
- */
-type AgnosticDataRouteObject = AgnosticDataIndexRouteObject | AgnosticDataNonIndexRouteObject;
-/**
- * The parameters that were parsed from the URL path.
- */
-type Params<Key extends string = string> = {
-    readonly [key in Key]: string | undefined;
-};
-/**
- * A RouteMatch contains info about how a route matched a URL.
- */
-interface AgnosticRouteMatch<ParamKey extends string = string, RouteObjectType extends AgnosticRouteObject = AgnosticRouteObject> {
-    /**
-     * The names and values of dynamic parameters in the URL.
-     */
-    params: Params<ParamKey>;
-    /**
-     * The portion of the URL pathname that was matched.
-     */
-    pathname: string;
-    /**
-     * The portion of the URL pathname that was matched before child routes.
-     */
-    pathnameBase: string;
-    /**
-     * The route object that was used to match.
-     */
-    route: RouteObjectType;
-}
-interface AgnosticDataRouteMatch extends AgnosticRouteMatch<string, AgnosticDataRouteObject> {
-}
-declare class DeferredData {
-    private pendingKeysSet;
-    private controller;
-    private abortPromise;
-    private unlistenAbortSignal;
-    private subscribers;
-    data: Record<string, unknown>;
-    init?: ResponseInit;
-    deferredKeys: string[];
-    constructor(data: Record<string, unknown>, responseInit?: ResponseInit);
-    private trackPromise;
-    private onSettle;
-    private emit;
-    subscribe(fn: (aborted: boolean, settledKey?: string) => void): () => boolean;
-    cancel(): void;
-    resolveData(signal: AbortSignal): Promise<boolean>;
-    get done(): boolean;
-    get unwrappedData(): {};
-    get pendingKeys(): string[];
-}
-
-/**
- * State maintained internally by the router.  During a navigation, all states
- * reflect the the "old" location unless otherwise noted.
- */
-interface RouterState {
-    /**
-     * The action of the most recent navigation
-     */
-    historyAction: Action;
-    /**
-     * The current location reflected by the router
-     */
-    location: Location;
-    /**
-     * The current set of route matches
-     */
-    matches: AgnosticDataRouteMatch[];
-    /**
-     * Tracks whether we've completed our initial data load
-     */
-    initialized: boolean;
-    /**
-     * Current scroll position we should start at for a new view
-     *  - number -> scroll position to restore to
-     *  - false -> do not restore scroll at all (used during submissions)
-     *  - null -> don't have a saved position, scroll to hash or top of page
-     */
-    restoreScrollPosition: number | false | null;
-    /**
-     * Indicate whether this navigation should skip resetting the scroll position
-     * if we are unable to restore the scroll position
-     */
-    preventScrollReset: boolean;
-    /**
-     * Tracks the state of the current navigation
-     */
-    navigation: Navigation;
-    /**
-     * Tracks any in-progress revalidations
-     */
-    revalidation: RevalidationState;
-    /**
-     * Data from the loaders for the current matches
-     */
-    loaderData: RouteData;
-    /**
-     * Data from the action for the current matches
-     */
-    actionData: RouteData | null;
-    /**
-     * Errors caught from loaders for the current matches
-     */
-    errors: RouteData | null;
-    /**
-     * Map of current fetchers
-     */
-    fetchers: Map<string, Fetcher>;
-    /**
-     * Map of current blockers
-     */
-    blockers: Map<string, Blocker>;
-}
-/**
- * Data that can be passed into hydrate a Router from SSR
- */
-type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "errors">>;
-/**
- * Potential states for state.navigation
- */
-type NavigationStates = {
-    Idle: {
-        state: "idle";
-        location: undefined;
-        formMethod: undefined;
-        formAction: undefined;
-        formEncType: undefined;
-        formData: undefined;
-        json: undefined;
-        text: undefined;
-    };
-    Loading: {
-        state: "loading";
-        location: Location;
-        formMethod: Submission["formMethod"] | undefined;
-        formAction: Submission["formAction"] | undefined;
-        formEncType: Submission["formEncType"] | undefined;
-        formData: Submission["formData"] | undefined;
-        json: Submission["json"] | undefined;
-        text: Submission["text"] | undefined;
-    };
-    Submitting: {
-        state: "submitting";
-        location: Location;
-        formMethod: Submission["formMethod"];
-        formAction: Submission["formAction"];
-        formEncType: Submission["formEncType"];
-        formData: Submission["formData"];
-        json: Submission["json"];
-        text: Submission["text"];
-    };
-};
-type Navigation = NavigationStates[keyof NavigationStates];
-type RevalidationState = "idle" | "loading";
-/**
- * Potential states for fetchers
- */
-type FetcherStates<TData = any> = {
-    Idle: {
-        state: "idle";
-        formMethod: undefined;
-        formAction: undefined;
-        formEncType: undefined;
-        text: undefined;
-        formData: undefined;
-        json: undefined;
-        data: TData | undefined;
-        " _hasFetcherDoneAnything "?: boolean;
-    };
-    Loading: {
-        state: "loading";
-        formMethod: Submission["formMethod"] | undefined;
-        formAction: Submission["formAction"] | undefined;
-        formEncType: Submission["formEncType"] | undefined;
-        text: Submission["text"] | undefined;
-        formData: Submission["formData"] | undefined;
-        json: Submission["json"] | undefined;
-        data: TData | undefined;
-        " _hasFetcherDoneAnything "?: boolean;
-    };
-    Submitting: {
-        state: "submitting";
-        formMethod: Submission["formMethod"];
-        formAction: Submission["formAction"];
-        formEncType: Submission["formEncType"];
-        text: Submission["text"];
-        formData: Submission["formData"];
-        json: Submission["json"];
-        data: TData | undefined;
-        " _hasFetcherDoneAnything "?: boolean;
-    };
-};
-type Fetcher<TData = any> = FetcherStates<TData>[keyof FetcherStates<TData>];
-interface BlockerBlocked {
-    state: "blocked";
-    reset(): void;
-    proceed(): void;
-    location: Location;
-}
-interface BlockerUnblocked {
-    state: "unblocked";
-    reset: undefined;
-    proceed: undefined;
-    location: undefined;
-}
-interface BlockerProceeding {
-    state: "proceeding";
-    reset: undefined;
-    proceed: undefined;
-    location: Location;
-}
-type Blocker = BlockerUnblocked | BlockerBlocked | BlockerProceeding;
-
-/**
- * NOTE: If you refactor this to split up the modules into separate files,
- * you'll need to update the rollup config for react-router-dom-v5-compat.
- */
-
-declare global {
-    var __staticRouterHydrationData: HydrationState | undefined;
-}
-
-declare global {
-	interface SymbolConstructor {
-		readonly observable: symbol;
-	}
-}
-
-declare global {
-    var globalProjectAnnotations: NormalizedProjectAnnotations<any>;
-    var defaultProjectAnnotations: ProjectAnnotations<any>;
-}
-type WrappedStoryRef = {
-    __pw_type: 'jsx' | 'importRef';
-};
-type UnwrappedJSXStoryRef = {
-    __pw_type: 'jsx';
-    type: UnwrappedImportStoryRef;
+declare const fullStatusStore: StatusStore & {
+    selectStatuses: (statuses: Status[]) => void;
+    typeId: undefined;
 };
-type UnwrappedImportStoryRef = ComposedStoryFn;
-declare global {
-    function __pwUnwrapObject(storyRef: WrappedStoryRef): Promise<UnwrappedJSXStoryRef | UnwrappedImportStoryRef>;
-}
+declare const getStatusStoreByTypeId: (typeId: StatusTypeId) => StatusStoreByTypeId;
+declare const useStatusStore: UseStatusStore;
+declare const universalStatusStore: UniversalStore<StatusesByStoryIdAndTypeId, StatusStoreEvent>;
 
 type TestProviderState = 'test-provider-state:pending' | 'test-provider-state:running' | 'test-provider-state:succeeded' | 'test-provider-state:crashed';
 type TestProviderId = string;
@@ -1993,14 +1478,6 @@ type UseTestProviderStore = <T = TestProviderStateByProviderId>(
  */
 selector?: (state: TestProviderStateByProviderId) => T) => T;
 
-declare const fullStatusStore: StatusStore & {
-    selectStatuses: (statuses: Status[]) => void;
-    typeId: undefined;
-};
-declare const getStatusStoreByTypeId: (typeId: StatusTypeId) => StatusStoreByTypeId;
-declare const useStatusStore: UseStatusStore;
-declare const universalStatusStore: UniversalStore<StatusesByStoryIdAndTypeId, StatusStoreEvent>;
-
 declare const fullTestProviderStore: {
     settingsChanged: () => void;
     onRunAll: (listener: () => void) => () => void;

package/dist/manager-api/index.js

@@ -1895,9 +1895,9 @@ var ue = Object.freeze({
 }), sr = {};
 function Es(e) {
   let t = e.target;
-  return /input|textarea/i.test(t.tagName) || t.getAttribute("contenteditable") !== null;
+  return !!(/input|textarea/i.test(t.tagName) || t.getAttribute("contenteditable") !== null || t.closest("dialog[open]"));
 }
-n(Es, "focusInInput");
+n(Es, "shouldSkipShortcut");
 var vs = /* @__PURE__ */ n(({ store: e, fullAPI: t, provider: r }) => {
   let o = {
     // Getting and setting shortcuts
@@ -3217,7 +3217,7 @@ import { global as Sr } from "@storybook/global";
 import $ from "semver";
 
 // src/manager-api/version.ts
-var No = "9.1.0-alpha.6";
+var No = "9.1.0-alpha.7";
 
 // src/manager-api/modules/versions.ts
 var { VERSIONCHECK: ca } = Sr, jo = (0, ko.default)(1)(() => {