@onekeyfe/inpage-providers-hub 2.0.0 → 2.0.2

package/dist/cjs/connectButtonHack/universal/findIconAndName.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTextByImg = exports.findIconAndNameDirectly = exports.findIconAndNameByParent = void 0;
+exports.findTextByImg = exports.findIconAndNameByIcon = exports.findIconAndNameByName = void 0;
 const consts_1 = require("./consts");
 const imgUtils_1 = require("./imgUtils");
 const textUtils_1 = require("./textUtils");
@@ -11,9 +11,9 @@ const utils_1 = require("./utils");
  *   don't document to querySelector because it maybe not work in shadowRoot,
  *   instead of it, use the containerElement
  */
-function findIconAndNameByParent(containerElement, walletName, constraints = {
+function findIconAndNameByName(containerElement, walletName, icon = 'auto-search-icon', constraints = {
     text: [utils_1.isClickable],
-    icon: [imgUtils_1.isWalletIconSizeMatch, utils_1.isClickable],
+    icon: [imgUtils_1.isWalletIconLessEqualThan, utils_1.isClickable],
 }) {
     const textNode = (0, textUtils_1.findWalletTextByParent)(containerElement, walletName, constraints.text);
     if (!textNode || !textNode.parentElement) {
@@ -24,18 +24,26 @@ function findIconAndNameByParent(containerElement, walletName, constraints = {
         utils_1.universalLog.log(`${walletName.toString()} is in external link`);
         return null;
     }
-    let parent = textNode.parentElement;
     let iconNode = undefined;
-    let level = 0;
-    while (parent && parent !== (containerElement === null || containerElement === void 0 ? void 0 : containerElement.parentElement) && level++ < consts_1.MAX_LEVELS) {
-        const walletIcon = (0, imgUtils_1.findWalletIconByParent)(parent, constraints.icon);
-        //TODO: unnecessary to traverse the parent node if the icon have more than one
-        if (!walletIcon) {
-            parent = parent.parentElement;
-            continue;
+    if (typeof icon === 'function') {
+        iconNode = icon(textNode);
+    }
+    else if (icon === 'auto-search-icon') {
+        let parent = textNode.parentElement;
+        let level = 0;
+        while (parent && parent !== (containerElement === null || containerElement === void 0 ? void 0 : containerElement.parentElement) && level++ < consts_1.MAX_LEVELS) {
+            const walletIcon = (0, imgUtils_1.findWalletIconByParent)(parent, constraints.icon);
+            if (!walletIcon) {
+                parent = parent.parentElement;
+                continue;
+            }
+            iconNode = walletIcon;
+            break;
         }
-        iconNode = walletIcon;
-        break;
+    }
+    else {
+        utils_1.universalLog.warn('icon paramter should be a function or auto-search-icon');
+        return null;
     }
     if (!iconNode) {
         utils_1.universalLog.log(`no wallet ${walletName.toString()} icon node found`);
@@ -44,9 +52,8 @@ function findIconAndNameByParent(containerElement, walletName, constraints = {
     // make sure the icon and text are both existed
     return { iconNode, textNode };
 }
-exports.findIconAndNameByParent = findIconAndNameByParent;
-function findIconAndNameDirectly(iconSelector, textSelector, name, container = document, constraints = { text: [], icon: [] }, searchLevel = consts_1.MAX_SEARCH_LEVELS_By_IMG) {
-    var _a;
+exports.findIconAndNameByName = findIconAndNameByName;
+function findIconAndNameByIcon(iconSelector, textSelector, name, container = document, constraints = { text: [], icon: [] }, searchLevel = consts_1.MAX_SEARCH_LEVELS_By_IMG) {
     const iconElements = typeof iconSelector === 'string'
         ? container.querySelectorAll(iconSelector)
         : (0, utils_1.arrayify)(iconSelector());
@@ -55,6 +62,7 @@ function findIconAndNameDirectly(iconSelector, textSelector, name, container = d
         return null;
     }
     const iconElement = Array.from(iconElements)[0];
+    //find the text node by img
     let textNode = null;
     if (textSelector === 'auto-search-text') {
         const containerEle = container instanceof HTMLElement ? container : document.body;
@@ -62,14 +70,6 @@ function findIconAndNameDirectly(iconSelector, textSelector, name, container = d
             ? findTextByImg(iconElement, name, containerEle, constraints.text, searchLevel)
             : null;
     }
-    else if (typeof textSelector === 'string') {
-        const textContainer = (_a = Array.from(container.querySelectorAll(textSelector))) === null || _a === void 0 ? void 0 : _a.filter(Boolean);
-        if ((textContainer === null || textContainer === void 0 ? void 0 : textContainer.length) > 1) {
-            utils_1.universalLog.warn('more one wallet text found ,please check the selector');
-            return null;
-        }
-        textNode = (0, textUtils_1.findWalletTextByParent)(textContainer[0], name, constraints.text);
-    }
     else if (typeof textSelector === 'function') {
         const containerEle = iconElement && textSelector(iconElement);
         textNode =
@@ -90,12 +90,12 @@ function findIconAndNameDirectly(iconSelector, textSelector, name, container = d
         textNode,
     };
 }
-exports.findIconAndNameDirectly = findIconAndNameDirectly;
+exports.findIconAndNameByIcon = findIconAndNameByIcon;
 function findTextByImg(img, walletName, containerLimit, constraints, maxLevel = consts_1.MAX_SEARCH_LEVELS_By_IMG) {
     let text = null;
     let parent = img;
     let level = 0;
-    while (parent && parent != containerLimit && level++ < maxLevel) {
+    while (parent && parent != containerLimit.parentElement && level++ < maxLevel) {
         text = (0, textUtils_1.findWalletTextByParent)(parent, walletName, constraints);
         if (text) {
             return text;

package/dist/cjs/connectButtonHack/universal/imgUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWalletIconSizeMatch = exports.findWalletIconByParent = exports.findIconNodesByParent = exports.createImageEle = exports.replaceIcon = void 0;
+exports.isWalletIconLessEqualThan = exports.isWalletIconSizeMatch = exports.findWalletIconByParent = exports.findIconNodesByParent = exports.createImageEle = exports.replaceIcon = void 0;
 const consts_1 = require("./consts");
 const utils_1 = require("./utils");
 /**
@@ -14,9 +14,6 @@ function replaceIcon(originalNode, newIconSrc) {
     if (originalNode instanceof HTMLImageElement) {
         originalNode.src = newIconSrc;
         originalNode.removeAttribute('srcset');
-        originalNode.style.width = width;
-        originalNode.style.height = height;
-        originalNode.classList.add(...Array.from(originalNode.classList));
         return originalNode;
     }
     else {
@@ -60,29 +57,29 @@ exports.findIconNodesByParent = findIconNodesByParent;
 function findWalletIconByParent(parent, constraints) {
     const iconNodes = findIconNodesByParent(parent);
     if (iconNodes.length === 0) {
-        utils_1.universalLog.warn(`no icon node found`, parent);
+        utils_1.universalLog.warn(`no icon node found for parent`, parent);
         return null;
     }
     if (iconNodes.length > 1) {
         utils_1.universalLog.warn(`more than one icon node found`, iconNodes.length, iconNodes);
-        return null;
+        throw new Error('more than one icon node found');
     }
     const icon = iconNodes[0];
     if (constraints.some((f) => !f(icon))) {
-        utils_1.universalLog.warn('it doesnt satisfy the constraints');
-        return null;
+        throw new Error('it doesnt satisfy the constraints');
     }
     return icon;
 }
 exports.findWalletIconByParent = findWalletIconByParent;
-//TODO:  deal with lazy loading image
-function isWalletIconSizeMatch(walletIcon) {
+//NOTE:  use function isWalletIconLessEqualThan with lazy loading image
+function isWalletIconSizeMatch(walletIcon, min = consts_1.ICON_MIN_SIZE, max = consts_1.ICON_MAX_SIZE) {
     const { width, height } = walletIcon.getBoundingClientRect();
-    const isMatch = width < consts_1.ICON_MAX_SIZE &&
-        width > consts_1.ICON_MIN_SIZE &&
-        height < consts_1.ICON_MAX_SIZE &&
-        height > consts_1.ICON_MIN_SIZE;
+    const isMatch = width <= max && width >= min && height <= max && height >= min;
     !isMatch && utils_1.universalLog.log('wallet icon size doesnot match: ', width, height);
     return isMatch;
 }
 exports.isWalletIconSizeMatch = isWalletIconSizeMatch;
+function isWalletIconLessEqualThan(walletIcon) {
+    return isWalletIconSizeMatch(walletIcon, 0, consts_1.ICON_MAX_SIZE);
+}
+exports.isWalletIconLessEqualThan = isWalletIconLessEqualThan;

package/dist/cjs/connectButtonHack/universal/index.js

@@ -49,7 +49,7 @@ function hackWalletConnectButton(sites) {
                                         utils_1.universalLog.warn('containerElement is null, container=', container);
                                         continue;
                                     }
-                                    result = (0, findIconAndName_1.findIconAndNameByParent)(containerElement, name, constraintMap);
+                                    result = (0, findIconAndName_1.findIconAndNameByName)(containerElement, name, 'auto-search-icon', constraintMap);
                                 }
                                 if (!result) {
                                     utils_1.universalLog.warn('no result found');

package/dist/cjs/connectButtonHack/universal/shadowRoot.js

@@ -6,7 +6,7 @@ const utils_1 = require("./utils");
 const imgUtils_1 = require("./imgUtils");
 function findIconAndNameInShadowRoot(hostSelector, containerSelector, walletName, constraints = {
     text: [utils_1.isClickable],
-    icon: [imgUtils_1.isWalletIconSizeMatch, utils_1.isClickable],
+    icon: [imgUtils_1.isWalletIconLessEqualThan, utils_1.isClickable],
 }) {
     const shadowRoots = Array.from(document.querySelectorAll(hostSelector))
         .filter(Boolean)
@@ -24,6 +24,6 @@ function findIconAndNameInShadowRoot(hostSelector, containerSelector, walletName
         utils_1.universalLog.warn('findIconAndNameInShadowRoot,length=', length);
         return null;
     }
-    return (0, findIconAndName_1.findIconAndNameByParent)(containerElements[0], walletName, constraints);
+    return (0, findIconAndName_1.findIconAndNameByName)(containerElements[0], walletName, 'auto-search-icon', constraints);
 }
 exports.findIconAndNameInShadowRoot = findIconAndNameInShadowRoot;

package/dist/cjs/connectButtonHack/universal/textUtils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findWalletTextByParent = exports.replaceText = exports.makeTextWrap = exports.makeTextEllipse = void 0;
+exports.findWalletTextByParent = exports.replaceText = exports.makeTextAlignCenter = exports.makeTextAlignLeft = exports.makeTextWordBreak = exports.makeTextWrap = exports.makeTextEllipse = void 0;
 const utilsDomNodes_1 = __importDefault(require("../utils/utilsDomNodes"));
 const utils_1 = require("./utils");
 function makeTextEllipse(textNode, option = {}) {
@@ -17,6 +17,18 @@ function makeTextWrap(textNode) {
     textNode.style.whiteSpace = 'normal';
 }
 exports.makeTextWrap = makeTextWrap;
+function makeTextWordBreak(textNode) {
+    textNode.style.wordBreak = 'break-word';
+}
+exports.makeTextWordBreak = makeTextWordBreak;
+function makeTextAlignLeft(textNode) {
+    textNode.style.textAlign = 'left';
+}
+exports.makeTextAlignLeft = makeTextAlignLeft;
+function makeTextAlignCenter(textNode) {
+    textNode.style.textAlign = 'center';
+}
+exports.makeTextAlignCenter = makeTextAlignCenter;
 function replaceText(textNode, newText) {
     const newTextNode = document.createTextNode(newText);
     textNode.replaceWith(newTextNode);

package/dist/cjs/injectWeb3Provider.js

@@ -4,12 +4,12 @@ exports.injectWeb3Provider = void 0;
 const onekey_eth_provider_1 = require("@onekeyfe/onekey-eth-provider");
 const onekey_private_provider_1 = require("@onekeyfe/onekey-private-provider");
 const onekey_solana_provider_1 = require("@onekeyfe/onekey-solana-provider");
-const onekey_starcoin_provider_1 = require("@onekeyfe/onekey-starcoin-provider");
+// import { ProviderStarcoin } from '@onekeyfe/onekey-starcoin-provider';
 const onekey_aptos_provider_1 = require("@onekeyfe/onekey-aptos-provider");
 const onekey_conflux_provider_1 = require("@onekeyfe/onekey-conflux-provider");
 const onekey_tron_provider_1 = require("@onekeyfe/onekey-tron-provider");
 const onekey_cardano_provider_1 = require("@onekeyfe/onekey-cardano-provider");
-const onekey_private_external_account_provider_1 = require("@onekeyfe/onekey-private-external-account-provider");
+// import { ProviderPrivateExternalAccount } from '@onekeyfe/onekey-private-external-account-provider';
 const onekey_cosmos_provider_1 = require("@onekeyfe/onekey-cosmos-provider");
 const onekey_polkadot_provider_1 = require("@onekeyfe/onekey-polkadot-provider");
 const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
@@ -36,9 +36,9 @@ function injectWeb3Provider() {
     const solana = new onekey_solana_provider_1.ProviderSolana({
         bridge,
     });
-    const starcoin = new onekey_starcoin_provider_1.ProviderStarcoin({
-        bridge,
-    });
+    // const starcoin = new ProviderStarcoin({
+    //   bridge,
+    // });
     const martian = new onekey_aptos_provider_1.ProviderAptosMartian({
         bridge,
     });
@@ -69,13 +69,14 @@ function injectWeb3Provider() {
     const btc = new onekey_btc_provider_1.ProviderBtc({ bridge });
     const btcWallet = new onekey_btc_provider_1.ProviderBtcWallet({ bridge });
     const algorand = new onekey_algo_provider_1.ProviderAlgo({ bridge });
-    const $privateExternalAccount = new onekey_private_external_account_provider_1.ProviderPrivateExternalAccount({ bridge });
+    // const $privateExternalAccount = new ProviderPrivateExternalAccount({ bridge });
     // providerHub
     const $onekey = Object.assign(Object.assign({}, window.$onekey), { jsBridge: bridge, $private,
-        $privateExternalAccount,
+        // $privateExternalAccount,
         ethereum,
-        solana,
-        starcoin, aptos: martian, conflux,
+        solana, 
+        // starcoin,
+        aptos: martian, conflux,
         tron, sollet: null, sui,
         cardano,
         cosmos,
@@ -108,7 +109,7 @@ function injectWeb3Provider() {
     }
     (0, cross_inpage_provider_core_1.defineWindowProperty)('solana', solana);
     (0, cross_inpage_provider_core_1.defineWindowProperty)('phantom', { solana });
-    (0, cross_inpage_provider_core_1.defineWindowProperty)('starcoin', starcoin);
+    // defineWindowProperty('starcoin', starcoin);
     (0, cross_inpage_provider_core_1.defineWindowProperty)('aptos', martian);
     (0, cross_inpage_provider_core_1.defineWindowProperty)('petra', martian, { enumerable: true });
     (0, cross_inpage_provider_core_1.defineWindowProperty)('martian', martianProxy, { enumerable: true });