From f9a1042fb495effa3444792fc1db9f0b43f73bbb Mon Sep 17 00:00:00 2001 From: Martin Ohlson Date: Fri, 10 Jul 2020 12:06:31 +0200 Subject: [PATCH] fix: add prop rightHeader to Transfer --- packages/widgets/src/Transfer/RightHeader.js | 25 +++++++++++++++++++ packages/widgets/src/Transfer/Transfer.js | 9 +++++++ .../widgets/src/Transfer/Transfer.stories.js | 9 +++++++ 3 files changed, 43 insertions(+) create mode 100644 packages/widgets/src/Transfer/RightHeader.js diff --git a/packages/widgets/src/Transfer/RightHeader.js b/packages/widgets/src/Transfer/RightHeader.js new file mode 100644 index 0000000000..86d92e0ee5 --- /dev/null +++ b/packages/widgets/src/Transfer/RightHeader.js @@ -0,0 +1,25 @@ +import React from 'react' +import propTypes from '@dhis2/prop-types' + +import { spacers } from '@dhis2/ui-constants' + +import { borderColor } from './common/index.js' + +export const RightHeader = ({ children, dataTest }) => ( +
+ {children} + + +
+) + +RightHeader.propTypes = { + children: propTypes.node, + dataTest: propTypes.string, +} diff --git a/packages/widgets/src/Transfer/Transfer.js b/packages/widgets/src/Transfer/Transfer.js index 984dc4ebca..577d350a72 100644 --- a/packages/widgets/src/Transfer/Transfer.js +++ b/packages/widgets/src/Transfer/Transfer.js @@ -13,6 +13,7 @@ import { PickedOptions } from './PickedOptions.js' import { RemoveAll } from './RemoveAll.js' import { RemoveIndividual } from './RemoveIndividual.js' import { ReorderingActions } from './ReorderingActions.js' +import { RightHeader } from './RightHeader.js' import { RightFooter } from './RightFooter.js' import { RightSide } from './RightSide.js' import { SourceOptions } from './SourceOptions.js' @@ -87,6 +88,7 @@ export const Transfer = ({ maxSelections, optionsWidth, renderOption, + rightHeader, rightFooter, searchTerm, selected, @@ -295,6 +297,11 @@ export const Transfer = ({ + {rightHeader && ( + + {rightHeader} + + )} ( console.log('Will be overriden')} leftHeader={

Header on the left side

} + rightHeader={

Header on the right side

} options={options} /> @@ -171,6 +172,7 @@ export const Filtered = () => ( onChange={() => console.log('Will be overriden by StatefulWrapper')} initialSearchTerm="ANC" leftHeader={

Header on the left side

} + rightHeader={

Header on the right side

} options={options} /> @@ -295,6 +297,7 @@ export const IncreasedOptionsHeight = () => ( } height="400px" leftHeader={

Header on the left side

} + rightHeader={

Header on the right side

} options={options} /> @@ -308,6 +311,7 @@ export const DifferentWidths = () => ( onChange={() => console.log('Will be overriden by StatefulWrapper')} initialSearchTerm="Ba" leftHeader={

Header on the left side

} + rightHeader={

Header on the right side

} optionsWidth="500px" selectedWidth="240px" options={options} @@ -405,6 +409,11 @@ const createCustomFilteringInHeader = hideFilterInput => { searchTerm={filter} filterCallback={filterCallback} leftHeader={header} + rightHeader={ +

+ Selected Periods +

+ } onFilterChange={({ value }) => setFilter(value)} height="400px" filterLabel="Filter options"