unpoly-rails 3.10.0 → 3.10.2

data/assets/unpoly/unpoly.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.10.0'
+    version: '3.10.2'
 };
 
 
@@ -637,8 +637,8 @@ up.util = (function () {
             });
         }
     }
-    function delegatePromise(object, promiseProp) {
-        return defineDelegates(object, ['then', 'catch', 'finally'], function () { return this[promiseProp]; });
+    function delegatePromise(object, targetProvider) {
+        return defineDelegates(object, ['then', 'catch', 'finally'], targetProvider);
     }
     function stringifyArg(arg, placeholder = '%o') {
         let string;
@@ -2262,7 +2262,7 @@ up.RenderJob = (_a = class RenderJob {
         }
     },
     (() => {
-        u.delegatePromise(_a.prototype, '_rendered');
+        u.delegatePromise(_a.prototype, function () { return this._rendered; });
         u.memoizeMethod(_a.prototype, {
             _awaitFinished: true,
             _getChange: true,
@@ -2853,9 +2853,8 @@ up.Change.CloseLayer = class CloseLayer extends up.Change {
         this._history = options.history ?? true;
     }
     execute() {
-        if (!this._layer.isOpen()) {
-            return Promise.resolve();
-        }
+        if (!this._layer.isOpen())
+            return;
         up.browser.assertConfirmed(this.options);
         if (this._emitCloseEvent().defaultPrevented && this._preventable) {
             throw new up.Aborted('Close event was prevented');
@@ -2904,10 +2903,13 @@ up.Change.CloseLayer = class CloseLayer extends up.Change {
         });
     }
     _handleFocus(formerParent) {
+        let hadFocus = this._layer.hasFocus();
         this._layer.overlayFocus.teardown();
         formerParent.overlayFocus?.moveToFront();
-        let newFocusElement = this._layer.origin || formerParent.element;
-        up.focus(newFocusElement, { preventScroll: true });
+        if (hadFocus) {
+            let newFocusElement = this._layer.origin || formerParent.element;
+            up.focus(newFocusElement, { preventScroll: true });
+        }
     }
 };
 
@@ -4099,15 +4101,21 @@ up.FormValidator = class FormValidator {
 /***/ (() => {
 
 up.FocusCapsule = class FocusCapsule {
-    constructor(element, target, cursorProps) {
+    constructor(element, target) {
         this._element = element;
         this._target = target;
-        this._cursorProps = cursorProps;
+        this._cursorProps = up.viewport.copyCursorProps(this._element);
     }
     wasLost() {
-        return document.activeElement !== this._element;
+        return document.activeElement !== this._element && !this._voided;
+    }
+    autoVoid() {
+        up.on('focusin', { once: true }, () => this._voided = true);
     }
     restore(layer, focusOptions) {
+        if (!this.wasLost()) {
+            return false;
+        }
         let rediscoveredElement = up.fragment.get(this._target, { layer });
         if (rediscoveredElement) {
             up.viewport.copyCursorProps(this._cursorProps, rediscoveredElement);
@@ -4122,8 +4130,7 @@ up.FocusCapsule = class FocusCapsule {
         let target = up.fragment.tryToTarget(focusedElement);
         if (!target)
             return;
-        const cursorProps = up.viewport.copyCursorProps(focusedElement);
-        return new this(focusedElement, target, cursorProps);
+        return new this(focusedElement, target);
     }
 };
 
@@ -4296,9 +4303,7 @@ up.FragmentFocus = class FragmentFocus extends up.FragmentProcessor {
         return this._focusElement(match);
     }
     _restoreLostFocus() {
-        if (this._wasFocusLost()) {
-            return this.focusCapsule?.restore(this.layer, PREVENT_SCROLL_OPTIONS);
-        }
+        return this.focusCapsule?.restore(this.layer, PREVENT_SCROLL_OPTIONS);
     }
     _restorePreviousFocusForLocation() {
         return up.viewport.restoreFocus({ layer: this.layer });
@@ -6806,7 +6811,7 @@ up.Request = (_a = class Request extends up.Record {
         }
     },
     (() => {
-        u.delegatePromise(_a.prototype, '_deferred');
+        u.delegatePromise(_a.prototype, function () { return this._deferred; });
     })(),
     _a);
 
@@ -6954,14 +6959,14 @@ up.Request.Cache = class Cache {
     _isUsable(request) {
         return request.age < up.network.config.cacheEvictAge;
     }
-    get _size() {
+    get currentSize() {
         return this._requests.length;
     }
     get _capacity() {
         return up.network.config.cacheSize;
     }
     _limitSize() {
-        for (let i = 0; i < (this._size - this._capacity); i++) {
+        for (let i = 0; i < (this.currentSize - this._capacity); i++) {
             this._delete(this._requests[0]);
         }
     }
@@ -10960,7 +10965,7 @@ up.status = (function () {
         let focusCapsule = up.FocusCapsule.preserve(bindLayer);
         let applyPreviews = () => doRunPreviews(request, renderOptions);
         let revertPreviews = bindLayer.asCurrent(applyPreviews);
-        up.on('focusin', { once: true }, () => focusCapsule = null);
+        focusCapsule?.autoVoid();
         return () => {
             bindLayer.asCurrent(revertPreviews);
             focusCapsule?.restore(bindLayer, { preventScroll: true });