From 4ea370959ba0e880e6ff3988d7ae81be2a1b2a17 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Sun, 7 Aug 2022 17:01:25 +0200
Subject: [PATCH] Fix flicker when remapping imported notetype field (#2005)

---
 ts/import-csv/FieldMapper.svelte | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ts/import-csv/FieldMapper.svelte b/ts/import-csv/FieldMapper.svelte
index 4a80367f0..26c9ed09e 100644
--- a/ts/import-csv/FieldMapper.svelte
+++ b/ts/import-csv/FieldMapper.svelte
@@ -13,10 +13,21 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let columnOptions: ColumnOption[];
     export let tagsColumn: number;
     export let globalNotetype: ImportExport.CsvMetadata.MappedNotetype | null;
+
+    let lastNotetypeId: number | undefined = -1;
+    let fieldNamesPromise: Promise<string[]>;
+
+    $: if (globalNotetype?.id !== lastNotetypeId) {
+        lastNotetypeId = globalNotetype?.id;
+        fieldNamesPromise =
+            globalNotetype === null
+                ? Promise.resolve([])
+                : getNotetypeFields(globalNotetype.id);
+    }
 </script>
 
 {#if globalNotetype}
-    {#await getNotetypeFields(globalNotetype.id) then fieldNames}
+    {#await fieldNamesPromise then fieldNames}
         {#each fieldNames as label, idx}
             <!-- first index is treated specially, because it must be assigned some column -->
             <MapperRow