@breakside/jskit 2023.12.2 → 2023.14.0

package/Root/Frameworks/UIKit/UIHTMLTextRun.js

@@ -247,9 +247,14 @@ JSClass("UIHTMLTextRun", JSTextRun, {
 
     recalculateRange: function(offset){
         var diff = 0;
+        var length = 0;
         if (this.textNode){
-            diff = this.textNode.nodeValue.length - this._range.length;
-            this._range = JSRange(this._range.location + offset, this.textNode.nodeValue.length);
+            length = this.textNode.nodeValue.length;
+            if (length > 0 && this.textNode.nodeValue[length - 1] === 0x200B){
+                length -= 1;
+            }
+            diff = length - this._range.length;
+            this._range = JSRange(this._range.location + offset, length);
         }else{
             this._range = JSRange(this._range.location + offset, this._range.length);
         }

package/Root/Frameworks/UIKit/UIHTMLTextTypesetter.js

@@ -125,8 +125,12 @@ JSClass("UIHTMLTextTypesetter", JSTextTypesetter, {
         var attributes = this._attributedString.attributesAtIndex(range.location);
         attributes = this.resolveAttributes(attributes);
         var font = attributes.font || null;
-        var element = this._createLineElement();
-        return UIHTMLTextLine.initWithElementAndFont(element, font, font.displayLineHeight, range.location, this.canvasContext);
+        var span = this._createRunElement();
+        span.appendChild(span.ownerDocument.createTextNode("\u200B"));
+        this._styleTextElementWithAttributes(span, attributes, font);
+        var div = this._createLineElement();
+        var emptyRun = UIHTMLTextRun.initWithElement(span, font, attributes, range);
+        return UIHTMLTextLine.initWithElement(div, [emptyRun], 0, [], this.canvasContext);
     },
 
     _createLineFromHTMLLayout: function(layout){
@@ -136,6 +140,7 @@ JSClass("UIHTMLTextTypesetter", JSTextTypesetter, {
         var runDescriptor;
         var span;
         var attachmentRuns = [];
+        var endsWithMandatoryLineBreak = false;
         for (var i = 0, l = layout.runDescriptors.length; i < l; ++i){
             runDescriptor = layout.runDescriptors[i];
             span = this._createRunElement();
@@ -150,6 +155,7 @@ JSClass("UIHTMLTextTypesetter", JSTextTypesetter, {
                 }else{
                     span.appendChild(span.ownerDocument.createTextNode(utf16));
                 }
+                endsWithMandatoryLineBreak = utf16.userPerceivedCharacterIterator(utf16.length - 1).isMandatoryLineBreak;
             }else{
                 this._styleAttachmentElementWithAttributes(span, runDescriptor.attributes, runDescriptor.attachment);
                 if (span.childNodes.length > 0){
@@ -169,7 +175,7 @@ JSClass("UIHTMLTextTypesetter", JSTextTypesetter, {
             return this._createEmptyHTMLLine(layout.range);
         }
         var div = this._createLineElement();
-        return UIHTMLTextLine.initWithElement(div, runs, layout.trailingWhitespaceWidth, attachmentRuns, this.canvasContext);
+        return UIHTMLTextLine.initWithElement(div, runs, layout.trailingWhitespaceWidth, attachmentRuns, this.canvasContext, endsWithMandatoryLineBreak);
     },
 
     _styleTextElementWithAttributes: function(span, attributes, font){

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -600,6 +600,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     touchend: function(e){
         e.preventDefault();
         this._createTouchEventFromDOMEvent(e, UIEvent.Type.touchesEnded);
+        this.textInputManager._ensureCorrectFocus();
     },
 
     touchcancel: function(e){

package/Root/Frameworks/UIKit/UIWindow.js

@@ -795,6 +795,9 @@ JSClass('UIWindow', UIView, {
         if (this.mouseTrackingViews === null || this.mouseTrackingViews.length === 0){
             return;
         }
+        if (this._modal !== null){
+            return;
+        }
         var view;
         var area;
         var viewIndex, viewCount;
@@ -901,6 +904,9 @@ JSClass('UIWindow', UIView, {
         while (modal !== null && modal._modal !== null){
             modal = modal._modal;
         }
+        if (this.mouseEventView !== null && this.mouseEventView.window !== this){
+            this.mouseEventView = null;
+        }
         if (modal !== null){
             this.mouseEventView = null;
             if (event.type == UIEvent.Type.mouseEntered || event.type == UIEvent.Type.mouseExited || event.type == UIEvent.mouseMoved){
@@ -925,7 +931,9 @@ JSClass('UIWindow', UIView, {
         }
         switch (event.type){
             case UIEvent.Type.leftMouseDown:
-                this.makeKeyAndOrderFront();
+                if (this._isOpen){
+                    this.makeKeyAndOrderFront();
+                }
                 eventTarget.mouseDown(event);
                 this._validateToolbar();
                 break;

package/Root/Frameworks/UIKit/UIWindowServer.js

@@ -422,7 +422,7 @@ JSClass("UIWindowServer", JSObject, {
             }
         }
         if (shouldHideTooltip){
-            if (view !== null && view.tooltip !== null){
+            if (view !== null && view.tooltip !== null && view.tooltip !== ""){
                 this.showTooltipForView(view, this.mouseLocation);
             }else{
                 this._scheduleHideTooltip();
@@ -726,7 +726,7 @@ JSClass("UIWindowServer", JSObject, {
         var event;
         for (windowIndex = this.windowStack.length - 1; windowIndex >= 0 && window === null; --windowIndex){
             location = this.windowStack[windowIndex].convertPointFromScreen(this.mouseLocation);
-            if (this.windowStack[windowIndex].userInteractionEnabled && this.windowStack[windowIndex].containsPoint(location)){
+            if (this.windowStack[windowIndex].userInteractionEnabled && (this.windowStack[windowIndex].containsPoint(location) || this.windowStack[windowIndex].receivesAllEvents)){
                 window = this.windowStack[windowIndex];
             }
         }

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/Root/Templates/html/${PROJECT_NAME}/conf/debug/nginx.conf

@@ -36,6 +36,8 @@ http {
     gzip  on;
     gzip_types text/css application/javascript application/json text/xml text/plain image/svg+xml text/cache-manifest application/x-font-ttf;
 
+    absolute_redirect off;
+
     server {
         listen *:{{HTTP_PORT}}{{SSL_LISTEN}};
         {{SSL_CERT}}
@@ -76,6 +78,8 @@ http {
             return 200;
         }
 
+        {{STATE_PATH_REDIRECTS}}
+
         location /Resources {
             expires max;
         }

package/Root/Templates/html/${PROJECT_NAME}/conf/release/nginx.conf

@@ -36,6 +36,8 @@ http {
     gzip  on;
     gzip_types text/css application/javascript application/json text/xml text/plain image/svg+xml text/cache-manifest application/x-font-ttf;
 
+    absolute_redirect off;
+
     server {
         listen *:{{HTTP_PORT}};
         server_name "";
@@ -77,6 +79,8 @@ http {
             return 200;
         }
 
+        {{STATE_PATH_REDIRECTS}}
+
         location / {
             # REQUIRED to eliminate extra requests for everything else
             expires max;

package/package.json

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