Skip to content

Commit 7117deb

Browse files
committed
package-upgraded
1 parent f4f22e6 commit 7117deb

4 files changed

Lines changed: 26 additions & 27 deletions

File tree

package-lock.json

Lines changed: 17 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@types/react": "^16.9.53",
1212
"@types/react-dom": "^16.9.8",
1313
"bootstrap": "^4.5.3",
14-
"global-input-react": "^4.5.0",
14+
"global-input-react": "^4.6.0",
1515
"react": "^17.0.1",
1616
"react-dom": "^17.0.1",
1717
"react-scripts": "4.0.0",

src/app/mobile/useMobile.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const useMobile = (initData: InitData | (() => InitData), showWidgetOnSta
2525
initData, options:connectOptions, codeAES: connectionSettings.codeKey
2626
}, isShowWidget, `${settingsConfig}-${configId}`);
2727
////dev-test codeData
28-
const {disconnect}=mobile;
28+
const {close}=mobile;
2929
const onSaveSettings=useCallback((settings)=>{
3030
if (storage.saveConnectionSettings(settings)) {
3131
setWidgetState(WidgetState.PAIRING);
@@ -34,8 +34,8 @@ export const useMobile = (initData: InitData | (() => InitData), showWidgetOnSta
3434
setWidgetState(WidgetState.CONNECT_QR);
3535
}
3636
setSettingsConfigId(configId => configId + 1);
37-
disconnect();
38-
},[disconnect]);
37+
close();
38+
},[close]);
3939
const loadSettings=useCallback(()=>connectionSettings,[connectionSettings]);
4040
return {...mobile,isShowWidget,onSaveSettings,loadSettings,widgetState,setWidgetState,setShowWidget};
4141
};

src/app/mobile/widgets.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,14 +451,16 @@ export const ConnectButton:React.FC<ButtonProps>=({mobile,label='Connect', skin}
451451
<ConnectLabel>{label}</ConnectLabel>
452452
</DarkButton>
453453
);
454-
455454
};
456455

457456

458457

458+
459+
460+
459461
export const DisConnectButton:React.FC<ButtonProps>=({mobile,label='Disconnect',skin})=>{
460-
const {isConnected,isConnectionDenied, restart}=mobile;
461-
if(isConnected || isConnectionDenied){
462+
const {isConnected,isConnectionDenied, isDisconnected, restart}=mobile;
463+
if(isConnected || isConnectionDenied || isDisconnected){
462464
if(skin==='white'){
463465
return (<BigButton onClick={()=>restart()}>{label}</BigButton>);
464466
}

0 commit comments

Comments
 (0)