Merge branch 'main' into switch-to-vite

2023-05-24 21:37:28 -04:00
parent d625a003b8 6bb5274d83
commit d1e59fe08c
10 changed files with 116 additions and 22 deletions
--- a/web/src/components/EmojiPicker.jsx
+++ b/web/src/components/EmojiPicker.jsx
@@ -74,6 +74,8 @@ const EmojiPicker = (props) => {
                inputProps={{
                  role: "searchbox",
                  "aria-label": t("emoji_picker_search_placeholder"),
+                }}
+                InputProps={{
                  endAdornment: (
                    <InputAdornment position="end" sx={{ display: search ? "" : "none" }}>
                      <IconButton size="small" onClick={handleSearchClear} edge="end" aria-label={t("emoji_picker_search_clear")}>