fixed more issues with rotation. restrutured how MarqueeAnnotator works to be simpler and more correct.

1 files changed, 2 insertions, 12 deletions

diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
index 465bbcf2f..421d431b3 100644
--- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
+++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx
@@ -131,9 +131,6 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF
     public static animStringFields = ['backgroundColor', 'color', 'fillColor']; // fields that are configured to be animatable using animation frames
     public static animDataFields = (doc: Doc) => (Doc.LayoutFieldKey(doc) ? [Doc.LayoutFieldKey(doc)] : []); // fields that are configured to be animatable using animation frames
 
-    @observable _animPos: number[] | undefined = undefined;
-    @observable _contentView: DocumentView | undefined | null;
-
     get CollectionFreeFormView() {
         return this.props.CollectionFreeFormView;
     }
@@ -231,7 +228,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF
         this.props
             .ScreenToLocalTransform()
             .translate(-this.props.w_X(), -this.props.w_Y())
-            .rotateDeg(this.props.w_Rotation?.() || 0);
+            .rotateDeg(-(this.props.w_Rotation?.() || 0));
     returnThis = () => this;
 
     /// this indicates whether the doc view is activated because of its relationshop to a group
@@ -262,14 +259,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF
                 {this.props.RenderCutoffProvider(this.props.Document) ? (
                     <div style={{ position: 'absolute', width: this.props.PanelWidth(), height: this.props.PanelHeight(), background: 'lightGreen' }} />
                 ) : (
-                    <DocumentView
-                        ref={action((r: DocumentView | null) => (this._contentView = r))}
-                        {...passOnProps}
-                        CollectionFreeFormDocumentView={this.returnThis}
-                        styleProvider={this.styleProvider}
-                        ScreenToLocalTransform={this.screenToLocalTransform}
-                        isGroupActive={this.isGroupActive}
-                    />
+                    <DocumentView {...passOnProps} CollectionFreeFormDocumentView={this.returnThis} styleProvider={this.styleProvider} ScreenToLocalTransform={this.screenToLocalTransform} isGroupActive={this.isGroupActive} />
                 )}
             </div>
         );