Skip to content

Commit 151c534

Browse files
authored
Merge pull request #385 from sencha/REAC-431-ReactIssues
REAC-431 | Issues are resolved.
2 parents 0d2c312 + b16b523 commit 151c534

File tree

4 files changed

+311
-289
lines changed

4 files changed

+311
-289
lines changed

packages/ext-react-kitchensink/src/Layout.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class Layout extends Component {
3333
* This likely happened when someone is deep linking into
3434
* the application without user interaction
3535
* (changing hash manually or first visiting via bookmark).
36-
*/
36+
*/
3737
const nav = this.phoneNav.cmp;
3838
const anim = nav.getLayout().getAnimation();
3939
anim.disable();
40-
40+
4141
if(node.isLeaf()) {
4242
nav.goToLeaf(node);
4343
} else {
@@ -86,10 +86,10 @@ class Layout extends Component {
8686
}
8787

8888
render() {
89-
const {
90-
selectedNavNode,
91-
component,
92-
navStore,
89+
const {
90+
selectedNavNode,
91+
component,
92+
navStore,
9393
files,
9494
children,
9595
showCode,
@@ -103,15 +103,15 @@ class Layout extends Component {
103103
if (Ext.os.is.Phone) {
104104
// phone layout
105105
return (
106-
<NestedList
106+
<NestedList
107107
ref={phoneNav => this.phoneNav = phoneNav}
108-
store={navStore}
108+
store={navStore}
109109
className={component && this.isPremium(selectedNavNode) ? 'app-premium-component' : ''}
110-
title='<i class="ext ext-sencha" style="position: relative; top: 1px; margin-right: 4px"></i> ExtReact 6.7 Kitchen Sink'
110+
title='<i class="ext ext-sencha" style="position: relative; top: 1px; margin-right: 4px"></i> ExtReact 7.0 Kitchen Sink'
111111
onItemTap={(self, list, index, target, node) => this.onNavChange(node && node.getId())}
112112
onBack={(self, node) => {
113113
// There is no easy way to grab the node that will be used after NestedList switches to previous List.
114-
// The 'node' here will always be the 'previous' node, which means we can just strip the last /* from the
114+
// The 'node' here will always be the 'previous' node, which means we can just strip the last /* from the
115115
// node's ID and use that as the new nav URL.
116116
this.onNavChange(node && node.getId().replace(/\/[^\/]*$/, ''))
117117
}}
@@ -137,35 +137,35 @@ class Layout extends Component {
137137
<Container layout="hbox" cls="main-background">
138138
<Container layout="fit" flex={4}>
139139
<TitleBar docked="top" shadow style={{zIndex: 2}}>
140-
<Button
140+
<Button
141141
align="left"
142-
iconCls="x-fa fa-bars"
142+
iconCls="x-fa fa-bars"
143143
handler={actions.toggleTree}
144144
/>
145145
<div className="ext ext-sencha" style={{margin: '0 5px 0 7px', fontSize: '20px', width: '20px'}}/>
146146
<a href="#" className="app-title">Sencha Extreact 7.0 Kitchen Sink - React v{REACT_VERSION}</a>
147147
</TitleBar>
148148
<Container layout="fit" flex={1}>
149-
<NavTree
149+
<NavTree
150150
docked="left"
151151
width="300"
152152
resizable={{
153153
edges: 'east',
154154
dynamic: true
155155
}}
156-
store={navStore}
156+
store={navStore}
157157
selection={selectedNavNode}
158158
onSelectionChange={(tree, node) => this.onNavChange(node && node.getId())}
159159
collapsed={!showTree}
160-
/>
160+
/>
161161
<Breadcrumbs docked="top" node={selectedNavNode}/>
162162
<Transition type="slide" bindDirectionToLocation padding="30">
163163
{ component ? (
164164
<Container layout={layout} scrollable key={selectedNavNode.id} autoSize={layout !== 'fit'}>
165165
{ layout === 'fit' ? (
166-
<Container padding="30" layout="fit">{ example }</Container>
166+
<Container padding="30" layout="fit">{ example }</Container>
167167
) : (
168-
example
168+
example
169169
)}
170170
</Container>
171171
) : selectedNavNode ? (
@@ -175,30 +175,30 @@ class Layout extends Component {
175175
</Container>
176176
</Container>
177177
{ files && (
178-
<Button
179-
align="right"
178+
<Button
179+
align="right"
180180
iconCls={'x-font-icon ' + (showCode ? 'md-icon-close' : 'md-icon-code') }
181-
ui="fab"
181+
ui="fab"
182182
top={Ext.os.is.Desktop ? 20 : 35}
183183
right={21}
184184
zIndex={1000}
185-
handler={actions.toggleCode}
186-
/>
187-
)}
185+
handler={actions.toggleCode}
186+
/>
187+
)}
188188
{ files && (
189-
<Panel
190-
resizable={{ edges: 'west', dynamic: true }}
189+
<Panel
190+
resizable={{ edges: 'west', dynamic: true }}
191191
flex={2}
192-
layout="fit"
192+
layout="fit"
193193
collapsed={!showCode}
194194
header={false}
195195
collapsible={{ direction: 'right' }}
196-
shadow
197-
style={{zIndex: 3}}
196+
shadow
197+
style={{zIndex: 3}}
198198
hideAnimation={{type: 'slideOut', direction: 'right', duration: 100, easing: 'ease' }}
199199
showAnimation={{type: 'slideIn', direction: 'left', duration: 100, easing: 'ease' }}
200200
>
201-
<Files files={files} />
201+
<Files files={files} />
202202
</Panel>
203203
)}
204204
</Container>
@@ -225,4 +225,4 @@ const mapDispatchToProps = (dispatch) => {
225225
return { actions: bindActionCreators(actionCreators, dispatch) };
226226
}
227227

228-
export default connect(mapStateToProps, mapDispatchToProps)(Layout)
228+
export default connect(mapStateToProps, mapDispatchToProps)(Layout)

0 commit comments

Comments
 (0)