From ecdb7dcad2f524a1922e7e40423ef36a1bfd1966 Mon Sep 17 00:00:00 2001
From: Andrew Simachev <andrew.simachev@gmail.com>
Date: Thu, 8 Feb 2024 14:26:45 +0100
Subject: [PATCH] JS-3943: fix, refactoring

---
 extension/entry.tsx             | 26 ++++++++++++++++++++++++++
 extension/iframe.tsx            | 25 +------------------------
 extension/popup.tsx             | 24 +-----------------------
 extension/scss/common.scss      |  2 ++
 src/scss/common.scss            |  2 +-
 src/ts/app.tsx                  |  1 +
 src/ts/component/menu/index.tsx |  2 +-
 src/ts/store/popup.ts           |  8 ++++++++
 8 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/extension/entry.tsx b/extension/entry.tsx
index 491ee1f7b1..3e396e0fda 100644
--- a/extension/entry.tsx
+++ b/extension/entry.tsx
@@ -1,18 +1,42 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import $ from 'jquery';
+import { C, UtilCommon, UtilRouter } from 'Lib'; 
 import Popup from './popup';
 import Iframe from './iframe';
 import Util from './lib/util';
 import Extension from 'json/extension.json';
+import * as Store from 'Store';
 
 import './scss/common.scss';
 
+declare global {
+	interface Window {
+		isExtension: boolean;
+		Electron: any;
+		$: any;
+		Anytype: any;
+		isWebVersion: boolean;
+		AnytypeGlobalConfig: any;
+	}
+};
+
+window.$ = $;
+window.isExtension = true;
 window.Electron = {
 	currentWindow: () => ({ windowId: 1 }),
 	Api: () => {},
 };
 
