Merge branch 'master' into alyssa-starter

1 files changed, 24 insertions, 5 deletions

diff --git a/src/client/views/OverlayView.tsx b/src/client/views/OverlayView.tsx
index 5e9677b45..6686a162e 100644
--- a/src/client/views/OverlayView.tsx
+++ b/src/client/views/OverlayView.tsx
@@ -18,6 +18,8 @@ import { ObservableReactComponent } from './ObservableReactComponent';
 import './OverlayView.scss';
 import { DefaultStyleProvider, returnEmptyDocViewList } from './StyleProvider';
 import { DocumentView, DocumentViewInternal } from './nodes/DocumentView';
+import { SnappingManager } from '../util/SnappingManager';
+import { GPTPopup } from './pdf/GPTPopup/GPTPopup';
 
 export type OverlayDisposer = () => void;
 
@@ -27,12 +29,17 @@ export type OverlayElementOptions = {
     width?: number;
     height?: number;
     title?: string;
+    onClick?: (e: React.MouseEvent) => void;
+    isHidden?: () => boolean;
+    backgroundColor?: string;
 };
 
 export interface OverlayWindowProps {
     children: JSX.Element;
     overlayOptions: OverlayElementOptions;
-    onClick: () => void;
+    onClick: (e: React.MouseEvent) => void;
+    isHidden?: () => boolean;
+    backgroundColor?: string;
 }
 
 @observer
@@ -93,15 +100,17 @@ export class OverlayWindow extends ObservableReactComponent<OverlayWindowProps>
 
     render() {
         return (
-            <div className="overlayWindow-outerDiv" style={{ transform: `translate(${this.x}px, ${this.y}px)`, width: this.width, height: this.height }}>
-                <div className="overlayWindow-titleBar" onPointerDown={this.onPointerDown}>
+            <div
+                className="overlayWindow-outerDiv"
+                style={{ display: this.props.isHidden?.() ? 'none' : undefined, backgroundColor: this._props.backgroundColor, transform: `translate(${this.x}px, ${this.y}px)`, width: this.width, height: this.height }}>
+                <div className="overlayWindow-titleBar" onPointerDown={this.onPointerDown} style={{ backgroundColor: SnappingManager.userVariantColor, color: SnappingManager.userColor }}>
                     {this._props.overlayOptions.title || 'Untitled'}
                     <button type="button" onClick={this._props.onClick} className="overlayWindow-closeButton">
                         X
                     </button>
                 </div>
                 <div className="overlayWindow-content">{this.props.children}</div>
-                <div className="overlayWindow-resizeDragger" onPointerDown={this.onResizerPointerDown} />
+                <div className="overlayWindow-resizeDragger" style={{ backgroundColor: SnappingManager.userVariantColor }} onPointerDown={this.onResizerPointerDown} />
             </div>
         );
     }
@@ -118,6 +127,16 @@ export class OverlayView extends ObservableReactComponent<object> {
         makeObservable(this);
         if (!OverlayView.Instance) {
             OverlayView.Instance = this;
+            this.addWindow(<GPTPopup />, {
+                x: 400,
+                y: 200,
+                width: 500,
+                height: 400,
+                title: 'GPT', //
+                backgroundColor: 'transparent',
+                isHidden: () => !SnappingManager.ChatVisible,
+                onClick: () => SnappingManager.SetChatVisible(false),
+            });
             new ResizeObserver(
                 action(entries => {
                     Array.from(entries).forEach(entry => {
@@ -166,7 +185,7 @@ export class OverlayView extends ObservableReactComponent<object> {
             if (index !== -1) this._elements.splice(index, 1);
         });
         const wincontents = (
-            <OverlayWindow onClick={() => remove(wincontents)} key={Utils.GenerateGuid()} overlayOptions={options}>
+            <OverlayWindow isHidden={options.isHidden} backgroundColor={options.backgroundColor} onClick={options.onClick ?? (() => remove(wincontents))} key={Utils.GenerateGuid()} overlayOptions={options}>
                 {contents}
             </OverlayWindow>
         );