From 2c5d06c3e8368dabfbb5e2a6f6958148857fe0d6 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Sat, 1 Dec 2018 16:01:05 +0100
Subject: [PATCH] [@storybook/addon-options] Add withOptions

---
 types/storybook__addon-options/index.d.ts     |  7 +++++++
 .../storybook__addon-options-tests.ts         | 19 ++++++++++++++++++-
 types/storybook__addon-options/tsconfig.json  |  5 ++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index 61f9f11def..a0baa39ab2 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -6,6 +6,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+import { StoryDecorator } from "@storybook/react";
+
 export interface Options {
     name?: string;
     url?: string;
@@ -23,4 +25,9 @@ export interface Options {
     selectedAddonPanel?: string;
 }
 
+/**
+ * @deprecated Use withOptions instead
+ */
 export function setOptions(options: Options): void;
+
+export function withOptions(options: Options): StoryDecorator;
diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
index a3003c913f..1fc49d18e0 100644
--- a/types/storybook__addon-options/storybook__addon-options-tests.ts
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -1,4 +1,5 @@
-import { setOptions } from '@storybook/addon-options';
+import { setOptions, withOptions } from '@storybook/addon-options';
+import { addDecorator } from '@storybook/react';
 
 setOptions({
   name: 'My Storybook',
@@ -31,3 +32,19 @@ setOptions({
   hierarchySeparator: '.',
   hierarchyRootSeparator: '#',
 });
+
+addDecorator(
+    withOptions({
+        name: "My Storybook",
+        url: "https://example.com",
+        goFullScreen: false,
+        showStoriesPanel: false,
+        showAddonPanel: false,
+        showSearchBox: false,
+        addonPanelInRight: false,
+        sortStoriesByKind: false,
+        hierarchySeparator: /\//,
+        hierarchyRootSeparator: /\|/,
+        selectedAddonPanel: "storybook/actions/action-panel"
+    })
+);
diff --git a/types/storybook__addon-options/tsconfig.json b/types/storybook__addon-options/tsconfig.json
index 936a535725..df1a88f769 100644
--- a/types/storybook__addon-options/tsconfig.json
+++ b/types/storybook__addon-options/tsconfig.json
@@ -15,6 +15,9 @@
         "paths": {
             "@storybook/addon-options": [
                 "storybook__addon-options"
+            ],
+            "@storybook/react": [
+                "storybook__react"
             ]
         },
         "types": [],
@@ -25,4 +28,4 @@
         "index.d.ts",
         "storybook__addon-options-tests.ts"
     ]
-}
\ No newline at end of file
+}