You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-11-23 22:36:32 +02:00
Chore: SideBar => Sidebar
This commit is contained in:
@@ -335,9 +335,9 @@ packages/app-desktop/gui/ConfigScreen/ButtonBar.js.map
|
|||||||
packages/app-desktop/gui/ConfigScreen/ConfigScreen.d.ts
|
packages/app-desktop/gui/ConfigScreen/ConfigScreen.d.ts
|
||||||
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js
|
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js
|
||||||
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
|
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
|
||||||
packages/app-desktop/gui/ConfigScreen/SideBar.d.ts
|
packages/app-desktop/gui/ConfigScreen/Sidebar.d.ts
|
||||||
packages/app-desktop/gui/ConfigScreen/SideBar.js
|
packages/app-desktop/gui/ConfigScreen/Sidebar.js
|
||||||
packages/app-desktop/gui/ConfigScreen/SideBar.js.map
|
packages/app-desktop/gui/ConfigScreen/Sidebar.js.map
|
||||||
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.d.ts
|
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.d.ts
|
||||||
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
|
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
|
||||||
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js.map
|
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js.map
|
||||||
@@ -452,9 +452,9 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
|
|||||||
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
|
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
|
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
|
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
|
packages/app-desktop/gui/MainScreen/commands/toggleSidebar.d.ts
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
|
packages/app-desktop/gui/MainScreen/commands/toggleSidebar.js
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
|
packages/app-desktop/gui/MainScreen/commands/toggleSidebar.js.map
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.d.ts
|
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.d.ts
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js
|
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js.map
|
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js.map
|
||||||
@@ -680,15 +680,15 @@ packages/app-desktop/gui/SearchBar/SearchBar.js.map
|
|||||||
packages/app-desktop/gui/ShareNoteDialog.d.ts
|
packages/app-desktop/gui/ShareNoteDialog.d.ts
|
||||||
packages/app-desktop/gui/ShareNoteDialog.js
|
packages/app-desktop/gui/ShareNoteDialog.js
|
||||||
packages/app-desktop/gui/ShareNoteDialog.js.map
|
packages/app-desktop/gui/ShareNoteDialog.js.map
|
||||||
packages/app-desktop/gui/SideBar/SideBar.d.ts
|
packages/app-desktop/gui/Sidebar/Sidebar.d.ts
|
||||||
packages/app-desktop/gui/SideBar/SideBar.js
|
packages/app-desktop/gui/Sidebar/Sidebar.js
|
||||||
packages/app-desktop/gui/SideBar/SideBar.js.map
|
packages/app-desktop/gui/Sidebar/Sidebar.js.map
|
||||||
packages/app-desktop/gui/SideBar/commands/focusElementSideBar.d.ts
|
packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.d.ts
|
||||||
packages/app-desktop/gui/SideBar/commands/focusElementSideBar.js
|
packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js
|
||||||
packages/app-desktop/gui/SideBar/commands/focusElementSideBar.js.map
|
packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js.map
|
||||||
packages/app-desktop/gui/SideBar/styles/index.d.ts
|
packages/app-desktop/gui/Sidebar/styles/index.d.ts
|
||||||
packages/app-desktop/gui/SideBar/styles/index.js
|
packages/app-desktop/gui/Sidebar/styles/index.js
|
||||||
packages/app-desktop/gui/SideBar/styles/index.js.map
|
packages/app-desktop/gui/Sidebar/styles/index.js.map
|
||||||
packages/app-desktop/gui/StatusScreen/StatusScreen.d.ts
|
packages/app-desktop/gui/StatusScreen/StatusScreen.d.ts
|
||||||
packages/app-desktop/gui/StatusScreen/StatusScreen.js
|
packages/app-desktop/gui/StatusScreen/StatusScreen.js
|
||||||
packages/app-desktop/gui/StatusScreen/StatusScreen.js.map
|
packages/app-desktop/gui/StatusScreen/StatusScreen.js.map
|
||||||
@@ -1370,15 +1370,15 @@ packages/lib/uuid.js.map
|
|||||||
packages/lib/versionInfo.d.ts
|
packages/lib/versionInfo.d.ts
|
||||||
packages/lib/versionInfo.js
|
packages/lib/versionInfo.js
|
||||||
packages/lib/versionInfo.js.map
|
packages/lib/versionInfo.js.map
|
||||||
packages/plugins/ToggleSideBars/api/index.d.ts
|
packages/plugins/ToggleSidebars/api/index.d.ts
|
||||||
packages/plugins/ToggleSideBars/api/index.js
|
packages/plugins/ToggleSidebars/api/index.js
|
||||||
packages/plugins/ToggleSideBars/api/index.js.map
|
packages/plugins/ToggleSidebars/api/index.js.map
|
||||||
packages/plugins/ToggleSideBars/api/types.d.ts
|
packages/plugins/ToggleSidebars/api/types.d.ts
|
||||||
packages/plugins/ToggleSideBars/api/types.js
|
packages/plugins/ToggleSidebars/api/types.js
|
||||||
packages/plugins/ToggleSideBars/api/types.js.map
|
packages/plugins/ToggleSidebars/api/types.js.map
|
||||||
packages/plugins/ToggleSideBars/src/index.d.ts
|
packages/plugins/ToggleSidebars/src/index.d.ts
|
||||||
packages/plugins/ToggleSideBars/src/index.js
|
packages/plugins/ToggleSidebars/src/index.js
|
||||||
packages/plugins/ToggleSideBars/src/index.js.map
|
packages/plugins/ToggleSidebars/src/index.js.map
|
||||||
packages/renderer/HtmlToHtml.d.ts
|
packages/renderer/HtmlToHtml.d.ts
|
||||||
packages/renderer/HtmlToHtml.js
|
packages/renderer/HtmlToHtml.js
|
||||||
packages/renderer/HtmlToHtml.js.map
|
packages/renderer/HtmlToHtml.js.map
|
||||||
|
|||||||
48
.gitignore
vendored
48
.gitignore
vendored
@@ -324,9 +324,9 @@ packages/app-desktop/gui/ConfigScreen/ButtonBar.js.map
|
|||||||
packages/app-desktop/gui/ConfigScreen/ConfigScreen.d.ts
|
packages/app-desktop/gui/ConfigScreen/ConfigScreen.d.ts
|
||||||
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js
|
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js
|
||||||
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
|
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js.map
|
||||||
packages/app-desktop/gui/ConfigScreen/SideBar.d.ts
|
packages/app-desktop/gui/ConfigScreen/Sidebar.d.ts
|
||||||
packages/app-desktop/gui/ConfigScreen/SideBar.js
|
packages/app-desktop/gui/ConfigScreen/Sidebar.js
|
||||||
packages/app-desktop/gui/ConfigScreen/SideBar.js.map
|
packages/app-desktop/gui/ConfigScreen/Sidebar.js.map
|
||||||
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.d.ts
|
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.d.ts
|
||||||
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
|
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
|
||||||
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js.map
|
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js.map
|
||||||
@@ -441,9 +441,9 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
|
|||||||
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
|
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
|
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
|
packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
|
packages/app-desktop/gui/MainScreen/commands/toggleSidebar.d.ts
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
|
packages/app-desktop/gui/MainScreen/commands/toggleSidebar.js
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
|
packages/app-desktop/gui/MainScreen/commands/toggleSidebar.js.map
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.d.ts
|
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.d.ts
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js
|
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js
|
||||||
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js.map
|
packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.js.map
|
||||||
@@ -669,15 +669,15 @@ packages/app-desktop/gui/SearchBar/SearchBar.js.map
|
|||||||
packages/app-desktop/gui/ShareNoteDialog.d.ts
|
packages/app-desktop/gui/ShareNoteDialog.d.ts
|
||||||
packages/app-desktop/gui/ShareNoteDialog.js
|
packages/app-desktop/gui/ShareNoteDialog.js
|
||||||
packages/app-desktop/gui/ShareNoteDialog.js.map
|
packages/app-desktop/gui/ShareNoteDialog.js.map
|
||||||
packages/app-desktop/gui/SideBar/SideBar.d.ts
|
packages/app-desktop/gui/Sidebar/Sidebar.d.ts
|
||||||
packages/app-desktop/gui/SideBar/SideBar.js
|
packages/app-desktop/gui/Sidebar/Sidebar.js
|
||||||
packages/app-desktop/gui/SideBar/SideBar.js.map
|
packages/app-desktop/gui/Sidebar/Sidebar.js.map
|
||||||
packages/app-desktop/gui/SideBar/commands/focusElementSideBar.d.ts
|
packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.d.ts
|
||||||
packages/app-desktop/gui/SideBar/commands/focusElementSideBar.js
|
packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js
|
||||||
packages/app-desktop/gui/SideBar/commands/focusElementSideBar.js.map
|
packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js.map
|
||||||
packages/app-desktop/gui/SideBar/styles/index.d.ts
|
packages/app-desktop/gui/Sidebar/styles/index.d.ts
|
||||||
packages/app-desktop/gui/SideBar/styles/index.js
|
packages/app-desktop/gui/Sidebar/styles/index.js
|
||||||
packages/app-desktop/gui/SideBar/styles/index.js.map
|
packages/app-desktop/gui/Sidebar/styles/index.js.map
|
||||||
packages/app-desktop/gui/StatusScreen/StatusScreen.d.ts
|
packages/app-desktop/gui/StatusScreen/StatusScreen.d.ts
|
||||||
packages/app-desktop/gui/StatusScreen/StatusScreen.js
|
packages/app-desktop/gui/StatusScreen/StatusScreen.js
|
||||||
packages/app-desktop/gui/StatusScreen/StatusScreen.js.map
|
packages/app-desktop/gui/StatusScreen/StatusScreen.js.map
|
||||||
@@ -1359,15 +1359,15 @@ packages/lib/uuid.js.map
|
|||||||
packages/lib/versionInfo.d.ts
|
packages/lib/versionInfo.d.ts
|
||||||
packages/lib/versionInfo.js
|
packages/lib/versionInfo.js
|
||||||
packages/lib/versionInfo.js.map
|
packages/lib/versionInfo.js.map
|
||||||
packages/plugins/ToggleSideBars/api/index.d.ts
|
packages/plugins/ToggleSidebars/api/index.d.ts
|
||||||
packages/plugins/ToggleSideBars/api/index.js
|
packages/plugins/ToggleSidebars/api/index.js
|
||||||
packages/plugins/ToggleSideBars/api/index.js.map
|
packages/plugins/ToggleSidebars/api/index.js.map
|
||||||
packages/plugins/ToggleSideBars/api/types.d.ts
|
packages/plugins/ToggleSidebars/api/types.d.ts
|
||||||
packages/plugins/ToggleSideBars/api/types.js
|
packages/plugins/ToggleSidebars/api/types.js
|
||||||
packages/plugins/ToggleSideBars/api/types.js.map
|
packages/plugins/ToggleSidebars/api/types.js.map
|
||||||
packages/plugins/ToggleSideBars/src/index.d.ts
|
packages/plugins/ToggleSidebars/src/index.d.ts
|
||||||
packages/plugins/ToggleSideBars/src/index.js
|
packages/plugins/ToggleSidebars/src/index.js
|
||||||
packages/plugins/ToggleSideBars/src/index.js.map
|
packages/plugins/ToggleSidebars/src/index.js.map
|
||||||
packages/renderer/HtmlToHtml.d.ts
|
packages/renderer/HtmlToHtml.d.ts
|
||||||
packages/renderer/HtmlToHtml.js
|
packages/renderer/HtmlToHtml.js
|
||||||
packages/renderer/HtmlToHtml.js.map
|
packages/renderer/HtmlToHtml.js.map
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ export enum ButtonLevel {
|
|||||||
Primary = 'primary',
|
Primary = 'primary',
|
||||||
Secondary = 'secondary',
|
Secondary = 'secondary',
|
||||||
Tertiary = 'tertiary',
|
Tertiary = 'tertiary',
|
||||||
SideBarSecondary = 'sideBarSecondary',
|
SidebarSecondary = 'sidebarSecondary',
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -121,7 +121,7 @@ const StyledButtonTertiary = styled(StyledButtonBase)`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledButtonSideBarSecondary = styled(StyledButtonBase)`
|
const StyledButtonSidebarSecondary = styled(StyledButtonBase)`
|
||||||
background: none;
|
background: none;
|
||||||
border-color: ${(props: any) => props.theme.color2};
|
border-color: ${(props: any) => props.theme.color2};
|
||||||
color: ${(props: any) => props.theme.color2};
|
color: ${(props: any) => props.theme.color2};
|
||||||
@@ -166,7 +166,7 @@ const StyledButtonSideBarSecondary = styled(StyledButtonBase)`
|
|||||||
function buttonClass(level: ButtonLevel) {
|
function buttonClass(level: ButtonLevel) {
|
||||||
if (level === ButtonLevel.Primary) return StyledButtonPrimary;
|
if (level === ButtonLevel.Primary) return StyledButtonPrimary;
|
||||||
if (level === ButtonLevel.Tertiary) return StyledButtonTertiary;
|
if (level === ButtonLevel.Tertiary) return StyledButtonTertiary;
|
||||||
if (level === ButtonLevel.SideBarSecondary) return StyledButtonSideBarSecondary;
|
if (level === ButtonLevel.SidebarSecondary) return StyledButtonSidebarSecondary;
|
||||||
return StyledButtonSecondary;
|
return StyledButtonSecondary;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import SideBar from './SideBar';
|
import Sidebar from './Sidebar';
|
||||||
import ButtonBar from './ButtonBar';
|
import ButtonBar from './ButtonBar';
|
||||||
import Button, { ButtonLevel } from '../Button/Button';
|
import Button, { ButtonLevel } from '../Button/Button';
|
||||||
import { _ } from '@joplin/lib/locale';
|
import { _ } from '@joplin/lib/locale';
|
||||||
@@ -40,7 +40,7 @@ class ConfigScreenComponent extends React.Component<any, any> {
|
|||||||
marginBottom: 10,
|
marginBottom: 10,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.sideBar_selectionChange = this.sideBar_selectionChange.bind(this);
|
this.sidebar_selectionChange = this.sidebar_selectionChange.bind(this);
|
||||||
this.checkSyncConfig_ = this.checkSyncConfig_.bind(this);
|
this.checkSyncConfig_ = this.checkSyncConfig_.bind(this);
|
||||||
this.checkNextcloudAppButton_click = this.checkNextcloudAppButton_click.bind(this);
|
this.checkNextcloudAppButton_click = this.checkNextcloudAppButton_click.bind(this);
|
||||||
this.showLogButton_click = this.showLogButton_click.bind(this);
|
this.showLogButton_click = this.showLogButton_click.bind(this);
|
||||||
@@ -114,7 +114,7 @@ class ConfigScreenComponent extends React.Component<any, any> {
|
|||||||
this.setState({ selectedSectionName: section.name, screenName: screenName });
|
this.setState({ selectedSectionName: section.name, screenName: screenName });
|
||||||
}
|
}
|
||||||
|
|
||||||
sideBar_selectionChange(event: any) {
|
sidebar_selectionChange(event: any) {
|
||||||
this.switchSection(event.section.name);
|
this.switchSection(event.section.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -729,9 +729,9 @@ class ConfigScreenComponent extends React.Component<any, any> {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={{ display: 'flex', flexDirection: 'row' }}>
|
<div style={{ display: 'flex', flexDirection: 'row' }}>
|
||||||
<SideBar
|
<Sidebar
|
||||||
selection={this.state.selectedSectionName}
|
selection={this.state.selectedSectionName}
|
||||||
onSelectionChange={this.sideBar_selectionChange}
|
onSelectionChange={this.sidebar_selectionChange}
|
||||||
sections={sections}
|
sections={sections}
|
||||||
/>
|
/>
|
||||||
<div style={style}>
|
<div style={style}>
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ export const StyledListItemIcon = styled.i`
|
|||||||
margin-right: ${(props: any) => props.theme.mainPadding / 1.5}px;
|
margin-right: ${(props: any) => props.theme.mainPadding / 1.5}px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export default function SideBar(props: Props) {
|
export default function Sidebar(props: Props) {
|
||||||
const buttons: any[] = [];
|
const buttons: any[] = [];
|
||||||
|
|
||||||
function renderButton(section: any) {
|
function renderButton(section: any) {
|
||||||
@@ -9,7 +9,7 @@ import NoteContentPropertiesDialog from '../NoteContentPropertiesDialog';
|
|||||||
import ShareNoteDialog from '../ShareNoteDialog';
|
import ShareNoteDialog from '../ShareNoteDialog';
|
||||||
import CommandService from '@joplin/lib/services/CommandService';
|
import CommandService from '@joplin/lib/services/CommandService';
|
||||||
import { PluginStates, utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
|
import { PluginStates, utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
|
||||||
import SideBar from '../SideBar/SideBar';
|
import Sidebar from '../Sidebar/Sidebar';
|
||||||
import UserWebview from '../../services/plugins/UserWebview';
|
import UserWebview from '../../services/plugins/UserWebview';
|
||||||
import UserWebviewDialog from '../../services/plugins/UserWebviewDialog';
|
import UserWebviewDialog from '../../services/plugins/UserWebviewDialog';
|
||||||
import { ContainerType } from '@joplin/lib/services/plugins/WebviewController';
|
import { ContainerType } from '@joplin/lib/services/plugins/WebviewController';
|
||||||
@@ -578,7 +578,7 @@ class MainScreenComponent extends React.Component<Props, State> {
|
|||||||
|
|
||||||
const components: any = {
|
const components: any = {
|
||||||
sideBar: () => {
|
sideBar: () => {
|
||||||
return <SideBar key={key} />;
|
return <Sidebar key={key} />;
|
||||||
},
|
},
|
||||||
|
|
||||||
noteList: () => {
|
noteList: () => {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ function FolderItem(props: any) {
|
|||||||
|
|
||||||
const menuUtils = new MenuUtils(CommandService.instance());
|
const menuUtils = new MenuUtils(CommandService.instance());
|
||||||
|
|
||||||
class SideBarComponent extends React.Component<Props, State> {
|
class SidebarComponent extends React.Component<Props, State> {
|
||||||
|
|
||||||
private folderItemsOrder_: any[] = [];
|
private folderItemsOrder_: any[] = [];
|
||||||
private tagItemsOrder_: any[] = [];
|
private tagItemsOrder_: any[] = [];
|
||||||
@@ -472,7 +472,7 @@ class SideBarComponent extends React.Component<Props, State> {
|
|||||||
<StyledHeaderIcon className={iconName}/>
|
<StyledHeaderIcon className={iconName}/>
|
||||||
<StyledHeaderLabel>{label}</StyledHeaderLabel>
|
<StyledHeaderLabel>{label}</StyledHeaderLabel>
|
||||||
</StyledHeader>
|
</StyledHeader>
|
||||||
{ onPlusButtonClick && <StyledAddButton onClick={onPlusButtonClick} iconName="fas fa-plus" level={ButtonLevel.SideBarSecondary}/> }
|
{ onPlusButtonClick && <StyledAddButton onClick={onPlusButtonClick} iconName="fas fa-plus" level={ButtonLevel.SidebarSecondary}/> }
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -581,7 +581,7 @@ class SideBarComponent extends React.Component<Props, State> {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledSynchronizeButton
|
<StyledSynchronizeButton
|
||||||
level={ButtonLevel.SideBarSecondary}
|
level={ButtonLevel.SidebarSecondary}
|
||||||
iconName="icon-sync"
|
iconName="icon-sync"
|
||||||
key="sync_button"
|
key="sync_button"
|
||||||
iconAnimation={iconAnimation}
|
iconAnimation={iconAnimation}
|
||||||
@@ -687,7 +687,7 @@ class SideBarComponent extends React.Component<Props, State> {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledRoot ref={this.rootRef} onKeyDown={this.onKeyDown} className="side-bar">
|
<StyledRoot ref={this.rootRef} onKeyDown={this.onKeyDown} className="sidebar">
|
||||||
<div style={{ flex: 1, overflowX: 'hidden', overflowY: 'auto' }}>{items}</div>
|
<div style={{ flex: 1, overflowX: 'hidden', overflowY: 'auto' }}>{items}</div>
|
||||||
<div style={{ flex: 0, padding: theme.mainPadding }}>
|
<div style={{ flex: 0, padding: theme.mainPadding }}>
|
||||||
{syncReportComp}
|
{syncReportComp}
|
||||||
@@ -719,4 +719,4 @@ const mapStateToProps = (state: AppState) => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export default connect(mapStateToProps)(SideBarComponent);
|
export default connect(mapStateToProps)(SidebarComponent);
|
||||||
@@ -12,9 +12,9 @@ export const declaration: CommandDeclaration = {
|
|||||||
export const runtime = (comp: any): CommandRuntime => {
|
export const runtime = (comp: any): CommandRuntime => {
|
||||||
return {
|
return {
|
||||||
execute: async (context: CommandContext) => {
|
execute: async (context: CommandContext) => {
|
||||||
const sideBarVisible = layoutItemProp((context.state as AppState).mainLayout, 'sideBar', 'visible');
|
const sidebarVisible = layoutItemProp((context.state as AppState).mainLayout, 'sideBar', 'visible');
|
||||||
|
|
||||||
if (sideBarVisible) {
|
if (sidebarVisible) {
|
||||||
const item = comp.selectedItem();
|
const item = comp.selectedItem();
|
||||||
if (item) {
|
if (item) {
|
||||||
const anchorRef = comp.anchorItemRefs[item.type][item.id];
|
const anchorRef = comp.anchorItemRefs[item.type][item.id];
|
||||||
@@ -17,7 +17,10 @@ export default function stateToWhenClauseContext(state: AppState) {
|
|||||||
markdownEditorPaneVisible: state.settings['editor.codeView'] && state.noteVisiblePanes.includes('editor'),
|
markdownEditorPaneVisible: state.settings['editor.codeView'] && state.noteVisiblePanes.includes('editor'),
|
||||||
markdownViewerPaneVisible: state.settings['editor.codeView'] && state.noteVisiblePanes.includes('viewer'),
|
markdownViewerPaneVisible: state.settings['editor.codeView'] && state.noteVisiblePanes.includes('viewer'),
|
||||||
modalDialogVisible: !!Object.keys(state.visibleDialogs).length,
|
modalDialogVisible: !!Object.keys(state.visibleDialogs).length,
|
||||||
sideBarVisible: !!state.mainLayout && layoutItemProp(state.mainLayout, 'sideBar', 'visible'),
|
sidebarVisible: !!state.mainLayout && layoutItemProp(state.mainLayout, 'sideBar', 'visible'),
|
||||||
noteListHasNotes: !!state.notes.length,
|
noteListHasNotes: !!state.notes.length,
|
||||||
|
|
||||||
|
// Deprecated
|
||||||
|
sideBarVisible: !!state.mainLayout && layoutItemProp(state.mainLayout, 'sideBar', 'visible'),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class SideMenuContentNoteComponent extends Component {
|
|||||||
return <View style={{ marginTop: 15, marginBottom: 15, flex: -1, borderBottomWidth: 1, borderBottomColor: theme.dividerColor }} key={key}></View>;
|
return <View style={{ marginTop: 15, marginBottom: 15, flex: -1, borderBottomWidth: 1, borderBottomColor: theme.dividerColor }} key={key}></View>;
|
||||||
}
|
}
|
||||||
|
|
||||||
renderSideBarButton(key, title, iconName, onPressHandler) {
|
renderSidebarButton(key, title, iconName, onPressHandler) {
|
||||||
const content = (
|
const content = (
|
||||||
<View key={key} style={onPressHandler ? this.styles().sideButton : this.styles().sideButtonDisabled}>
|
<View key={key} style={onPressHandler ? this.styles().sideButton : this.styles().sideButtonDisabled}>
|
||||||
{!iconName ? null : <Icon name={iconName} style={this.styles().sidebarIcon} />}
|
{!iconName ? null : <Icon name={iconName} style={this.styles().sidebarIcon} />}
|
||||||
@@ -83,7 +83,7 @@ class SideMenuContentNoteComponent extends Component {
|
|||||||
if (option.isDivider) {
|
if (option.isDivider) {
|
||||||
items.push(this.renderDivider(`divider_${dividerIndex++}`));
|
items.push(this.renderDivider(`divider_${dividerIndex++}`));
|
||||||
} else {
|
} else {
|
||||||
items.push(this.renderSideBarButton(option.title, option.title, null, option.onPress));
|
items.push(this.renderSidebarButton(option.title, option.title, null, option.onPress));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ class SideMenuContentComponent extends Component {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
renderSideBarButton(key, title, iconName, onPressHandler = null, selected = false) {
|
renderSidebarButton(key, title, iconName, onPressHandler = null, selected = false) {
|
||||||
let icon = <Icon name={iconName} style={this.styles().sidebarIcon} />;
|
let icon = <Icon name={iconName} style={this.styles().sidebarIcon} />;
|
||||||
|
|
||||||
if (key === 'synchronize_button') {
|
if (key === 'synchronize_button') {
|
||||||
@@ -309,11 +309,11 @@ class SideMenuContentComponent extends Component {
|
|||||||
|
|
||||||
items.push(this.makeDivider('divider_1'));
|
items.push(this.makeDivider('divider_1'));
|
||||||
|
|
||||||
items.push(this.renderSideBarButton('newFolder_button', _('New Notebook'), 'md-folder-open', this.newFolderButton_press));
|
items.push(this.renderSidebarButton('newFolder_button', _('New Notebook'), 'md-folder-open', this.newFolderButton_press));
|
||||||
|
|
||||||
items.push(this.renderSideBarButton('tag_button', _('Tags'), 'md-pricetag', this.tagButton_press));
|
items.push(this.renderSidebarButton('tag_button', _('Tags'), 'md-pricetag', this.tagButton_press));
|
||||||
|
|
||||||
items.push(this.renderSideBarButton('config_button', _('Configuration'), 'md-settings', this.configButton_press));
|
items.push(this.renderSidebarButton('config_button', _('Configuration'), 'md-settings', this.configButton_press));
|
||||||
|
|
||||||
items.push(this.makeDivider('divider_2'));
|
items.push(this.makeDivider('divider_2'));
|
||||||
|
|
||||||
@@ -335,7 +335,7 @@ class SideMenuContentComponent extends Component {
|
|||||||
if (resourceFetcherText) fullReport.push(resourceFetcherText);
|
if (resourceFetcherText) fullReport.push(resourceFetcherText);
|
||||||
if (decryptionReportText) fullReport.push(decryptionReportText);
|
if (decryptionReportText) fullReport.push(decryptionReportText);
|
||||||
|
|
||||||
items.push(this.renderSideBarButton('synchronize_button', !this.props.syncStarted ? _('Synchronise') : _('Cancel'), 'md-sync', this.synchronize_press));
|
items.push(this.renderSidebarButton('synchronize_button', !this.props.syncStarted ? _('Synchronise') : _('Cancel'), 'md-sync', this.synchronize_press));
|
||||||
|
|
||||||
if (fullReport.length) {
|
if (fullReport.length) {
|
||||||
items.push(
|
items.push(
|
||||||
@@ -357,11 +357,11 @@ class SideMenuContentComponent extends Component {
|
|||||||
// using padding. So instead creating blank elements for padding bottom and top.
|
// using padding. So instead creating blank elements for padding bottom and top.
|
||||||
items.push(<View style={{ height: theme.marginTop }} key="bottom_top_hack" />);
|
items.push(<View style={{ height: theme.marginTop }} key="bottom_top_hack" />);
|
||||||
|
|
||||||
items.push(this.renderSideBarButton('all_notes', _('All notes'), 'md-document', this.allNotesButton_press, this.props.notesParentType === 'SmartFilter'));
|
items.push(this.renderSidebarButton('all_notes', _('All notes'), 'md-document', this.allNotesButton_press, this.props.notesParentType === 'SmartFilter'));
|
||||||
|
|
||||||
items.push(this.makeDivider('divider_all'));
|
items.push(this.makeDivider('divider_all'));
|
||||||
|
|
||||||
items.push(this.renderSideBarButton('folder_header', _('Notebooks'), 'md-folder'));
|
items.push(this.renderSidebarButton('folder_header', _('Notebooks'), 'md-folder'));
|
||||||
|
|
||||||
if (this.props.folders.length) {
|
if (this.props.folders.length) {
|
||||||
const result = shared.renderFolders(this.props, this.renderFolderItem);
|
const result = shared.renderFolders(this.props, this.renderFolderItem);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "joplin-plugin-toggle-side-bars",
|
"name": "joplin-plugin-toggle-sidebars",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dist": "webpack",
|
"dist": "webpack",
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
import joplin from 'api';
|
import joplin from 'api';
|
||||||
|
import { ToolbarButtonLocation } from 'api/types';
|
||||||
|
|
||||||
joplin.plugins.register({
|
joplin.plugins.register({
|
||||||
onStart: async function() {
|
onStart: async function() {
|
||||||
await joplin.views.toolbarButtons.create('toggleSideBarButton', 'toggleSideBar', 'noteToolbar');
|
await joplin.views.toolbarButtons.create('toggleSideBarButton', 'toggleSideBar', ToolbarButtonLocation.NoteToolbar);
|
||||||
await joplin.views.toolbarButtons.create('toggleNoteListButton', 'toggleNoteList', 'noteToolbar');
|
await joplin.views.toolbarButtons.create('toggleNoteListButton', 'toggleNoteList', ToolbarButtonLocation.NoteToolbar);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"manifest_version": 1,
|
"manifest_version": 1,
|
||||||
"id": "org.joplinapp.plugins.ToggleSideBars",
|
"id": "org.joplinapp.plugins.ToggleSidebars",
|
||||||
"app_min_version": "1.6",
|
"app_min_version": "1.6",
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"name": "Note list and side bar toggle buttons",
|
"name": "Note list and side bar toggle buttons",
|
||||||
"description": "Adds buttons to toggle note list and sidebar",
|
"description": "Adds buttons to toggle note list and sidebar",
|
||||||
"author": "Laurent Cozic",
|
"author": "Laurent Cozic",
|
||||||
"homepage_url": "https://github.com/laurent22/joplin/tree/dev/packages/plugins/ToggleSideBars",
|
"homepage_url": "https://github.com/laurent22/joplin/tree/dev/packages/plugins/ToggleSidebars",
|
||||||
"repository_url": "https://github.com/laurent22/joplin/tree/dev/packages/plugins/ToggleSideBars"
|
"repository_url": "https://github.com/laurent22/joplin/tree/dev/packages/plugins/ToggleSidebars"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user