Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

maryia/feat: barrier dropdown for turbos #76

Closed
wants to merge 2 commits into from
Closed

maryia/feat: barrier dropdown for turbos #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fd5c67
feat: barrier dropdown for turbos
maryia-deriv Feb 5, 2023
e9396d7
feat: added select native as turbos barrier
maryia-deriv Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/components/src/components/select-native/select-native.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const SelectNativeOptions = ({ list_items, should_hide_disabled_options, use_tex
};

const SelectNative = ({
align_center,
className,
classNameDisplay,
classNameHint,
Expand Down Expand Up @@ -79,7 +80,11 @@ const SelectNative = ({
'dc-input--error': error,
})}
>
<div className='dc-select-native__display'>
<div
className={classNames('dc-select-native__display', {
'dc-select-native__display--centered': align_center,
})}
>
{list_items && value && (
<div
className={classNames('dc-select-native__display-text', classNameDisplay)}
Expand Down Expand Up @@ -184,6 +189,7 @@ const list_items_shape = PropTypes.oneOfType([
]);

SelectNative.propTypes = {
align_center: PropTypes.bool,
className: PropTypes.string,
classNameDisplay: PropTypes.string,
classNameHint: PropTypes.string,
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/select-native/select-native.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
justify-content: flex-start;
padding-left: 1.2rem;

&--centered {
justify-content: center;
}
&-text {
color: var(--text-prominent);
font-size: 1.4rem;
Expand Down
141 changes: 86 additions & 55 deletions packages/trader/src/Modules/Trading/Components/Form/TradeParams/barrier.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classNames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import { DesktopWrapper, Icon, InputField, MobileWrapper } from '@deriv/components';
import { DesktopWrapper, Dropdown, Icon, InputField, MobileWrapper, SelectNative } from '@deriv/components';
import Fieldset from 'App/Components/Form/fieldset.jsx';
import { connect } from 'Stores/connect';
import { localize } from '@deriv/translations';
Expand All @@ -15,8 +15,10 @@ const Barrier = ({
duration_unit,
is_minimized,
is_absolute_only,
is_turbos,
onChange,
setCurrentFocus,
turbos_barrier_choices,
validation_errors,
}) => {
const barrier_title = barrier_count === 1 ? localize('Barrier') : localize('Barriers');
Expand Down Expand Up @@ -57,75 +59,100 @@ const Barrier = ({
is_center
>
<div>
<InputField
id='dt_barrier_1_input'
type='number'
name='barrier_1'
value={barrier_1}
className={`trade-container__barriers-${input_class}`}
classNameInput={classNames(
'trade-container__input',
'trade-container__barriers-input',
`trade-container__barriers-${input_class}-input`
)}
current_focus={current_focus}
onChange={onChange}
error_messages={validation_errors.barrier_1 || []}
is_float
is_signed
setCurrentFocus={setCurrentFocus}
/>

{barrier_count === 2 && (
<React.Fragment>
{is_turbos ? (
<Dropdown
name='barrier_1'
list={turbos_barrier_choices.map(choice => ({ text: choice, value: choice }))}
value={barrier_1}
onChange={onChange}
/>
) : (
<>
<InputField
id='dt_barrier_2_input'
id='dt_barrier_1_input'
type='number'
name='barrier_2'
value={barrier_2}
className='multiple'
classNameInput='trade-container__input'
name='barrier_1'
value={barrier_1}
className={`trade-container__barriers-${input_class}`}
classNameInput={classNames(
'trade-container__input',
'trade-container__barriers-input',
`trade-container__barriers-${input_class}-input`
)}
current_focus={current_focus}
onChange={onChange}
error_messages={validation_errors.barrier_2}
error_messages={validation_errors.barrier_1 || []}
is_float
is_signed
setCurrentFocus={setCurrentFocus}
/>
<Icon icon='IcArrowUp' className='trade-container__barriers--up' />
<Icon icon='IcArrowDown' className='trade-container__barriers--down' />
</React.Fragment>

{barrier_count === 2 && (
<React.Fragment>
<InputField
id='dt_barrier_2_input'
type='number'
name='barrier_2'
value={barrier_2}
className='multiple'
classNameInput='trade-container__input'
current_focus={current_focus}
onChange={onChange}
error_messages={validation_errors.barrier_2}
is_float
is_signed
setCurrentFocus={setCurrentFocus}
/>
<Icon icon='IcArrowUp' className='trade-container__barriers--up' />
<Icon icon='IcArrowDown' className='trade-container__barriers--down' />
</React.Fragment>
)}
</>
)}
</div>
</Fieldset>
</DesktopWrapper>
<MobileWrapper>
<div className='barrier__widget'>
<Fieldset className='barrier__fields'>
<InputField
id='dt_barrier_1_input'
type='number'
name='barrier_1'
value={barrier_1}
is_incrementable={!is_absolute_barrier}
is_incrementable_on_long_press={!is_absolute_barrier}
is_negative_disabled={is_absolute_barrier}
className={`barrier__fields-${input_class}`}
classNameInput={classNames(
'barrier__fields-input',
'barrier__fields-barriers-input',
`barrier__fields-barriers-${input_class}-input`,
{
'barrier__fields-input--is-offset': !is_absolute_barrier,
}
)}
current_focus={current_focus}
format={format}
onChange={onChange}
is_float
is_signed
setCurrentFocus={setCurrentFocus}
/>
{is_turbos ? (
<SelectNative
name='barrier_1'
align_center
list_items={turbos_barrier_choices.map(choice => ({
text: choice,
value: choice,
}))}
value={barrier_1}
should_show_empty_option={false}
onChange={onChange}
/>
) : (
<InputField
id='dt_barrier_1_input'
type='number'
name='barrier_1'
value={barrier_1}
is_incrementable={!is_absolute_barrier}
is_incrementable_on_long_press={!is_absolute_barrier}
is_negative_disabled={is_absolute_barrier}
className={`barrier__fields-${input_class}`}
classNameInput={classNames(
'barrier__fields-input',
'barrier__fields-barriers-input',
`barrier__fields-barriers-${input_class}-input`,
{
'barrier__fields-input--is-offset': !is_absolute_barrier,
}
)}
current_focus={current_focus}
format={format}
onChange={onChange}
is_float
is_signed
setCurrentFocus={setCurrentFocus}
/>
)}
</Fieldset>
<h2 className='barrier__widget-title'>
{barrier_count === 2 ? localize('Barrier 1') : localize('Barrier')}
Expand Down Expand Up @@ -176,8 +203,10 @@ Barrier.propTypes = {
duration_unit: PropTypes.string,
is_absolute_only: PropTypes.bool,
is_minimized: PropTypes.bool,
is_turbos: PropTypes.bool,
onChange: PropTypes.func,
setCurrentFocus: PropTypes.func,
turbos_barrier_choices: PropTypes.array,
validation_errors: PropTypes.object,
};

Expand All @@ -188,7 +217,9 @@ export default connect(({ modules, ui }) => ({
barrier_count: modules.trade.barrier_count,
current_focus: ui.current_focus,
duration_unit: modules.trade.duration_unit,
is_turbos: modules.trade.is_turbos,
onChange: modules.trade.onChange,
setCurrentFocus: ui.setCurrentFocus,
turbos_barrier_choices: modules.trade.turbos_barrier_choices,
validation_errors: modules.trade.validation_errors,
}))(Barrier);