+window.Anytype = {
+	Store,
+	Lib: {
+		C,
+		UtilCommon,
+		UtilRouter, 
+	},
+};
+
 window.AnytypeGlobalConfig = { 
 	emojiUrl: Extension.clipper.emojiUrl, 
 	menuBorderTop: 16, 
@@ -32,6 +56,8 @@ if (Util.isIframe()) {
 	component = <Iframe />;
 };
 
+console.log(window.Anytype);
+
 if (!rootId) {
 	console.error('[Entry] rootId is not defined');
 } else {
diff --git a/extension/iframe.tsx b/extension/iframe.tsx
index 490d285475..6ab5d34c94 100644
--- a/extension/iframe.tsx
+++ b/extension/iframe.tsx
@@ -1,12 +1,11 @@
 import * as React from 'react';
 import * as hs from 'history';
-import $ from 'jquery';
 import { Router, Route, Switch } from 'react-router-dom';
 import { RouteComponentProps } from 'react-router';
 import { Provider } from 'mobx-react';
 import { configure } from 'mobx';
 import { ListMenu } from 'Component';
-import { dispatcher, C, UtilCommon, UtilRouter } from 'Lib'; 
+import { UtilRouter } from 'Lib'; 
 import { commonStore, authStore, blockStore, detailStore, dbStore, menuStore, popupStore, extensionStore } from 'Store';
 
 import Index from './iframe/index';
@@ -41,28 +40,6 @@ const rootStore = {
 	extensionStore,
 };
 
-declare global {
-	interface Window {
-		Electron: any;
-		$: any;
-		Anytype: any;
-		isWebVersion: boolean;
-		AnytypeGlobalConfig: any;
-	}
-};
-
-window.$ = $;
-window.$ = $;
-window.Anytype = {
-	Store: rootStore,
-	Lib: {
-		C,
-		UtilCommon,
-		dispatcher,
-		Storage,
-	},
-};
-
 class RoutePage extends React.Component<RouteComponentProps> {
 	render () {
 		const { match } = this.props;
diff --git a/extension/popup.tsx b/extension/popup.tsx
index 064a6cf86b..3bbd6d3bc6 100644
--- a/extension/popup.tsx
+++ b/extension/popup.tsx
@@ -1,12 +1,11 @@
 import * as React from 'react';
 import * as hs from 'history';
-import $ from 'jquery';
 import { Router, Route, Switch } from 'react-router-dom';
 import { RouteComponentProps } from 'react-router';
 import { Provider } from 'mobx-react';
 import { configure } from 'mobx';
 import { ListMenu } from 'Component';
-import { dispatcher, C, UtilCommon, UtilRouter } from 'Lib'; 
+import { UtilRouter } from 'Lib'; 
 import { commonStore, authStore, blockStore, detailStore, dbStore, menuStore, popupStore, extensionStore } from 'Store';
 import Extension from 'json/extension.json';
 
@@ -45,27 +44,6 @@ const rootStore = {
 	extensionStore,
 };
 
-declare global {
-	interface Window {
-		Electron: any;
-		$: any;
-		Anytype: any;
-		isWebVersion: boolean;
-		AnytypeGlobalConfig: any;
-	}
-};
-
-window.$ = $;
-window.Anytype = {
-	Store: rootStore,
-	Lib: {
-		C,
-		UtilCommon,
-		dispatcher,
-		Storage,
-	},
-};
-
 class RoutePage extends React.Component<RouteComponentProps> {
 	render () {
 		const { match } = this.props;
diff --git a/extension/scss/common.scss b/extension/scss/common.scss
index c42f96093f..6fb2364746 100644
--- a/extension/scss/common.scss
+++ b/extension/scss/common.scss
@@ -81,4 +81,6 @@ html.anytypeWebclipper-popup {
 		.inner { border-color: var(--color-ice) !important; box-shadow: 0px 0px 0px 1px var(--color-ice) !important; }
 		.input { border: unset !important; box-shadow: unset !important; }
 	}
+
+	.passThrough { pointer-events: all; }
 }
\ No newline at end of file
diff --git a/src/scss/common.scss b/src/scss/common.scss
index 4e776d1c72..f1319c12ce 100644
--- a/src/scss/common.scss
+++ b/src/scss/common.scss
@@ -75,7 +75,7 @@ html.platformWindows, html.platformLinux {
 .txt { vertical-align: middle; display: inline-block; line-height: 1; }
 .flex { display: flex; }
 .nw { white-space: nowrap; }
-.through { pointer-events: none; }
+.passThrough { pointer-events: none; }
 .rel { position: relative; }
 .disabled { opacity: 0.5; cursor: default !important; }
 .dis { cursor: default !important; }
diff --git a/src/ts/app.tsx b/src/ts/app.tsx
index 17e7d10489..801cc6ed4e 100644
--- a/src/ts/app.tsx
+++ b/src/ts/app.tsx
@@ -55,6 +55,7 @@ interface State {
 
 declare global {
 	interface Window {
+		isExtension: boolean;
 		$: any;
 		Electron: any;
 		Anytype: any;
diff --git a/src/ts/component/menu/index.tsx b/src/ts/component/menu/index.tsx
index 6c4d09e4f4..9d10e11365 100644
--- a/src/ts/component/menu/index.tsx
+++ b/src/ts/component/menu/index.tsx
@@ -248,7 +248,7 @@ const Menu = observer(class Menu extends React.Component<I.Menu, State> {
 		};
 
 		if (passThrough) {
-			cd.push('through');
+			cd.push('passThrough');
 		};
 
 		const Tab = (item: any) => (
diff --git a/src/ts/store/popup.ts b/src/ts/store/popup.ts
index 7295a7044b..580632400a 100644
--- a/src/ts/store/popup.ts
+++ b/src/ts/store/popup.ts
@@ -47,6 +47,14 @@ class PopupStore {
 
 		param.data = param.data || {};
 
+		// Auto-confirm in extension
+		if (window.isExtension && (id == 'confirm')) {
+			if (param.data.onConfirm) {
+				param.data.onConfirm();
+			};
+			return;
+		};
+
 		if (!param.preventMenuClose) {
 			menuStore.closeAll();
 		};