aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/console/index.tsx2
-rw-r--r--src/content/Application.ts8
-rw-r--r--src/content/Bootstrap.ts27
-rw-r--r--src/content/index.ts33
-rw-r--r--src/content/operators/impls/AddonOperatorFactoryChain.ts14
-rw-r--r--src/content/operators/impls/DisableAddonOperator.ts5
-rw-r--r--src/content/operators/impls/EnableAddonOperator.ts5
-rw-r--r--src/content/operators/impls/ToggleAddonOperator.ts15
-rw-r--r--src/content/presenters/ConsoleFramePresenter.ts31
-rw-r--r--src/content/usecases/AddonEnabledUseCase.ts16
10 files changed, 121 insertions, 35 deletions
diff --git a/src/console/index.tsx b/src/console/index.tsx
index 228625e..f9313a0 100644
--- a/src/console/index.tsx
+++ b/src/console/index.tsx
@@ -11,7 +11,7 @@ import ReactDOM from "react-dom";
const store = createStore(reducers, applyMiddleware(promise));
-window.addEventListener("load", () => {
+window.addEventListener("DOMContentLoaded", () => {
const wrapper = document.getElementById("vimvixen-console");
ReactDOM.render(
<Provider store={store}>
diff --git a/src/content/Application.ts b/src/content/Application.ts
index 7c8e588..b09edfa 100644
--- a/src/content/Application.ts
+++ b/src/content/Application.ts
@@ -36,12 +36,12 @@ export default class Application {
private navigateController: NavigateController
) {}
- run() {
- this.routeCommonComponents();
+ init(): Promise<void> {
this.routeFocusEvents();
if (window.self === window.top) {
this.routeMasterComponents();
}
+ return this.routeCommonComponents();
}
private routeMasterComponents() {
@@ -76,7 +76,7 @@ export default class Application {
});
}
- private routeCommonComponents() {
+ private routeCommonComponents(): Promise<void> {
this.messageListener.onWebMessage((msg: Message) => {
switch (msg.type) {
case messages.FOLLOW_REQUEST_COUNT_TARGETS:
@@ -117,7 +117,7 @@ export default class Application {
inputDriver.onKey((key) => this.markKeyController.press(key));
inputDriver.onKey((key) => this.keymapController.press(key));
- this.settingController.initSettings();
+ return this.settingController.initSettings();
}
private routeFocusEvents() {
diff --git a/src/content/Bootstrap.ts b/src/content/Bootstrap.ts
new file mode 100644
index 0000000..62e1530
--- /dev/null
+++ b/src/content/Bootstrap.ts
@@ -0,0 +1,27 @@
+type Callback = () => void;
+
+export default class Bootstrap {
+ constructor() {}
+
+ isReady(): boolean {
+ return document.body !== null;
+ }
+
+ waitForReady(callback: Callback): void {
+ const observer = new MutationObserver(() => {
+ if (document.body != null) {
+ observer.disconnect();
+ callback();
+ }
+ });
+
+ observer.observe(document, {
+ attributes: false,
+ attributeOldValue: false,
+ characterData: false,
+ characterDataOldValue: false,
+ childList: true,
+ subtree: true,
+ });
+ }
+}
diff --git a/src/content/index.ts b/src/content/index.ts
index b575e0d..82f3a4c 100644
--- a/src/content/index.ts
+++ b/src/content/index.ts
@@ -1,22 +1,29 @@
import "reflect-metadata";
import Application from "./Application";
+import Bootstrap from "./Bootstrap";
import consoleFrameStyle from "./site-style";
-import { ConsoleFramePresenterImpl } from "./presenters/ConsoleFramePresenter";
import { container } from "tsyringe";
import "./di";
-if (window.self === window.top) {
- new ConsoleFramePresenterImpl().initialize();
-}
+const initDom = () => {
+ (async () => {
+ try {
+ const app = container.resolve(Application);
+ await app.init();
+ } catch (e) {
+ console.error(e);
+ }
+ })();
-try {
- const app = container.resolve(Application);
- app.run();
-} catch (e) {
- console.error(e);
-}
+ const style = window.document.createElement("style");
+ style.textContent = consoleFrameStyle;
+ window.document.head.appendChild(style);
+};
-const style = window.document.createElement("style");
-style.textContent = consoleFrameStyle;
-window.document.head.appendChild(style);
+const bootstrap = new Bootstrap();
+if (bootstrap.isReady()) {
+ initDom();
+} else {
+ bootstrap.waitForReady(() => initDom());
+}
diff --git a/src/content/operators/impls/AddonOperatorFactoryChain.ts b/src/content/operators/impls/AddonOperatorFactoryChain.ts
index 54880c4..5e464e8 100644
--- a/src/content/operators/impls/AddonOperatorFactoryChain.ts
+++ b/src/content/operators/impls/AddonOperatorFactoryChain.ts
@@ -7,6 +7,7 @@ import Operator from "../Operator";
import EnableAddonOperator from "./EnableAddonOperator";
import DisableAddonOperator from "./DisableAddonOperator";
import ToggleAddonOperator from "./ToggleAddonOperator";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
@injectable()
export default class AddonOperatorFactoryChain implements OperatorFactoryChain {
@@ -14,7 +15,9 @@ export default class AddonOperatorFactoryChain implements OperatorFactoryChain {
@inject("AddonIndicatorClient")
private readonly addonIndicatorClient: AddonIndicatorClient,
@inject("AddonEnabledRepository")
- private readonly addonEnabledRepository: AddonEnabledRepository
+ private readonly addonEnabledRepository: AddonEnabledRepository,
+ @inject("ConsoleFramePresenter")
+ private readonly consoleFramePresenter: ConsoleFramePresenter
) {}
create(op: operations.Operation, _repeat: number): Operator | null {
@@ -22,17 +25,20 @@ export default class AddonOperatorFactoryChain implements OperatorFactoryChain {
case operations.ADDON_ENABLE:
return new EnableAddonOperator(
this.addonIndicatorClient,
- this.addonEnabledRepository
+ this.addonEnabledRepository,
+ this.consoleFramePresenter
);
case operations.ADDON_DISABLE:
return new DisableAddonOperator(
this.addonIndicatorClient,
- this.addonEnabledRepository
+ this.addonEnabledRepository,
+ this.consoleFramePresenter
);
case operations.ADDON_TOGGLE_ENABLED:
return new ToggleAddonOperator(
this.addonIndicatorClient,
- this.addonEnabledRepository
+ this.addonEnabledRepository,
+ this.consoleFramePresenter
);
}
return null;
diff --git a/src/content/operators/impls/DisableAddonOperator.ts b/src/content/operators/impls/DisableAddonOperator.ts
index 28811fe..a92e04b 100644
--- a/src/content/operators/impls/DisableAddonOperator.ts
+++ b/src/content/operators/impls/DisableAddonOperator.ts
@@ -1,15 +1,18 @@
import Operator from "../Operator";
import AddonIndicatorClient from "../../client/AddonIndicatorClient";
import AddonEnabledRepository from "../../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
export default class DisableAddonOperator implements Operator {
constructor(
private readonly indicator: AddonIndicatorClient,
- private readonly repository: AddonEnabledRepository
+ private readonly repository: AddonEnabledRepository,
+ private readonly consoleFramePresenter: ConsoleFramePresenter
) {}
async run(): Promise<void> {
this.repository.set(false);
+ this.consoleFramePresenter.detach();
await this.indicator.setEnabled(false);
}
}
diff --git a/src/content/operators/impls/EnableAddonOperator.ts b/src/content/operators/impls/EnableAddonOperator.ts
index b5b1d79..fe2b771 100644
--- a/src/content/operators/impls/EnableAddonOperator.ts
+++ b/src/content/operators/impls/EnableAddonOperator.ts
@@ -1,15 +1,18 @@
import Operator from "../Operator";
import AddonIndicatorClient from "../../client/AddonIndicatorClient";
import AddonEnabledRepository from "../../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
export default class EnableAddonOperator implements Operator {
constructor(
private readonly indicator: AddonIndicatorClient,
- private readonly repository: AddonEnabledRepository
+ private readonly repository: AddonEnabledRepository,
+ private readonly consoleFramePresenter: ConsoleFramePresenter
) {}
async run(): Promise<void> {
this.repository.set(true);
+ this.consoleFramePresenter.attach();
await this.indicator.setEnabled(true);
}
}
diff --git a/src/content/operators/impls/ToggleAddonOperator.ts b/src/content/operators/impls/ToggleAddonOperator.ts
index 2a249d6..1019b8b 100644
--- a/src/content/operators/impls/ToggleAddonOperator.ts
+++ b/src/content/operators/impls/ToggleAddonOperator.ts
@@ -1,16 +1,23 @@
import Operator from "../Operator";
import AddonIndicatorClient from "../../client/AddonIndicatorClient";
import AddonEnabledRepository from "../../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
export default class ToggleAddonOperator implements Operator {
constructor(
private readonly indicator: AddonIndicatorClient,
- private readonly repository: AddonEnabledRepository
+ private readonly repository: AddonEnabledRepository,
+ private readonly consoleFramePresenter: ConsoleFramePresenter
) {}
async run(): Promise<void> {
- const current = this.repository.get();
- this.repository.set(!current);
- await this.indicator.setEnabled(!current);
+ const enabled = !this.repository.get();
+ this.repository.set(enabled);
+ if (enabled) {
+ this.consoleFramePresenter.attach();
+ } else {
+ this.consoleFramePresenter.detach();
+ }
+ await this.indicator.setEnabled(enabled);
}
}
diff --git a/src/content/presenters/ConsoleFramePresenter.ts b/src/content/presenters/ConsoleFramePresenter.ts
index ccc196b..0db58f0 100644
--- a/src/content/presenters/ConsoleFramePresenter.ts
+++ b/src/content/presenters/ConsoleFramePresenter.ts
@@ -1,24 +1,43 @@
export default interface ConsoleFramePresenter {
- initialize(): void;
+ attach(): void;
+
+ detach(): void;
blur(): void;
resize(width: number, height: number): void;
+
+ isTopWindow(): boolean;
}
export class ConsoleFramePresenterImpl implements ConsoleFramePresenter {
- initialize(): void {
+ private static readonly IframeId = "vimvixen-console-frame" as const;
+
+ attach(): void {
+ const ele = document.getElementById("vimvixen-console-frame");
+ if (ele) {
+ return;
+ }
+
const iframe = document.createElement("iframe");
iframe.src = browser.runtime.getURL("build/console.html");
- iframe.id = "vimvixen-console-frame";
+ iframe.id = ConsoleFramePresenterImpl.IframeId;
iframe.className = "vimvixen-console-frame";
document.body.append(iframe);
}
+ detach(): void {
+ const ele = document.getElementById(ConsoleFramePresenterImpl.IframeId);
+ if (!ele) {
+ return;
+ }
+ ele.remove();
+ }
+
blur(): void {
const ele = document.getElementById("vimvixen-console-frame");
if (!ele) {
- throw new Error("console frame not created");
+ return;
}
ele.blur();
}
@@ -30,4 +49,8 @@ export class ConsoleFramePresenterImpl implements ConsoleFramePresenter {
}
ele.style.height = `${height}px`;
}
+
+ isTopWindow(): boolean {
+ return window.top === window;
+ }
}
diff --git a/src/content/usecases/AddonEnabledUseCase.ts b/src/content/usecases/AddonEnabledUseCase.ts
index f7e78c5..f49fde5 100644
--- a/src/content/usecases/AddonEnabledUseCase.ts
+++ b/src/content/usecases/AddonEnabledUseCase.ts
@@ -1,15 +1,17 @@
import { injectable, inject } from "tsyringe";
import AddonIndicatorClient from "../client/AddonIndicatorClient";
import AddonEnabledRepository from "../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../presenters/ConsoleFramePresenter";
@injectable()
export default class AddonEnabledUseCase {
constructor(
@inject("AddonIndicatorClient")
- private indicator: AddonIndicatorClient,
-
+ private readonly indicator: AddonIndicatorClient,
@inject("AddonEnabledRepository")
- private repository: AddonEnabledRepository
+ private readonly repository: AddonEnabledRepository,
+ @inject("ConsoleFramePresenter")
+ private readonly consoleFramePresenter: ConsoleFramePresenter
) {}
async enable(): Promise<void> {
@@ -31,6 +33,14 @@ export default class AddonEnabledUseCase {
private async setEnabled(on: boolean): Promise<void> {
this.repository.set(on);
+
+ if (this.consoleFramePresenter.isTopWindow()) {
+ if (on) {
+ this.consoleFramePresenter.attach();
+ } else {
+ this.consoleFramePresenter.detach();
+ }
+ }
await this.indicator.setEnabled(on);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 14:33:20 +0000