Merge remote-tracking branch 'parent/main' into kb_development

2023-09-23 20:14:11 +09:00 · 2023-09-23 20:14:11 +09:00 · 36f3bbb909
commit 36f3bbb909
parent 77297b43bd 4b7bc1f07c
28 changed files with 135 additions and 92 deletions
--- a/app/javascript/mastodon/components/scrollable_list.jsx
+++ b/app/javascript/mastodon/components/scrollable_list.jsx
@ -23,9 +23,14 @@ const MOUSE_IDLE_DELAY = 300;

 const listenerOptions = supportsPassiveEvents ? { passive: true } : false;

+/**
+ *
+ * @param {import('mastodon/store').RootState} state
+ * @param {*} props
+ */
 const mapStateToProps = (state, { scrollKey }) => {
  return {
-    preventScroll: scrollKey === state.getIn(['dropdown_menu', 'scroll_key']),
+    preventScroll: scrollKey === state.dropdownMenu.scrollKey,
  };
 };