diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-07-02 04:31:43 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-07-02 05:50:55 +0800 |
| commit | a6f40d418704a8dca8c787663f00b6bcbdf18ba4 (patch) | |
| tree | 8da4c0c480df8d200b0a39e7945787e95953b1e8 /packages/website/ts/components/top_bar | |
| parent | 6daf754f5bb4aa85d0f65bfdaf8910db4401d1cc (diff) | |
| download | dexon-sol-tools-a6f40d418704a8dca8c787663f00b6bcbdf18ba4.tar dexon-sol-tools-a6f40d418704a8dca8c787663f00b6bcbdf18ba4.tar.gz dexon-sol-tools-a6f40d418704a8dca8c787663f00b6bcbdf18ba4.tar.bz2 dexon-sol-tools-a6f40d418704a8dca8c787663f00b6bcbdf18ba4.tar.lz dexon-sol-tools-a6f40d418704a8dca8c787663f00b6bcbdf18ba4.tar.xz dexon-sol-tools-a6f40d418704a8dca8c787663f00b6bcbdf18ba4.tar.zst dexon-sol-tools-a6f40d418704a8dca8c787663f00b6bcbdf18ba4.zip | |
Implement correct behavior for menu in the wallet
Diffstat (limited to 'packages/website/ts/components/top_bar')
| -rw-r--r-- | packages/website/ts/components/top_bar/provider_display.tsx | 9 | ||||
| -rw-r--r-- | packages/website/ts/components/top_bar/top_bar.tsx | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx index 3f29d5ff3..6d02ebd59 100644 --- a/packages/website/ts/components/top_bar/provider_display.tsx +++ b/packages/website/ts/components/top_bar/provider_display.tsx @@ -51,7 +51,7 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi this.props.providerType, this.props.injectedProviderName, ); - const hoverActiveNode = ( + const activeNode = ( <Island className="flex items-center py1 px2" style={styles.root}> {this._renderIcon()} <Container marginLeft="12px" marginRight="12px"> @@ -61,14 +61,13 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi </Island> ); const hasLedgerProvider = this.props.providerType === ProviderType.Ledger; - const horizontalPosition = isExternallyInjectedProvider || hasLedgerProvider ? 'left' : 'middle'; return ( <div style={{ width: 'fit-content', height: 48, float: 'right' }}> <DropDown - hoverActiveNode={hoverActiveNode} + activeNode={activeNode} popoverContent={this.renderPopoverContent(isExternallyInjectedProvider, hasLedgerProvider)} - anchorOrigin={{ horizontal: horizontalPosition, vertical: 'bottom' }} - targetOrigin={{ horizontal: horizontalPosition, vertical: 'top' }} + anchorOrigin={{ horizontal: 'middle', vertical: 'bottom' }} + targetOrigin={{ horizontal: 'middle', vertical: 'top' }} zDepth={1} /> </div> diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index fac6c131f..778536663 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -199,7 +199,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> { cursor: 'pointer', paddingTop: 16, }; - const hoverActiveNode = ( + const activeNode = ( <div className="flex relative" style={{ color: menuIconStyle.color }}> <div style={{ paddingRight: 10 }}>{this.props.translate.get(Key.Developers, Deco.Cap)}</div> <div className="absolute" style={{ paddingLeft: 3, right: 3, top: -2 }}> @@ -224,7 +224,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> { <div className={menuClasses}> <div className="flex justify-between"> <DropDown - hoverActiveNode={hoverActiveNode} + activeNode={activeNode} popoverContent={popoverContent} anchorOrigin={{ horizontal: 'middle', vertical: 'bottom' }} targetOrigin={{ horizontal: 'middle', vertical: 'top' }} |