Merge remote-tracking branch 'parent/main' into upstream-20231021

2023-10-23 18:48:26 +09:00 · 2023-10-23 18:48:26 +09:00 · 46a1e62dc4
commit 46a1e62dc4
parent b992e673c7 0ad66175bf
37 changed files with 154 additions and 157 deletions
--- a/app/javascript/mastodon/utils/react_router.jsx
+++ b/app/javascript/mastodon/utils/react_router.jsx
@ -49,6 +49,7 @@ export function withOptionalRouter(Component) {
  C.displayName = displayName;
  C.WrappedComponent = Component;
  C.propTypes = {
+    ...Component.propTypes,
    wrappedComponentRef: PropTypes.oneOfType([
      PropTypes.string,
      PropTypes.func,