From d05eb94052b311ac378ba03b57994f3df1d0f6fa Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 3 Nov 2019 10:50:15 +0100 Subject: [PATCH] Add Expanded component (#1834) --- packages/app-staking/src/Overview/Address.tsx | 29 ++++++---------- .../app-staking/src/Overview/CurrentList.tsx | 5 ++- packages/app-staking/src/Overview/Summary.tsx | 1 - packages/app-staking/src/Overview/index.tsx | 1 - packages/react-components/src/Expander.tsx | 33 +++++++++++++++++++ packages/react-components/src/index.tsx | 1 + 6 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 packages/react-components/src/Expander.tsx diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index 9869ad5872..d6b86c52a6 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -11,7 +11,7 @@ import BN from 'bn.js'; import React, { useContext, useEffect, useState } from 'react'; import styled from 'styled-components'; import { ApiContext, withCalls, withMulti } from '@polkadot/react-api'; -import { AddressCard, AddressMini, Badge, Icon } from '@polkadot/react-components'; +import { AddressCard, AddressMini, Badge, Expander, Icon } from '@polkadot/react-components'; import { classes } from '@polkadot/react-components/util'; import keyring from '@polkadot/ui-keyring'; import { formatNumber } from '@polkadot/util'; @@ -48,7 +48,6 @@ const WITH_VALIDATOR_PREFS = { validatorPayment: true }; function Address ({ address, authorsMap, className, currentElected, defaultName, filter, lastAuthors, points, recentlyOnline, stakingInfo, t, withNominations = true }: Props): React.ReactElement | null { const { isSubstrateV2 } = useContext(ApiContext); const [extraInfo, setExtraInfo] = useState<[React.ReactNode, React.ReactNode][] | undefined>(); - const [isNominationsOpen, setIsNominationsOpen] = useState(false); const [{ balanceOpts, controllerId, hasNominators, isNominatorMe, isSelected, nominators, sessionId, stashId }, setStakingState] = useState({ balanceOpts: { bonded: true }, hasNominators: false, @@ -118,13 +117,6 @@ function Address ({ address, authorsMap, className, currentElected, defaultName, ); } - const _toggleNominations = (event: React.SyntheticEvent): void => { - event.preventDefault(); - event.stopPropagation(); - - setIsNominationsOpen(!isNominationsOpen); - }; - const lastBlockNumber = authorsMap[stashId]; const isAuthor = lastAuthors && lastAuthors.includes(stashId); @@ -184,15 +176,14 @@ function Address ({ address, authorsMap, className, currentElected, defaultName, withValidatorPrefs={WITH_VALIDATOR_PREFS} > {withNominations && hasNominators && ( -
- - {t('Nominators ({{count}})', { - replace: { - count: nominators.length - } - })} - - {isNominationsOpen && nominators.map(([who, bonded]): React.ReactNode => + + {nominators.map(([who, bonded]): React.ReactNode => )} -
+ )} ); diff --git a/packages/app-staking/src/Overview/CurrentList.tsx b/packages/app-staking/src/Overview/CurrentList.tsx index e4f815bc95..757da08c85 100644 --- a/packages/app-staking/src/Overview/CurrentList.tsx +++ b/packages/app-staking/src/Overview/CurrentList.tsx @@ -10,6 +10,7 @@ import { ValidatorFilter } from '../types'; import React, { useContext, useEffect, useState } from 'react'; import { ApiContext } from '@polkadot/react-api'; import { Columar, Column, Dropdown, FilterOverlay } from '@polkadot/react-components'; +import { createType } from '@polkadot/types'; import translate from '../translate'; import Address from './Address'; @@ -22,6 +23,8 @@ interface Props extends I18nProps { stakingOverview?: DerivedStakingOverview; } +const EMPTY_POINTS = createType('Points'); + function renderColumn (addresses: AccountId[] | string[], defaultName: string, withOnline: boolean, withPoints: boolean, filter: string, { authorsMap, lastAuthors, recentlyOnline, stakingOverview }: Props): React.ReactNode { return (addresses as AccountId[]).map((address, index): React.ReactNode => (
{ + const [isExpanded, setIsExpanded] = useState(false); + + const _toggle = (event: React.SyntheticEvent): void => { + event.preventDefault(); + event.stopPropagation(); + + setIsExpanded(!isExpanded); + }; + + return ( +
+ {summary} + {isExpanded && children} +
+ ); +} diff --git a/packages/react-components/src/index.tsx b/packages/react-components/src/index.tsx index f96e6d4cc3..900bc0d4e3 100644 --- a/packages/react-components/src/index.tsx +++ b/packages/react-components/src/index.tsx @@ -28,6 +28,7 @@ export { default as CryptoType } from './CryptoType'; export { default as Dropdown } from './Dropdown'; export { default as Editor } from './Editor'; export { default as Event } from './Event'; +export { default as Expander } from './Expander'; export { default as Extrinsic } from './Extrinsic'; export { default as FilterOverlay } from './FilterOverlay'; export { default as Forget } from './Forget';