Просмотр исходного кода

Merge pull request #3147 from weseek/fix/4302-4591-adjust-bookmark-and-like

Fix/4302 4591 adjust bookmark and like
itizawa 5 лет назад
Родитель
Сommit
e8e6d00770
2 измененных файлов с 6 добавлено и 6 удалено
  1. 4 4
      src/client/js/components/BookmarkButton.jsx
  2. 2 2
      src/client/js/components/LikeButton.jsx

+ 4 - 4
src/client/js/components/BookmarkButton.jsx

@@ -18,8 +18,8 @@ class BookmarkButton extends React.Component {
   }
   }
 
 
   async handleClick() {
   async handleClick() {
-    const { pageContainer } = this.props;
-    const isGuestUser = pageContainer.state.isGuestUser;
+    const { appContainer, pageContainer } = this.props;
+    const { isGuestUser } = appContainer;
 
 
     if (isGuestUser) {
     if (isGuestUser) {
       return;
       return;
@@ -70,8 +70,8 @@ class BookmarkButton extends React.Component {
 const BookmarkButtonWrapper = withUnstatedContainers(BookmarkButton, [AppContainer, PageContainer]);
 const BookmarkButtonWrapper = withUnstatedContainers(BookmarkButton, [AppContainer, PageContainer]);
 
 
 BookmarkButton.propTypes = {
 BookmarkButton.propTypes = {
-  appContainer: PropTypes.instanceOf(PageContainer).isRequired,
-  pageContainer: PropTypes.instanceOf(AppContainer).isRequired,
+  appContainer: PropTypes.instanceOf(AppContainer).isRequired,
+  pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
 
 
   pageId: PropTypes.string,
   pageId: PropTypes.string,
   t: PropTypes.func.isRequired,
   t: PropTypes.func.isRequired,

+ 2 - 2
src/client/js/components/LikeButton.jsx

@@ -18,8 +18,8 @@ class LikeButton extends React.Component {
   }
   }
 
 
   async handleClick() {
   async handleClick() {
-    const { pageContainer } = this.props;
-    const isGuestUser = pageContainer.state.isGuestUser;
+    const { appContainer, pageContainer } = this.props;
+    const { isGuestUser } = appContainer;
 
 
     if (isGuestUser) {
     if (isGuestUser) {
       return;
       return;