@breakside/jskit 2022.23.0 → 2022.24.0

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -498,6 +498,14 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
                         preventDefault = true;
                     }
                     break;
+                case 66: // b
+                case 73: // i
+                case 85: // u
+                    // For common formatting commands, we should prevent
+                    // the browser's default behavior even if the text input
+                    // system hinted that there was input.
+                    preventDefault = true;
+                    break;
             }
         }
         if (preventDefault){
@@ -1146,10 +1154,18 @@ JSClass("UIHTMLDataTransferPasteboard", UIPasteboard, {
     },
 
     withDataTransfer: function(dataTransfer, action, target){
+        var locallySetTypes = JSCopy(this._locallySetTypes);
         try{
             this.dataTransfer = dataTransfer;
+            this._updateDataTransferTypeSet();
+            for (var type in this._dataTransferTypeSet){
+                if (type in this._locallySetTypes){
+                    delete this._locallySetTypes[type];
+                }
+            }
             action.call(target);
         }finally{
+            this._locallySetTypes = locallySetTypes;
             this.dataTransfer = null;
         }
     },

package/Root/Frameworks/UIKit/UIScrollView.js

@@ -476,6 +476,18 @@ JSClass('UIScrollView', UIView, {
     },
 
     _didScroll: function(){
+        if (this.window !== null){
+            var responder = this.window.firstResponder;
+            if (responder && responder.isKindOfClass(UIView) && responder.focusRingPath !== null){
+                var superview = responder.superview;
+                while (superview !== null && superview !== this){
+                    superview = superview.superview;
+                }
+                if (superview === this){
+                    this.window.invalidateFocusRing(false);
+                }
+            }
+        }
         if (this.delegate && this.delegate.scrollViewDidScroll){
             this.delegate.scrollViewDidScroll(this);
         }

package/Root/Frameworks/UIKit/UISegmentedControl.js

@@ -26,13 +26,13 @@ JSClass("UISegmentedControl", UIControl, {
     // MARK: - Creating a segment control
 
     initWithSpec: function(spec){
+        UISegmentedControl.$super.initWithSpec.call(this, spec);
         if (spec.containsKey('font')){
             this._font = spec.valueForKey("font", JSFont);
         }
         if (spec.containsKey('titleInsets')){
             this._titleInsets  = spec.valueForKey("titleInsets", JSInsets);
         }
-        UISegmentedControl.$super.initWithSpec.call(this, spec);
         var i, l;
         if (spec.containsKey('items')){
             var items = spec.valueForKey('items');
@@ -771,15 +771,15 @@ JSClass("UISegmentedControlDefaultStyler", UISegmentedControlStyler, {
 
     sizeControlToFitSize: function(control, maxSize){
         var intrinsicSize = this.intrinsicSizeOfControl(control);
-        var size = JSSize(control.bounds.size);
+        var size = JSSize(intrinsicSize);
         if (maxSize.width < Number.MAX_VALUE){
             size.width = maxSize.width;
         }
-        if (intrinsicSize.width < maxSize.width){
-            size.width = intrinsicSize.width;
+        if (maxSize.width < size.width){
+            size.width = maxSize.width;
         }
-        if (intrinsicSize.height < maxSize.height){
-            size.height = intrinsicSize.height;
+        if (maxSize.height < size.height){
+            size.height = maxSize.height;
         }
         control.bounds = JSRect(JSPoint.Zero, size);
     },

package/Root/Frameworks/UIKit/UITextAttachmentView.js

@@ -31,7 +31,7 @@ JSClass("UITextAttachmentView", JSTextAttachment, {
 
     layout: function(font, lineWidth){
         this.view.sizeToFitSize(JSSize(lineWidth, Number.MAX_VALUE));
-        this.baselineAdjustment = -this.view.lastBaselineOffsetFromBottom;
+        this.baselineAdjustment = this.view.lastBaselineOffsetFromBottom;
     },
 
     drawInContextAtPoint: function(context, point){

package/Root/Frameworks/UIKit/UITextEditor.js

@@ -31,7 +31,6 @@ JSClass("UITextEditor", JSObject, {
     delegate: null,
     cursorColor: JSDynamicProperty('_cursorColor', null),
     cursorWidth: 2.0,
-    insertAttributes: null,
     _isFirstResponder: false,
     _isWindowKey: false,
     _cursorBlinkRate: 0.5,
@@ -207,6 +206,10 @@ JSClass("UITextEditor", JSObject, {
         this._setSingleSelectionAtLocation(location);
     },
 
+    handleTouchesEndedAtLocation: function(location, touches, event){
+        this._setSingleSelectionAtLocation(location);
+    },
+
     handleTouchesEnded: function(touches, event){
     },
 
@@ -416,6 +419,147 @@ JSClass("UITextEditor", JSObject, {
     // -------------------------------------------------------------------------
     // MARK: - Common editing operations
 
+    bold: function(sender){
+        this._toggleBooleanAttribute("bold", "Bold");
+    },
+
+    italic: function(sender){
+        this._toggleBooleanAttribute("italic", "Italic");
+    },
+
+    underline: function(sender){
+        this._toggleBooleanAttribute("underline", "Underline");
+    },
+
+    removeParagraphAttribute: function(name, undoName){
+        this.setParagraphAttribute(name, undefined, undoName);
+    },
+
+    setParagraphAttributes: function(attributes, undoName){
+        this.undoManager.beginUndoGrouping();
+        var name, value;
+        var i, l;
+        var selection;
+        var selections = this._selectionsCopy();
+        for (name in attributes){
+            value = attributes[name];
+            for (i = 0, l = selections.length; i < l; ++i){
+                selection = selections[i];
+                this._setParagraphAttributeForSelection(name, value, selection);
+            }
+        }
+        this._setSelectionsAllowingUndo(selections);
+        this.undoManager.endUndoGrouping();
+        this.undoManager.setActionName(undoName);
+    },
+
+    setParagraphAttribute: function(name, value, undoName){
+        this.undoManager.beginUndoGrouping();
+        var i, l;
+        var selection;
+        var selections = this._selectionsCopy();
+        for (i = 0, l = selections.length; i < l; ++i){
+            selection = selections[i];
+            this._setParagraphAttributeForSelection(name, value, selection);
+        }
+        this._setSelectionsAllowingUndo(selections);
+        this.undoManager.endUndoGrouping();
+        this.undoManager.setActionName(undoName);
+    },
+
+    _setParagraphAttributeForSelection: function(name, value, selection){
+        var textStorage = this.textLayoutManager.textStorage;
+        var replacementString;
+        var replacementRange;
+        var paragraphRange;
+        paragraphRange = textStorage.string.rangeForParagraphAtIndex(selection.range.location);
+        replacementRange = JSRange(paragraphRange);
+        while (paragraphRange.length > 0 && paragraphRange.end < selection.range.end){
+            paragraphRange = textStorage.string.rangeForParagraphAtIndex(replacementRange.end);
+            replacementRange.length += paragraphRange.length;
+        }
+        if (replacementRange.length > 0){
+            replacementString = textStorage.attributedSubstringInRange(replacementRange);
+            if (value !== undefined){
+                replacementString.addAttributeInRange(name, value, JSRange(0, replacementString.string.length));
+            }else{
+                replacementString.removeAttributeInRange(name, JSRange(0, replacementString.string.length));
+            }
+            this._replaceTextStorageRangeAllowingUndo(textStorage, replacementRange, replacementString);
+        }else{
+            selection.attributes = this._insertAttributesForSelection(selection);
+            this.undoManager.registerUndo(this, this._setParagraphAttributeForSelection, name, selection.attributes[name], selection);
+            if (value !== undefined){
+                selection.attributes[name] = value;
+            }else{
+                delete selection.attributes[name];
+            }
+        }
+    },
+
+    _toggleBooleanAttribute: function(name, undoName){
+        var selection;
+        var textStorage = this.textLayoutManager.textStorage;
+        var locationAdjustment = 0;
+        var attributes;
+        var i, l;
+        var currentValue = true;
+        var runIterator;
+        for (i = 0, l = this.selections.length; i < l && currentValue === true; ++i){
+            selection = this.selections[i];
+            if (selection.range.length > 0){
+                runIterator = textStorage.runIterator(selection.range.location);
+                var j = 0;
+                while (runIterator.range.location < selection.range.end && currentValue === true && j < 10000){
+                    if (!runIterator.attributes[name]){
+                        currentValue = false;
+                    }
+                    runIterator.increment();
+                }
+                if (j === 10000){
+                    throw new Error("infinite loop");
+                }
+            }else{
+                attributes = this._insertAttributesForSelection(selection);
+                if (!attributes[name]){
+                    currentValue = false;
+                }
+            }
+        }
+        this.undoManager.beginUndoGrouping();
+        var selections = this._selectionsCopy();
+        for (i = 0, l = selections.length; i < l; ++i){
+            selection = selections[i];
+            this._setBooleanAttributeForSelection(name, !currentValue, selection);
+        }
+        this._setSelectionsAllowingUndo(selections);
+        this.undoManager.endUndoGrouping();
+        this.undoManager.setActionName(undoName);
+        this._resetSelectionAffinity();
+    },
+
+    _setBooleanAttributeForSelection: function(name, value, selection){
+        var textStorage = this.textLayoutManager.textStorage;
+        var replacementString;
+        if (selection.range.length > 0){
+            replacementString = textStorage.attributedSubstringInRange(selection.range);
+            if (value){
+                replacementString.addAttributeInRange(name, true, JSRange(0, replacementString.string.length));
+            }else{
+                replacementString.removeAttributeInRange(name, JSRange(0, replacementString.string.length));
+            }
+            this._replaceTextStorageRangeAllowingUndo(textStorage, selection.range, replacementString);
+        }else{
+            selection.attributes = this._insertAttributesForSelection(selection);
+            if (value){
+                selection.attributes[name] = true;
+            }else{
+                delete selection.attributes[name];
+            }
+            this.undoManager.registerUndo(this, this._setBooleanAttributeForSelection, name, !value, selection);
+        }
+    },
+
     _createSelectionAtLocation: function(location){
         var index = this.textLayoutManager.characterIndexAtPoint(location);
         var rect = this.textLayoutManager.rectForCharacterAtIndex(index);
@@ -462,6 +606,20 @@ JSClass("UITextEditor", JSObject, {
         this.layout();
     },
 
+    _selectionsCopy: function(){
+        var selections = [];
+        var i, l;
+        for (i = 0, l = this.selections.length; i < l; ++i){
+            selections.push(UITextInputSelection(this.selections[i]));
+        }
+        return selections;
+    },
+
+    _setSelectionsAllowingUndo: function(selections){
+        this.undoManager.registerUndo(this, this._setSelectionsAllowingUndo, this._selectionsCopy());
+        this.setSelections(selections);
+    },
+
     _insertSelection: function(selection){
         var searcher = JSBinarySearcher(this.selections, function(a, b){
             return a.range.location - b.range.location;
@@ -489,8 +647,8 @@ JSClass("UITextEditor", JSObject, {
         var adjustedRange;
         var locationAdjustment = 0;
         var textStorage = this.textLayoutManager.textStorage;
-        this._isHandlingSelectionAdjustments = true;
         this.undoManager.beginUndoGrouping();
+        var selections = this._selectionsCopy();
         for (i = 0, l = ranges.length; i < l; ++i){
             range = ranges[i];
             adjustedRange = JSRange(range.location + locationAdjustment, range.length);
@@ -498,19 +656,20 @@ JSClass("UITextEditor", JSObject, {
                 this._replaceTextStorageRangeAllowingUndo(textStorage, adjustedRange, null);
             }
             locationAdjustment -= range.length;
-            if (i == this.selections.length){
-                this.selections.push(this._createSelection(JSRange(0, 0)));
+            if (i == selections.length){
+                selections.push(this._createSelection(JSRange(0, 0)));
             }
-            this.selections[i].range = JSRange(adjustedRange.location, 0);
+            selections[i].range = JSRange(adjustedRange.location, 0);
         }
-        this._isHandlingSelectionAdjustments = false;
-        for (var j = this.selections.length - 1; j >= i; --j){
-            this.selections.splice(j, 1);
+        for (var j = selections.length - 1; j >= i; --j){
+            selections.splice(j, 1);
         }
+        for (i = 0, l = selections.length; i < l; ++i){
+            selections[i].affinity = UITextInput.SelectionAffinity.beforeCurrentCharacter;
+        }
+        this._setSelectionsAllowingUndo(selections);
         this.undoManager.endUndoGrouping();
         this.undoManager.setActionName("Typing");
-        this._collapseOverlappingSelections();
-        this._resetSelectionAffinity();
     },
 
     _replaceTextStorageRangeAllowingUndo: function(textStorage, range, attributedString){
@@ -523,10 +682,12 @@ JSClass("UITextEditor", JSObject, {
             insertedLength = attributedString.string.length;
         }
         this.undoManager.registerUndo(this, this._replaceTextStorageRangeAllowingUndo, textStorage, JSRange(range.location, insertedLength), replacedString);
+        this._isHandlingSelectionAdjustments = true;
         textStorage.replaceCharactersInRangeWithAttributedString(range, attributedString);
+        this._isHandlingSelectionAdjustments = false;
     },
 
-    _collapseOverlappingSelections: function(){
+    _collapseOverlappingSelections: function(sections){
         var removed = [];
         for (var i = this.selections.length - 1; i > 0; --i){
             if (this.selections[i - 1].range.end >= this.selections[i].range.location){
@@ -545,10 +706,20 @@ JSClass("UITextEditor", JSObject, {
     },
 
     _insertAttributesForSelection: function(selection){
-        var index = selection.range.location > 0 ? selection.range.location - 1 : 0;
-        var attributes = this.textLayoutManager.textStorage.attributesAtIndex(index);
+        if (selection.attributes){
+            return selection.attributes;
+        }
+        var index = selection.range.location;
+        var iterator;
+        if (index > 0){
+            iterator = this.textLayoutManager.textStorage.string.userPerceivedCharacterIterator(index);
+            iterator.decrement();
+            if (!iterator.isParagraphBreak){
+                index = iterator.range.location;
+            }
+        }
+        var attributes = JSCopy(this.textLayoutManager.textStorage.attributesAtIndex(index));
         if (JSAttributedString.Attribute.attachment in attributes){
-            attributes = JSCopy(attributes);
             delete attributes[JSAttributedString.Attribute.attachment];
         }
         return attributes;
@@ -587,23 +758,21 @@ JSClass("UITextEditor", JSObject, {
         var locationAdjustment = 0;
         var adjustedRange;
         var insertAttributes;
-        this._isHandlingSelectionAdjustments = true;
+        var i, l;
+        var selections = this._selectionsCopy();
         this.undoManager.beginUndoGrouping();
-        for (var i = 0, l = this.selections.length; i < l; ++i){
-            selection = this.selections[i];
-            insertAttributes = this.insertAttributes;
-            if (insertAttributes === null){
-                insertAttributes = this._insertAttributesForSelection(selection);
-            }
+        for (i = 0, l = selections.length; i < l; ++i){
+            selection = selections[i];
+            insertAttributes = this._insertAttributesForSelection(selection);
             adjustedRange = JSRange(selection.range.location + locationAdjustment, selection.range.length);
             this._replaceTextStorageRangeAllowingUndo(textStorage, adjustedRange, JSAttributedString.initWithString(text, insertAttributes));
             selection.range = JSRange(adjustedRange.location + textLength, 0);
+            selection.affinity = UITextInput.SelectionAffinity.beforeCurrentCharacter;
             locationAdjustment += textLength - adjustedRange.length;
         }
+        this._setSelectionsAllowingUndo(selections);
         this.undoManager.endUndoGrouping();
         this.undoManager.setActionName("Typing");
-        this._isHandlingSelectionAdjustments = false;
-        this._resetSelectionAffinity();
     },
 
     setMarkedText: function(text){
@@ -631,7 +800,7 @@ JSClass("UITextEditor", JSObject, {
     },
 
     insertLineBreak: function(){
-        this.insertText("\n");
+        this.insertText("\u2028");
     },
 
     insertTab: function(){
@@ -812,6 +981,7 @@ JSClass("UITextEditor", JSObject, {
         var perceivedCharacterRange;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             if (selection.range.length === 0){
                 if (selection.range.location > 0){
                     perceivedCharacterRange = textStorage.string.rangeForUserPerceivedCharacterAtIndex(selection.range.location - 1);
@@ -834,6 +1004,7 @@ JSClass("UITextEditor", JSObject, {
         var indexOfPreviousWord;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             indexOfPreviousWord = textStorage.string.indexOfWordStartBeforeIndex(selection.range.location);
             selection.range = JSRange(indexOfPreviousWord, 0);
         }
@@ -849,6 +1020,7 @@ JSClass("UITextEditor", JSObject, {
         var line;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             line = this._lineForSelectionStart(selection);
             if (line !== null){
                 selection.range = JSRange(line.range.location, 0);
@@ -872,6 +1044,7 @@ JSClass("UITextEditor", JSObject, {
         var cursorX;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             selection.insertionPoint = UITextInput.SelectionInsertionPoint.start;
             cursorRect = this._cursorRectForSelection(selection);
             cursorX = cursorRect.origin.x + Math.floor(cursorRect.size.width / 2.0);
@@ -915,6 +1088,7 @@ JSClass("UITextEditor", JSObject, {
         var perceivedCharacterRange;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             if (selection.range.length === 0){
                 if (selection.range.location < textStorage.string.length){
                     perceivedCharacterRange = textStorage.string.rangeForUserPerceivedCharacterAtIndex(selection.range.location);
@@ -937,6 +1111,7 @@ JSClass("UITextEditor", JSObject, {
         var nextWordIndex;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             nextWordIndex = textStorage.string.indexOfWordEndAfterIndex(selection.range.end);
             selection.range = JSRange(nextWordIndex, 0);
         }
@@ -952,6 +1127,7 @@ JSClass("UITextEditor", JSObject, {
         var line;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             line = this._lineForSelectionEnd(selection);
             if (line !== null && line.range.end > selection.range.location){
                 var iterator = textStorage.string.userPerceivedCharacterIterator(line.range.end - 1);
@@ -981,6 +1157,7 @@ JSClass("UITextEditor", JSObject, {
         var lineEnumerator;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             selection.insertionPoint = UITextInput.SelectionInsertionPoint.end;
             cursorRect = this._cursorRectForSelection(selection);
             cursorX = cursorRect.origin.x + Math.floor(cursorRect.size.width / 2.0);
@@ -1025,6 +1202,7 @@ JSClass("UITextEditor", JSObject, {
         var perceivedCharacterRange;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             if (selection.range.length > 0 && selection.insertionPoint == UITextInput.SelectionInsertionPoint.end){
                 perceivedCharacterRange = textStorage.string.rangeForUserPerceivedCharacterAtIndex(selection.range.end - 1);
                 selection.range.length -= perceivedCharacterRange.length;
@@ -1050,6 +1228,7 @@ JSClass("UITextEditor", JSObject, {
         var end;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             if (selection.insertionPoint == UITextInput.SelectionInsertionPoint.start){
                 end = selection.range.end;
             }else{
@@ -1072,6 +1251,7 @@ JSClass("UITextEditor", JSObject, {
         var end;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             line = this._lineForSelectionStart(selection);
             if (line !== null){
                 if (selection.insertionPoint == UITextInput.SelectionInsertionPoint.start){
@@ -1101,6 +1281,7 @@ JSClass("UITextEditor", JSObject, {
         var lineEnumerator;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             cursorRect = this._cursorRectForSelection(selection);
             cursorX = cursorRect.origin.x + Math.floor(cursorRect.size.width / 2.0);
             lineEnumerator = this.textLayoutManager.lineEnumerator((selection.insertionPoint == UITextInput.SelectionInsertionPoint.start ? selection.range.location : selection.range.end) - (selection.affinity === UITextInput.SelectionAffinity.afterPreviousCharacter ? 1 : 0));
@@ -1166,6 +1347,7 @@ JSClass("UITextEditor", JSObject, {
         var perceivedCharacterRange;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             if (selection.range.length > 0 && selection.insertionPoint == UITextInput.SelectionInsertionPoint.start){
                 perceivedCharacterRange = textStorage.string.rangeForUserPerceivedCharacterAtIndex(selection.range.location);
                 selection.range.advance(perceivedCharacterRange.length);
@@ -1191,6 +1373,7 @@ JSClass("UITextEditor", JSObject, {
         var start;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             if (selection.insertionPoint == UITextInput.SelectionInsertionPoint.start){
                 start = selection.range.end;
             }else{
@@ -1213,6 +1396,7 @@ JSClass("UITextEditor", JSObject, {
         var start;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             line = this._lineForSelectionEnd(selection);
             if (selection.insertionPoint == UITextInput.SelectionInsertionPoint.start){
                 start = selection.range.end;
@@ -1248,6 +1432,7 @@ JSClass("UITextEditor", JSObject, {
         var cursorX;
         for (var i = 0, l = this.selections.length; i < l; ++i){
             selection = this.selections[i];
+            selection.attributes = null;
             cursorRect = this._cursorRectForSelection(selection);
             cursorX = cursorRect.origin.x + Math.floor(cursorRect.size.width / 2.0);
             lineEnumerator = this.textLayoutManager.lineEnumerator((selection.insertionPoint == UITextInput.SelectionInsertionPoint.start ? selection.range.location : selection.range.end) - (selection.affinity === UITextInput.SelectionAffinity.afterPreviousCharacter ? 1 : 0));
@@ -1334,7 +1519,7 @@ JSClass("UITextEditor", JSObject, {
             return this.textLayoutManager.lineForCharacterAtIndex(selection.range.end - 1);
         }
         return this.textLayoutManager.lineForCharacterAtIndex(selection.range.end);
-    }
+    },
 
 });