1 files changed, 15 insertions, 12 deletions
diff --git a/src/client/views/ContextMenuItem.tsx b/src/client/views/ContextMenuItem.tsx
index d15ab749c..5760872fb 100644
--- a/src/client/views/ContextMenuItem.tsx
+++ b/src/client/views/ContextMenuItem.tsx
@@ -1,17 +1,17 @@
-import * as React from 'react';
-import { observable, action, runInAction, makeObservable } from 'mobx';
-import { observer } from 'mobx-react';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { action, makeObservable, observable, runInAction } from 'mobx';
+import { observer } from 'mobx-react';
+import * as React from 'react';
+import { SnappingManager } from '../util/SnappingManager';
 import { UndoManager } from '../util/UndoManager';
-import { SettingsManager } from '../util/SettingsManager';
 import { ObservableReactComponent } from './ObservableReactComponent';
 
 export interface OriginalMenuProps {
     description: string;
     event: (stuff?: any) => void;
     undoable?: boolean;
-    icon: IconProp | JSX.Element; //maybe should be optional (icon?)
+    icon: IconProp | JSX.Element; // maybe should be optional (icon?)
     closeMenu?: () => void;
 }
 
@@ -20,7 +20,7 @@ export interface SubmenuProps {
     subitems: ContextMenuProps[];
     noexpand?: boolean;
     addDivider?: boolean;
-    icon: IconProp; //maybe should be optional (icon?)
+    icon: IconProp; // maybe should be optional (icon?)
     closeMenu?: () => void;
 }
 
@@ -67,7 +67,9 @@ export class ContextMenuItem extends ObservableReactComponent<ContextMenuProps &
         this._overPosY = e.clientY;
         this._overPosX = e.clientX;
         this.currentTimeout = setTimeout(
-            action(() => (this.overItem = true)),
+            action(() => {
+                this.overItem = true;
+            }),
             ContextMenuItem.timeout
         );
     };
@@ -97,14 +99,15 @@ export class ContextMenuItem extends ObservableReactComponent<ContextMenuProps &
                     {this._props.icon ? <span className="contextMenu-item-icon-background">{this.isJSXElement(this._props.icon) ? this._props.icon : <FontAwesomeIcon icon={this._props.icon} size="sm" />}</span> : null}
                     <div className="contextMenu-description">{this._props.description.replace(':', '')}</div>
                     <div
-                        className={`contextMenu-item-background`}
+                        className="contextMenu-item-background"
                         style={{
-                            background: SettingsManager.userColor,
+                            background: SnappingManager.userColor,
                         }}
                     />
                 </div>
             );
-        } else if ('subitems' in this._props) {
+        }
+        if ('subitems' in this._props) {
             const where = !this.overItem ? '' : this._overPosY < window.innerHeight / 3 ? 'flex-start' : this._overPosY > (window.innerHeight * 2) / 3 ? 'flex-end' : 'center';
             const marginTop = !this.overItem ? '' : this._overPosY < window.innerHeight / 3 ? '20px' : this._overPosY > (window.innerHeight * 2) / 3 ? '-20px' : '';
 
@@ -115,7 +118,7 @@ export class ContextMenuItem extends ObservableReactComponent<ContextMenuProps &
                     style={{
                         marginLeft: window.innerWidth - this._overPosX - 50 > 0 ? '90%' : '20%',
                         marginTop,
-                        background: SettingsManager.userBackgroundColor,
+                        background: SnappingManager.userBackgroundColor,
                     }}>
                     {this._items.map(prop => (
                         <ContextMenuItem {...prop} key={prop.description} closeMenu={this._props.closeMenu} />
@@ -149,7 +152,7 @@ export class ContextMenuItem extends ObservableReactComponent<ContextMenuProps &
                     <div
                         className={`contextMenu-item-background`}
                         style={{
-                            background: SettingsManager.userColor,
+                            background: SnappingManager.userColor,
                         }}
                     />
                     {submenu}