fix openedModals

signumsoftware · Mar 15, 2019 · cf7f4e6 · cf7f4e6
1 parent fb5206a
commit cf7f4e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Signum.React/Scripts/Frames/FrameModal.tsx b/Signum.React/Scripts/Frames/FrameModal.tsx
@@ -277,7 +277,7 @@ export default class FrameModal extends React.Component<FrameModalProps, FrameMo
     return (
       <div className="modal-body">
         {renderWidgets({ ctx: ctx, pack: pack })}
-        {this.entityComponent && <ButtonBar frame={frame} pack={pack} isOperationVisible={this.props.isOperationVisible} />}
+        {this.entityComponent && <ButtonBar ref={bb => this.buttonBar = bb} frame={frame} pack={pack} isOperationVisible={this.props.isOperationVisible} />}
         <ValidationErrors entity={pack.entity} ref={ve => this.validationErrors = ve} prefix={this.prefix} />
         {embeddedWidgets.top}
         <div className="sf-main-control" data-test-ticks={new Date().valueOf()} data-main-entity={entityInfo(ctx.value)}>

diff --git a/Signum.React/Scripts/Frames/FramePage.tsx b/Signum.React/Scripts/Frames/FramePage.tsx
@@ -67,8 +67,8 @@ export default class FramePage extends React.Component<FramePageProps, FramePage
   }
 
   hanldleKeyDown = (e: KeyboardEvent) => {
-    if (!e.defaultPrevented)
-      this.buttonBar && this.buttonBar.hanldleKeyDown(e);
+    if (!e.openedModals && this.buttonBar)
+      this.buttonBar.hanldleKeyDown(e);
   }
 
   load(props: FramePageProps) {

diff --git a/Signum.React/Scripts/Modals.tsx b/Signum.React/Scripts/Modals.tsx
@@ -4,6 +4,12 @@ import * as React from 'react'
 import { FunctionalAdapter } from './Frames/FrameModal';
 import { Modal } from 'react-overlays';
 
+declare global {
+  interface KeyboardEvent {
+    openedModals?: boolean;
+  }
+}
+
 export interface IModalProps {
   onExited?: (val: any) => void;
 }
@@ -39,7 +45,7 @@ export class GlobalModalContainer extends React.Component<{}, GlobalModalContain
 
   hanldleKeyDown = (e: KeyboardEvent) => {
     if (modalInstances.length) {
-      e.preventDefault();
+      e.openedModals = true;
       var topMost = modalInstances[modalInstances.length - 1];
 
       if (topMost.handleKeyDown) {