From 3f6cf9645229a3ecff390fcff77689811cca9ee7 Mon Sep 17 00:00:00 2001
From: Kasper Peulen <kasperpeulen@gmail.com>
Date: Thu, 8 Dec 2022 16:50:26 +0100
Subject: [PATCH] Fix bug with meta not working well as generic parameter for
 StoryObj

---
 .../renderers/react/src/public-types.test.tsx | 28 +++++++++++++++++++
 code/ui/blocks/src/blocks/Canvas.stories.tsx  | 10 +++----
 code/yarn.lock                                |  6 ++--
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/code/renderers/react/src/public-types.test.tsx b/code/renderers/react/src/public-types.test.tsx
index 68b68fd23b28..c955c6b59fb2 100644
--- a/code/renderers/react/src/public-types.test.tsx
+++ b/code/renderers/react/src/public-types.test.tsx
@@ -200,3 +200,31 @@ describe('Story args can be inferred', () => {
     expectTypeOf(Basic).toEqualTypeOf<Expected>();
   });
 });
+
+test('StoryObj<typeof meta> is allowed when meta is upcasted to Meta<Props>', () => {
+  expectTypeOf<StoryObj<Meta<ButtonProps>>>().toEqualTypeOf<
+    ReactStory<
+      ButtonProps & { children?: ReactNode },
+      Partial<ButtonProps & { children?: ReactNode }>
+    >
+  >();
+});
+
+test('StoryObj<typeof meta> is allowed when meta is upcasted to Meta<typeof Cmp>', () => {
+  expectTypeOf<StoryObj<Meta<typeof Button>>>().toEqualTypeOf<
+    ReactStory<
+      ButtonProps & { children?: ReactNode },
+      Partial<ButtonProps & { children?: ReactNode }>
+    >
+  >();
+});
+
+test('StoryObj<typeof meta> is allowed when all arguments are optional', () => {
+  expectTypeOf<StoryObj<Meta<{ label?: string }>>>().toEqualTypeOf<
+    ReactStory<{ label?: string; children?: ReactNode }, { label?: string; children?: ReactNode }>
+  >();
+});
+
+test('Meta can be used without generic', () => {
+  expectTypeOf({ component: Button }).toMatchTypeOf<Meta>();
+});
diff --git a/code/ui/blocks/src/blocks/Canvas.stories.tsx b/code/ui/blocks/src/blocks/Canvas.stories.tsx
index 764ccd3225c0..d54dbb6e6bf7 100644
--- a/code/ui/blocks/src/blocks/Canvas.stories.tsx
+++ b/code/ui/blocks/src/blocks/Canvas.stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Meta, StoryObj } from '@storybook/react';
-import { Canvas } from './Canvas';
+import { Canvas, SourceState } from './Canvas';
 import { Story as StoryComponent } from './Story';
 import * as BooleanStories from '../controls/Boolean.stories';
 
@@ -25,12 +25,12 @@ export const BasicStory: Story = {};
 
 export const WithSourceOpen: Story = {
   args: {
-    withSource: 'open',
+    withSource: SourceState.OPEN,
   },
 };
 export const WithSourceClosed: Story = {
   args: {
-    withSource: 'closed',
+    withSource: SourceState.CLOSED,
   },
 };
 
@@ -38,7 +38,7 @@ export const WithSourceClosed: Story = {
 export const WithMdxSource: Story = {
   name: 'With MDX Source',
   args: {
-    withSource: 'open',
+    withSource: SourceState.OPEN,
     mdxSource: `const thisIsCustomSource = true;
 if (isSyntaxHighlighted) {
   console.log('syntax highlighting is working');
@@ -48,7 +48,7 @@ if (isSyntaxHighlighted) {
 
 export const WithoutSource: Story = {
   args: {
-    withSource: 'none',
+    withSource: SourceState.NONE,
   },
 };
 
diff --git a/code/yarn.lock b/code/yarn.lock
index ca2670913f08..62a1f5f6e972 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -6335,13 +6335,13 @@ __metadata:
   linkType: hard
 
 "@storybook/csf@npm:next":
-  version: 0.0.2-next.7
-  resolution: "@storybook/csf@npm:0.0.2-next.7"
+  version: 0.0.2-next.8
+  resolution: "@storybook/csf@npm:0.0.2-next.8"
   dependencies:
     expect-type: ^0.14.2
     lodash: ^4.17.15
     type-fest: ^2.19.0
-  checksum: 3920626fdd6dc4875ba95ae46fa0776051f544a479029ee7d561b87602511010161750a42b0d5e1371ec336b47262e1098524c834805ca686d9bc2de5cae0e4e
+  checksum: 86f5599c030b87cbab6fa5e4b4a9ef1aeed5e838b993b2bae5f0fc50d79ae80d5cfbf2590a05bae0a95068ef77eec88d8c102072d63c77745afe74f91cfa03a3
   languageName: node
   linkType: hard