Refactor main types.ts .

src/components/elements.ts

@@ -1,31 +1,31 @@
 import { HASSDomEvent, HomeAssistant } from 'custom-card-helpers';
 import {
   CSSResultGroup,
-  html,
   LitElement,
   PropertyValues,
   TemplateResult,
+  html,
   unsafeCSS,
 } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { actionHandler } from '../action-handler-directive.js';
-import { localize } from '../localize/localize.js';
-import ptzStyle from '../scss/elements-ptz.scss';
-import elementsStyle from '../scss/elements.scss';
 import {
   Actions,
   ActionsConfig,
-  FrigateCardError,
   FrigateCardPTZConfig,
   FrigateConditional,
-  MenuButton,
   MenuIcon,
+  MenuItem,
   MenuStateIcon,
   MenuSubmenu,
   MenuSubmenuSelect,
   PictureElements,
-} from '../types.js';
+} from '../config/types.js';
+import { localize } from '../localize/localize.js';
+import ptzStyle from '../scss/elements-ptz.scss';
+import elementsStyle from '../scss/elements.scss';
+import { FrigateCardError } from '../types.js';
 import {
   frigateCardHandleActionConfig,
   frigateCardHasAction,
@@ -184,11 +184,7 @@ export class FrigateCardElements extends LitElement {
   protected _menuRemoveHandler(ev: Event): void {
     // Re-dispatch event from this element (instead of the disconnected one, as
     // there is no parent of the disconnected element).
-    dispatchFrigateCardEvent<MenuButton>(
-      this,
-      'menu-remove',
-      (ev as CustomEvent).detail,
-    );
+    dispatchFrigateCardEvent<MenuItem>(this, 'menu-remove', (ev as CustomEvent).detail);
   }
 
   /**
@@ -196,7 +192,7 @@ export class FrigateCardElements extends LitElement {
    * @param ev The event.
    */
   protected _menuAddHandler(ev: Event): void {
-    ev = ev as CustomEvent<MenuButton>;
+    ev = ev as CustomEvent<MenuItem>;
     const path = ev.composedPath();
     if (!path.length) {
       return;