craft-native 0.0.350 → 0.0.352

package/dist/android/templates/MainActivityNative.kt.template

@@ -212,6 +212,24 @@ private data class CraftNativeLength(
     }
 }
 
+/** A screen root owns its viewport unless the document explicitly sizes it.
+ * Keep this parent constraint out of the protocol document, and apply it to
+ * targeted style updates too. An unstyled fragment with flex children would
+ * otherwise measure at their zero flex bases and collapse the entire screen. */
+internal fun craftNativeScreenRootStyle(style: JSONObject): JSONObject {
+    val rootStyle = JSONObject()
+    val keys = style.keys()
+    while (keys.hasNext()) {
+        val key = keys.next()
+        rootStyle.put(key, style.opt(key))
+    }
+    if (rootStyle.isNull("height")) {
+        if (rootStyle.isNull("flex")) rootStyle.put("flex", 1)
+        rootStyle.put("height", "100%")
+    }
+    return rootStyle
+}
+
 private data class CraftNativeLayoutStyle(
     val width: CraftNativeLength? = null,
     val height: CraftNativeLength? = null,
@@ -1132,14 +1150,23 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         invalidateMeasurements()
     }
 
+    private var viewportChild: View? = null
+
+    fun setViewportChild(view: View?) {
+        viewportChild = view
+        invalidateMeasurements()
+    }
+
     fun setChildStyle(view: View, style: JSONObject, density: Float) {
-        styles[view] = CraftNativeLayoutStyle.from(style, density)
+        val effective = if (view === viewportChild) craftNativeScreenRootStyle(style) else style
+        styles[view] = CraftNativeLayoutStyle.from(effective, density)
         invalidateMeasurements()
         invalidateMeasurementAncestors(parent)
     }
 
     override fun onViewRemoved(child: View) {
         val parentBeforeRemoval = parent
+        if (child === viewportChild) viewportChild = null
         styles.remove(child)
         super.onViewRemoved(child)
         invalidateMeasurements()
@@ -5434,6 +5461,7 @@ class MainActivity : AppCompatActivity() {
         screen.controls.clear()
         screen.controls.putAll(next)
         screen.handlers.keys.retainAll(retainedViews(screen))
+        screen.view.setViewportChild(tree)
         screen.view.setChildStyle(tree, document.optJSONObject("style") ?: JSONObject(), resources.displayMetrics.density)
         promoteModalOverlays(screen)
         updateSafeAreaViews()

package/dist/cli.js

@@ -356,7 +356,19 @@ async function packageMacOS(config, outDir) {
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
     const outputPath = join2(outDir, `${name}-${version}.dmg`);
-    const dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    let dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    if (dmgResult.success && opts.signIdentity) {
+      const signed = await runTool("codesign", codesignArguments({
+        path: outputPath,
+        identity: opts.signIdentity,
+        keychain: opts.signingKeychain,
+        hardenedRuntime: false,
+        deep: false
+      }));
+      const verified = signed.success ? await runTool("codesign", ["--verify", "--strict", outputPath]) : signed;
+      if (!verified.success)
+        dmgResult = { success: false, error: verified.error };
+    }
     results.push({
       success: dmgResult.success,
       platform: "macos",
@@ -3035,7 +3047,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.350";
+var version = "0.0.352";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.350";
+var version = "0.0.352";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -722,7 +722,19 @@ async function packageMacOS(config, outDir) {
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
     const outputPath = import_path.join(outDir, `${name}-${version}.dmg`);
-    const dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    let dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    if (dmgResult.success && opts.signIdentity) {
+      const signed = await runTool("codesign", codesignArguments({
+        path: outputPath,
+        identity: opts.signIdentity,
+        keychain: opts.signingKeychain,
+        hardenedRuntime: false,
+        deep: false
+      }));
+      const verified = signed.success ? await runTool("codesign", ["--verify", "--strict", outputPath]) : signed;
+      if (!verified.success)
+        dmgResult = { success: false, error: verified.error };
+    }
     results.push({
       success: dmgResult.success,
       platform: "macos",

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.350";
+var version = "0.0.352";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -478,7 +478,19 @@ async function packageMacOS(config, outDir) {
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
     const outputPath = join2(outDir, `${name}-${version}.dmg`);
-    const dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    let dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    if (dmgResult.success && opts.signIdentity) {
+      const signed = await runTool("codesign", codesignArguments({
+        path: outputPath,
+        identity: opts.signIdentity,
+        keychain: opts.signingKeychain,
+        hardenedRuntime: false,
+        deep: false
+      }));
+      const verified = signed.success ? await runTool("codesign", ["--verify", "--strict", outputPath]) : signed;
+      if (!verified.success)
+        dmgResult = { success: false, error: verified.error };
+    }
     results.push({
       success: dmgResult.success,
       platform: "macos",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.350",
+  "version": "0.0.352",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",