-
Notifications
You must be signed in to change notification settings - Fork 0
Improve layout and components for different orientations #40
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
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
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,27 +1,46 @@ | ||
| import React from "react"; | ||
| import { ContentLayout } from "./index"; | ||
| import { loremIpsum } from "lorem-ipsum"; | ||
|
|
||
| export default { | ||
| title: "ContentLayout" | ||
| }; | ||
|
|
||
| const Box: React.FC<{ text: string; color: string; style?: any }> = ({ | ||
| text, | ||
| color, | ||
| style | ||
| }) => <div style={{ ...style, backgroundColor: color }}>Info {text}</div>; | ||
| const Box: React.FC<{ | ||
| text?: string; | ||
| title: string; | ||
| words?: number; | ||
| color: string; | ||
| style?: any; | ||
| }> = ({ text, words = 1, color, style, title }) => ( | ||
| <div | ||
| style={{ | ||
| ...style, | ||
| backgroundColor: color, | ||
| overflow: "auto", | ||
| height: "100%" | ||
| }} | ||
| > | ||
| <div> | ||
| <h2>{title}</h2> | ||
| {text} | ||
| </div> | ||
| {loremIpsum({ count: words })} | ||
| </div> | ||
| ); | ||
|
|
||
| export const Layout = () => ( | ||
| <ContentLayout | ||
| info={<Box text="Info" color="grey" />} | ||
| editor={<Box text="Editor" color="blue" />} | ||
| tools={<Box text="Tools" color="red" />} | ||
| info={<Box title="Info" color="grey" />} | ||
| editor={<Box title="Editor" color="cyan" />} | ||
| tools={<Box title="Tools" color="red" />} | ||
| /> | ||
| ); | ||
|
|
||
| export const LayoutWithContent = () => ( | ||
| <ContentLayout | ||
| info={<Box style={{ height: "1200px" }} text="Info" color="grey" />} | ||
| editor={<Box text="Editor" color="blue" />} | ||
| tools={<Box text="Tools" color="red" />} | ||
| info={<Box title="Info" words={50} color="grey" />} | ||
| editor={<Box title="Editor" words={50} color="cyan" />} | ||
| tools={<Box title="Tools" words={50} color="red" />} | ||
| /> | ||
| ); |
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,29 +1,31 @@ | ||
| import React from "react"; | ||
| import { Col, Row } from "reactstrap"; | ||
| import "bootstrap/dist/css/bootstrap.css"; | ||
| import styles from "./layout.module.scss"; | ||
| import Div100vh from "react-div-100vh"; | ||
|
|
||
| type ContentLayoutProps = { | ||
| info: React.ReactNode; | ||
| editor: React.ReactNode; | ||
| tools: React.ReactNode; | ||
| menu?: React.ReactNode; | ||
| }; | ||
|
|
||
| export const ContentLayout: React.FC<ContentLayoutProps> = ({ | ||
| menu = "This is the menu", | ||
| info, | ||
| editor, | ||
| tools | ||
| }) => ( | ||
| <div> | ||
| <Row noGutters> | ||
| <Col xs={12} md={12} lg={5} className="border-bottom border-right"> | ||
| {editor} | ||
| </Col> | ||
| <Col xs={12} md={8} lg={4} className="border-bottom border-right"> | ||
| {tools} | ||
| </Col> | ||
| <Col xs={12} md={4} lg={3} className="border-bottom border-right"> | ||
| {info} | ||
| </Col> | ||
| </Row> | ||
| </div> | ||
| <Div100vh> | ||
| <div className={styles.outer}> | ||
| <div className={styles.menu}>{menu}</div> | ||
| <div className={styles.content}> | ||
| <div className={styles.editor}>{editor}</div> | ||
| <div className={styles.toolSection}> | ||
| <div className={styles.tools}>{tools}</div> | ||
| <div className={styles.info}>{info}</div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </Div100vh> | ||
| ); |
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,58 @@ | ||
| .outer { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: stretch; | ||
| height:100%; | ||
| } | ||
|
|
||
| .content { | ||
| overflow: auto; | ||
| display: flex; | ||
| flex-direction: column; | ||
| flex-grow: 1; | ||
| height: 0; //This is a dirty hack to enable flex behaviour for Safari on iOS. | ||
| } | ||
|
|
||
| .menu { | ||
| overflow: auto; | ||
| flex-grow: 0; | ||
| } | ||
|
|
||
| .editor { | ||
| flex-basis: 70%; | ||
| overflow: auto; | ||
| } | ||
|
|
||
| .toolSection { | ||
| flex-direction: row; | ||
| display: flex; | ||
| overflow: auto; | ||
| flex-basis: 30%; | ||
| } | ||
|
|
||
|
|
||
| .info { | ||
| flex-basis: 30%; | ||
| overflow: auto; | ||
| } | ||
|
|
||
| .tools { | ||
| flex-basis: 70%; | ||
| overflow: auto; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| @media screen and (orientation: landscape) { | ||
| .content { | ||
| flex-direction: row; | ||
| } | ||
| .toolSection { | ||
| flex-direction: column; | ||
| flex-basis: 30%; | ||
| overflow: initial; | ||
| } | ||
| .info { | ||
| flex-basis: auto; | ||
| } | ||
| } | ||
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,14 +1,13 @@ | ||
| import React, { FunctionComponent } from "react"; | ||
|
|
||
| import { useStartup } from "../startup/useStartup"; | ||
| import Header from "../header/Header"; | ||
| import SnackMessage from "../snack-message/SnackMessage"; | ||
| import Content from "./Content"; | ||
|
|
||
| const App: FunctionComponent<any> = props => { | ||
| useStartup(); | ||
|
|
||
| return <>{[<Header />, <Content {...props} />, <SnackMessage />]}</>; | ||
| return <>{[<Content {...props} />, <SnackMessage />]}</>; | ||
| }; | ||
|
|
||
| export default App; |
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
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
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
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.
@monotv Check this crazy f**k. When I remove this line, it breaks only on iOS.
Uh oh!
There was an error while loading. Please reload this page.
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.
@levino Yeah that's why I don't like web projects :P How does it break? Is the view collapsing?
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.
There is no "view" in "web" my friend. The div is vertically too small.
iPad with the rule:
iPad without the rule:
Chrome iPad preview without(!) the rule: