betterstart-cli 0.0.8 → 0.0.10

package/dist/assets/adapters/next/templates/init/pages/media/media-page-content.tsx

@@ -210,7 +210,7 @@ export function MediaPageContent() {
         }
       />
 
-      <main className="space-y-3 px-4 pb-4 h-full">
+      <main className="space-y-3 px-4 pb-4 flex-1">
         <div className="flex w-full flex-col gap-4 pt-px">
           {activeTab === 'url' ? (
             <MediaUrlImporter

package/dist/assets/shared-assets/react-admin/custom/content-editor/index.tsx

@@ -67,7 +67,7 @@ export function ContentEditor({
   return (
     <Card
       className={cn(
-        'content-editor-wrapper relative flex min-h-60 max-h-[90vh]',
+        'content-editor-wrapper relative flex min-h-60',
         { 'opacity-50': disabled },
         className
       )}

package/dist/cli.js

@@ -13530,8 +13530,10 @@ ${cardJSX}
       cards.push(options2.conditionalTabs ? wrapSidebarCardForTab(cardJSX, entry.tabName) : cardJSX);
     }
     flushDefaultCardFields();
-    const columnClassName = options2.scrollable ? "relative h-fit max-h-full space-y-4 overflow-y-auto pb-4 lg:sticky lg:top-0" : "lg:sticky lg:top-17 space-y-4 pb-4";
-    return `              <div className="${columnClassName}">
+    const columnClassName = options2.scrollable ? 'className="relative h-fit max-h-full space-y-4 overflow-y-auto pb-4 lg:sticky lg:top-0"' : showMetadataWidget ? `className={initialData?.id != null
+                  ? 'lg:sticky lg:top-32 space-y-4 pb-4'
+                  : 'lg:sticky lg:top-14 space-y-4 pb-4'}` : 'className="lg:sticky lg:top-14 space-y-4 pb-4"';
+    return `              <div ${columnClassName}>
 ${cards.join("\n")}
               </div>`;
   };
@@ -13854,8 +13856,9 @@ ${sidebarCardJSX}
     "handleErrors"
   ]);
   const hookReturnObject = hookReturnNames.map((name) => `    ${name}`).join(",\n");
+  const contentUsesInitialData = hasDraft || hasSidebarFields && showMetadataWidget || topLevelTabsField && showMetadataWidget;
   const contentStateNames = uniqueNames([
-    ...hasDraft || topLevelTabsField && showMetadataWidget ? ["initialData"] : [],
+    ...contentUsesInitialData ? ["initialData"] : [],
     "form",
     ...contentUsesPendingState ? ["isPending"] : [],
     ...hasTabsField ? ["activeTab", "setActiveTab"] : [],
@@ -13869,7 +13872,6 @@ ${sidebarCardJSX}
   ]);
   const contentStateDestructure = contentStateNames.map((name) => `    ${name}`).join(",\n");
   const needsCn = hasRelationship || hasSelectCombobox || shouldGuardSidebarByTab || Boolean(topLevelTabsField && showMetadataWidget);
-  const needsReact = mainRelFields.length > 0 || hasNestedList || hasDraft || hasCreatableSelect || staticMultiSelectFields.length > 0;
   const metadataOffsetConst = showMetadataWidget ? "const SCROLL_BORDER_OFFSET = 8;\n\n" : "";
   const tabParserConst = hasTabsField ? `const TAB_VALUES = [${tabNames.map((name) => JSON.stringify(name)).join(", ")}] as const
 const TAB_PARSER = parseAsStringLiteral(TAB_VALUES).withDefault(TAB_VALUES[0])
@@ -13901,7 +13903,8 @@ export type TabValue = (typeof TAB_VALUES)[number]
 
 ` : "";
   const hookContent = `'use client'
-${needsReact ? "\nimport * as React from 'react'" : ""}
+
+import * as React from 'react'
 import { standardSchemaResolver } from '@hookform/resolvers/standard-schema'
 import { useMutation, ${hasCreatableSelect ? "useQuery, " : ""}useQueryClient } from '@tanstack/react-query'
 import { useRouter } from 'next/navigation'
@@ -13961,12 +13964,22 @@ ${staticMultiSelectState}` : ""}${hasDraft ? "\n  const [submitIntent, setSubmit
 
   const isPending = createMutation.isPending || updateMutation.isPending
 
+  const defaultValues: FormValues = {
+${defaultValues}
+  }
+
   const form = useForm<FormValues>({
     resolver: standardSchemaResolver(formSchema),
-    defaultValues: {
-${defaultValues}
-    }
+    defaultValues
   })
+  const defaultValuesRef = React.useRef(defaultValues)
+  defaultValuesRef.current = defaultValues
+  React.useEffect(
+    () => () => {
+      form.reset(defaultValuesRef.current)
+    },
+    [form]
+  )
   const { isDirty } = form.formState
 ${hasDraft ? "  const canPublishPristineDraft = Boolean(initialData && !initialData.published)\n  const canSubmitDraftAction = Boolean(initialData?.published || isDirty)\n  const canSubmitPublishAction = isDirty || canPublishPristineDraft\n" : ""}
 ${defaultValueFromSyncFunctions ? `
@@ -22826,6 +22839,12 @@ var TEMPLATE_REGISTRY = {
     content: () => readTemplate("lib/actions/auth/middleware.ts"),
     dependencies: ["auth-roles-utils"]
   },
+  "admin-layout": {
+    relPath: "app/(admin)/admin/layout.tsx",
+    content: () => readTemplate("pages/admin-layout.tsx"),
+    base: "cwd",
+    dependencies: ["admin-globals", "admin-providers", "cn"]
+  },
   "auth-layout": {
     relPath: "app/(admin)/admin/(authenticated)/layout.tsx",
     content: () => readTemplate("pages/authenticated-layout.tsx"),