itizawa 5 years ago
parent
commit
ce057b3d69
2 changed files with 4 additions and 11 deletions
  1. 1 1
      src/client/js/app.jsx
  2. 3 10
      src/client/js/components/User/UserInfo.jsx

+ 1 - 1
src/client/js/app.jsx

@@ -126,7 +126,7 @@ if (pageContainer.state.path != null) {
     'page': <Page />,
     'grw-subnav-container': <GrowiSubNavigation />,
     'grw-subnav-switcher-container': <GrowiSubNavigationSwitcher />,
-    'user-info': <UserInfo />,
+    'user-info': <UserInfo pageUser={pageContainer.state.pageContainer} />,
     'display-switcher': <DisplaySwitcher />,
   });
 }

+ 3 - 10
src/client/js/components/User/UserInfo.jsx

@@ -1,15 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import PageContainer from '../../services/PageContainer';
-import { withUnstatedContainers } from '../UnstatedUtils';
-
 import UserPicture from './UserPicture';
 
 const UserInfo = (props) => {
-
-  const { pageContainer } = props;
-  const { pageUser } = pageContainer.state;
+  const { pageUser } = props;
 
   // do not display when the user does not exist
   if (pageUser == null) {
@@ -40,9 +35,7 @@ const UserInfo = (props) => {
 
 
 UserInfo.propTypes = {
-  pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
+  pageUser: PropTypes.object,
 };
 
-const UserInfoWrapper = withUnstatedContainers(UserInfo, [PageContainer]);
-
-export default UserInfoWrapper;
+export default UserInfo;