infra
/
etesync
2
0
Fork 0
Code Issues Pull Requests Packages Activity

Get rid of the useless HOC.

master
Tom Hacohen 2017-12-07 17:00:59 +00:00
parent e6778f5ace
commit 425923aa6a
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Journal.tsx
View File

@ -10,6 +10,8 @@ import JournalAddressBook from './JournalAddressBook';
import JournalCalendar from './JournalCalendar';
import LoadingIndicator from './LoadingIndicator';
import { syncEntriesToItemMap } from './journal-processors';
import { store, StoreState, JournalsData, EntriesType, CredentialsData, fetchEntries } from './store';
interface PropsType {
@ -71,7 +73,7 @@ class Journal extends React.Component {
itemsView = <JournalCalendar journal={journal} entries={syncEntries} />;
itemsTitle = 'Events';
} else if (collectionInfo.type === 'ADDRESS_BOOK') {
itemsView = <JournalAddressBook journal={journal} entries={syncEntries} />;
itemsView = <JournalAddressBook journal={journal} entries={syncEntriesToItemMap(syncEntries)} />;
itemsTitle = 'Contacts';
} else {
itemsView = <div>Unsupported type</div>;

4
src/JournalAddressBook.tsx
View File

@ -5,8 +5,6 @@ import * as ICAL from 'ical.js';
import * as EteSync from './api/EteSync';
import { syncEntryToEntriesProps } from './journal-processors';
import { routeResolver } from './App';
import AddressBook from './AddressBook';
@ -65,4 +63,4 @@ class JournalAddressBook extends React.Component {
}
}
export default syncEntryToEntriesProps(withRouter(JournalAddressBook));
export default withRouter(JournalAddressBook);

20
src/journal-processors.tsx
View File

@ -1,5 +1,3 @@
import * as React from 'react';
import * as ICAL from 'ical.js';
import * as EteSync from './api/EteSync';
@ -22,21 +20,3 @@ export function syncEntriesToItemMap(entries: EteSync.SyncEntry[]) {
return items;
}
// FIXME: Figure out how to correctly use the props type
export function syncEntryToEntriesProps(WrappedComponent: any) {
return class extends React.Component {
props: any;
render() {
let items = syncEntriesToItemMap(this.props.entries);
return (
<WrappedComponent
{...this.props}
entries={items}
/>
);
}
};
}