@octane-xplat/macos-renderer 0.13.0 → 0.15.0

package/src/html-text.ts

@@ -0,0 +1,88 @@
+/** AppKit's HTML importer owns markup semantics; this layer supplies host styling. */
+export function validateHtmlProps(props: Record<string, any>) {
+	if (props.html != null && typeof props.html !== 'string') {
+		throw new Error('AppKit htmlview html must be a string')
+	}
+}
+
+const cssString = (value: string) =>
+	'"' +
+	value
+		.replace(/\\/g, '\\\\')
+		.replace(/"/g, '\\"')
+		.replace(/[\n\r\f]/g, ' ') +
+	'"'
+
+export function htmlDocument(
+	html: string,
+	defaults: {
+		fontSize: number
+		fontFamily: string
+		fontWeight: string
+		color: string
+		style: Record<string, any>
+	},
+) {
+	const { style } = defaults
+	const css = [
+		`font-family:${cssString(defaults.fontFamily)}`,
+		`font-size:${defaults.fontSize}px`,
+		`font-weight:${defaults.fontWeight}`,
+		`color:${defaults.color}`,
+		'margin:0',
+	]
+
+	if (['italic', 'oblique', 'normal'].includes(style.fontStyle)) {
+		css.push(`font-style:${style.fontStyle}`)
+	}
+
+	if (['left', 'center', 'right', 'justify'].includes(style.textAlign)) {
+		css.push(`text-align:${style.textAlign}`)
+	}
+
+	if (Number.isFinite(Number(style.lineHeight)) && Number(style.lineHeight) > 0) {
+		css.push(`line-height:${Number(style.lineHeight)}px`)
+	}
+
+	// Append the body defaults as NativeScript does, without escaping authored
+	// markup. Escape '<' in generated CSS so a font name cannot close the style.
+	return html + '<style>body{' + css.join(';').replace(/</g, '\\3c ') + '}</style>'
+}
+
+export function parseHtmlText(
+	html: string,
+	defaults: {
+		fontSize: number
+		fontFamily: string
+		fontWeight: string
+		color: any
+		style: Record<string, any>
+	},
+) {
+	const native = globalThis as any
+	if (!html) {
+		return native.NSAttributedString.alloc().initWithString('')
+	}
+
+	const rgb = defaults.color.colorUsingColorSpace(native.NSColorSpace.sRGBColorSpace)
+	const color = `rgb(${[rgb.redComponent, rgb.greenComponent, rgb.blueComponent].map((value) => Math.round(Number(value) * 255)).join(',')})`
+	const data = native.NSString.stringWithString(
+		htmlDocument(html, { ...defaults, color }),
+	).dataUsingEncoding(native.NSUTF8StringEncoding)
+
+	const result = native.NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(
+		data,
+		{
+			[native.NSDocumentTypeDocumentAttribute]: native.NSHTMLTextDocumentType,
+			[native.NSCharacterEncodingDocumentAttribute]: native.NSUTF8StringEncoding,
+		},
+		null,
+		null,
+	)
+
+	if (!result) {
+		throw new Error('AppKit htmlview could not parse HTML')
+	}
+
+	return result
+}

package/src/image.ts

@@ -1,4 +1,6 @@
 /** Local and embedded sources avoid synchronous network work on AppKit's main thread. */
+
+import { NSBundle, NSData, NSImage, NSImageView, NSURL, NSURLSession } from '@octane-xplat/platform/macos'
 export function loadImage(source: unknown): NSImage | null {
 	const src = String(source ?? '')
 	const match = /^data:[^,]*;base64,(.+)$/s.exec(src)
@@ -7,6 +9,14 @@ export function loadImage(source: unknown): NSImage | null {
 		return data ? NSImage.alloc().initWithData(data) : null
 	}
 
+	if (src.startsWith('res://')) {
+		return NSImage.imageNamed(src.slice(6))
+	}
+
+	if (src.startsWith('~/')) {
+		return NSImage.alloc().initWithContentsOfFile(NSBundle.mainBundle.resourcePath + '/' + src.slice(2))
+	}
+
 	if (src.startsWith('file://')) {
 		return NSImage.alloc().initWithContentsOfURL(NSURL.URLWithString(src))
 	}
@@ -24,9 +34,13 @@ export function loadImage(source: unknown): NSImage | null {
 
 /** Per-view load state. The generation invalidates in-flight decodes when the
  *  source changes or `disposeImage` runs — the same guard the webview leaf
- *  applies to async measurements. */
+ *  applies to async measurements. `placeholderImage` is kept so a failed load
+ *  can leave the placeholder standing (the native contract — the placeholder
+ *  doubles as the failure image). */
 interface ImageRequest {
 	source: string
+	placeholder: string
+	placeholderImage: NSImage | null
 	generation: number
 }
 
@@ -39,17 +53,10 @@ const cache = new Map<string, NSImage>()
 const pending = new Map<string, ((image: NSImage | null) => void)[]>()
 const IMAGE_CACHE_LIMIT = 64
 
-function decodeImage(source: string) {
+function settleImage(source: string, image: NSImage | null) {
 	const callbacks = pending.get(source) ?? []
 	pending.delete(source)
 
-	let image: NSImage | null = null
-	try {
-		image = loadImage(source)
-	} catch (error) {
-		console.error('[macos-image] decode failed', error)
-	}
-
 	if (image) {
 		cache.delete(source)
 		cache.set(source, image)
@@ -63,32 +70,93 @@ function decodeImage(source: string) {
 	}
 }
 
+function decodeImage(source: string) {
+	let image: NSImage | null = null
+	try {
+		image = loadImage(source)
+	} catch (error) {
+		console.error('[macos-image] decode failed', error)
+	}
+
+	settleImage(source, image)
+}
+
+/** Remote sources fetch through NSURLSession and settle through the same
+ *  cache/waiter path as local decodes. The task is keyed by source, not view —
+ *  a superseded request is generation-guarded, and letting the fetch finish
+ *  still populates the cache for the next view asking for it. */
+function fetchImage(source: string) {
+	NSURLSession.sharedSession
+		.dataTaskWithURLCompletionHandler(NSURL.URLWithString(source), (data: any, _response: any, error: any) => {
+			let image: NSImage | null = null
+			if (data && !error) {
+				try {
+					image = NSImage.alloc().initWithData(data)
+				} catch (decodeError) {
+					console.error('[macos-image] remote decode failed', decodeError)
+				}
+			}
+
+			settleImage(source, image)
+		})
+		.resume()
+}
+
 /** Points `view` at `source`. Cached decodes assign immediately; anything else
- *  decodes on a later run-loop turn so command batches never block on image
- *  I/O. The previous image stays visible until its replacement resolves. */
-export function updateImage(view: NSImageView, source: unknown) {
+ *  decodes on a later run-loop turn — or fetches over NSURLSession for
+ *  http(s) — so command batches never block on image I/O. While a load is
+ *  pending, `placeholder` (a loadImage-resolvable source; the leaf resolves
+ *  thumbhash:/blurhash: to data: PNGs) paints into the same view, and a failed
+ *  load leaves it standing. The previous image stays visible until its
+ *  replacement resolves. */
+export function updateImage(view: NSImageView, source: unknown, placeholder?: unknown) {
 	const src = String(source ?? '')
+	const ph = String(placeholder ?? '')
 	let request = requests.get(view)
 	if (!request) {
-		request = { source: '', generation: 0 }
+		request = { source: '', placeholder: '', placeholderImage: null, generation: 0 }
 		requests.set(view, request)
 	}
 
-	if (request.source === src) {
+	if (request.source === src && request.placeholder === ph) {
 		return
 	}
 
+	if (request.placeholder !== ph) {
+		request.placeholderImage = null
+	}
+
 	request.source = src
+	request.placeholder = ph
 	const generation = ++request.generation
 	const deliver = (image: NSImage | null) => {
 		if (requests.get(view) !== request || request.generation !== generation) {
 			return
 		}
 
-		view.image = image
+		view.image = (image ?? request.placeholderImage) as NSImage
+	}
+
+	const showPlaceholder = () => {
+		if (!ph) {
+			return
+		}
+
+		if (!request.placeholderImage) {
+			try {
+				request.placeholderImage = loadImage(ph)
+			} catch (error) {
+				console.error('[macos-image] placeholder decode failed', error)
+			}
+		}
+
+		if (request.placeholderImage) {
+			view.image = request.placeholderImage as NSImage
+		}
 	}
 
 	if (!src) {
+		showPlaceholder()
 		deliver(null)
 		return
 	}
@@ -99,11 +167,18 @@ export function updateImage(view: NSImageView, source: unknown) {
 		return
 	}
 
+	// A decode/fetch is pending — the placeholder is the interim content.
+	showPlaceholder()
+
 	let waiters = pending.get(src)
 	if (!waiters) {
 		waiters = []
 		pending.set(src, waiters)
-		setTimeout(() => decodeImage(src), 0)
+		if (/^https?:\/\//i.test(src)) {
+			fetchImage(src)
+		} else {
+			setTimeout(() => decodeImage(src), 0)
+		}
 	}
 
 	waiters.push(deliver)

package/src/index.d.ts

@@ -1,4 +1,5 @@
 import '@nativescript/macos-node-api'
+import { NSFontDescriptor, NSView } from '@octane-xplat/platform/macos'
 
 export * from 'octane/universal/native'
 export interface MacOSRootOptions {
@@ -16,3 +17,11 @@ export declare function createMacOSRoot(
 	hostView: NSView,
 	options?: MacOSRootOptions,
 ): import('octane/universal/native').UniversalRoot
+
+/** @internal Compiler ABI for tabviewitem JSX spreads in xplatMacOS builds. */
+export declare function __tabItemProps(props: any): any
+
+/** @internal Compiler-owned portal wrapper for raw AppKit tab items. */
+export declare function __PortalTabItem(props: any): any
+/** @internal Compiler-owned portal wrapper for raw AppKit list cells. */
+export declare function __PortalList(props: any): any