restoring eslint - updates not complete yet

2 files changed, 17 insertions, 11 deletions

diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx
index cc4da1694..c3e513154 100644
--- a/src/client/views/animationtimeline/Timeline.tsx
+++ b/src/client/views/animationtimeline/Timeline.tsx
@@ -4,7 +4,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { action, computed, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
-import { Utils, emptyFunction, setupMoveUpEvents } from '../../../Utils';
+import { setupMoveUpEvents } from '../../../ClientUtils';
+import { Utils, emptyFunction } from '../../../Utils';
 import { Doc, DocListCast } from '../../../fields/Doc';
 import { BoolCast, NumCast, StrCast } from '../../../fields/Types';
 import { DocumentType } from '../../documents/DocumentTypes';
diff --git a/src/client/views/animationtimeline/TimelineMenu.tsx b/src/client/views/animationtimeline/TimelineMenu.tsx
index 97a571dc4..20da21cb9 100644
--- a/src/client/views/animationtimeline/TimelineMenu.tsx
+++ b/src/client/views/animationtimeline/TimelineMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable jsx-a11y/click-events-have-key-events */
 import { IconLookup } from '@fortawesome/fontawesome-svg-core';
 import { faChartLine, faClipboard } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -9,6 +10,7 @@ import './TimelineMenu.scss';
 
 @observer
 export class TimelineMenu extends React.Component {
+    // eslint-disable-next-line no-use-before-define
     public static Instance: TimelineMenu;
 
     @observable private _opacity = 0;
@@ -67,16 +69,19 @@ export class TimelineMenu extends React.Component {
             this._currentMenu.push(
                 <div key={Utils.GenerateGuid()} className="timeline-menu-item">
                     <FontAwesomeIcon icon={faChartLine as IconLookup} size="lg" />
-                    <p
-                        className="timeline-menu-desc"
-                        onClick={e => {
-                            e.preventDefault();
-                            e.stopPropagation();
-                            event(e);
-                            this.closeMenu();
-                        }}>
-                        {title}
-                    </p>
+                    {
+                        // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+                        <p
+                            className="timeline-menu-desc"
+                            onClick={e => {
+                                e.preventDefault();
+                                e.stopPropagation();
+                                event(e);
+                                this.closeMenu();
+                            }}>
+                            {title}
+                        </p>
+                    }
                 </div>
             );
         }