fix(getSandpackStateFromProps): get activeFile from files from props …

…+ template files (#665)
codesandbox · Dec 14, 2022 · 0480f1b · 0480f1b
1 parent 00d7b57
commit 0480f1b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/sandpack-react/src/Issues.stories.tsx b/sandpack-react/src/Issues.stories.tsx
@@ -23,6 +23,16 @@ export const FlushServerVsClient = (): JSX.Element => {
   );
 };
 
+export const Issue663 = (): JSX.Element => (
+  <Sandpack
+    options={{
+      showTabs: true,
+      activeFile: "/index.tsx",
+    }}
+    template="react-ts"
+  />
+);
+
 export const Issue482 = (): JSX.Element => {
   const [hidden, setHidden] = useState(false);
 

diff --git a/sandpack-react/src/utils/sandpackUtils.test.ts b/sandpack-react/src/utils/sandpackUtils.test.ts
@@ -136,10 +136,20 @@ describe(getSandpackStateFromProps, () => {
     expect(setup.activeFile).toEqual("/entry.js");
   });
 
+  test("custom activeFile", () => {
+    const setup = getSandpackStateFromProps({
+      template: "react",
+      options: {
+        activeFile: "/index.js",
+      },
+    });
+
+    expect(setup.activeFile).toBe("/index.js");
+  });
+
   /**
    * hidden file
    */
-
   test("exclude hidden files from custom files", () => {
     const setup = getSandpackStateFromProps({
       files: {

diff --git a/sandpack-react/src/utils/sandpackUtils.ts b/sandpack-react/src/utils/sandpackUtils.ts
@@ -45,7 +45,7 @@ export const getSandpackStateFromProps = (
   // visibleFiles and activeFile override the setup flags
   let visibleFiles = normalizePath(props.options?.visibleFiles ?? []);
   let activeFile = props.options?.activeFile
-    ? resolveFile(props.options?.activeFile, normalizedFilesPath || {})
+    ? resolveFile(props.options?.activeFile, projectSetup.files)
     : undefined;
 
   if (visibleFiles.length === 0 && normalizedFilesPath) {