-
Notifications
You must be signed in to change notification settings - Fork 21
Integrate react-material-workspace-layout, update dependencies #7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
97656d4
0.1.22
seveibar e2d15f9
integrated react-material-workspace-layout and updated dependencies
seveibar 5dfa0db
transcription fixes, integrate react-material-workspace-layout
seveibar 52ac1fe
hotkeys can be enabled or disabled
seveibar ceec5eb
build script should clean build dir
seveibar 6ca4b4b
0.2.0
seveibar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,50 @@ | ||
| // @flow | ||
|
|
||
| import React from "react" | ||
| import React, { useMemo } from "react" | ||
| import Box from "@material-ui/core/Box" | ||
| import Typography from "@material-ui/core/Typography" | ||
| import Workspace from "react-material-workspace-layout/Workspace" | ||
|
|
||
| export default ({ children }: any) => ( | ||
| <div style={{ border: "1px solid #ccc", padding: 10, borderRadius: 4 }}> | ||
| {children} | ||
| </div> | ||
| ) | ||
| export default ({ | ||
| children, | ||
| onNext, | ||
| onPrev, | ||
| currentSampleIndex = 0, | ||
| numberOfSamples = 1, | ||
| titleContent, | ||
| onClickHeaderItem | ||
| }: any) => { | ||
| const headerItems = useMemo( | ||
| () => | ||
| [ | ||
| (currentSampleIndex > 0 || onPrev) && { name: "Prev", onClick: onPrev }, | ||
| (numberOfSamples > currentSampleIndex + 1 || onNext) && { | ||
| name: "Next", | ||
| onClick: onNext | ||
| }, | ||
| { name: "Done" } | ||
| ].filter(Boolean), | ||
| [currentSampleIndex, numberOfSamples] | ||
| ) | ||
| return ( | ||
| <Workspace | ||
| headerLeftSide={ | ||
| titleContent === undefined ? ( | ||
| <Box paddingLeft={2} fontWeight="bold"> | ||
| <Typography> | ||
| Sample {currentSampleIndex + 1} / {numberOfSamples} | ||
| </Typography> | ||
| </Box> | ||
| ) : ( | ||
| titleContent | ||
| ) | ||
| } | ||
| onClickHeaderItem={onClickHeaderItem} | ||
| headerItems={headerItems} | ||
| iconSidebarItems={[]} | ||
| rightSidebarItems={[]} | ||
| > | ||
| <Box padding={2}>{children}</Box> | ||
| </Workspace> | ||
| ) | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // @flow | ||
|
|
||
| import React from "react" | ||
| import { storiesOf } from "@storybook/react" | ||
| import { action } from "@storybook/addon-actions" | ||
| import Container from "./" | ||
|
|
||
| storiesOf("Container", module).add("Basic", () => ( | ||
| <Container | ||
| onNext={action("onNext")} | ||
| onPrev={action("onPrev")} | ||
| onClickHeaderItem={action("onClickHeaderItem")} | ||
| > | ||
| Some inner content | ||
| </Container> | ||
| )) |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoa! I didn't know that but it's a really quick and good solution! 🤘