1 files changed, 11 insertions, 6 deletions
diff --git a/src/client/views/smartdraw/SmartDrawHandler.tsx b/src/client/views/smartdraw/SmartDrawHandler.tsx
index d0f6566a5..23ab7657f 100644
--- a/src/client/views/smartdraw/SmartDrawHandler.tsx
+++ b/src/client/views/smartdraw/SmartDrawHandler.tsx
@@ -61,6 +61,7 @@ export class SmartDrawHandler extends ObservableReactComponent<object> {
     @observable private _display: boolean = false;
     @observable private _pageX: number = 0;
     @observable private _pageY: number = 0;
+    @observable private _scale: number = 0;
     @observable private _yRelativeToTop: boolean = true;
     @observable private _isLoading: boolean = false;
     @observable private _userInput: string = '';
@@ -82,8 +83,8 @@ export class SmartDrawHandler extends ObservableReactComponent<object> {
 
     /**
      *  AddDrawing and RemoveDrawing are defined by the other classes that call the smart draw functions (i.e. 
-        CollectionFreeForm, FormattedTextBox, AnnotationPalette) to define how a drawing document should be added
-        or removed in their respective locations (to the freeform canvs, to the annotation palette's preview, etc.)
+        CollectionFreeForm, FormattedTextBox, StickerPalette) to define how a drawing document should be added
+        or removed in their respective locations (to the freeform canvas, to the sticker palette's preview, etc.)
     */
     public AddDrawing: (doc: Doc, opts: DrawingOptions, gptRes: string) => void = unimplementedFunction;
     public RemoveDrawing: (useLastContainer: boolean, doc?: Doc) => void = unimplementedFunction;
@@ -122,9 +123,10 @@ export class SmartDrawHandler extends ObservableReactComponent<object> {
     };
 
     @action
-    displaySmartDrawHandler = (x: number, y: number) => {
+    displaySmartDrawHandler = (x: number, y: number, scale: number) => {
         [this._pageX, this._pageY] = [x, y];
         this._display = true;
+        this._scale = scale;
     };
 
     /**
@@ -200,6 +202,10 @@ export class SmartDrawHandler extends ObservableReactComponent<object> {
                 this._showEditBox = false;
             });
         } else {
+            if (this._userInput == '') {
+                this._isLoading = false;
+                return;
+            }
             runInAction(() => {
                 this._showOptions = false;
             });
@@ -292,7 +298,7 @@ export class SmartDrawHandler extends ObservableReactComponent<object> {
             svgStrokes.forEach(child => {
                 const convertedBezier: InkData = SVGToBezier(child.name as SVGType, child.attributes);
                 strokeData.push([
-                    convertedBezier.map(point => ({ X: point.X + startPoint.X - this._size / 1.5, Y: point.Y + startPoint.Y - this._size / 2 })),
+                    convertedBezier.map(point => ({ X: startPoint.X + (point.X - startPoint.X) * this._scale, Y: startPoint.Y + (point.Y - startPoint.Y) * this._scale })),
                     (regenerate ? this._lastInput.autoColor : autoColor) ? child.attributes.stroke : '',
                     (regenerate ? this._lastInput.autoColor : autoColor) ? child.attributes.fill : '',
                 ]);
@@ -345,7 +351,6 @@ export class SmartDrawHandler extends ObservableReactComponent<object> {
     renderDisplay() {
         return (
             <div
-                id="label-handler"
                 className="smart-draw-handler"
                 style={{
                     display: this._display ? '' : 'none',
@@ -354,7 +359,7 @@ export class SmartDrawHandler extends ObservableReactComponent<object> {
                     background: SettingsManager.userBackgroundColor,
                     color: SettingsManager.userColor,
                 }}>
-                <div>
+                <div className="smart-draw-main">
                     <IconButton
                         tooltip="Cancel"
                         onClick={() => {