Imprv/fix subnavigation #1839
Merged
Imprv/fix subnavigation #1839
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
rrih
commented
Apr 2, 2020
rrih
commented
yuki-takei
requested changes
Apr 2, 2020
| import ReducedPageCreator from './ReducedPageCreator'; | ||
| import ReducedRevisionAuthor from './ReducedRevisionAuthor'; | ||
|
|
||
| const GrowiCompactSubNavigation = (props) => { |
There was a problem hiding this comment.
これはコンポーネント新設ではなく、GrowiSubNavigation をリサイクルして、コンパクトモードを実装して
yuki-takei
requested changes
Apr 2, 2020
|
|
||
| </div> | ||
| ); | ||
| } |
There was a problem hiding this comment.
isCompactMode で完全に return をするのではなく、部分的に部品を入れ替えるべきだと思う。基本レイアウトは変わらないはずなので。
| </div> | ||
| </div> | ||
| ); | ||
| } |
There was a problem hiding this comment.
これらも同様、isCompactMode で完全に return をするのではなく、部分的に部品を入れ替えるべきだと思う。
yuki-takei
reviewed
Apr 6, 2020
| @@ -20,5 +20,22 @@ | |||
| } | |||
| } | |||
| } | |||
| .grw-compact-subnavbar { | |||
| background-color: rgba(250, 250, 250, 0.9); | |||
| box-shadow: 0 0 2px #999; | |||
added 3 commits
April 6, 2020 16:07
yuki-takei
requested changes
Apr 6, 2020
| .grw-compact-subnavbar { | ||
| background-color: rgba(250, 250, 250, 0.9); | ||
| box-shadow: 0 0 2px #999; | ||
| } |
There was a problem hiding this comment.
- 色の変数は各テーマで用意し、このファイルで apply する
- または、apply-colors-light/dark で、色を固定して apply する
- または、色の変数は各テーマで用意し、apply-colors-light/dark で apply する
| @@ -20,6 +20,8 @@ const GrowiSubNavigation = (props) => { | |||
| const { | |||
| path, createdAt, creator, updatedAt, revisionAuthor, | |||
| } = pageContainer.state; | |||
| const isCompactMode = true; | |||
There was a problem hiding this comment.
概ね良いと思う。
あとここを props 見るようにするだけかな？
yuki-takei
requested changes
Apr 7, 2020
| const { revisionAuthor, updatedAt } = props; | ||
| const isCompactMode = true; | ||
| const { revisionAuthor, updatedAt, isCompactMode } = props; | ||
| // const isCompactMode = true; |
| @@ -26,6 +25,7 @@ PageCreator.propTypes = { | |||
|
|
|||
| creator: PropTypes.object.isRequired, | |||
| createdAt: PropTypes.string.isRequired, | |||
| isCompactMode: PropTypes.bool.isRequired, | |||
There was a problem hiding this comment.
required にはしなくていいと思う。代わりにデフォルト値を用意する。
| @@ -26,6 +26,7 @@ RevisionAuthor.propTypes = { | |||
|
|
|||
| revisionAuthor: PropTypes.object.isRequired, | |||
| updatedAt: PropTypes.string.isRequired, | |||
| isCompactMode: PropTypes.bool.isRequired, | |||
There was a problem hiding this comment.
required にはしなくていいと思う。代わりにデフォルト値を用意する。
| @@ -64,6 +65,9 @@ export default class PageContainer extends Container { | |||
| this.save = this.save.bind(this); | |||
| this.addWebSocketEventHandlers = this.addWebSocketEventHandlers.bind(this); | |||
| this.addWebSocketEventHandlers(); | |||
|
|
|||
| const scrollAmountForFixed = 122; | |||
There was a problem hiding this comment.
この値は 9 行目付近に const として用意する(static 変数っぽいイメージ)
| @@ -64,6 +65,9 @@ export default class PageContainer extends Container { | |||
| this.save = this.save.bind(this); | |||
| this.addWebSocketEventHandlers = this.addWebSocketEventHandlers.bind(this); | |||
| this.addWebSocketEventHandlers(); | |||
|
|
|||
| const scrollAmountForFixed = 122; | |||
| window.addEventListener('scroll', () => { this.setState({ isCompactMode: window.pageYOffset > scrollAmountForFixed }) }); | |||
There was a problem hiding this comment.
https://www.npmjs.com/package/throttle-debounce
の throttle を使ってください。
| {revisionAuthor != null && <li className="mt-1"><RevisionAuthor revisionAuthor={revisionAuthor} updatedAt={updatedAt} /></li>} | ||
| {creator != null && <li><PageCreator creator={creator} createdAt={createdAt} isCompactMode={isCompactMode} /></li>} | ||
| {revisionAuthor != null | ||
| && <li className="mt-1"><RevisionAuthor revisionAuthor={revisionAuthor} updatedAt={updatedAt} isCompactMode={isCompactMode} /></li>} |
added 2 commits
April 8, 2020 14:16
yuki-takei
approved these changes
Apr 8, 2020
# Conflicts: # src/client/js/components/Navbar/GrowiSubNavigation.jsx
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.