From f4a1021902b903d2a1c425da3bb089e336b1ab53 Mon Sep 17 00:00:00 2001
From: Martin Nabhan <7613182+martinnabhan@users.noreply.github.com>
Date: Tue, 29 Aug 2023 18:13:39 +0900
Subject: [PATCH] Make sure the Next.js Image Context is reused instead of
 recreated when imported

---
 code/frameworks/nextjs/package.json                   |  8 +++++++-
 .../src/{images/context.ts => image-context.ts}       |  0
 code/frameworks/nextjs/src/images/decorator.tsx       |  3 ++-
 .../nextjs/src/images/next-future-image.tsx           | 11 ++++-------
 code/frameworks/nextjs/src/images/next-image.tsx      |  9 ++++-----
 .../nextjs/src/images/next-legacy-image.tsx           | 11 ++++-------
 6 files changed, 21 insertions(+), 21 deletions(-)
 rename code/frameworks/nextjs/src/{images/context.ts => image-context.ts} (100%)

diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json
index acdeb7177946..00afe2a336e5 100644
--- a/code/frameworks/nextjs/package.json
+++ b/code/frameworks/nextjs/package.json
@@ -27,6 +27,11 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs"
     },
+    "./image-context": {
+      "types": "./dist/image-context.d.ts",
+      "require": "./dist/image-context.js",
+      "import": "./dist/image-context.mjs"
+    },
     "./preset": {
       "types": "./dist/preset.d.ts",
       "require": "./dist/preset.js"
@@ -136,11 +141,12 @@
   },
   "bundler": {
     "entries": [
+      "./src/image-context.ts",
       "./src/index.ts",
       "./src/preset.ts",
       "./src/preview.tsx",
       "./src/next-image-loader-stub.ts",
-      "./src/images/context.ts",
+      "./src/images/decorator.tsx",
       "./src/images/next-future-image.tsx",
       "./src/images/next-legacy-image.tsx",
       "./src/images/next-image.tsx",
diff --git a/code/frameworks/nextjs/src/images/context.ts b/code/frameworks/nextjs/src/image-context.ts
similarity index 100%
rename from code/frameworks/nextjs/src/images/context.ts
rename to code/frameworks/nextjs/src/image-context.ts
diff --git a/code/frameworks/nextjs/src/images/decorator.tsx b/code/frameworks/nextjs/src/images/decorator.tsx
index f0917b3a3b50..0ee445f8707b 100644
--- a/code/frameworks/nextjs/src/images/decorator.tsx
+++ b/code/frameworks/nextjs/src/images/decorator.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import type { Addon_StoryContext } from '@storybook/types';
-import { ImageContext } from './context';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { ImageContext } from '@storybook/nextjs/dist/image-context';
 
 export const ImageDecorator = (
   Story: React.FC,
diff --git a/code/frameworks/nextjs/src/images/next-future-image.tsx b/code/frameworks/nextjs/src/images/next-future-image.tsx
index 559d2e857d39..0b841452d1fc 100644
--- a/code/frameworks/nextjs/src/images/next-future-image.tsx
+++ b/code/frameworks/nextjs/src/images/next-future-image.tsx
@@ -3,18 +3,15 @@ import type * as _NextImage from 'next/image';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore import is aliased in webpack config
 import OriginalNextFutureImage from 'sb-original/next/future/image';
-import { ImageContext } from './context';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { ImageContext } from '@storybook/nextjs/dist/image-context';
 import { defaultLoader } from './next-image-default-loader';
 
-function NextFutureImage(props: _NextImage.ImageProps) {
+function NextFutureImage({ loader, ...props }: _NextImage.ImageProps) {
   const imageParameters = React.useContext(ImageContext);
 
   return (
-    <OriginalNextFutureImage
-      {...imageParameters}
-      {...props}
-      loader={props.loader ?? defaultLoader}
-    />
+    <OriginalNextFutureImage {...imageParameters} {...props} loader={loader ?? defaultLoader} />
   );
 }
 
diff --git a/code/frameworks/nextjs/src/images/next-image.tsx b/code/frameworks/nextjs/src/images/next-image.tsx
index 74e252d93a7d..34cf6d242bc4 100644
--- a/code/frameworks/nextjs/src/images/next-image.tsx
+++ b/code/frameworks/nextjs/src/images/next-image.tsx
@@ -3,15 +3,14 @@
 import OriginalNextImage from 'sb-original/next/image';
 import type * as _NextImage from 'next/image';
 import React from 'react';
-import { ImageContext } from './context';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { ImageContext } from '@storybook/nextjs/dist/image-context';
 import { defaultLoader } from './next-image-default-loader';
 
-const MockedNextImage = (props: _NextImage.ImageProps) => {
+const MockedNextImage = ({ loader, ...props }: _NextImage.ImageProps) => {
   const imageParameters = React.useContext(ImageContext);
 
-  return (
-    <OriginalNextImage {...imageParameters} {...props} loader={props.loader ?? defaultLoader} />
-  );
+  return <OriginalNextImage {...imageParameters} {...props} loader={loader ?? defaultLoader} />;
 };
 
 export default MockedNextImage;
diff --git a/code/frameworks/nextjs/src/images/next-legacy-image.tsx b/code/frameworks/nextjs/src/images/next-legacy-image.tsx
index 8d899cc341a5..1e2f8d9df20c 100644
--- a/code/frameworks/nextjs/src/images/next-legacy-image.tsx
+++ b/code/frameworks/nextjs/src/images/next-legacy-image.tsx
@@ -3,18 +3,15 @@
 import OriginalNextLegacyImage from 'sb-original/next/legacy/image';
 import type * as _NextLegacyImage from 'next/legacy/image';
 import React from 'react';
-import { ImageContext } from './context';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { ImageContext } from '@storybook/nextjs/dist/image-context';
 import { defaultLoader } from './next-image-default-loader';
 
-function NextLegacyImage(props: _NextLegacyImage.ImageProps) {
+function NextLegacyImage({ loader, ...props }: _NextLegacyImage.ImageProps) {
   const imageParameters = React.useContext(ImageContext);
 
   return (
-    <OriginalNextLegacyImage
-      {...imageParameters}
-      {...props}
-      loader={props.loader ?? defaultLoader}
-    />
+    <OriginalNextLegacyImage {...imageParameters} {...props} loader={loader ?? defaultLoader} />
   );
 }