@tronweb3/tronwallet-adapter-react-hooks 1.1.13 → 1.1.14
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.
|
@@ -61,6 +61,20 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
61
61
|
const [disconnecting, setDisconnecting] = (0, react_1.useState)(false);
|
|
62
62
|
const isConnecting = (0, react_1.useRef)(false);
|
|
63
63
|
const isDisconnecting = (0, react_1.useRef)(false);
|
|
64
|
+
/**
|
|
65
|
+
* `connect()`/`disconnect()` are awaited, so every state write in their `finally`
|
|
66
|
+
* happens on a later tick — by which time the provider may already be gone. React
|
|
67
|
+
* warns about the update, and under a test runner the DOM is torn down first and the
|
|
68
|
+
* update throws outright. The refs above are safe to write after unmount; the state
|
|
69
|
+
* setters are not.
|
|
70
|
+
*/
|
|
71
|
+
const isMounted = (0, react_1.useRef)(true);
|
|
72
|
+
(0, react_1.useEffect)(function () {
|
|
73
|
+
isMounted.current = true;
|
|
74
|
+
return function () {
|
|
75
|
+
isMounted.current = false;
|
|
76
|
+
};
|
|
77
|
+
}, []);
|
|
64
78
|
// set default supported adapters
|
|
65
79
|
const adapters = (0, react_1.useMemo)(() => {
|
|
66
80
|
if (adaptersPro === null) {
|
|
@@ -208,8 +222,9 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
208
222
|
// setName(null);
|
|
209
223
|
}
|
|
210
224
|
finally {
|
|
211
|
-
setConnecting(false);
|
|
212
225
|
isConnecting.current = false;
|
|
226
|
+
if (isMounted.current)
|
|
227
|
+
setConnecting(false);
|
|
213
228
|
}
|
|
214
229
|
});
|
|
215
230
|
})();
|
|
@@ -235,8 +250,9 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
235
250
|
throw error;
|
|
236
251
|
}
|
|
237
252
|
finally {
|
|
238
|
-
setConnecting(false);
|
|
239
253
|
isConnecting.current = false;
|
|
254
|
+
if (isMounted.current)
|
|
255
|
+
setConnecting(false);
|
|
240
256
|
}
|
|
241
257
|
});
|
|
242
258
|
}, [isConnecting, isDisconnecting, adapter, connected, handleError, setName]);
|
|
@@ -257,8 +273,9 @@ const WalletProvider = function ({ children, adapters: adaptersPro = null, onErr
|
|
|
257
273
|
throw error;
|
|
258
274
|
}
|
|
259
275
|
finally {
|
|
260
|
-
setDisconnecting(false);
|
|
261
276
|
isDisconnecting.current = false;
|
|
277
|
+
if (isMounted.current)
|
|
278
|
+
setDisconnecting(false);
|
|
262
279
|
}
|
|
263
280
|
});
|
|
264
281
|
}, [adapter, isDisconnecting, setName]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uFAA+E;AAQ/E,uFAAwE;AAExE,+CAAiF;AAEjF,iDAA+C;AAC/C,6DAAuD;AAiBvD,MAAM,YAAY,GAKd;IACA,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,IAAI;CAChB,CAAC;AAEK,MAAM,cAAc,GAA4B,UAAU,EAC7D,QAAQ,EACR,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EACzC,mBAAmB,EACnB,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,eAAe,GAAG,iBAAiB,EACnC,WAAW,GAAG,IAAI,EAClB,wBAAwB,GAAG,KAAK,GACnC;IACG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,oCAAe,EAAqB,eAAe,EAAE,IAAI,CAAC,CAAC;IACnF,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,CAAC,CAAC;IACnF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,20 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
25
25
|
const [disconnecting, setDisconnecting] = useState(false);
|
|
26
26
|
const isConnecting = useRef(false);
|
|
27
27
|
const isDisconnecting = useRef(false);
|
|
28
|
+
/**
|
|
29
|
+
* `connect()`/`disconnect()` are awaited, so every state write in their `finally`
|
|
30
|
+
* happens on a later tick — by which time the provider may already be gone. React
|
|
31
|
+
* warns about the update, and under a test runner the DOM is torn down first and the
|
|
32
|
+
* update throws outright. The refs above are safe to write after unmount; the state
|
|
33
|
+
* setters are not.
|
|
34
|
+
*/
|
|
35
|
+
const isMounted = useRef(true);
|
|
36
|
+
useEffect(function () {
|
|
37
|
+
isMounted.current = true;
|
|
38
|
+
return function () {
|
|
39
|
+
isMounted.current = false;
|
|
40
|
+
};
|
|
41
|
+
}, []);
|
|
28
42
|
// set default supported adapters
|
|
29
43
|
const adapters = useMemo(() => {
|
|
30
44
|
if (adaptersPro === null) {
|
|
@@ -172,8 +186,9 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
172
186
|
// setName(null);
|
|
173
187
|
}
|
|
174
188
|
finally {
|
|
175
|
-
setConnecting(false);
|
|
176
189
|
isConnecting.current = false;
|
|
190
|
+
if (isMounted.current)
|
|
191
|
+
setConnecting(false);
|
|
177
192
|
}
|
|
178
193
|
});
|
|
179
194
|
})();
|
|
@@ -199,8 +214,9 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
199
214
|
throw error;
|
|
200
215
|
}
|
|
201
216
|
finally {
|
|
202
|
-
setConnecting(false);
|
|
203
217
|
isConnecting.current = false;
|
|
218
|
+
if (isMounted.current)
|
|
219
|
+
setConnecting(false);
|
|
204
220
|
}
|
|
205
221
|
});
|
|
206
222
|
}, [isConnecting, isDisconnecting, adapter, connected, handleError, setName]);
|
|
@@ -221,8 +237,9 @@ export const WalletProvider = function ({ children, adapters: adaptersPro = null
|
|
|
221
237
|
throw error;
|
|
222
238
|
}
|
|
223
239
|
finally {
|
|
224
|
-
setDisconnecting(false);
|
|
225
240
|
isDisconnecting.current = false;
|
|
241
|
+
if (isMounted.current)
|
|
242
|
+
setDisconnecting(false);
|
|
226
243
|
}
|
|
227
244
|
});
|
|
228
245
|
}, [adapter, isDisconnecting, setName]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQ/E,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjF,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAiBvD,MAAM,YAAY,GAKd;IACA,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAA4B,UAAU,EAC7D,QAAQ,EACR,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EACzC,mBAAmB,EACnB,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,eAAe,GAAG,iBAAiB,EACnC,WAAW,GAAG,IAAI,EAClB,wBAAwB,GAAG,KAAK,GACnC;IACG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,eAAe,CAAqB,eAAe,EAAE,IAAI,CAAC,CAAC;IACnF,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IACnF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQ/E,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjF,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAiBvD,MAAM,YAAY,GAKd;IACA,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAA4B,UAAU,EAC7D,QAAQ,EACR,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EACzC,mBAAmB,EACnB,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,eAAe,GAAG,iBAAiB,EACnC,WAAW,GAAG,IAAI,EAClB,wBAAwB,GAAG,KAAK,GACnC;IACG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,eAAe,CAAqB,eAAe,EAAE,IAAI,CAAC,CAAC;IACnF,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IACnF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC;;;;;;OAMG;IACH,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/B,SAAS,CAAC;QACN,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QACzB,OAAO;YACH,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC;QAC9B,CAAC,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,iCAAiC;IACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAClB,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAW,GAAG,EAAE,CAClD,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO;QACP,KAAK,EAAE,OAAO,CAAC,KAAK;KACvB,CAAC,CAAC,CACN,CAAC;IACF,SAAS,CACL;QACI,UAAU,CAAC,CAAC,WAAW,EAAE,EAAE,CACvB,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,IAAI,MAAM,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;gBACzE,OAAO,MAAM,CAAC;YAClB,CAAC;YACD,OAAO;gBACH,OAAO;gBACP,KAAK,EAAE,OAAO,CAAC,KAAK;aACvB,CAAC;QACN,CAAC,CAAC,CACL,CAAC;QAEF,SAAS,iBAAiB;YACtB,UAAU,CAAC,CAAC,WAAW,EAAE,EAAE;gBACvB,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC;gBACzE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;oBACf,OAAO,WAAW,CAAC;gBACvB,CAAC;gBACD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;oBACnC,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;wBAChB,uCACO,MAAM,KACT,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,IAC7B;oBACN,CAAC;oBACD,OAAO,MAAM,CAAC;gBAClB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC;QACD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;QACtF,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IACxG,CAAC,EACD,CAAC,QAAQ,CAAC,CACb,CAAC;IAEF,wCAAwC;IACxC,SAAS,CACL;QACI,MAAM,MAAM,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC1E,IAAI,MAAM,EAAE,CAAC;YACT,QAAQ,CAAC;gBACL,MAAM;gBACN,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;gBACnC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;aAClC,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC,EACD,CAAC,IAAI,EAAE,OAAO,CAAC,CAClB,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAChD,SAAS,CACL;QACI,IAAI,OAAO,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC;YACjC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,CAAC,CAAC;YAC5B,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;QACjC,CAAC;IACL,CAAC,EACD,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAC9B,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC7B,UAAU,IAAY;QAClB,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCACb,KAAK,KACR,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,OAAO,IAC1B,CAAC,CAAC;QACJ,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAG,IAAI,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAChC,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC3B,UAAU,KAAkB;QACxB,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,OAAO,KAAK,CAAC;IACjB,CAAC,EACD,CAAC,OAAO,CAAC,CACZ,CAAC;IACF,MAAM,mBAAmB,GAAG,WAAW,CACnC,UAAU,OAAe,EAAE,OAAgB;QACvC,gFAAgF;QAChF,8EAA8E;QAC9E,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,iCAAM,KAAK,KAAE,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,CAAA,IAAG,CAAA,EAAA,CAAC,CAAC;QACrG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC,EACD,CAAC,iBAAiB,CAAC,CACtB,CAAC;IACF,MAAM,gBAAgB,GAAG,WAAW,CAChC;QACI,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;YAAC,OAAA,iCACb,KAAK,KACR,OAAO,EAAE,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,OAAO,mCAAI,IAAI,EACvC,SAAS,EAAE,CAAC,CAAC,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,CAAA,IACvC,CAAA;SAAA,CAAC,CAAC;QACJ,YAAY,aAAZ,YAAY,uBAAZ,YAAY,EAAI,CAAC;IACrB,CAAC,EACD,CAAC,YAAY,CAAC,CACjB,CAAC;IACF,MAAM,uBAAuB,GAAG,WAAW,CACvC,UAAU,UAA4B;QAClC,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,UAAU,CAAC,CAAC;IACtC,CAAC,EACD,CAAC,mBAAmB,CAAC,CACxB,CAAC;IACF,MAAM,kBAAkB,GAAG,WAAW,CAClC,UAAU,SAAkB;QACxB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,SAAS,CAAC,CAAC;IAChC,CAAC,EACD,CAAC,cAAc,CAAC,CACnB,CAAC;IACF,SAAS,CACL;QACI,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;YACrC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACjC,OAAO,CAAC,EAAE,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;YACnD,OAAO,CAAC,EAAE,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YAC/C,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;YACzD,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;YAC3C,OAAO,GAAG,EAAE;gBACR,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBAClC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;gBACpD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;gBAChD,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;gBAC1D,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;YAChD,CAAC,CAAC;QACN,CAAC;IACL,CAAC,EACD;QACI,OAAO;QACP,aAAa;QACb,WAAW;QACX,mBAAmB;QACnB,kBAAkB;QAClB,uBAAuB;QACvB,gBAAgB;KACnB,CACJ,CAAC;IACF,8CAA8C;IAC9C,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,GAAG,EAAE;YACR,kFAAkF;YAClF,oFAAoF;YACpF,qFAAqF;YACrF,sDAAsD;YACtD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAClC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,8CAA8C,EAAE,KAAK,CAAC,CAAC;YACxF,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,eAAe;IACf,SAAS,CACL;QACI,MAAM,cAAc,GAAG,WAAW,IAAI,CAAC,CAAC,wBAAwB,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAChG,IAAI,YAAY,CAAC,OAAO,IAAI,CAAC,cAAc,IAAI,CAAC,OAAO,EAAE,CAAC;YACtD,OAAO;QACX,CAAC;QACD,CAAC,SAAe,OAAO;;gBACnB,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC5B,aAAa,CAAC,IAAI,CAAC,CAAC;gBACpB,IAAI,CAAC;oBACD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC5B,CAAC;gBAAC,WAAM,CAAC;oBACL,iBAAiB;gBACrB,CAAC;wBAAS,CAAC;oBACP,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;oBAC7B,IAAI,SAAS,CAAC,OAAO;wBAAE,aAAa,CAAC,KAAK,CAAC,CAAC;gBAChD,CAAC;YACL,CAAC;SAAA,CAAC,EAAE,CAAC;IACT,CAAC,EACD,CAAC,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAC1E,CAAC;IACF,MAAM,MAAM,GAAG,WAAW,CACtB,CAAC,IAAiB,EAAE,EAAE;QAClB,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC,EACD,CAAC,OAAO,CAAC,CACZ,CAAC;IAEF,MAAM,OAAO,GAAG,WAAW,CACvB;;YACI,IAAI,YAAY,CAAC,OAAO,IAAI,eAAe,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;gBAC/D,OAAO;YACX,CAAC;YACD,IAAI,CAAC,OAAO;gBAAE,MAAM,WAAW,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC;YAC9D,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC5B,aAAa,CAAC,IAAI,CAAC,CAAC;YACpB,IAAI,CAAC;gBACD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YAC5B,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,CAAC;gBACd,MAAM,KAAK,CAAC;YAChB,CAAC;oBAAS,CAAC;gBACP,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;gBAC7B,IAAI,SAAS,CAAC,OAAO;oBAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YAChD,CAAC;QACL,CAAC;KAAA,EACD,CAAC,YAAY,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAC5E,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC1B;;YACI,IAAI,eAAe,CAAC,OAAO;gBAAE,OAAO;YACpC,IAAI,CAAC,OAAO;gBAAE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;YAEnC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;YAC/B,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,CAAC;gBACD,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAClB,OAAO,CAAC,IAAI,CAAC,CAAC;gBACd,MAAM,KAAK,CAAC;YAChB,CAAC;oBAAS,CAAC;gBACP,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;gBAChC,IAAI,SAAS,CAAC,OAAO;oBAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACnD,CAAC;QACL,CAAC;KAAA,EACD,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,CACtC,CAAC;IAEF,MAAM,eAAe,GAAG,WAAW,CAC/B,UAAgB,WAAwB;;YACpC,IAAI,CAAC,OAAO;gBAAE,MAAM,WAAW,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC;YAC9D,OAAO,MAAM,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACtD,CAAC;KAAA,EACD,CAAC,OAAO,EAAE,WAAW,CAAC,CACzB,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC3B,UAAgB,OAAe;;YAC3B,IAAI,CAAC,OAAO;gBAAE,MAAM,WAAW,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC;YAC9D,OAAO,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;KAAA,EACD,CAAC,OAAO,EAAE,WAAW,CAAC,CACzB,CAAC;IAEF,OAAO,CACH,oBAAC,aAAa,CAAC,QAAQ,IACnB,KAAK,EAAE;YACH,wBAAwB;YACxB,WAAW;YACX,OAAO;YACP,MAAM;YACN,OAAO;YACP,UAAU;YACV,SAAS;YACT,aAAa;YAEb,MAAM;YACN,OAAO;YACP,UAAU;YACV,eAAe;YACf,WAAW;SACd,IAEA,QAAQ,CACY,CAC5B,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,OAAO,EACP,WAAW,EAGX,gBAAgB,EACnB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAM3C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACnE,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC;IAC3D,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,OAAO,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,KAAK,OAAO,CAAC;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACtC;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,OAAO,EACP,WAAW,EAGX,gBAAgB,EACnB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAM3C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACnE,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC;IAC3D,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,OAAO,CAAC;IACjD,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,KAAK,OAAO,CAAC;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACtC;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAkUlD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tronweb3/tronwallet-adapter-react-hooks",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.14",
|
|
4
4
|
"description": "A `useWallet()` hook to make it easy to interact with Tron wallets.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"TRON",
|
|
@@ -45,8 +45,8 @@
|
|
|
45
45
|
"react-dom": "*"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@tronweb3/tronwallet-abstract-adapter": "^1.
|
|
49
|
-
"@tronweb3/tronwallet-adapter-tronlink": "^1.
|
|
48
|
+
"@tronweb3/tronwallet-abstract-adapter": "^1.3.0",
|
|
49
|
+
"@tronweb3/tronwallet-adapter-tronlink": "^1.3.0"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@testing-library/react": "16.3.2",
|
package/src/WalletProvider.tsx
CHANGED
|
@@ -60,6 +60,20 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
60
60
|
const [disconnecting, setDisconnecting] = useState(false);
|
|
61
61
|
const isConnecting = useRef(false);
|
|
62
62
|
const isDisconnecting = useRef(false);
|
|
63
|
+
/**
|
|
64
|
+
* `connect()`/`disconnect()` are awaited, so every state write in their `finally`
|
|
65
|
+
* happens on a later tick — by which time the provider may already be gone. React
|
|
66
|
+
* warns about the update, and under a test runner the DOM is torn down first and the
|
|
67
|
+
* update throws outright. The refs above are safe to write after unmount; the state
|
|
68
|
+
* setters are not.
|
|
69
|
+
*/
|
|
70
|
+
const isMounted = useRef(true);
|
|
71
|
+
useEffect(function () {
|
|
72
|
+
isMounted.current = true;
|
|
73
|
+
return function () {
|
|
74
|
+
isMounted.current = false;
|
|
75
|
+
};
|
|
76
|
+
}, []);
|
|
63
77
|
|
|
64
78
|
// set default supported adapters
|
|
65
79
|
const adapters = useMemo(() => {
|
|
@@ -253,8 +267,8 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
253
267
|
} catch {
|
|
254
268
|
// setName(null);
|
|
255
269
|
} finally {
|
|
256
|
-
setConnecting(false);
|
|
257
270
|
isConnecting.current = false;
|
|
271
|
+
if (isMounted.current) setConnecting(false);
|
|
258
272
|
}
|
|
259
273
|
})();
|
|
260
274
|
},
|
|
@@ -282,8 +296,8 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
282
296
|
setName(null);
|
|
283
297
|
throw error;
|
|
284
298
|
} finally {
|
|
285
|
-
setConnecting(false);
|
|
286
299
|
isConnecting.current = false;
|
|
300
|
+
if (isMounted.current) setConnecting(false);
|
|
287
301
|
}
|
|
288
302
|
},
|
|
289
303
|
[isConnecting, isDisconnecting, adapter, connected, handleError, setName]
|
|
@@ -303,8 +317,8 @@ export const WalletProvider: FC<WalletProviderProps> = function ({
|
|
|
303
317
|
setName(null);
|
|
304
318
|
throw error;
|
|
305
319
|
} finally {
|
|
306
|
-
setDisconnecting(false);
|
|
307
320
|
isDisconnecting.current = false;
|
|
321
|
+
if (isMounted.current) setDisconnecting(false);
|
|
308
322
|
}
|
|
309
323
|
},
|
|
310
324
|
[adapter, isDisconnecting, setName]
|