@breakside/jskit 2023.20.0 → 2023.22.0

package/Root/Frameworks/UIKit/UIHTMLApplication.js

@@ -305,6 +305,8 @@ JSGlobalObject.UIApplicationMain = function(rootElement, bootstrapper){
     application.run(function(error){
         if (error === null){
             application.addEventListeners();
+        }else{
+            application.windowServer.stop();
         }
         if (bootstrapper){
             bootstrapper.applicationLaunchResult(application, error);

package/Root/Frameworks/UIKit/UIHTMLContentEditableTextInputManager.js

@@ -57,8 +57,8 @@ JSClass('UIHTMLContentEditableTextInputManager', UITextInputManager, {
             this.textInputLayer = null;
             this.layoutManager = null;
         }else{
-            this.textInputLayer = this.textInputClient.textInputLayer ? this.textInputClient.textInputLayer() : null;
             this.layoutManager = this.textInputClient.textInputLayoutManager ? this.textInputClient.textInputLayoutManager() : null;
+            this.textInputLayer = this.textInputClient.textInputLayer ? this.textInputClient.textInputLayer() : null;
         }
     },
 

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -401,6 +401,13 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
                         preventDefault = false;
                     }
                     break;
+                case 81: // q
+                    if (modifiers === UIPlatform.shared.commandModifier){
+                        // We want to let the quit shortcut go through, so it can be
+                        // handled by the system.
+                        preventDefault = false;
+                    }
+                    break;
                 case 88: // x
                     if (modifiers === UIPlatform.shared.commandModifier){
                         // We want to let the cut keyboard shortcut go through, so it can be
@@ -957,7 +964,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     layoutWindow: function(window){
         UIHTMLWindowServer.$super.layoutWindow.call(this, window);
         if (window instanceof UIRootWindow){
-            window.contentInsets = this.safeAreaInsets();
+            window.contentInsets = window.contentInsets.insetsWithInsets(this.safeAreaInsets());
         }
     },
 

package/Root/Frameworks/UIKit/UIListView.js

@@ -535,9 +535,10 @@ JSClass("UIListView", UIScrollView, {
     },
 
     _approximateYForVisibleItem: function(item){
+        var y;
         if (item.kind === VisibleItem.Kind.cell){
             var row = this._sectionRowForIndexPath(item.indexPath);
-            var y = this._approximateYForSection(item.indexPath.section);
+            y = this._approximateYForSection(item.indexPath.section);
             y += this._approximateYForSectionRow(item.indexPath.section, row);
             return y;
         }
@@ -545,7 +546,8 @@ JSClass("UIListView", UIScrollView, {
             return this._approximateYForSection(item.indexPath.section);
         }
         if (item.kind === VisibleItem.Kind.footer){
-            return this._approximateYForSectionFooter(item.indexPath.section);
+            y = this._approximateYForSection(item.indexPath.section);
+            return y + this._approximateYForSectionFooter(item.indexPath.section);
         }
         return 0;
     },

package/Root/Frameworks/UIKit/UIWindowServer.js

@@ -165,9 +165,6 @@ JSClass("UIWindowServer", JSObject, {
         if (this._normalLevelRange.location === 0 && window.level === UIWindow.Level.normal){
             window.level = UIWindow.Level.back;
         }
-        if (this._normalLevelRange.location === 0 && window.level == UIWindow.Level.back){
-            this.updateRootWindowInsets(window);
-        }
         this._beginWindowOrderChange();
         this._windowsById[window.objectID] = window;
         switch (window.level){
@@ -278,8 +275,13 @@ JSClass("UIWindowServer", JSObject, {
     },
 
     layoutWindow: function(window){
-        if (window.level === UIWindow.Level.back){
+        if (window instanceof UIRootWindow){
             window.frame = window._screen.frame;
+            var insets = JSInsets.Zero;
+            if (this._menuBar !== null && this._menuBar.isOpaque){
+                insets.top = this._menuBar.frame.size.height;
+            }
+            window.contentInsets = insets;
         }else{
             // TODO: make sure nothing has moved off screen
         }
@@ -293,14 +295,6 @@ JSClass("UIWindowServer", JSObject, {
         this.screen.availableInsets = insets;
     },
 
-    updateRootWindowInsets: function(rootWindow){
-        var insets = JSInsets.Zero;
-        if (this._menuBar !== null && this._menuBar.isOpaque){
-            insets.top = this._menuBar.frame.size.height;
-            rootWindow.contentInsets = insets;
-        }
-    },
-
     // -----------------------------------------------------------------------
     // MARK: - Text Input Coordination
 
@@ -346,7 +340,7 @@ JSClass("UIWindowServer", JSObject, {
         }
         this.updateScreenAvailableInsets();
         if (this.windowStack.length > 0 && this._normalLevelRange.location > 0){
-            this.updateRootWindowInsets(this.windowStack[0]);
+            this.layoutWindow(this.windowStack[0]);
         }
     },
 

package/Root/Frameworks/UIKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKitTesting
-JSBundleVersion: 2023.20.0
+JSBundleVersion: 2023.22.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Templates/html/${PROJECT_NAME}/www/${PROJECT_NAME}.webmanifest

@@ -0,0 +1,9 @@
+{
+    "lang": "en",
+    "name": "${PROJECT_NAME}",
+    "short_name": "${PROJECT_NAME}",
+    "scope": "/",
+    "start_url": "/",
+    "display": "standalone",
+    "shortcuts": []
+}

package/Root/Templates/html/${PROJECT_NAME}/www/HTMLAppBootstrapper.js

@@ -222,6 +222,8 @@ HTMLAppBootstrapper.prototype = {
         this.setStatus(HTMLAppBootstrapper.STATUS.appCrashed);
     },
 
+    scriptContainerElement: null,
+
     include: function(src, async, callback, errorCallback){
         try{
             this.loadingScripts[src] = {
@@ -244,7 +246,11 @@ HTMLAppBootstrapper.prototype = {
                 errorCallback(new Error("Include of '" + src + "' failed"));
             });
             script.src = src;
-            this.rootElement.ownerDocument.body.appendChild(script);
+            if (this.scriptContainerElement === null){
+                this.scriptContainerElement = this.rootElement.appendChild(this.rootElement.ownerDocument.createElement("div"));
+                this.scriptContainerElement.style.display = "none";
+            }
+            this.scriptContainerElement.appendChild(script);
         }catch (e){
             errorCallback(e);
         }

package/Root/Templates/html/${PROJECT_NAME}/www/index.html

@@ -2,6 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
+  <link rel="manifest" href="${PROJECT_NAME}.webmanifest">
   <meta name="viewport" content="initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, viewport-fit=cover">
   <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
   <meta name="theme-color" media="(prefers-color-scheme: dark)" content="rgb(38,38,38)">

package/Root/Templates/html/${PROJECT_NAME}/www/service-worker.js

@@ -166,4 +166,28 @@ self.addEventListener('message', function(event){
     console.log('Client message to activate ' + cacheKey);
     self.skipWaiting();
   }
-});
+});
+
+// Push notification handling example:
+//
+// self.addEventListener('push', function(event){
+//   let message = event.data.json();
+//   console.log("received push message", message);
+//   if (message.type === "notification"){
+//     if (!self.Notification){
+//       console.warn("notifications not available");
+//     }
+//     if (self.Notification.permission !== "granted"){
+//       console.warn("notifications permission not granted");
+//     }
+//     var options = {
+//     };
+//     if (message.identifier){
+//       options.tag = message.identifier;
+//     }
+//     if (message.body !== null && message.body !== undefined){
+//         options.body = message.body;
+//     }
+//     self.registration.showNotification(message.title, options);
+//   }
+// });

package/package.json

@@ -9,7 +9,7 @@
     "node": ">=10.10.0"
   },
   "name": "@breakside/jskit",
-  "version": "2023.20.0",
+  "version": "2023.22.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "files": [
     "*"