Skip to content

Commit a930d2d

Browse files
bershanskiybershanskiy
authored
Refactor: remove mock Connector (darkreader#7159)
1 parent da58fcd commit a930d2d

5 files changed

Lines changed: 6 additions & 68 deletions

File tree

‎src/ui/connect/index.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/ui/connect/mock.ts‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import {getURLHostOrProtocol} from '../../utils/url';
21
import type {ExtensionData, TabInfo, Theme, UserSettings} from '../../definitions';
32

43
export function getMockData(override = {} as Partial<ExtensionData>): ExtensionData {
@@ -87,54 +86,3 @@ export function getMockActiveTabInfo(): TabInfo {
8786
isInjected: true,
8887
};
8988
}
90-
91-
type listener = (data: ExtensionData) => void;
92-
93-
export function createConnectorMock() {
94-
let listener: listener = null;
95-
const data = getMockData();
96-
const tab = getMockActiveTabInfo();
97-
const connector = {
98-
async getData() {
99-
return Promise.resolve(data);
100-
},
101-
async getActiveTabInfo() {
102-
return Promise.resolve(tab);
103-
},
104-
subscribeToChanges(callback: listener) {
105-
listener = callback;
106-
},
107-
changeSettings(settings: UserSettings) {
108-
Object.assign(data.settings, settings);
109-
listener(data);
110-
},
111-
setTheme(theme: Theme) {
112-
Object.assign(data.settings.theme, theme);
113-
listener(data);
114-
},
115-
setShortcut(command: string, shortcut: string) {
116-
Object.assign(data.shortcuts, {[command]: shortcut});
117-
listener(data);
118-
},
119-
toggleURL(url: string) {
120-
const pattern = getURLHostOrProtocol(url);
121-
const index = data.settings.siteList.indexOf(pattern);
122-
if (index >= 0) {
123-
data.settings.siteList.splice(index, 1, pattern);
124-
} else {
125-
data.settings.siteList.push(pattern);
126-
}
127-
listener(data);
128-
},
129-
markNewsAsRead(ids: string[]) {
130-
data.news
131-
.filter(({id}) => ids.includes(id))
132-
.forEach((news) => news.read = true);
133-
listener(data);
134-
},
135-
disconnect() {
136-
//
137-
},
138-
};
139-
return connector;
140-
}

‎src/ui/devtools/index.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import {m} from 'malevic';
22
import {sync} from 'malevic/dom';
33
import Body from './components/body';
4-
import connect from '../connect';
4+
import Connector from '../connect/connector';
55
import type {ExtensionData, TabInfo} from '../../definitions';
6-
import type Connector from '../connect/connector';
76

87
function renderBody(data: ExtensionData, tab: TabInfo, actions: Connector) {
98
sync(document.body, <Body data={data} tab={tab} actions={actions} />);
109
}
1110

1211
async function start() {
13-
const connector = connect();
12+
const connector = new Connector();
1413
window.addEventListener('unload', () => connector.disconnect());
1514

1615
const data = await connector.getData();

‎src/ui/popup/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {m} from 'malevic';
22
import {sync} from 'malevic/dom';
3-
import connect from '../connect';
3+
import Connector from '../connect/connector';
44
import Body from './components/body';
55
import {popupHasBuiltInHorizontalBorders, popupHasBuiltInBorders, fixNotClosingPopupOnNavigation} from './utils/issues';
66
import type {ExtensionData, ExtensionActions, TabInfo} from '../../definitions';
@@ -23,7 +23,7 @@ function renderBody(data: ExtensionData, tab: TabInfo, fonts: string[], actions:
2323
}
2424

2525
async function start() {
26-
const connector = connect();
26+
const connector = new Connector();
2727
window.addEventListener('unload', () => connector.disconnect());
2828

2929
const [data, tab, fonts] = await Promise.all([

‎src/ui/stylesheet-editor/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import {m} from 'malevic';
22
import {sync} from 'malevic/dom';
33
import Body from './components/body';
4-
import connect from '../connect';
4+
import Connector from '../connect/connector';
55
import type {ExtensionActions, ExtensionData, TabInfo} from '../../definitions';
66

77
function renderBody(data: ExtensionData, tab: TabInfo, actions: ExtensionActions) {
88
sync(document.body, <Body data={data} tab={tab} actions={actions} />);
99
}
1010

1111
async function start() {
12-
const connector = connect();
12+
const connector = new Connector();
1313
window.addEventListener('unload', () => connector.disconnect());
1414

1515
const data = await connector.getData();

0 commit comments

Comments
 (0)