Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-12-25 01:21:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Switch from creating a separate column to scoping ThreadList to split+list modes

Browse source
This commit is contained in:
Ben Gotow 2021-01-19 01:25:02 -06:00
parent 5b7f323217
commit 944eeeb1cc
3 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/internal_packages/thread-list/lib/main.ts
View file

@ -16,10 +16,12 @@ export function activate() {
ComponentRegistry.register(ThreadList, {
location: WorkspaceStore.Location.ThreadList,
modes: ['split', 'list'],
});
ComponentRegistry.register(ThreadListVertical, {
location: WorkspaceStore.Location.ThreadListVertical,
location: WorkspaceStore.Location.ThreadList,
modes: ['splitVertical'],
});
ComponentRegistry.register(SelectedItemsStack, {

42
app/internal_packages/thread-list/lib/thread-list-vertical.tsx
View file

@ -3,24 +3,30 @@ import { InjectedComponentSet } from 'mailspring-component-kit';
import { WorkspaceStore } from 'mailspring-exports';
class ThreadListVertical extends React.Component<{}, { style: string; syncing: boolean }> {
static displayName = 'ThreadListVertical';
render() {
return (
<>
<div style={{ height: '50%', width: '100%', boxShadow: '0 0.5px 0 #dddddd' }}>
<InjectedComponentSet
matching={{ location: WorkspaceStore.Location.ThreadList }} />
</div>
<div style={{ height: '50%', width: '100%' }}>
<InjectedComponentSet
matching={{ location: WorkspaceStore.Location.MessageList }} />
</div>
</>
);
}
static displayName = 'ThreadListVertical';
static containerRequired = false;
render() {
return (
<>
<div style={{ height: '50%', width: '100%', boxShadow: '0 0.5px 0 #dddddd' }}>
<InjectedComponentSet
matching={{ location: WorkspaceStore.Location.ThreadList, modes: ['split'] }}
/>
</div>
<div className="sheet-toolbar">
<InjectedComponentSet
matching={{ location: WorkspaceStore.Location.MessageList.Toolbar, modes: ['split'] }}
/>
</div>
<div style={{ height: '50%', width: '100%' }}>
<InjectedComponentSet
matching={{ location: WorkspaceStore.Location.MessageList, modes: ['split'] }}
/>
</div>
</>
);
}
}
export default ThreadListVertical;
export default ThreadListVertical;

15
app/src/flux/stores/workspace-store.ts
View file

@ -119,7 +119,7 @@ class WorkspaceStore extends MailspringStore {
{
list: ['RootSidebar', 'ThreadList'],
split: ['RootSidebar', 'ThreadList', 'MessageList', 'MessageListSidebar'],
splitVertical: ['RootSidebar', 'ThreadListVertical', 'MessageListSidebar'],
splitVertical: ['RootSidebar', 'ThreadList', 'MessageListSidebar'],
}
);
this.defineSheet('Thread', {}, { list: ['MessageList', 'MessageListSidebar'] });
@ -196,7 +196,6 @@ class WorkspaceStore extends MailspringStore {
};
_onSelectLayoutMode = mode => {
if (mode === this._preferredLayoutMode) {
return;
}
@ -223,9 +222,15 @@ class WorkspaceStore extends MailspringStore {
{
'core:pop-sheet': () => this.popSheet(),
},
this._preferredLayoutMode === 'list' ? { 'navigation:list-mode-on': () => this._onSelectLayoutMode('list') } : { 'navigation:list-mode-off': () => this._onSelectLayoutMode('list') },
this._preferredLayoutMode === 'split' ? { 'navigation:split-mode-on': () => this._onSelectLayoutMode('split') } : { 'navigation:split-mode-off': () => this._onSelectLayoutMode('split') },
this._preferredLayoutMode === 'splitVertical' ? { 'navigation:splitVertical-mode-on': () => this._onSelectLayoutMode('splitVertical') } : { 'navigation:splitVertical-mode-off': () => this._onSelectLayoutMode('splitVertical') },
this._preferredLayoutMode === 'list'
? { 'navigation:list-mode-on': () => this._onSelectLayoutMode('list') }
: { 'navigation:list-mode-off': () => this._onSelectLayoutMode('list') },
this._preferredLayoutMode === 'split'
? { 'navigation:split-mode-on': () => this._onSelectLayoutMode('split') }
: { 'navigation:split-mode-off': () => this._onSelectLayoutMode('split') },
this._preferredLayoutMode === 'splitVertical'
? { 'navigation:splitVertical-mode-on': () => this._onSelectLayoutMode('splitVertical') }
: { 'navigation:splitVertical-mode-off': () => this._onSelectLayoutMode('splitVertical') }
)
);
}