pushfeedback 0.1.66 → 0.1.68

package/dist/collection/components/feedback-modal/feedback-modal.js

@@ -82,8 +82,27 @@ export class FeedbackModal {
         this.showScreenshotTopBar = false;
         this.hasSelectedElement = false;
         this.encodedScreenshot = null;
-        this.originalElement = null;
-        this.selectedElementBounds = null;
+        // Remove highlight from ALL selected elements
+        document.querySelectorAll('.feedback-modal-element-selected').forEach(el => {
+          el.classList.remove('feedback-modal-element-selected');
+        });
+        // Reset canvas editor states
+        this.takingScreenshot = false;
+        this.showPreviewModal = false;
+        this.showCanvasEditor = false;
+        this.annotations = [];
+        this.currentAnnotation = null;
+        this.isDrawing = false;
+        this.canvasRef = null;
+        this.canvasContext = null;
+        this.originalImageData = null;
+        // Reset resizing states
+        this.isResizing = false;
+        this.resizingAnnotation = null;
+        this.resizeStartSize = 16;
+        this.hoveredAnnotation = null;
+        this.resizeHandle = false;
+        // Reset form states
         this.formSuccess = false;
         this.formError = false;
         this.formErrorStatus = 500;
@@ -92,108 +111,608 @@ export class FeedbackModal {
         this.resetOverflow();
       }, 200);
     };
