@w3ux/react-connect-kit 3.4.0 → 3.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/Extensions/Accounts.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { createSafeContext } from '@w3ux/hooks';
|
|
3
|
-
import { extensionAccounts$, getReconnectSync, initialisedExtensions$, reconnectSync$, resetAccounts, } from '@w3ux/observables-connect';
|
|
2
|
+
import { createSafeContext, useEffectIgnoreInitial } from '@w3ux/hooks';
|
|
3
|
+
import { extensionAccounts$, forrmatAccountAddresses, getReconnectSync, initialisedExtensions$, reconnectSync$, resetAccounts, } from '@w3ux/observables-connect';
|
|
4
4
|
import { unsubAll } from '@w3ux/observables-connect/accounts';
|
|
5
5
|
import { connectExtension as doConnectExtension, reconnectExtensions, } from '@w3ux/observables-connect/extensions';
|
|
6
6
|
import { formatAccountSs58 } from '@w3ux/utils';
|
|
@@ -33,7 +33,7 @@ export const ExtensionAccountsProvider = ({ children, ss58, dappName, }) => {
|
|
|
33
33
|
};
|
|
34
34
|
})
|
|
35
35
|
.filter((account) => account !== null);
|
|
36
|
-
const
|
|
36
|
+
const getExtensionAccount = (address) => {
|
|
37
37
|
const account = extensionAccounts.find((item) => item.address === address);
|
|
38
38
|
return account ? { ...account, address } : undefined;
|
|
39
39
|
};
|
|
@@ -41,6 +41,9 @@ export const ExtensionAccountsProvider = ({ children, ss58, dappName, }) => {
|
|
|
41
41
|
handleInitialConnect();
|
|
42
42
|
return () => unsubAll();
|
|
43
43
|
}, [gettingExtensions]);
|
|
44
|
+
useEffectIgnoreInitial(() => {
|
|
45
|
+
forrmatAccountAddresses(ss58);
|
|
46
|
+
}, [ss58]);
|
|
44
47
|
useEffect(() => {
|
|
45
48
|
const sub = combineLatest([
|
|
46
49
|
initialisedExtensions$,
|
|
@@ -59,7 +62,7 @@ export const ExtensionAccountsProvider = ({ children, ss58, dappName, }) => {
|
|
|
59
62
|
extensionsInitialised,
|
|
60
63
|
connectExtension,
|
|
61
64
|
extensionsSynced,
|
|
62
|
-
|
|
65
|
+
getExtensionAccount,
|
|
63
66
|
getExtensionAccounts,
|
|
64
67
|
}, children: children }));
|
|
65
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/Extensions/Accounts.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"sources":["../src/Extensions/Accounts.tsx"],"names":[],"mappings":"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","file":"Accounts.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport { createSafeContext, useEffectIgnoreInitial } from '@w3ux/hooks'\nimport {\n extensionAccounts$,\n forrmatAccountAddresses,\n getReconnectSync,\n initialisedExtensions$,\n reconnectSync$,\n resetAccounts,\n} from '@w3ux/observables-connect'\nimport { unsubAll } from '@w3ux/observables-connect/accounts'\nimport {\n connectExtension as doConnectExtension,\n reconnectExtensions,\n} from '@w3ux/observables-connect/extensions'\nimport type { Account, ExtensionAccount, Sync } from '@w3ux/types'\nimport { formatAccountSs58 } from '@w3ux/utils'\nimport { useEffect, useState } from 'react'\nimport { combineLatest } from 'rxjs'\nimport { useExtensions } from './Connect'\nimport type {\n ExtensionAccountsContextInterface,\n ExtensionsProviderProps,\n} from './types'\n\nexport const [ExtensionAccountsContext, useExtensionAccounts] =\n createSafeContext<ExtensionAccountsContextInterface>()\n\nexport const ExtensionAccountsProvider = ({\n children,\n ss58,\n dappName,\n}: ExtensionsProviderProps) => {\n const { gettingExtensions } = useExtensions()\n\n // Store connected extension accounts\n const [extensionAccounts, setExtensionAccounts] = useState<Account[]>([])\n // Stores initialised extensions\n const [extensionsInitialised, setExtensionsInitialised] = useState<string[]>(\n []\n )\n // Store whether previously enabled extensions have been re-connected\n const [extensionsSynced, setExtensionsSynced] =\n useState<Sync>(getReconnectSync())\n\n // Handle initial connection to previously enabled extensions\n const handleInitialConnect = async () => {\n if (!gettingExtensions && extensionsSynced === 'unsynced') {\n // Defensive: unsubscribe from all accounts and reset state\n unsubAll()\n resetAccounts()\n await reconnectExtensions(dappName, ss58)\n }\n }\n\n // Connects to a single extension and processes its accounts\n const connectExtension = async (id: string): Promise<boolean> =>\n await doConnectExtension(dappName, ss58, id)\n\n // Get extension accounts, formatted by a provided ss58 prefix\n const getExtensionAccounts = (ss58Prefix: number) =>\n extensionAccounts\n .map((account) => {\n const formattedAddress = formatAccountSs58(account.address, ss58Prefix)\n if (!formattedAddress) {\n return null\n }\n return {\n ...account,\n address: formattedAddress,\n }\n })\n .filter((account) => account !== null)\n\n // Get an imported extension account\n const getExtensionAccount = (\n address: string\n ): ExtensionAccount | undefined => {\n const account = extensionAccounts.find((item) => item.address === address)\n return account ? { ...account, address } : undefined\n }\n\n // Initialise extension accounts sync\n useEffect(() => {\n handleInitialConnect()\n return () => unsubAll()\n }, [gettingExtensions])\n\n // Reformat account addresses on ss58 prefix change\n useEffectIgnoreInitial(() => {\n forrmatAccountAddresses(ss58)\n }, [ss58])\n\n // Subscribes to observables and updates state\n useEffect(() => {\n const sub = combineLatest([\n initialisedExtensions$,\n extensionAccounts$,\n reconnectSync$,\n ]).subscribe(([initialised, accounts, sync]) => {\n setExtensionsInitialised(initialised)\n setExtensionAccounts(accounts)\n setExtensionsSynced(sync)\n })\n return () => {\n sub.unsubscribe()\n }\n }, [])\n\n return (\n <ExtensionAccountsContext.Provider\n value={{\n extensionsInitialised,\n connectExtension,\n extensionsSynced,\n getExtensionAccount,\n getExtensionAccounts,\n }}\n >\n {children}\n </ExtensionAccountsContext.Provider>\n )\n}\n"]}
|
package/Extensions/types.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export interface ExtensionAccountsContextInterface {
|
|
|
12
12
|
extensionsInitialised: string[];
|
|
13
13
|
connectExtension: (id: string) => Promise<boolean>;
|
|
14
14
|
extensionsSynced: Sync;
|
|
15
|
-
|
|
15
|
+
getExtensionAccount: (address: string) => ExtensionAccount | undefined;
|
|
16
16
|
getExtensionAccounts: (ss58: number) => Account[];
|
|
17
17
|
}
|
|
18
18
|
export interface ExtensionsProviderProps {
|
package/Extensions/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/Extensions/types.ts"],"names":[],"mappings":"","file":"types.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n Account,\n ExtensionAccount,\n ExtensionStatus,\n Sync,\n} from '@w3ux/types'\nimport type { ReactNode } from 'react'\n\nexport interface ExtensionsConnectContextInterface {\n gettingExtensions: boolean\n extensionsStatus: Record<string, ExtensionStatus>\n setExtensionStatus: (id: string, status: ExtensionStatus) => void\n removeExtensionStatus: (id: string) => void\n extensionInstalled: (id: string) => boolean\n extensionCanConnect: (id: string) => boolean\n}\n\nexport interface ExtensionAccountsContextInterface {\n extensionsInitialised: string[]\n connectExtension: (id: string) => Promise<boolean>\n extensionsSynced: Sync\n
|
|
1
|
+
{"version":3,"sources":["../src/Extensions/types.ts"],"names":[],"mappings":"","file":"types.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport type {\n Account,\n ExtensionAccount,\n ExtensionStatus,\n Sync,\n} from '@w3ux/types'\nimport type { ReactNode } from 'react'\n\nexport interface ExtensionsConnectContextInterface {\n gettingExtensions: boolean\n extensionsStatus: Record<string, ExtensionStatus>\n setExtensionStatus: (id: string, status: ExtensionStatus) => void\n removeExtensionStatus: (id: string) => void\n extensionInstalled: (id: string) => boolean\n extensionCanConnect: (id: string) => boolean\n}\n\nexport interface ExtensionAccountsContextInterface {\n extensionsInitialised: string[]\n connectExtension: (id: string) => Promise<boolean>\n extensionsSynced: Sync\n getExtensionAccount: (address: string) => ExtensionAccount | undefined\n getExtensionAccounts: (ss58: number) => Account[]\n}\n\nexport interface ExtensionsProviderProps {\n children: ReactNode\n ss58: number\n dappName: string\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@w3ux/react-connect-kit",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.2",
|
|
4
4
|
"license": "GPL-3.0-only",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@w3ux/extension-assets": "^2.2.0",
|
|
11
11
|
"@w3ux/hooks": "^2.1.0",
|
|
12
|
-
"@w3ux/observables-connect": "^0.9.
|
|
12
|
+
"@w3ux/observables-connect": "^0.9.38",
|
|
13
13
|
"@w3ux/utils": "^2.0.10"
|
|
14
14
|
},
|
|
15
15
|
"peerDependencies": {
|