mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-02-24 16:14:01 +08:00
* Switch to using Typescript instead of Babel * Switch all es6 / jsx file extensions to ts / tsx * Convert Utils to a TS module from module.exports style module * Move everything from module.exports to typescript exports * Define .d.ts files for mailspring-exports and component kit… Yes it seems this is the best option :( * Load up on those @types * Synthesize TS types from PropTypes for standard components * Add types to Model classes and move constructor constants to instance vars * 9800 => 7700 TS errors * 7700 => 5600 TS errors * 5600 => 5330 TS errors * 5330 => 4866 TS errors * 4866 => 4426 TS errors * 4426 => 2411 TS errors * 2411 > 1598 TS errors * 1598 > 769 TS errors * 769 > 129 TS errors * 129 > 22 TS errors * Fix runtime errors * More runtime error fixes * Remove support for custom .es6 file extension * Remove a few odd remaining references to Nylas * Don’t ship Typescript support in the compiled app for now * Fix issues in compiled app - module resolution in TS is case sensitive? * README updates * Fix a few more TS errors * Make “No Signature” option clickable + selectable * Remove flicker when saving file and reloading keymaps * Fix mail rule item height in preferences * Fix missing spacing in thread sharing popover * Fix scrollbar ticks being nested incorrectly * Add Japanese as a manually reviewed language * Prevent the thread list from “sticking” * Re-use Sheet when switching root tabs, prevent sidebar from resetting * Ensure specs run * Update package configuration to avoid shpping types * Turn eslint back on - we will opt-in to the TS rules one by one
61 lines
1.6 KiB
TypeScript
61 lines
1.6 KiB
TypeScript
import React, { Component } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { ListensToObservable, InjectedComponentSet } from 'mailspring-component-kit';
|
|
import ThreadListStore from './thread-list-store';
|
|
|
|
export const ToolbarRole = 'ThreadActionsToolbarButton';
|
|
|
|
function defaultObservable() {
|
|
return ThreadListStore.selectionObservable();
|
|
}
|
|
|
|
function InjectsToolbarButtons(
|
|
ToolbarComponent,
|
|
{
|
|
getObservable,
|
|
extraRoles = [],
|
|
}: { getObservable?: () => Rx.Observable<any>; extraRoles: string[] }
|
|
) {
|
|
const roles = [ToolbarRole].concat(extraRoles);
|
|
|
|
class ComposedComponent extends Component<{ items: object[] }> {
|
|
static displayName = ToolbarComponent.displayName;
|
|
|
|
static propTypes = {
|
|
items: PropTypes.array,
|
|
};
|
|
|
|
static containerRequired = false;
|
|
|
|
render() {
|
|
const { items } = this.props;
|
|
const { selection } = ThreadListStore.dataSource();
|
|
|
|
// Keep all of the exposed props from deprecated regions that now map to this one
|
|
const exposedProps = {
|
|
items,
|
|
selection,
|
|
thread: items[0],
|
|
};
|
|
const injectedButtons = (
|
|
<InjectedComponentSet key="injected" matching={{ roles }} exposedProps={exposedProps} />
|
|
);
|
|
return (
|
|
<ToolbarComponent items={items} selection={selection} injectedButtons={injectedButtons} />
|
|
);
|
|
}
|
|
}
|
|
|
|
const getStateFromObservable = items => {
|
|
if (!items) {
|
|
return { items: [] };
|
|
}
|
|
return { items };
|
|
};
|
|
return ListensToObservable(ComposedComponent, {
|
|
getObservable: getObservable || defaultObservable,
|
|
getStateFromObservable,
|
|
});
|
|
}
|
|
|
|
export default InjectsToolbarButtons;
|