Replaced instances of InstanceType with vue.ComponentPublicInstance.

Author: agarny

src/renderer/src/components/MainMenu.vue

@@ -152,13 +152,13 @@ const items = [
 
 // A few things that can only be done when the component is mounted.
 
-const menuBarRef = vue.ref<(InstanceType<typeof Menubar> & { hide: () => void }) | null>(null);
+const menuBarRef = vue.ref<(vue.ComponentPublicInstance<typeof Menubar> & { hide: () => void }) | null>(null);
 
 vue.onMounted(() => {
   if (menuBarRef.value) {
     // Ensure that the menubar never gets the 'p-menubar-mobile' class, which would turn it into a hamburger menu.
 
-    const menuBarElement = menuBarRef.value.$el as HTMLElement;
+    const menuBarElement = menuBarRef.value.$el;
     const mutationObserver = new MutationObserver(() => {
       if (menuBarElement.classList.contains('p-menubar-mobile')) {
         menuBarElement.classList.remove('p-menubar-mobile');

src/renderer/src/components/OpenCOR.vue

@@ -141,10 +141,10 @@ const props = defineProps<IOpenCORProps>();
 
 const { isDialogActive } = provideDialogState();
 
-const blockUiRef = vue.ref<InstanceType<typeof BlockUI> | null>(null);
-const mainMenuRef = vue.ref<InstanceType<typeof MainMenu> | null>(null);
+const blockUiRef = vue.ref<vue.ComponentPublicInstance<typeof BlockUI> | null>(null);
+const mainMenuRef = vue.ref<vue.ComponentPublicInstance<typeof MainMenu> | null>(null);
 const filesRef = vue.ref<HTMLElement | null>(null);
-const contentsRef = vue.ref<InstanceType<typeof ContentsComponent> | null>(null);
+const contentsRef = vue.ref<vue.ComponentPublicInstance<typeof ContentsComponent> | null>(null);
 const issues = vue.ref<locApi.IIssue[]>([]);
 const compIssues = vue.computed(() => {
   return [...initialisation.issues.value, ...issues.value];

src/renderer/src/components/dialogs/SimulationExperimentViewSettingsDialog.vue

@@ -787,9 +787,9 @@ const emit = defineEmits<{
 const DEFAULT_TAB = 'interactive';
 const DEFAULT_INTERACTIVE_TAB = 'simulationInputs';
 
-const simulationSettingsIssuesPopoverRef = vue.ref<InstanceType<typeof Popover> | null>(null);
-const solversSettingsIssuesPopoverRef = vue.ref<InstanceType<typeof Popover> | null>(null);
-const uiJsonIssuesPopoverRef = vue.ref<InstanceType<typeof Popover> | null>(null);
+const simulationSettingsIssuesPopoverRef = vue.ref<vue.ComponentPublicInstance<typeof Popover> | null>(null);
+const solversSettingsIssuesPopoverRef = vue.ref<vue.ComponentPublicInstance<typeof Popover> | null>(null);
+const uiJsonIssuesPopoverRef = vue.ref<vue.ComponentPublicInstance<typeof Popover> | null>(null);
 const activeTab = vue.ref(DEFAULT_TAB);
 const activeInteractiveTab = vue.ref(DEFAULT_INTERACTIVE_TAB);
 const showSimulationSettingsIssuesPanel = vue.ref(false);

src/renderer/src/components/views/SimulationExperimentView.vue

@@ -165,7 +165,7 @@
                             :title="`Change ${run.isLiveRun ? 'live run' : 'run'} colour`"
                             @click="onToggleRunColorPopover(index, $event)"
                           />
-                          <Popover :ref="(element: any) => interactiveRunColorPopoverRefs[index] = element as unknown as InstanceType<typeof Popover> ?? undefined"
+                          <Popover :ref="(element: any) => interactiveRunColorPopoverRefs[index] = element as unknown as vue.ComponentPublicInstance<typeof Popover> ?? undefined"
                             v-if="interactiveRunColorPopoverIndex === index"
                           >
                             <div class="flex gap-2">
@@ -212,7 +212,7 @@
             <IssuesView v-show="interactiveInstanceIssues.length" class="mt-4 mr-4" style="height: calc(100% - 2rem);" :issues="interactiveInstanceIssues" />
             <GraphPanelWidget v-show="!interactiveInstanceIssues.length"
               v-for="(_plot, index) in interactiveUiJson.output.plots"
-              :ref="(element: any) => interactiveGraphPanelRefs[index] = element as unknown as InstanceType<typeof GraphPanelWidget> ?? undefined"
+              :ref="(element: any) => interactiveGraphPanelRefs[index] = element as unknown as vue.ComponentPublicInstance<typeof GraphPanelWidget> ?? undefined"
               :key="`plot_${index}`"
               class="w-full min-h-0"
               :margins="interactiveCompMargins"
@@ -543,8 +543,12 @@ const interactiveRuns = vue.ref<ISimulationRun[]>([
   }
 ]);
 const interactiveRunColorPopoverIndex = vue.ref<number>(-1);
-const interactiveRunColorPopoverRefs = vue.ref<Record<number, InstanceType<typeof Popover> | undefined>>({});
-const interactiveGraphPanelRefs = vue.ref<Record<number, InstanceType<typeof GraphPanelWidget> | undefined>>({});
+const interactiveRunColorPopoverRefs = vue.ref<Record<number, vue.ComponentPublicInstance<typeof Popover> | undefined>>(
+  {}
+);
+const interactiveGraphPanelRefs = vue.ref<
+  Record<number, vue.ComponentPublicInstance<typeof GraphPanelWidget> | undefined>
+>({});
 const interactiveCompData = vue.computed(() => {
   // Combine the live data with the data from the tracked runs.
 

src/renderer/src/components/widgets/GraphPanelWidget.vue

@@ -89,7 +89,7 @@ const mainDivRef = vue.ref<HTMLElement | null>(null);
 const isVisible = vue.ref(false);
 const margins = vue.ref<IGraphPanelMargins>({ left: -1, right: -1 });
 const theme = vueCommon.useTheme();
-const contextMenuRef = vue.ref<InstanceType<typeof ContextMenu> | null>(null);
+const contextMenuRef = vue.ref<vue.ComponentPublicInstance<typeof ContextMenu> | null>(null);
 let updatingMargins = false;
 const progressMessage = vue.inject<IProgressMessage>('progressMessage');