dazscript-framework 1.0.9 → 1.0.10

package/README.md

@@ -302,8 +302,9 @@ Custom action icons are selected from `action(...)` metadata and sibling image f
 Setup dialog header assets are optional and are discovered beside `src/Setup.dsa.ts`:
 
 1. `src/Setup.header.png`
-2. `src/Setup.png`
-3. `src/Setup.dsa.png` legacy fallback
+2. `src/Setup.tip.png`
+3. `src/Setup.png`
+4. `src/Setup.dsa.png` legacy fallback
 
 Header text can be placed in `src/Setup.header.html`, `src/Setup.header.md`, or `src/Setup.header.txt`, with `src/Setup.html`, `src/Setup.md`, and `src/Setup.txt` as script-named fallbacks. The installer generator embeds that text into `Setup.dsa.ts`, so Daz Studio does not need to read the text file at setup time. The setup dialog renders the header body with `DzTextBrowser` rich text support; no Markdown conversion is performed. The image remains a deployed PNG asset and is resolved relative to the generated setup script at runtime.
 

package/dist/scripts/install-generator.js

@@ -279,6 +279,7 @@ function toPosix(filePath) {
 function resolveSetupHeaderImage(workdir) {
   const candidates = [
     path.join(workdir, 'src', 'Setup.header.png'),
+    path.join(workdir, 'src', 'Setup.tip.png'),
     path.join(workdir, 'src', 'Setup.png'),
     path.join(workdir, 'src', 'Setup.dsa.png'),
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",

package/src/dialog/builders/dialog-header-builder.ts

@@ -1,6 +1,7 @@
 import LayoutBuilder from './layout-builder'
 import { createWidget } from './widget-builder'
 import { WidgetBuilderContext } from './widgets-builder'
+import { getScriptPath } from '@dsf/helpers/script-helper'
 
 export type DialogHeaderOptions = {
     image?: Pixmap
@@ -20,13 +21,21 @@ const escapeHtml = (value: string): string =>
         .replace(/'/g, ''')
         .replace(/\r?\n/g, '<br>')
 
+const resolveImagePath = (filePath: string): string => {
+    const value = String(filePath ?? '').replace(/\\/g, '/')
+    if (!value) return ''
+    if (value.indexOf(':') >= 0 || value.charAt(0) === '/') return value
+
+    return `${getScriptPath()}/${value.replace(/^\.\//, '')}`
+}
+
 export class DialogHeaderBuilder {
     constructor(
         private readonly context: WidgetBuilderContext,
         private readonly options: DialogHeaderOptions
     ) { }
 
-    build(): DzHBoxLayout {
+    build(): DzWidget {
         const height = this.options.height ?? 96
         const imageWidth = this.options.imageWidth ?? height
         const html = this.options.html ?? (
@@ -35,18 +44,23 @@ export class DialogHeaderBuilder {
                 : ''
         )
 
-        return LayoutBuilder
-            .create(this.context)
-            .direction('horizontal')
-            .build(() => {
-                this.buildImage(height, imageWidth)
-                this.buildText(html, height)
-            }) as DzHBoxLayout
+        return createWidget(this.context).build(DzWidget, (container) => {
+            container.setFixedHeight(height)
+
+            LayoutBuilder
+                .create(this.context)
+                .parent(container)
+                .direction('horizontal')
+                .build(() => {
+                    this.buildImage(height, imageWidth)
+                    this.buildText(html, height)
+                })
+        })
     }
 
     private buildImage(height: number, imageWidth: number): void {
         const pixmap = this.options.image ?? (
-            this.options.imagePath ? new Pixmap(this.options.imagePath) : null
+            this.options.imagePath ? new Pixmap(resolveImagePath(this.options.imagePath)) : null
         )
         if (!pixmap) return
 

package/src/scripts/install-generator.test.ts

@@ -113,11 +113,25 @@ describe('install generator setup header', () => {
         const projectDir = makeProject()
         writeScript(projectDir, 'render-tools')
         writePng(projectDir, 'Setup.header.png')
+        writePng(projectDir, 'Setup.tip.png')
         writePng(projectDir, 'Setup.png')
 
         const setup = generateSetup(projectDir)
 
         expect(setup).toContain('"headerImagePath":"./Setup.header.png"')
+        expect(setup).not.toContain('"headerImagePath":"./Setup.tip.png"')
+        expect(setup).not.toContain('"headerImagePath":"./Setup.png"')
+    })
+
+    it('uses the setup tip image before the generic setup image', () => {
+        const projectDir = makeProject()
+        writeScript(projectDir, 'render-tools')
+        writePng(projectDir, 'Setup.tip.png')
+        writePng(projectDir, 'Setup.png')
+
+        const setup = generateSetup(projectDir)
+
+        expect(setup).toContain('"headerImagePath":"./Setup.tip.png"')
         expect(setup).not.toContain('"headerImagePath":"./Setup.png"')
     })