@magic-xpa/engine 4.1000.0 → 4.1000.410-0.428

package/fesm2020/magic-xpa-engine.mjs

@@ -3126,6 +3126,12 @@ class MgPriorityBlockingQueue {
 }
 
 class RunTimeEvent extends RunTimeEventBase {
+    set ShouldHandleZoom(value) {
+        this._shouldHandleZoom = value;
+    }
+    get ShouldHandleZoom() {
+        return this._shouldHandleZoom;
+    }
     set Control(value) {
         this._ctrl = value;
     }
@@ -3169,6 +3175,7 @@ class RunTimeEvent extends RunTimeEventBase {
         this._task = null;
         this._taskTag = null;
         this._val = null;
+        this._shouldHandleZoom = false;
         this.IgnoreSpecifiedControl = false;
         this.LastFocusedVal = null;
         if (arguments.length === 1 && (taskRefOrCtrlRefOrTaskrefOrFldRefOrEvt === null || taskRefOrCtrlRefOrTaskrefOrFldRefOrEvt instanceof TaskBase))
@@ -25818,7 +25825,7 @@ class EventsManager {
             if (raiseAt === RaiseAt.TaskInFocus)
                 mgControl.setRtEvtTask(LastFocusedManager.Instance.getLastFocusedTask());
         }
-        await this.handleFocus(mgControl, line, produceClick);
+        await this.handleFocus(mgControl, line, produceClick, false);
         currTask.setCancelWasRaised(cancelWasRaised);
         if (this._stopExecution)
             return;
@@ -26401,7 +26408,7 @@ class EventsManager {
             this.setLastSavedRouteEvent(aRtEvt);
         }
     }
-    async handleFocus(ctrl, line, onClick) {
+    async handleFocus(ctrl, line, onClick, shouldHandleZoom) {
         try {
             if (ctrl.isStatic())
                 return;
@@ -26419,6 +26426,10 @@ class EventsManager {
             let prevCtrl = LastFocusedManager.getLastFocusedControl();
             if (ctrl === prevCtrl && !ctrl.isRepeatable()) {
                 await ctrl.getForm().bringRecordToPage();
+                await this.HandleZoomIfNeeded(ctrl, line, shouldHandleZoom);
+                let rtEvnt = this.getLastRtEvent();
+                if (rtEvnt != null && rtEvnt.ShouldHandleZoom)
+                    FocusManager.SetFocus(ctrl, -1);
                 return;
             }
             let prevTask = LastFocusedManager.Instance.getLastFocusedTask();
@@ -26458,8 +26469,10 @@ class EventsManager {
             }
             else
                 await this.HandleNonParkableControls(ctrl.getForm().getTask());
-            if (!this._stopExecution && MgControl.ReturnToCtrl === ctrl)
+            if (!this._stopExecution && MgControl.ReturnToCtrl === ctrl) {
                 LastFocusedManager.setLastFocusedControl(ctrl.getForm().getTask(), ctrl);
+                await this.HandleZoomIfNeeded(ctrl, line, shouldHandleZoom);
+            }
             return;
         }
         finally {
@@ -26520,6 +26533,13 @@ class EventsManager {
             }
         }
     }
+    async HandleZoomIfNeeded(ctrl, line, shouldHandleZoom) {
+        if (shouldHandleZoom) {
+            var rtEvt = new RunTimeEvent(ctrl, line, true);
+            rtEvt.setInternal(InternalInterface.MG_ACT_ZOOM);
+            await this.handleEvent(rtEvt, false);
+        }
+    }
     canGoToControl(ctrl, onClick) {
         if (onClick && (ctrl.Type === MgControlType.CTRL_TYPE_SUBFORM || ctrl.Type === MgControlType.CTRL_TYPE_BROWSER))
             return false;
@@ -26752,7 +26772,7 @@ class EventsManager {
                 case InternalInterface.MG_ACT_WEB_ON_DBLICK:
                     break;
                 case InternalInterface.MG_ACT_CTRL_FOCUS:
-                    await this.handleFocus(ctrl, displayLine, evt.isProduceClick());
+                    await this.handleFocus(ctrl, displayLine, evt.isProduceClick(), evt.ShouldHandleZoom);
                     return false;
                 case InternalInterface.MG_ACT_CTRL_FOCUS_ON_NON_MAGIC_CONTROL:
                     await this.handleFocusOnNonMagicControl(ctrl);
@@ -28610,15 +28630,15 @@ class GuiEventsProcessor extends EventsProcessor {
     }
     static processSelection(val, guiMgCtrl, line, produceClick) {
         let mgControl = guiMgCtrl;
-        if (mgControl.Type === MgControlType.CTRL_TYPE_BUTTON && mgControl.getForm().getTask().getLastParkedCtrl() !== mgControl)
-            produceClick = true;
         if (guiMgCtrl.ConnectedControl) {
             let rtEvt = new RunTimeEvent(mgControl, +line, true);
-            rtEvt.setInternal(InternalInterface.MG_ACT_ZOOM);
-            rtEvt.setProduceClick(produceClick);
+            rtEvt.setInternal(InternalInterface.MG_ACT_CTRL_FOCUS);
+            rtEvt.ShouldHandleZoom = true;
             EventsManager.Instance.addToTail(rtEvt);
         }
         else {
+            if (mgControl.Type === MgControlType.CTRL_TYPE_BUTTON && mgControl.getForm().getTask().getLastParkedCtrl() !== mgControl)
+                produceClick = true;
             let rtEvt = new RunTimeEvent(mgControl, +line, true);
             rtEvt.setInternal(InternalInterface.MG_ACT_SELECTION);
             rtEvt.setValue(val);
@@ -29546,7 +29566,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1000.0';
+let CurrentClientVersion = '4.1000.04100.428';
 
 class ClientManager {
     static get Instance() {
@@ -29574,7 +29594,7 @@ class ClientManager {
                         }
                         break;
                     case "mousedown":
-                        if (control.isButton()) {
+                        if (control.isButton() || (control.ConnectedControl && guiEvent.fromButton)) {
                             this._buttonIsClicked = true;
                         }
                         else if (!control.isSubform())
@@ -29593,7 +29613,7 @@ class ClientManager {
                         }
                         break;
                     case "focus":
-                        if (this._buttonIsClicked)
+                        if (this._buttonIsClicked || (control.ConnectedControl && guiEvent.fromButton))
                             return;
                         Events.OnFocus(control, lineIdx, true, false);
                         break;
@@ -29609,6 +29629,9 @@ class ClientManager {
                     case "setexternalvalue":
                         EventsManager.Instance.AddExternalValueEvent(control, guiEvent.externalValue, guiEvent.param);
                         break;
+                    case "setAsThreeState":
+                        control.setAsThreeState();
+                        break;
                     default:
                         break;
                 }