FIX: Grid editors open in a modal window were not repositioned after …

frontend-html/package.json

@@ -16,7 +16,7 @@
     "@decorize/bind": "^1.0.3",
     "@mapbox/geojson-area": "^0.2.2",
     "@messageformat/core": "^3.0.1",
-    "@origam/components": "^1.5.4",
+    "@origam/components": "^1.6.1",
     "@origam/plugin-audit": "^2.0.0",
     "@origam/plugin-chart": "^2.0.1",
     "@origam/plugin-filter": "^2.0.1",
@@ -102,7 +102,9 @@
   },
   "resolutions": {
     "@types/react": "17.0.2",
-    "@types/react-dom": "17.0.2"
+    "@types/react-dom": "17.0.2",
+    "@types/leaflet": "1.7.11",
+    "@types/leaflet-draw": "1.0.5"
   },
   "jest": {
     "testEnvironment": "jsdom",

frontend-html/src/gui/Components/Dialog/ModalDialog.tsx

@@ -33,6 +33,7 @@ export const ModalDialog: React.FC<{
   height?: number;
   topPosiotionProc?: number;
   onKeyDown?: (event: any) => void;
+  onWindowMove?: (top: number, left: number)=>void;
 }> = (props) => {
   const application = useContext(MobXProviderContext).application
 
@@ -49,6 +50,7 @@ export const ModalDialog: React.FC<{
       fullScreen={isMobileLayoutActive(application)}
       topPosiotionProc={props.topPosiotionProc}
       onKeyDown={props.onKeyDown}
+      onWindowMove={props.onWindowMove}
     >
       {props.children}
     </ModalWindow>

frontend-html/src/gui/Workbench/ScreenArea/ScreenArea.tsx

@@ -86,6 +86,7 @@ export const DialogScreen: React.FC<{
             }
             buttonsCenter={null}
             buttonsLeft={null}
+            onWindowMove={(top, left)=> props.openedScreen.onWindowMove(top, left)}
             buttonsRight={
               <Observer>
                 {() =>

frontend-html/src/model/entities/OpenedScreen.ts

@@ -98,6 +98,36 @@ export class OpenedScreen implements IOpenedScreen {
     screen.parent = this;
   }
 
+  @observable
+  private top: number | undefined;
+  @observable
+  private left: number | undefined;
+  private originalTop: number | undefined;
+  private originalLeft: number | undefined;
+
+  onWindowMove(top: number, left: number){
+    if(this.originalLeft === undefined){
+      this.originalLeft = left;
+    }
+    if(this.originalTop === undefined){
+      this.originalTop = top;
+    }
+    this.left = left;
+    this.top = top;
+  }
+
+  get positionOffset(): {[key: string]: number}{
+    let topOffset = 0;
+    let leftOffset = 0;
+    if(this.top !== undefined && this.originalTop !== undefined){
+      topOffset = this.top - this.originalTop;
+    }
+    if(this.left !== undefined && this.originalLeft !== undefined){
+      leftOffset = this.left - this.originalLeft;
+    }
+    return {topOffset: topOffset, leftOffset: leftOffset}
+  }
+
   parent?: any;
   canRefresh = true;
 }

frontend-html/src/model/entities/TablePanelView/TablePanelView.tsx

@@ -51,6 +51,7 @@ import { getGrouper } from "model/selectors/DataView/getGrouper";
 import { IConfigurationManager } from "model/entities/TablePanelView/types/IConfigurationManager";
 import { isMobileLayoutActive } from "model/selectors/isMobileLayoutActive";
 import { ColumnConfigurationModel } from "model/entities/TablePanelView/ColumnConfigurationModel";
+import { getOpenedScreen } from "model/selectors/getOpenedScreen";
 
 export class TablePanelView implements ITablePanelView {
   $type_ITablePanelView: 1 = 1;
@@ -460,7 +461,15 @@ export class TablePanelView implements ITablePanelView {
         rowHeight: 0,
       };
     }
-    return this.rectangleMap.get(rowIndex + cellOffset.row)!.get(columnIndex + cellOffset.column)!;
+    const rectangle = this.rectangleMap.get(rowIndex + cellOffset.row)!.get(columnIndex + cellOffset.column)!;
+    const openedScreen = getOpenedScreen(this);
+
+    return {
+      columnLeft: rectangle.columnLeft + openedScreen.positionOffset.leftOffset,
+      columnWidth: rectangle.columnWidth,
+      rowTop: rectangle.rowTop + openedScreen.positionOffset.topOffset,
+      rowHeight: rectangle.rowHeight
+    };
   }
 
   setCellRectangle(rowId: number, columnId: number, rectangle: ICellRectangle) {

frontend-html/src/model/entities/WebScreen.ts

@@ -85,4 +85,11 @@ export class WebScreen implements IWebScreen, IOpenedScreen {
   parentContext: IOpenedScreen | undefined;
 
   activationHandler = new EventHandler();
+
+  onWindowMove(top: number, left: number): void {
+  }
+
+  get positionOffset(): { [p: string]: number } {
+    return {topOffset: 0, leftOffset: 0};
+  }
 }

frontend-html/src/model/entities/types/IOpenedScreen.ts

@@ -60,6 +60,9 @@ export interface IOpenedScreen extends IOpenedScreenData {
   screenUrl?: string;
   parent?: any;
   hasDynamicTitle: boolean;
+
+  onWindowMove(top: number, left: number): void;
+  get positionOffset(): {[key: string]: number};
 }
 
 export const isIOpenedScreen = (o: any): o is IOpenedScreen =>