-    this.openScreenShot = () => {
-      this.hasSelectedElement = false;
-      this.showModal = false;
-      this.showScreenshotMode = true;
-      this.showScreenshotTopBar = true;
-      this.encodedScreenshot = null;
-      this.originalElement = null;
-      this.selectedElementBounds = null;
-      if (window.innerWidth > document.documentElement.clientWidth) {
-        document.documentElement.classList.add('feedback-modal-screenshot-open--scroll');
+    this.openScreenShot = async () => {
+      // Show loading state immediately
+      this.takingScreenshot = true;
+      try {
+        // Capture viewport screenshot immediately
+        const dataUrl = await this.captureViewportScreenshot();
+        this.encodedScreenshot = dataUrl;
+        this.originalImageData = dataUrl;
+        // Reset loading state
+        this.takingScreenshot = false;
+        // Skip preview modal and go directly to canvas editor
+        this.showModal = false;
+        this.showCanvasEditor = true;
+        // Initialize canvas after a short delay to ensure DOM is ready
+        setTimeout(() => {
+          this.initializeCanvas();
+        }, 100);
+      }
+      catch (error) {
+        console.error('Failed to capture screenshot:', error);
+        // Reset loading state on error
+        this.takingScreenshot = false;
+        // Show modal anyway
+        this.showModal = true;
       }
-      const scrollY = window.scrollY;
-      document.documentElement.style.top = `-${scrollY}px`;
-      window.scrollTo(0, parseInt(document.documentElement.style.top || '0') * -1);
-      document.documentElement.classList.add('feedback-modal-screenshot-open');
     };
-    this.closeScreenShot = () => {
+    this.openCanvasEditor = (event) => {
+      if (event) {
+        event.stopPropagation();
+      }
       this.showModal = false;
-      this.showScreenshotMode = false;
-      this.showScreenshotTopBar = false;
-      this.hasSelectedElement = false;
-      this.encodedScreenshot = null;
-      this.originalElement = null;
-      this.selectedElementBounds = null;
-      this.resetOverflow();
+      this.showCanvasEditor = true;
+      // Initialize canvas after a short delay to ensure DOM is ready
+      setTimeout(() => {
+        this.initializeCanvas();
+      }, 100);
     };
-    this.handleMouseOverScreenShot = (event) => {
-      event.preventDefault();
-      if (this.hasSelectedElement)
+    this.closeCanvasEditor = () => {
+      this.showCanvasEditor = false;
+      this.showModal = true;
+    };
+    this.saveAnnotations = () => {
+      if (this.canvasRef) {
+        // Create final image with annotations
+        const finalDataUrl = this.canvasRef.toDataURL('image/png');
+        this.encodedScreenshot = finalDataUrl;
+      }
+      this.showCanvasEditor = false;
+      this.showModal = true;
+    };
+    this.initializeCanvas = () => {
+      if (!this.canvasRef || !this.originalImageData)
         return;
-      const borderOffset = 2;
-      this.screenshotModal.style.display = 'none';
-      const elementUnder = document.elementFromPoint(event.clientX, event.clientY);
-      const rect = elementUnder.getBoundingClientRect();
-      this.screenshotModal.style.display = '';
-      // Get the bounding box of the element selected
-      this.elementSelected.style.position = 'absolute';
-      this.elementSelected.style.left = `${rect.left}px`;
-      this.elementSelected.style.top = `${rect.top}px`;
-      this.elementSelected.style.width = `${rect.width}px`;
-      this.elementSelected.style.height = `${rect.height}px`;
-      this.elementSelected.classList.add('feedback-modal-element-hover');
-      // Set the background color of nonselected areas
-      // Top
-      this.topSide.style.position = 'absolute';
-      this.topSide.style.left = `${rect.left}px`;
-      this.topSide.style.top = '0px';
-      this.topSide.style.width = `${rect.width + borderOffset}px`;
-      this.topSide.style.height = `${rect.top}px`;
-      this.topSide.style.backgroundColor = 'rgba(0, 0, 0, 0.4)';
-      // Left
-      this.leftSide.style.position = 'absolute';
-      this.leftSide.style.left = '0px';
-      this.leftSide.style.top = '0px';
-      this.leftSide.style.width = `${rect.left}px`;
-      this.leftSide.style.height = '100vh';
-      this.leftSide.style.backgroundColor = 'rgba(0, 0, 0, 0.4)';
-      // Bottom
-      this.bottomSide.style.position = 'absolute';
-      this.bottomSide.style.left = `${rect.left}px`;
-      this.bottomSide.style.top = `${rect.bottom + borderOffset}px`;
-      this.bottomSide.style.width = `${rect.width + borderOffset}px`;
-      this.bottomSide.style.height = '100vh';
-      this.bottomSide.style.backgroundColor = 'rgba(0, 0, 0, 0.4)';
-      // Right
-      this.rightSide.style.position = 'absolute';
-      this.rightSide.style.left = `${rect.right + borderOffset}px`;
-      this.rightSide.style.top = '0px';
-      this.rightSide.style.width = '100%';
-      this.rightSide.style.height = '100vh';
-      this.rightSide.style.backgroundColor = 'rgba(0, 0, 0, 0.4)';
-      // Restore the visibility of the screenshot-modal
-      this.screenshotModal.style.backgroundColor = 'transparent';
+      this.canvasContext = this.canvasRef.getContext('2d');
+      const img = new Image();
+      img.onload = () => {
+        // Set canvas to original image dimensions
+        this.canvasRef.width = img.width;
+        this.canvasRef.height = img.height;
+        // Get available container dimensions
+        const containerWidth = this.canvasRef.parentElement.clientWidth - 32; // Account for reduced padding (16px * 2)
+        const containerHeight = this.canvasRef.parentElement.clientHeight - 32;
+        // Calculate scale factors for both dimensions
+        const scaleX = containerWidth / img.width;
+        const scaleY = containerHeight / img.height;
+        // Use the smaller scale to ensure complete image fits
+        const scale = Math.min(scaleX, scaleY, 1); // Never scale up, only down
+        // Calculate final display dimensions
+        const displayWidth = img.width * scale;
+        const displayHeight = img.height * scale;
+        // Set CSS size for display (this scales the canvas visually)
+        this.canvasRef.style.width = `${displayWidth}px`;
+        this.canvasRef.style.height = `${displayHeight}px`;
+        console.log('Canvas initialized with complete image fit:', {
+          originalWidth: img.width,
+          originalHeight: img.height,
+          displayWidth,
+          displayHeight,
+          scale,
+          scaleX,
+          scaleY,
+          containerWidth,
+          containerHeight,
+          usingScale: scale === scaleX ? 'width-limited' : 'height-limited'
+        });
+        // Draw the original image at full resolution
+        this.canvasContext.drawImage(img, 0, 0);
+        // Redraw existing annotations
+        this.redrawAnnotations();
+      };
+      img.src = this.originalImageData;
     };
-    this.handleMouseClickedSelectedElement = async (event) => {
-      event.preventDefault();
-      if (!this.elementSelected) {
+    this.redrawAnnotations = () => {
+      if (!this.canvasContext)
+        return;
+      // Clear and redraw background image
+      const img = new Image();
+      img.onload = () => {
+        this.canvasContext.clearRect(0, 0, this.canvasRef.width, this.canvasRef.height);
+        this.canvasContext.drawImage(img, 0, 0);
+        // Draw all annotations
+        this.annotations.forEach(annotation => {
+          this.drawAnnotation(annotation);
+        });
+      };
+      img.src = this.originalImageData;
+    };
+    this.drawAnnotation = (annotation) => {
+      if (!this.canvasContext)
         return;
+      this.canvasContext.strokeStyle = annotation.color;
+      this.canvasContext.lineWidth = annotation.lineWidth;
+      this.canvasContext.lineCap = 'round';
+      this.canvasContext.lineJoin = 'round';
+      switch (annotation.type) {
+        case 'rectangle':
+          this.canvasContext.strokeRect(annotation.startX, annotation.startY, annotation.width, annotation.height);
+          // Rectangle resize handles disabled for now
+          break;
+        case 'line':
+          this.canvasContext.beginPath();
+          this.canvasContext.moveTo(annotation.startX, annotation.startY);
+          this.canvasContext.lineTo(annotation.endX, annotation.endY);
+          this.canvasContext.stroke();
+          // Draw resize handles if this annotation is hovered
+          if (this.hoveredAnnotation === annotation) {
+            this.drawLineResizeHandles(annotation);
+          }
+          break;
+        case 'arrow':
+          this.drawArrow(annotation.startX, annotation.startY, annotation.endX, annotation.endY);
+          // Draw resize handles if this annotation is hovered
+          if (this.hoveredAnnotation === annotation) {
+            this.drawLineResizeHandles(annotation); // Same as line
+          }
+          break;
+        case 'text':
+          const fontSize = annotation.fontSize || 16;
+          this.canvasContext.fillStyle = annotation.color;
+          this.canvasContext.font = `${fontSize}px Arial`;
+          this.canvasContext.fillText(annotation.text, annotation.x, annotation.y);
+          // Draw resize handle if this annotation is hovered
+          if (this.hoveredAnnotation === annotation) {
+            this.drawTextResizeHandle(annotation);
+          }
+          break;
       }
-      this.hasSelectedElement = true;
-      this.elementSelected.classList.add('feedback-modal-element-selected');
-      // Store the original element that was under the mouse
-      this.screenshotModal.style.display = 'none';
-      this.originalElement = document.elementFromPoint(event.clientX, event.clientY);
-      this.selectedElementBounds = this.originalElement.getBoundingClientRect();
-      this.screenshotModal.style.display = '';
-      // Hide the screenshot interface
-      this.showScreenshotTopBar = false;
-      this.showModal = false;
-      try {
-        const dataUrl = await this.captureScreenshot();
-        console.log('Screenshot captured');
-        this.encodedScreenshot = dataUrl;
+    };
+    // Draw resize handle for text annotation
+    this.drawTextResizeHandle = (annotation) => {
+      if (!this.canvasContext || annotation.type !== 'text')
+        return;
+      const fontSize = annotation.fontSize || 16;
+      const textWidth = this.getTextWidth(annotation.text, fontSize);
+      const handleSize = 8;
+      const handleX = annotation.x + textWidth;
+      const handleY = annotation.y;
+      // Draw resize handle (small square) - using widget primary color
+      this.canvasContext.fillStyle = '#0070F4'; // var(--feedback-primary-color)
+      this.canvasContext.strokeStyle = '#ffffff';
+      this.canvasContext.lineWidth = 2;
+      this.canvasContext.fillRect(handleX - handleSize / 2, handleY - handleSize / 2, handleSize, handleSize);
+      this.canvasContext.strokeRect(handleX - handleSize / 2, handleY - handleSize / 2, handleSize, handleSize);
+    };
+    this.drawArrow = (fromX, fromY, toX, toY) => {
+      const headlen = 15; // Arrow head length
+      const angle = Math.atan2(toY - fromY, toX - fromX);
+      // Draw line
+      this.canvasContext.beginPath();
+      this.canvasContext.moveTo(fromX, fromY);
+      this.canvasContext.lineTo(toX, toY);
+      this.canvasContext.stroke();
+      // Draw arrow head
+      this.canvasContext.beginPath();
+      this.canvasContext.moveTo(toX, toY);
+      this.canvasContext.lineTo(toX - headlen * Math.cos(angle - Math.PI / 6), toY - headlen * Math.sin(angle - Math.PI / 6));
+      this.canvasContext.moveTo(toX, toY);
+      this.canvasContext.lineTo(toX - headlen * Math.cos(angle + Math.PI / 6), toY - headlen * Math.sin(angle + Math.PI / 6));
+      this.canvasContext.stroke();
+    };
+    this.undoLastAnnotation = () => {
+      this.annotations = this.annotations.slice(0, -1);
+      this.redrawAnnotations();
+    };
+    // Handle color slot editing
+    this.handleColorSlotClick = (colorIndex) => {
+      if (this.editingColorIndex === colorIndex) {
+        // If already editing this slot, just select the color
+        this.canvasDrawingColor = this.defaultColors[colorIndex];
+        this.showColorPicker = false;
+        this.editingColorIndex = -1;
       }
-      catch (error) {
-        console.error('Failed to capture screenshot:', error);
-        this.hasSelectedElement = false;
+      else {
+        // Start editing this color slot
+        this.editingColorIndex = colorIndex;
+        this.showColorPicker = true;
+        this.canvasDrawingColor = this.defaultColors[colorIndex];
       }
-      finally {
-        // Show the modal again
-        this.showModal = true;
+    };
+    // Update color in slot
+    this.updateColorSlot = (newColor) => {
+      if (this.editingColorIndex >= 0 && this.editingColorIndex < this.defaultColors.length) {
+        this.defaultColors[this.editingColorIndex] = newColor;
+        this.canvasDrawingColor = newColor;
+        this.showColorPicker = false;
+        this.editingColorIndex = -1;
+        // Force reactivity
+        this.defaultColors = [...this.defaultColors];
+      }
+    };
+    // Handle color picker input without closing
+    this.handleColorPickerInput = (event) => {
+      event.stopPropagation();
+      const newColor = event.target.value;
+      if (this.editingColorIndex >= 0 && this.editingColorIndex < this.defaultColors.length) {
+        this.defaultColors[this.editingColorIndex] = newColor;
+        this.canvasDrawingColor = newColor;
+        // Force reactivity
+        this.defaultColors = [...this.defaultColors];
+      }
+    };
+    // Handle color picker click to prevent closing
+    this.handleColorPickerClick = (event) => {
+      event.stopPropagation();
+    };
+    // Close color picker
+    this.closeColorPicker = () => {
+      this.showColorPicker = false;
+      this.editingColorIndex = -1;
+    };
+    // Check if point is in resize handle for any annotation type
+    this.isPointInResizeHandle = (x, y, annotation) => {
+      const handleSize = 8;
+      switch (annotation.type) {
+        case 'text':
+          const textWidth = this.getTextWidth(annotation.text, annotation.fontSize || 16);
+          const handleX = annotation.x + textWidth;
+          const handleY = annotation.y;
+          return x >= handleX - handleSize / 2 && x <= handleX + handleSize / 2 &&
+            y >= handleY - handleSize / 2 && y <= handleY + handleSize / 2;
+        case 'rectangle':
+          // Rectangle resizing disabled for now
+          return false;
+        case 'line':
+        case 'arrow':
+          // Check both endpoint handles
+          const lineHandles = [
+            { x: annotation.startX, y: annotation.startY, point: 'start' },
+            { x: annotation.endX, y: annotation.endY, point: 'end' }
+          ];
+          for (const handle of lineHandles) {
+            if (x >= handle.x - handleSize / 2 && x <= handle.x + handleSize / 2 &&
+              y >= handle.y - handleSize / 2 && y <= handle.y + handleSize / 2) {
+              return handle.point; // Return which endpoint was clicked
+            }
+          }
+          return false;
+        default:
+          return false;
+      }
+    };
+    // Get text width for resize handle positioning
+    this.getTextWidth = (text, fontSize) => {
+      // Approximate text width calculation
+      return text.length * fontSize * 0.6;
+    };
+    // Start text resize
+    this.startTextResize = (annotation, startPos) => {
+      this.isResizing = true;
+      this.resizingAnnotation = annotation;
+      this.resizeStartSize = annotation.fontSize || 16;
+      this.dragStartPos = startPos;
+    };
+    // Handle text resize
+    this.handleTextResize = (currentPos) => {
+      if (!this.resizingAnnotation || !this.dragStartPos)
+        return;
+      const deltaX = currentPos.x - this.dragStartPos.x;
+      const deltaY = currentPos.y - this.dragStartPos.y;
+      const avgDelta = (deltaX + deltaY) / 2;
+      // Calculate new font size (minimum 8px, maximum 72px)
+      const newSize = Math.max(8, Math.min(72, this.resizeStartSize + avgDelta * 0.5));
+      // Update annotation font size
+      const index = this.annotations.findIndex(a => a === this.resizingAnnotation);
+      if (index !== -1) {
+        this.annotations[index] = Object.assign(Object.assign({}, this.resizingAnnotation), { fontSize: Math.round(newSize) });
+        this.resizingAnnotation = this.annotations[index];
+      }
+      this.redrawAnnotations();
+    };
+    // Start resize for any annotation type
+    this.startResize = (annotation, handle, startPos) => {
+      this.isResizing = true;
+      this.resizingAnnotation = annotation;
+      this.resizeHandle = handle;
+      this.dragStartPos = startPos;
+      // Store original values for different annotation types
+      if (annotation.type === 'text') {
+        this.resizeStartSize = annotation.fontSize || 16;
+      }
+    };
+    // Enhanced mouse down handler with resize detection for all annotation types
+    this.handleCanvasMouseDown = (event) => {
+      if (!this.canvasRef)
+        return;
+      // Close color picker if open
+      if (this.showColorPicker) {
+        this.closeColorPicker();
+      }
+      const coords = this.getCanvasCoordinates(event);
+      // Check if clicking on existing annotation first
+      const found = this.findAnnotationAt(coords.x, coords.y);
+      if (found) {
+        // Check if clicking on resize handle for any annotation type
+        const handle = this.isPointInResizeHandle(coords.x, coords.y, found.annotation);
+        if (handle) {
+          this.startResize(found.annotation, handle, coords);
+          this.canvasRef.style.cursor = 'nw-resize';
+          return;
+        }
+        // Start dragging existing annotation
+        if (!this.isDrawing) {
+          this.isDragging = true;
+          this.draggedAnnotation = found.annotation;
+          this.dragStartPos = coords;
+          this.canvasRef.style.cursor = 'grabbing';
+          return;
+        }
+      }
+      // Original drawing logic
+      this.isDrawing = true;
+      if (this.canvasDrawingTool === 'text') {
+        const text = prompt('Enter text:');
+        if (text) {
+          const annotation = {
+            type: 'text',
+            x: coords.x,
+            y: coords.y,
+            text,
+            color: this.canvasDrawingColor,
+            fontSize: 16
+          };
+          this.annotations = [...this.annotations, annotation];
+          this.redrawAnnotations();
+        }
+        this.isDrawing = false;
+      }
+      else {
+        this.currentAnnotation = {
+          type: this.canvasDrawingTool,
+          startX: coords.x,
+          startY: coords.y,
+          color: this.canvasDrawingColor,
+          lineWidth: this.canvasLineWidth
+        };
+      }
+    };
+    this.handleCanvasMouseMove = (event) => {
+      if (!this.canvasRef)
+        return;
+      const coords = this.getCanvasCoordinates(event);
+      // Handle resizing for any annotation type
+      if (this.isResizing && this.resizingAnnotation) {
+        this.handleResize(coords);
+        return;
+      }
+      // Handle dragging existing annotation
+      if (this.isDragging && this.draggedAnnotation && this.dragStartPos) {
+        const deltaX = coords.x - this.dragStartPos.x;
+        const deltaY = coords.y - this.dragStartPos.y;
+        // Update annotation position
+        const updatedAnnotation = Object.assign({}, this.draggedAnnotation);
+        switch (updatedAnnotation.type) {
+          case 'rectangle':
+            updatedAnnotation.startX += deltaX;
+            updatedAnnotation.startY += deltaY;
+            break;
+          case 'line':
+          case 'arrow':
+            updatedAnnotation.startX += deltaX;
+            updatedAnnotation.startY += deltaY;
+            updatedAnnotation.endX += deltaX;
+            updatedAnnotation.endY += deltaY;
+            break;
+          case 'text':
+            updatedAnnotation.x += deltaX;
+            updatedAnnotation.y += deltaY;
+            break;
+        }
+        // Update annotation in array
+        const index = this.annotations.findIndex(a => a === this.draggedAnnotation);
+        if (index !== -1) {
+          this.annotations[index] = updatedAnnotation;
+          this.draggedAnnotation = updatedAnnotation;
+        }
+        this.dragStartPos = coords;
+        this.redrawAnnotations();
+        return;
+      }
+      // Handle drawing new annotation
+      if (this.isDrawing && this.currentAnnotation) {
+        if (this.canvasDrawingTool === 'rectangle') {
+          this.currentAnnotation.width = coords.x - this.currentAnnotation.startX;
+          this.currentAnnotation.height = coords.y - this.currentAnnotation.startY;
+        }
+        else {
+          this.currentAnnotation.endX = coords.x;
+          this.currentAnnotation.endY = coords.y;
+        }
+        this.redrawAnnotations();
+        this.drawAnnotation(this.currentAnnotation);
+        return;
+      }
+      // Handle hover states and cursor changes
+      const found = this.findAnnotationAt(coords.x, coords.y);
+      if (found) {
+        // Check if hovering over resize handle for any annotation type
+        const handle = this.isPointInResizeHandle(coords.x, coords.y, found.annotation);
+        if (handle) {
+          this.canvasRef.style.cursor = 'nw-resize';
+          this.hoveredAnnotation = found.annotation;
+          this.redrawAnnotations();
+          return;
+        }
+        // Regular hover over annotation
+        this.canvasRef.style.cursor = 'grab';
+        if (this.hoveredAnnotation !== found.annotation) {
+          this.hoveredAnnotation = found.annotation;
+          this.redrawAnnotations();
+        }
+      }
+      else {
+        // No annotation under cursor
+        this.canvasRef.style.cursor = 'crosshair';
+        if (this.hoveredAnnotation) {
+          this.hoveredAnnotation = null;
+          this.redrawAnnotations();
+        }
+      }
+    };
+    this.handleCanvasMouseUp = () => {
+      // Handle end of text resizing
+      if (this.isResizing) {
+        this.isResizing = false;
+        this.resizingAnnotation = null;
+        this.dragStartPos = null;
+        this.resizeHandle = false;
+        if (this.canvasRef) {
+          this.canvasRef.style.cursor = 'crosshair';
+        }
+        return;
+      }
+      // Handle end of dragging
+      if (this.isDragging) {
+        this.isDragging = false;
+        this.draggedAnnotation = null;
+        this.dragStartPos = null;
+        if (this.canvasRef) {
+          this.canvasRef.style.cursor = 'crosshair';
+        }
+        return;
+      }
+      // Handle end of drawing
+      if (!this.isDrawing || !this.currentAnnotation)
+        return;
+      this.isDrawing = false;
+      this.annotations = [...this.annotations, this.currentAnnotation];
+      this.currentAnnotation = null;
+      this.redrawAnnotations();
+    };
+    // Draw resize handles for rectangle annotation
+    this.drawRectangleResizeHandles = (annotation) => {
+      if (!this.canvasContext || annotation.type !== 'rectangle')
+        return;
+      const handleSize = 8;
+      const left = annotation.startX;
+      const top = annotation.startY;
+      const right = annotation.startX + annotation.width;
+      const bottom = annotation.startY + annotation.height;
+      // Define handle positions (4 corners)
+      const handles = [
+        { x: left, y: top },
+        { x: right, y: top },
+        { x: right, y: bottom },
+        { x: left, y: bottom } // Bottom-left
+      ];
+      // Draw each handle
+      this.canvasContext.fillStyle = '#0070F4'; // Primary color
+      this.canvasContext.strokeStyle = '#ffffff';
+      this.canvasContext.lineWidth = 2;
+      handles.forEach(handle => {
+        this.canvasContext.fillRect(handle.x - handleSize / 2, handle.y - handleSize / 2, handleSize, handleSize);
+        this.canvasContext.strokeRect(handle.x - handleSize / 2, handle.y - handleSize / 2, handleSize, handleSize);
+      });
+    };
+    // Draw resize handles for line/arrow annotation
+    this.drawLineResizeHandles = (annotation) => {
+      if (!this.canvasContext || (annotation.type !== 'line' && annotation.type !== 'arrow'))
+        return;
+      const handleSize = 8;
+      // Define handle positions (2 endpoints)
+      const handles = [
+        { x: annotation.startX, y: annotation.startY },
+        { x: annotation.endX, y: annotation.endY } // End point
+      ];
+      // Draw each handle
+      this.canvasContext.fillStyle = '#0070F4'; // Primary color
+      this.canvasContext.strokeStyle = '#ffffff';
+      this.canvasContext.lineWidth = 2;
+      handles.forEach(handle => {
+        this.canvasContext.fillRect(handle.x - handleSize / 2, handle.y - handleSize / 2, handleSize, handleSize);
+        this.canvasContext.strokeRect(handle.x - handleSize / 2, handle.y - handleSize / 2, handleSize, handleSize);
+      });
+    };
+    // Convert screen coordinates to canvas coordinates
+    this.getCanvasCoordinates = (event) => {
+      if (!this.canvasRef)
+        return { x: 0, y: 0 };
+      const rect = this.canvasRef.getBoundingClientRect();
+      // Calculate the scale factor between display size and actual canvas size
+      const scaleX = this.canvasRef.width / rect.width;
+      const scaleY = this.canvasRef.height / rect.height;
+      const x = (event.clientX - rect.left) * scaleX;
+      const y = (event.clientY - rect.top) * scaleY;
+      return { x, y };
+    };
+    // Find annotation under mouse cursor
+    this.findAnnotationAt = (x, y) => {
+      // Check in reverse order (top to bottom)
+      for (let i = this.annotations.length - 1; i >= 0; i--) {
+        const annotation = this.annotations[i];
+        if (this.isPointInAnnotation(x, y, annotation)) {
+          return { annotation, index: i };
+        }
       }
+      return null;
+    };
+    // Check if point is within annotation bounds
+    this.isPointInAnnotation = (x, y, annotation) => {
+      const tolerance = 10; // Click tolerance
+      switch (annotation.type) {
+        case 'rectangle':
+          const left = Math.min(annotation.startX, annotation.startX + annotation.width);
+          const right = Math.max(annotation.startX, annotation.startX + annotation.width);
+          const top = Math.min(annotation.startY, annotation.startY + annotation.height);
+          const bottom = Math.max(annotation.startY, annotation.startY + annotation.height);
+          return x >= left - tolerance && x <= right + tolerance &&
+            y >= top - tolerance && y <= bottom + tolerance;
+        case 'line':
+        case 'arrow':
+          // Distance from point to line
+          const A = annotation.endY - annotation.startY;
+          const B = annotation.startX - annotation.endX;
+          const C = annotation.endX * annotation.startY - annotation.startX * annotation.endY;
+          const distance = Math.abs(A * x + B * y + C) / Math.sqrt(A * A + B * B);
+          return distance <= tolerance;
+        case 'text':
+          // Simple bounding box for text
+          return x >= annotation.x - tolerance && x <= annotation.x + 100 &&
+            y >= annotation.y - 20 && y <= annotation.y + tolerance;
+        default:
+          return false;
+      }
+    };
+    // Handle resize for different annotation types
+    this.handleResize = (currentPos) => {
+      if (!this.resizingAnnotation || !this.dragStartPos)
+        return;
+      const annotation = this.resizingAnnotation;
+      const index = this.annotations.findIndex(a => a === annotation);
+      if (index === -1)
+        return;
+      let updatedAnnotation = Object.assign({}, annotation);
+      switch (annotation.type) {
+        case 'text':
+          // Text resize logic (existing)
+          const deltaX = currentPos.x - this.dragStartPos.x;
+          const deltaY = currentPos.y - this.dragStartPos.y;
+          const avgDelta = (deltaX + deltaY) / 2;
+          const newSize = Math.max(8, Math.min(72, this.resizeStartSize + avgDelta * 0.5));
+          updatedAnnotation.fontSize = Math.round(newSize);
+          break;
+        case 'rectangle':
+          // Rectangle resizing disabled for now
+          return;
+        case 'line':
+        case 'arrow':
+          // Line/arrow resize logic - move endpoints
+          if (this.resizeHandle === 'start') {
+            updatedAnnotation.startX = currentPos.x;
+            updatedAnnotation.startY = currentPos.y;
+          }
+          else if (this.resizeHandle === 'end') {
+            updatedAnnotation.endX = currentPos.x;
+            updatedAnnotation.endY = currentPos.y;
+          }
+          break;
+      }
+      // Update annotation in array
+      this.annotations[index] = updatedAnnotation;
+      this.resizingAnnotation = updatedAnnotation;
+      this.redrawAnnotations();
     };
     this.sending = false;
     this.formMessage = '';
@@ -208,6 +727,26 @@ export class FeedbackModal {
     this.selectedRating = -1;
     this.overlayVisible = false;
     this.isAnimating = false;
+    this.takingScreenshot = false;
+    this.showPreviewModal = false;
+    this.showCanvasEditor = false;
+    this.canvasDrawingTool = 'rectangle';
+    this.canvasDrawingColor = '#ff0000';
+    this.canvasLineWidth = 3;
+    this.isDrawing = false;
+    this.annotations = [];
+    this.currentAnnotation = null;
+    this.isDragging = false;
+    this.draggedAnnotation = null;
+    this.dragStartPos = null;
+    this.showColorPicker = false;
+    this.editingColorIndex = -1;
+    this.isResizing = false;
+    this.resizingAnnotation = null;
+    this.resizeStartSize = 16;
+    this.hoveredAnnotation = null;
+    this.resizeHandle = false;
+    this.defaultColors = ['#ff0000', '#00ff00', '#0000ff', '#000000'];
     this.customFont = false;
     this.emailAddress = '';
     this.hideEmail = false;
@@ -238,10 +777,14 @@ export class FeedbackModal {
     this.ratingPlaceholder = 'Was this page helpful?';
     this.ratingStarsPlaceholder = 'How would you rate this page?';
     this.sendButtonText = 'Send';
-    this.screenshotButtonText = 'Add a screenshot';
     this.screenshotAttachedText = 'Screenshot attached';
+    this.screenshotButtonText = 'Add a screenshot';
+    this.screenshotTakingText = 'Taking screenshot...';
     this.screenshotTopbarText = 'Select an element on this page';
     this.successMessage = '';
+    this.canvasEditorTitle = 'Edit screenshot';
+    this.canvasEditorCancelText = 'Cancel';
+    this.canvasEditorSaveText = 'Save';
   }
   componentWillLoad() {
     if (this.fetchData)
@@ -265,15 +808,10 @@ export class FeedbackModal {
     }
   }
   resetOverflow() {
+    // Just clean up any stray classes, don't add/remove during screenshot
     document.documentElement.classList.remove('feedback-modal-screenshot-open');
     document.documentElement.classList.remove('feedback-modal-screenshot-open--scroll');
-    document.documentElement.classList.add('feedback-modal-screenshot-closing');
-    // Only restore scroll position if we previously modified it
-    if (document.documentElement.style.top) {
-      window.scrollTo(0, parseInt(document.documentElement.style.top || '0') * -1);
-      document.documentElement.style.top = '';
-    }
-    window.addEventListener('scroll', this.onScrollDebounced);
+    document.documentElement.classList.remove('feedback-modal-screenshot-closing');
   }
   handleMessageInput(event) {
     this.formMessage = event.target.value;
@@ -281,31 +819,48 @@ export class FeedbackModal {
   handleEmailInput(event) {
     this.formEmail = event.target.value;
   }
-  captureScreenshot() {
+  captureViewportScreenshot() {
     return new Promise((resolve, reject) => {
       requestAnimationFrame(() => {
-        html2canvas(document.body, {
-          x: window.scrollX,
-          y: window.scrollY,
-          width: window.innerWidth,
-          height: window.innerHeight,
-          allowTaint: true,
+        // Get viewport dimensions and scroll position
+        const viewportWidth = window.innerWidth;
+        const viewportHeight = window.innerHeight;
+        const scrollX = window.scrollX || window.pageXOffset || 0;
+        const scrollY = window.scrollY || window.pageYOffset || 0;
+        // Capture exactly what the user sees in their viewport
+        html2canvas(document.documentElement, {
+          x: scrollX,
+          y: scrollY,
+          width: viewportWidth,
+          height: viewportHeight,
+          scrollX: 0,
+          scrollY: 0,
+          allowTaint: false,
           useCORS: true,
           scale: 1,
+          backgroundColor: '#ffffff',
+          logging: false,
+          foreignObjectRendering: false,
+          imageTimeout: 15000,
+          windowWidth: viewportWidth,
+          windowHeight: viewportHeight,
+          removeContainer: true,
+          ignoreElements: (element) => {
+            // Ignore all feedback modal elements
+            return element.closest('feedback-modal') !== null ||
+              element.classList.contains('feedback-overlay') ||
+              element.classList.contains('feedback-modal-screenshot-header') ||
+              element.tagName === 'FEEDBACK-MODAL' ||
+              element.tagName === 'FEEDBACK-BUTTON';
+          }
         })
           .then((canvas) => {
-          const context = canvas.getContext('2d');
-          if (context && this.selectedElementBounds) {
-            // Use the same color as HTML highlight
-            context.strokeStyle = 'rgba(0, 123, 255, 0.8)'; // Example color
-            context.lineWidth = 3;
-            context.strokeRect(this.selectedElementBounds.left + window.scrollX, this.selectedElementBounds.top + window.scrollY, this.selectedElementBounds.width, this.selectedElementBounds.height);
-          }
-          const dataUrl = canvas.toDataURL();
+          const dataUrl = canvas.toDataURL('image/png');
+          console.log('Screenshot captured successfully, size:', canvas.width, 'x', canvas.height);
           resolve(dataUrl);
         })
           .catch((error) => {
-          console.error('Failed to capture screenshot:', error);
+          console.error('Failed to capture viewport screenshot:', error);
           reject(error);
         });
       });
@@ -320,12 +875,8 @@ export class FeedbackModal {
   handleRatingChange(newRating) {
     this.selectedRating = newRating;
   }
-  // Remove the preview modal toggle function
-  // togglePreviewModal() {
-  //   this.showPreviewModal = !this.showPreviewModal;
-  // }
   render() {
-    return (h("div", { class: `feedback-modal-wrapper ${this.customFont ? 'feedback-modal-wrapper--custom-font' : ''}` }, this.showScreenshotMode && (h("div", { class: "feedback-modal-screenshot", ref: (el) => (this.screenshotModal = el), onMouseMove: this.handleMouseOverScreenShot }, h("div", { class: "feedback-modal-screenshot-element-selected", ref: (el) => (this.elementSelected = el), onClick: this.handleMouseClickedSelectedElement }), h("div", { class: "top-side", ref: (el) => (this.topSide = el) }), h("div", { class: "left-side", ref: (el) => (this.leftSide = el) }), h("div", { class: "bottom-side", ref: (el) => (this.bottomSide = el) }), h("div", { class: "right-side", ref: (el) => (this.rightSide = el) }), this.showScreenshotTopBar && (h("div", { class: "feedback-modal-screenshot-header", onClick: this.closeScreenShot }, h("span", null, this.screenshotTopbarText), h("span", { class: "feedback-modal-screenshot-close" }, h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "22", height: "22", viewBox: "0 0 24 24", fill: "none", stroke: "#191919", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round", class: "feather feather-x" }, h("line", { x1: "18", y1: "6", x2: "6", y2: "18" }), h("line", { x1: "6", y1: "6", x2: "18", y2: "18" }))))))), this.showModal && (h("div", { class: `feedback-overlay ${this.isAnimating ? 'feedback-overlay--visible' : ''}` })), this.showModal && (h("div", { class: `feedback-modal-content feedback-modal-content--${this.modalPosition} ${this.isAnimating ? 'feedback-modal-content--open' : ''}`, ref: (el) => (this.modalContent = el) }, h("div", { class: "feedback-modal-header" }, !this.formSuccess && !this.formError ? (h("span", null, this.modalTitle)) : this.formSuccess ? (h("span", null, this.modalTitleSuccess)) : (h("span", null, this.modalTitleError)), h("button", { class: "feedback-modal-close", onClick: this.close }, h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "22", height: "22", viewBox: "0 0 24 24", fill: "none", stroke: "#191919", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round", class: "feather feather-x" }, h("line", { x1: "18", y1: "6", x2: "6", y2: "18" }), h("line", { x1: "6", y1: "6", x2: "18", y2: "18" })))), h("div", { class: "feedback-modal-body" }, !this.formSuccess && !this.formError ? (h("form", { onSubmit: this.handleSubmit }, !this.hideRating && (h("div", { class: "feedback-modal-rating" }, this.ratingMode === 'thumbs' ? (h("div", { class: "feedback-modal-rating-content" }, h("span", { class: "feedback-modal-input-heading" }, this.ratingPlaceholder), h("div", { class: "feedback-modal-rating-buttons feedback-modal-rating-buttons--thumbs" }, h("button", { title: "Yes", class: `feedback-modal-rating-button ${this.selectedRating === 1
+    return (h("div", { class: `feedback-modal-wrapper ${this.customFont ? 'feedback-modal-wrapper--custom-font' : ''}` }, this.showModal && (h("div", { class: `feedback-overlay ${this.isAnimating ? 'feedback-overlay--visible' : ''}` })), this.showModal && (h("div", { class: `feedback-modal-content feedback-modal-content--${this.modalPosition} ${this.isAnimating ? 'feedback-modal-content--open' : ''}`, ref: (el) => (this.modalContent = el) }, h("div", { class: "feedback-modal-header" }, !this.formSuccess && !this.formError ? (h("span", null, this.modalTitle)) : this.formSuccess ? (h("span", null, this.modalTitleSuccess)) : (h("span", null, this.modalTitleError)), h("button", { class: "feedback-modal-close", onClick: this.close }, h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "22", height: "22", viewBox: "0 0 24 24", fill: "none", stroke: "#191919", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round", class: "feather feather-x" }, h("line", { x1: "18", y1: "6", x2: "6", y2: "18" }), h("line", { x1: "6", y1: "6", x2: "18", y2: "18" })))), h("div", { class: "feedback-modal-body" }, !this.formSuccess && !this.formError ? (h("form", { onSubmit: this.handleSubmit }, !this.hideRating && (h("div", { class: "feedback-modal-rating" }, this.ratingMode === 'thumbs' ? (h("div", { class: "feedback-modal-rating-content" }, h("span", { class: "feedback-modal-input-heading" }, this.ratingPlaceholder), h("div", { class: "feedback-modal-rating-buttons feedback-modal-rating-buttons--thumbs" }, h("button", { title: "Yes", class: `feedback-modal-rating-button ${this.selectedRating === 1
         ? 'feedback-modal-rating-button--selected'
         : ''}`, onClick: (event) => {
         event.preventDefault();
@@ -340,7 +891,8 @@ export class FeedbackModal {
         : ''}`, onClick: (event) => {
         event.preventDefault();
         this.handleRatingChange(rating);
-      } }, h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "28", height: "28", viewBox: "0 0 24 24", fill: "none", stroke: "#5F6368", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" }, h("polygon", { points: "12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" })))))))))), h("div", { class: "feedback-modal-text" }, h("textarea", { placeholder: this.messagePlaceholder, value: this.formMessage, onInput: (event) => this.handleMessageInput(event) })), !this.hideEmail && (h("div", { class: "feedback-modal-email" }, h("input", { placeholder: this.emailPlaceholder, type: "email", onInput: (event) => this.handleEmailInput(event), value: this.formEmail, required: this.isEmailRequired }))), h("div", { class: "feedback-verification" }, h("input", { type: "text", name: "verification", style: { display: 'none' }, onInput: (event) => this.handleVerification(event), value: this.formVerification })), !this.hidePrivacyPolicy && (h("div", { class: "feedback-modal-privacy" }, h("input", { type: "checkbox", id: "privacyPolicy", onChange: (ev) => this.handleCheckboxChange(ev), required: true }), h("span", { innerHTML: this.privacyPolicyText }))), h("div", { class: `feedback-modal-buttons ${this.hideScreenshotButton ? 'single' : ''}` }, !this.hideScreenshotButton && (h("button", { type: "button", class: `feedback-modal-button feedback-modal-button--screenshot ${this.encodedScreenshot ? 'feedback-modal-button--active' : ''}`, onClick: this.openScreenShot, disabled: this.sending }, this.encodedScreenshot && (h("div", { class: "screenshot-preview" }, h("img", { src: this.encodedScreenshot, alt: "Screenshot Preview" }))), !this.encodedScreenshot && (h("svg", { xmlns: "http://www.w3.org/2000/svg", height: "24", viewBox: "0 -960 960 960", width: "24" }, h("path", { d: "M680-80v-120H560v-80h120v-120h80v120h120v80H760v120h-80ZM200-200v-200h80v120h120v80H200Zm0-360v-200h200v80H280v120h-80Zm480 0v-120H560v-80h200v200h-80Z" }))), this.encodedScreenshot ? this.screenshotAttachedText : this.screenshotButtonText)), h("button", { class: "feedback-modal-button feedback-modal-button--submit", type: "submit", disabled: this.sending }, this.sendButtonText)))) : this.formSuccess && !this.formError ? (h("div", { class: "feedback-modal-success" }, h("p", { class: "feedback-modal-message" }, this.successMessage))) : this.formError && this.formErrorStatus == 404 ? (h("p", { class: "feedback-modal-message" }, this.errorMessage404)) : this.formError && this.formErrorStatus == 403 ? (h("p", { class: "feedback-modal-message" }, this.errorMessage403)) : this.formError ? (h("p", { class: "feedback-modal-message" }, this.errorMessage)) : (h("span", null))), h("div", { class: "feedback-modal-footer" }, h("div", { class: "feedback-logo", style: { display: this.whitelabel ? 'none' : 'block' } }, "Powered by", ' ', h("a", { target: "_blank", href: "https://pushfeedback.com" }, "PushFeedback.com")), this.footerText && (h("div", { class: "feedback-footer-text" }, h("span", { innerHTML: this.footerText }))))))));
+      } }, h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "28", height: "28", viewBox: "0 0 24 24", fill: "none", stroke: "#5F6368", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" }, h("polygon", { points: "12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" })))))))))), h("div", { class: "feedback-modal-text" }, h("textarea", { placeholder: this.messagePlaceholder, value: this.formMessage, onInput: (event) => this.handleMessageInput(event) })), !this.hideEmail && (h("div", { class: "feedback-modal-email" }, h("input", { placeholder: this.emailPlaceholder, type: "email", onInput: (event) => this.handleEmailInput(event), value: this.formEmail, required: this.isEmailRequired }))), h("div", { class: "feedback-verification" }, h("input", { type: "text", name: "verification", style: { display: 'none' }, onInput: (event) => this.handleVerification(event), value: this.formVerification })), !this.hidePrivacyPolicy && (h("div", { class: "feedback-modal-privacy" }, h("input", { type: "checkbox", id: "privacyPolicy", onChange: (ev) => this.handleCheckboxChange(ev), required: true }), h("span", { innerHTML: this.privacyPolicyText }))), h("div", { class: `feedback-modal-buttons ${this.hideScreenshotButton ? 'single' : ''}` }, !this.hideScreenshotButton && (h("button", { type: "button", class: `feedback-modal-button feedback-modal-button--screenshot ${this.encodedScreenshot ? 'feedback-modal-button--active' : ''}`, onClick: this.openScreenShot, disabled: this.sending || this.takingScreenshot }, this.encodedScreenshot && (h("div", { class: "screenshot-preview", onClick: this.openCanvasEditor }, h("img", { src: this.encodedScreenshot, alt: "Screenshot Preview" }))), !this.encodedScreenshot && !this.takingScreenshot && (h("svg", { xmlns: "http://www.w3.org/2000/svg", height: "24", viewBox: "0 -960 960 960", width: "24" }, h("path", { d: "M680-80v-120H560v-80h120v-120h80v120h120v80H760v120h-80ZM200-200v-200h80v120h120v80H200Zm0-360v-200h200v80H280v120h-80Zm480 0v-120H560v-80h200v200h-80Z" }))), this.takingScreenshot && (h("div", { class: "screenshot-loading" }, h("svg", { width: "16", height: "16", viewBox: "0 0 16 16" }, h("circle", { cx: "8", cy: "8", r: "6", fill: "none", stroke: "#666", "stroke-width": "2", "stroke-dasharray": "6 6", "transform-origin": "8 8" }, h("animateTransform", { attributeName: "transform", type: "rotate", values: "0 8 8;360 8 8", dur: "1s", repeatCount: "indefinite" }))))), this.takingScreenshot ? this.screenshotTakingText :
+      this.encodedScreenshot ? this.screenshotAttachedText : this.screenshotButtonText)), h("button", { class: "feedback-modal-button feedback-modal-button--submit", type: "submit", disabled: this.sending }, this.sendButtonText)))) : this.formSuccess && !this.formError ? (h("div", { class: "feedback-modal-success" }, h("p", { class: "feedback-modal-message" }, this.successMessage))) : this.formError && this.formErrorStatus == 404 ? (h("p", { class: "feedback-modal-message" }, this.errorMessage404)) : this.formError && this.formErrorStatus == 403 ? (h("p", { class: "feedback-modal-message" }, this.errorMessage403)) : this.formError ? (h("p", { class: "feedback-modal-message" }, this.errorMessage)) : (h("span", null))), h("div", { class: "feedback-modal-footer" }, h("div", { class: "feedback-logo", style: { display: this.whitelabel ? 'none' : 'block' } }, "Powered by", ' ', h("a", { target: "_blank", href: "https://pushfeedback.com" }, "PushFeedback.com")), this.footerText && (h("div", { class: "feedback-footer-text" }, h("span", { innerHTML: this.footerText })))))), this.showCanvasEditor && (h("div", { class: "canvas-editor-overlay" }, h("div", { class: "canvas-editor-modal" }, h("div", { class: "canvas-editor-header" }, h("div", { class: "canvas-editor-title" }, h("h3", null, this.canvasEditorTitle)), h("div", { class: "canvas-editor-toolbar" }, h("div", { class: "toolbar-section" }, h("div", { class: "tool-group" }, h("button", { class: `tool-btn ${this.canvasDrawingTool === 'rectangle' ? 'active' : ''}`, onClick: () => this.canvasDrawingTool = 'rectangle', title: "Rectangle" }, h("svg", { width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" }, h("rect", { x: "3", y: "3", width: "18", height: "18", rx: "2", ry: "2" }))), h("button", { class: `tool-btn ${this.canvasDrawingTool === 'line' ? 'active' : ''}`, onClick: () => this.canvasDrawingTool = 'line', title: "Line" }, h("svg", { width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" }, h("line", { x1: "5", y1: "12", x2: "19", y2: "12" }))), h("button", { class: `tool-btn ${this.canvasDrawingTool === 'arrow' ? 'active' : ''}`, onClick: () => this.canvasDrawingTool = 'arrow', title: "Arrow" }, h("svg", { width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" }, h("line", { x1: "7", y1: "17", x2: "17", y2: "7" }), h("polyline", { points: "7,7 17,7 17,17" }))), h("button", { class: `tool-btn ${this.canvasDrawingTool === 'text' ? 'active' : ''}`, onClick: () => this.canvasDrawingTool = 'text', title: "Text" }, h("svg", { width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" }, h("polyline", { points: "4,7 4,4 20,4 20,7" }), h("line", { x1: "9", y1: "20", x2: "15", y2: "20" }), h("line", { x1: "12", y1: "4", x2: "12", y2: "20" }))), h("div", { class: "toolbar-divider" }), h("button", { class: "tool-btn undo-btn", onClick: this.undoLastAnnotation, disabled: this.annotations.length === 0, title: "Undo" }, h("svg", { width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" }, h("polyline", { points: "1,4 1,10 7,10" }), h("path", { d: "M3.51,15a9,9,0,0,0,14.85-3.36,9,9,0,0,0-9.19-10.15L1.83,10" }))))), h("div", { class: "toolbar-section" }, h("div", { class: "color-palette" }, this.defaultColors.map((color, index) => (h("div", { class: "color-slot-wrapper" }, h("button", { class: `color-btn ${this.canvasDrawingColor === color ? 'active' : ''} ${this.editingColorIndex === index ? 'editing' : ''}`, style: { backgroundColor: color }, onClick: () => this.handleColorSlotClick(index), title: `Color ${index + 1} - Click to customize` }, this.editingColorIndex === index && (h("svg", { width: "14", height: "14", viewBox: "0 0 24 24", fill: "none", stroke: "white", "stroke-width": "2" }, h("path", { d: "M21.174 6.812a1 1 0 0 0-3.986-3.987L3.842 16.174a2 2 0 0 0-.5.83l-1.321 4.352a.5.5 0 0 0 .623.622l4.353-1.32a2 2 0 0 0 .83-.497z" })))), this.editingColorIndex === index && this.showColorPicker && (h("div", { class: "color-picker-dropdown" }, h("input", { type: "color", value: color, onInput: (e) => this.handleColorPickerInput(e), onClick: (e) => this.handleColorPickerClick(e) })))))))), h("div", { class: "toolbar-section" }, h("div", { class: "size-control" }, h("input", { type: "range", min: "1", max: "10", value: this.canvasLineWidth, onInput: (e) => this.canvasLineWidth = parseInt(e.target.value), class: "size-slider" }), h("span", { class: "size-value" }, this.canvasLineWidth, "px"))), h("div", { class: "toolbar-section" }, h("button", { class: "action-btn secondary", onClick: this.closeCanvasEditor }, this.canvasEditorCancelText), h("button", { class: "action-btn primary", onClick: this.saveAnnotations }, this.canvasEditorSaveText))), h("div", { class: "canvas-editor-content" }, h("canvas", { ref: (el) => this.canvasRef = el, class: "annotation-canvas", onMouseDown: this.handleCanvasMouseDown, onMouseMove: this.handleCanvasMouseMove, onMouseUp: this.handleCanvasMouseUp, onMouseLeave: this.handleCanvasMouseUp }))))))));
   }
   componentDidRender() {
     if (this.showModal) {
@@ -909,6 +1461,24 @@ export class FeedbackModal {
         "reflect": false,
         "defaultValue": "'Send'"
       },
+      "screenshotAttachedText": {
+        "type": "string",
+        "mutable": false,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "screenshot-attached-text",
+        "reflect": false,
+        "defaultValue": "'Screenshot attached'"
+      },
       "screenshotButtonText": {
         "type": "string",
         "mutable": false,
@@ -927,7 +1497,7 @@ export class FeedbackModal {
         "reflect": false,
         "defaultValue": "'Add a screenshot'"
       },
-      "screenshotAttachedText": {
+      "screenshotTakingText": {
         "type": "string",
         "mutable": false,
         "complexType": {
@@ -941,9 +1511,9 @@ export class FeedbackModal {
           "tags": [],
           "text": ""
         },
-        "attribute": "screenshot-attached-text",
+        "attribute": "screenshot-taking-text",
         "reflect": false,
-        "defaultValue": "'Screenshot attached'"
+        "defaultValue": "'Taking screenshot...'"
       },
       "screenshotTopbarText": {
         "type": "string",
@@ -980,6 +1550,60 @@ export class FeedbackModal {
         "attribute": "success-message",
         "reflect": false,
         "defaultValue": "''"
+      },
+      "canvasEditorTitle": {
+        "type": "string",
+        "mutable": false,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "canvas-editor-title",
+        "reflect": false,
+        "defaultValue": "'Edit screenshot'"
+      },
+      "canvasEditorCancelText": {
+        "type": "string",
+        "mutable": false,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "canvas-editor-cancel-text",
+        "reflect": false,
+        "defaultValue": "'Cancel'"
+      },
+      "canvasEditorSaveText": {
+        "type": "string",
+        "mutable": false,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "canvas-editor-save-text",
+        "reflect": false,
+        "defaultValue": "'Save'"
       }
     };
   }
@@ -997,7 +1621,27 @@ export class FeedbackModal {
       "whitelabel": {},
       "selectedRating": {},
       "overlayVisible": {},
-      "isAnimating": {}
+      "isAnimating": {},
+      "takingScreenshot": {},
+      "showPreviewModal": {},
+      "showCanvasEditor": {},
+      "canvasDrawingTool": {},
+      "canvasDrawingColor": {},
+      "canvasLineWidth": {},
+      "isDrawing": {},
+      "annotations": {},
+      "currentAnnotation": {},
+      "isDragging": {},
+      "draggedAnnotation": {},
+      "dragStartPos": {},
+      "showColorPicker": {},
+      "editingColorIndex": {},
+      "isResizing": {},
+      "resizingAnnotation": {},
+      "resizeStartSize": {},
+      "hoveredAnnotation": {},
+      "resizeHandle": {},
+      "defaultColors": {}
     };
   }
   static get events() {