Rewrite actions/modal and reducers/modal with typescript (#24833)

2023-05-25 22:42:37 +09:00
parent 4197b5e4c8
commit 38c6216082
38 changed files with 503 additions and 261 deletions
--- a/app/javascript/mastodon/containers/dropdown_menu_container.js
+++ b/app/javascript/mastodon/containers/dropdown_menu_container.js
@ -18,15 +18,21 @@ const mapDispatchToProps = (dispatch, { status, items, scrollKey }) => ({
      dispatch(fetchRelationships([status.getIn(['account', 'id'])]));
    }

-    dispatch(isUserTouching() ? openModal('ACTIONS', {
-      status,
-      actions: items,
-      onClick: onItemClick,
+    dispatch(isUserTouching() ? openModal({
+      modalType: 'ACTIONS',
+      modalProps: {
+        status,
+        actions: items,
+        onClick: onItemClick,
+      },
    }) : openDropdownMenu(id, keyboard, scrollKey));
  },

  onClose(id) {
-    dispatch(closeModal('ACTIONS'));
+    dispatch(closeModal({
+      modalType: 'ACTIONS',
+      ignoreFocus: false,
+    }));
    dispatch(closeDropdownMenu(id));
  },
 });