Skip to content

Commit ac73c5a

Browse files
committed
Merge branch 'components-refactoring' into 'master'
Components refactoring See merge request code.brahma/react-lite-ui!3
2 parents 1a1ae07 + af0ab66 commit ac73c5a

File tree

33 files changed

+755
-730
lines changed

33 files changed

+755
-730
lines changed

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"extends": "airbnb",
44
"rules": {
55
"react/jsx-filename-extension": 0,
6-
"import/no-extraneous-dependencies": ["error" , { "devDependencies" : true }]
6+
"import/no-extraneous-dependencies": ["error" , { "devDependencies" : true }],
7+
"jsx-a11y/label-has-for": 0
78
},
89
"parserOptions": {
910
"ecmaFeatures": {

docs/client/components/PlaygroundPage/PlaygroundWithPreview/index.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ import components from '../../../../../src';
1010
import styles from './styles.scss';
1111
import theme from '../../../components/common/DefaultCode/theme.scss';
1212

13+
const PreviewBlock = ({ children, header }) => (
14+
<div className="preview-block">
15+
<div className="header">{header}</div>
16+
{children}
17+
</div>
18+
)
1319
class PlaygroundWithPreview extends React.Component {
1420
constructor(props) {
1521
super(props);
@@ -34,11 +40,13 @@ class PlaygroundWithPreview extends React.Component {
3440
(Editor not available at this screen size)
3541
</div>
3642
<LiveProvider
37-
scope={{ ...components, theme }}
43+
scope={{ ...components, PreviewBlock, theme }}
3844
code={this.props.defaultCode}
3945
>
4046
<div className="code-editor">
41-
<LiveEditor />
47+
<div className="editor-wrapper">
48+
<LiveEditor />
49+
</div>
4250
<div className="doc-enabler">
4351
<label htmlFor="normal-switch">
4452
<div>Show Docs</div>

docs/client/components/PlaygroundPage/PlaygroundWithPreview/styles.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
}
1616
.code-editor {
1717
width: 50%;
18+
.editor-wrapper {
19+
height: 400px !important;
20+
overflow-y: scroll;
21+
}
22+
1823
float: left;
1924
}
2025

@@ -62,4 +67,13 @@
6267
}
6368
}
6469

70+
.preview-block {
71+
.header {
72+
font-weight: bold;
73+
font-size: 20px;
74+
margin-top: 10px;
75+
margin-bottom: 15px;
76+
}
77+
78+
}
6579
}

docs/client/components/common/DefaultCode/Button/index.js

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ class Demo extends React.Component {
33
render() {
44
return (
55
<div>
6-
<div>
7-
<h4>Buttons with diffent styles</h4>
6+
<PreviewBlock header="Styled Buttons">
87
<Button>Default</Button>
98
<Button type="primary">Primary</Button>
109
<Button type="secondary">Secondary</Button>
@@ -14,20 +13,27 @@ class Demo extends React.Component {
1413
<Button type="info">Info</Button>
1514
<Button type="light">Light</Button>
1615
<Button type="dark">Dark</Button>
17-
</div>
18-
19-
<div>
20-
<h4>Buttons with diffent sizes</h4>
21-
<Button type="primary" size="small">Small</Button>
22-
<Button type="primary" size="medium">Medium</Button>
23-
<Button type="primary" size="large">Large</Button>
24-
</div>
25-
26-
<div>
27-
<h4>Buttons with Icon</h4>
28-
<Button type="success" icon="done">Left Icon</Button>
29-
<Button type="success" icon="done" iconAlignment="right">Right Icon</Button>
30-
</div>
16+
</PreviewBlock>
17+
<PreviewBlock header="Sizable Buttons">
18+
<Button
19+
type="primary"
20+
size="small"
21+
>
22+
Small
23+
</Button>
24+
<Button
25+
type="primary"
26+
size="medium"
27+
>
28+
Medium
29+
</Button>
30+
<Button
31+
type="primary"
32+
size="large"
33+
>
34+
Large
35+
</Button>
36+
</PreviewBlock>
3137
</div>
3238
)
3339
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
export const defaultCode = `
2+
class Demo extends React.Component {
3+
constructor(props) {
4+
super(props);
5+
6+
this.handleCheckClick = this.handleCheckClick.bind(this);
7+
}
8+
9+
handleCheckClick () {
10+
alert('Clicked one of the checkbox');
11+
}
12+
render() {
13+
return (
14+
<div>
15+
{/* PreviewBlock 1 */}
16+
<PreviewBlock header="Normal Checkbox">
17+
<Checkbox
18+
onClick={this.handleCheckClick}
19+
/>
20+
</PreviewBlock>
21+
{/* PreviewBlock 2 */}
22+
<PreviewBlock header="Checked by default">
23+
<Checkbox
24+
onClick={this.handleCheckClick}
25+
checked
26+
/>
27+
</PreviewBlock>
28+
{/* PreviewBlock 3 */}
29+
<PreviewBlock header="Checkbox with label">
30+
<Checkbox
31+
onClick={this.handleCheckClick}
32+
/>
33+
<span style={{ marginLeft: '10px' }}>
34+
Label for the checkbox
35+
</span>
36+
</PreviewBlock>
37+
</div>
38+
)
39+
}
40+
}
41+
`;
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
export const defaultCode = `
2+
class Demo extends React.Component {
3+
render() {
4+
const options = [
5+
{ label: 'Alpha' },
6+
{ label: 'Beta'},
7+
{ label: 'Zheta' }
8+
];
9+
return (
10+
<div>
11+
{/* Preview Block 1 */}
12+
<PreviewBlock header="Default Checkbox group">
13+
<CheckboxGroup
14+
options={options}
15+
/>
16+
</PreviewBlock>
17+
{/* Preview Block 2 */}
18+
<PreviewBlock header="Inline Checkbox group">
19+
<CheckboxGroup
20+
inline
21+
options={options}
22+
/>
23+
</PreviewBlock>
24+
</div>
25+
)
26+
}
27+
}
28+
`;
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
export const defaultCode = `
2+
class Demo extends React.Component {
3+
constructor(props) {
4+
super(props);
5+
6+
this.state = {
7+
toggled: true,
8+
};
9+
this.handleToggle = this.handleToggle.bind(this);
10+
}
11+
12+
handleToggle() {
13+
this.setState({
14+
toggled: !this.state.toggled,
15+
});
16+
}
17+
18+
render() {
19+
return (
20+
<div>
21+
{/* Preview Block 1 */}
22+
<PreviewBlock header="Default toggle (without toggable)">
23+
<Toggle />
24+
</PreviewBlock>
25+
{/* Preview Block 2 */}
26+
<PreviewBlock header="Toggle with switch on (with toggable)">
27+
<Toggle
28+
toggled={this.state.toggled}
29+
onClick={this.handleToggle}
30+
/>
31+
</PreviewBlock>
32+
</div>
33+
)
34+
}
35+
}
36+
`;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
export { defaultCode as CardDefaultCode } from './Card';
22
export { defaultCode as ButtonDefaultCode } from './Button';
3+
export { defaultCode as CheckboxDefaultCode } from './Checkbox';
4+
export { defaultCode as CheckboxGroupDefaultCode } from './CheckboxGroup';
5+
export { defaultCode as ToggleDefaultCode } from './Toggle';

docs/client/components/common/componentList.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@ import Card from '../../../../src/card';
22
import CardReadme from '../../../../src/card/readMe.md';
33
import Button from '../../../../src/button';
44
import ButtonReadme from '../../../../src/button/readMe.md';
5+
import Checkbox from '../../../../src/checkbox';
6+
import CheckboxReadme from '../../../../src/checkbox/readMe.md';
7+
import CheckboxGroup from '../../../../src/checkbox';
8+
import CheckboxGroupReadme from '../../../../src/checkbox/readMe.md';
9+
import Toggle from '../../../../src/toggle';
10+
import ToggleReadme from '../../../../src/toggle/readMe.md';
511

612
import {
713
CardDefaultCode,
814
ButtonDefaultCode,
15+
CheckboxDefaultCode,
16+
CheckboxGroupDefaultCode,
17+
ToggleDefaultCode,
918
} from './DefaultCode';
1019

1120
export const componentList = [
@@ -21,4 +30,22 @@ export const componentList = [
2130
component: Button,
2231
defaultCode: ButtonDefaultCode,
2332
},
33+
{
34+
name: 'Checkbox',
35+
docs: CheckboxReadme,
36+
component: Checkbox,
37+
defaultCode: CheckboxDefaultCode,
38+
},
39+
{
40+
name: 'CheckboxGroup',
41+
docs: CheckboxGroupReadme,
42+
component: CheckboxGroup,
43+
defaultCode: CheckboxGroupDefaultCode,
44+
},
45+
{
46+
name: 'Toggle',
47+
docs: CheckboxGroupReadme,
48+
component: Toggle,
49+
defaultCode: ToggleDefaultCode,
50+
},
2451
];

src/button/Button.js

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)