From b53ca6c04b101d5c1d40574bd552814780bcd5e0 Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber_t@mailbox.org>
Date: Sat, 3 Apr 2021 19:43:56 -0500
Subject: [PATCH] Update addons

---
 src/addons/addons/folders/userscript.js | 12 ++++++++++--
 src/addons/upstream-meta.json           |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/addons/addons/folders/userscript.js b/src/addons/addons/folders/userscript.js
index a467d37a8..f7d651569 100644
--- a/src/addons/addons/folders/userscript.js
+++ b/src/addons/addons/folders/userscript.js
@@ -497,6 +497,7 @@ export default async function ({ addon, global, console, msg }) {
           folderOccurences.set(folderName, occurence + 1);
           const baseUniqueId = getUniqueIdOfFolderItems(folderItems);
           const itemUniqueId = `${isOpen}&${occurence}&${folderName}&${baseUniqueId}&`;
+          const reactKey = `&__${occurence}_${folderName}`;
           const assetUniqueId = baseUniqueId;
 
           let folderItem;
@@ -507,11 +508,18 @@ export default async function ({ addon, global, console, msg }) {
           } else {
             folderItem = {
               // Can be used as a react key
+              id: {
+                toString() {
+                  return reactKey;
+                },
+              },
+            };
+            folderData = {
+              // Can be used as a react key
               toString() {
-                return itemUniqueId;
+                return reactKey;
               },
             };
-            folderData = {};
             folderItemCache.set(itemUniqueId, folderItem);
           }
 
diff --git a/src/addons/upstream-meta.json b/src/addons/upstream-meta.json
index 87848e02a..7a01dd344 100644
--- a/src/addons/upstream-meta.json
+++ b/src/addons/upstream-meta.json
@@ -1 +1 @@
-{"version":"1.12.1","commit":"6097d68","languages":["ar","de","en","es","fr","id","it","ja","nl","pl","pt-br","ro","ru","sl","th","tr"]}
\ No newline at end of file
+{"version":"1.12.1","commit":"d65cf58","languages":["ar","de","en","es","fr","id","it","ja","nl","pl","pt-br","ro","ru","sl","th","tr"]}
\ No newline at end of file