Skip to content

Allow collapsing sidebar, make sidebar have minimum size #236

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow collapsing sidebar, make sidebar have minimum size #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions static/rustw.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,13 +488,26 @@ span#measure {
display: flex;
flex-direction: column;
overflow: hidden;
position: relative;
min-width: 300px;
}
.div_sidebar.collapsed {
flex: 0 0 20px;
min-width: auto;
}
.div_side_tabbar {
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden;
}
.a_side_collapsebtn {
margin: 2px;
position: absolute;
}
.div_sidebar.collapsed .div_side_tabbar {
visibility: hidden;
}
.div_sidebar_tabs {
display: flex;
height: fit-content;
Expand Down
28 changes: 25 additions & 3 deletions static/rustw.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8416,10 +8416,28 @@ var Sidebar = exports.Sidebar = function (_React$Component) {

return _react2.default.createElement(
'div',
{ className: 'div_sidebar' },
{
className: "div_sidebar" + (this.state.collapsed ? " collapsed" : "")
},
_react2.default.createElement(
'a',
{
className: 'a_side_collapsebtn',
href: 'javascript:void(0)',
onClick: function onClick(_e) {
return _this2.setState({ collapsed: !_this2.state.collapsed });
}
},
this.state.collapsed ? "[+]" : "[-]"
),
_react2.default.createElement(
_reactTabs.Tabs,
{ selectedIndex: this.state.tabIndex, className: 'div_side_tabbar', selectedTabClassName: 'selected', onSelect: onSelect },
{
selectedIndex: this.state.tabIndex,
className: 'div_side_tabbar',
selectedTabClassName: 'selected',
onSelect: onSelect
},
_react2.default.createElement(
_reactTabs.TabList,
{ className: 'div_sidebar_tabs' },
Expand All @@ -8442,7 +8460,11 @@ var Sidebar = exports.Sidebar = function (_React$Component) {
_react2.default.createElement(
_reactTabs.TabPanel,
{ className: 'div_sidebar_main' },
_react2.default.createElement(_searchPanel.SearchPanel, _extends({ app: this.props.app }, this.props.search, { searchController: searchController }))
_react2.default.createElement(_searchPanel.SearchPanel, _extends({
app: this.props.app
}, this.props.search, {
searchController: searchController
}))
),
_react2.default.createElement(
_reactTabs.TabPanel,
Expand Down
2 changes: 1 addition & 1 deletion static/rustw.out.js.map
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 39 additions & 19 deletions static/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,45 @@ export class Sidebar extends React.Component {

const onSelect = tabIndex => this.setState({ tabIndex });

return <div className="div_sidebar">
<Tabs selectedIndex={this.state.tabIndex} className="div_side_tabbar" selectedTabClassName="selected" onSelect={onSelect}>
<TabList className="div_sidebar_tabs">
<Tab className="div_sidebar_tab">search</Tab>
<Tab className="div_sidebar_tab">files</Tab>
<Tab className="div_sidebar_tab">symbols</Tab>
</TabList>
<TabPanel className="div_sidebar_main">
<SearchPanel app={this.props.app} {...this.props.search} searchController={searchController} />
</TabPanel>
<TabPanel className="div_sidebar_main">
<TreePanel app={this.props.app} tree={this.props.fileTreeData} />
</TabPanel>
<TabPanel className="div_sidebar_main">
<SymbolPanel app={this.props.app} symbols={this.props.symbols} />
</TabPanel>
</Tabs>
<StatusBar status={this.props.status} />
</div>;
return (
<div
className={"div_sidebar" + (this.state.collapsed ? " collapsed" : "")}
>
<a
className="a_side_collapsebtn"
href="javascript:void(0)"
onClick={_e => this.setState({ collapsed: !this.state.collapsed })}
>
{this.state.collapsed ? "[+]" : "[-]"}
</a>
<Tabs
selectedIndex={this.state.tabIndex}
className="div_side_tabbar"
selectedTabClassName="selected"
onSelect={onSelect}
>
<TabList className="div_sidebar_tabs">
<Tab className="div_sidebar_tab">search</Tab>
<Tab className="div_sidebar_tab">files</Tab>
<Tab className="div_sidebar_tab">symbols</Tab>
</TabList>
<TabPanel className="div_sidebar_main">
<SearchPanel
app={this.props.app}
{...this.props.search}
searchController={searchController}
/>
</TabPanel>
<TabPanel className="div_sidebar_main">
<TreePanel app={this.props.app} tree={this.props.fileTreeData} />
</TabPanel>
<TabPanel className="div_sidebar_main">
<SymbolPanel app={this.props.app} symbols={this.props.symbols} />
</TabPanel>
</Tabs>
<StatusBar status={this.props.status} />
</div>
);
}
}

Expand Down