8000 fix: suggest-field total and submit (#351) · qiwi/pijma@cbbb02e · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit cbbb02e

Browse files
Irinaa133Irinaa133
authored
fix: suggest-field total and submit (#351)
1 parent dbaff20 commit cbbb02e

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

‎packages/core/src/suggest/SuggestControl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ export default class SuggestControl<V, O extends SuggestOptionModel<V>> extends
152152
private cancel: () => void = () => {
153153
this.setState({
154154
show: false,
155+
focused: false,
155156
})
156157
if (this.props.onCancel) {
157158
this.props.onCancel()

‎packages/mobile/src/suggest-field/SuggestField.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export const SuggestField = <V extends {}>({
4848
onBlur={props.onBlur}
4949
onFocus={props.onFocus}
5050
onCancel={props.onCancel}
51+
onSubmit={props.onSubmit}
5152
children={(renderProps) => (
5253
<Pos type="relative">
5354
<Box
@@ -106,6 +107,7 @@ export const SuggestField = <V extends {}>({
106107
onHide={renderProps.onHide}
107108
onEscape={renderProps.onEscapeInputModal}
108109
onBack={renderProps.onBack}
110+
onSubmit={props.onSubmit ? renderProps.onSearchClick : undefined}
109111
>
110112
{props.loading ? (
111113
Array(4).fill(1).map((_item, key) => (
@@ -134,7 +136,24 @@ export const SuggestField = <V extends {}>({
134136
) : (
135137
null
136138
)}
137-
{props.empty && menuRenderProps.items.length === 0 ? (
139+
{props.total && menuRenderProps.items.length > 0 ? (
140+
<Box px={6}>
141+
<Paragraph>
142+
{props.total.text}
143+
{props.total.link ? (
144+
<Fragment>
145+
{' '}
146+
<Link
147+
onClick={renderProps.onTotalClick}
148+
children={props.total.link.text}
149+
/>
150+
</Fragment>
151+
) : (
152+
null
153+
)}
154+
</Paragraph>
155+
</Box>
156+
) : props.empty && menuRenderProps.items.length === 0 && props.items !== undefined ? (
138157
<Box px={4}>
139158
<Paragraph>
140159
{props.empty.text}

‎packages/mobile/src/suggest-field/SuggestFieldProps.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default interface SuggestFieldProps<O extends SuggestFieldOptionModel<V>,
1515
stub?: boolean
1616
error?: ReactNode
1717
loading?: boolean
18+
total?: SuggestControlProps<O, V>['total']
1819
name?: string
1920
type?: 'text' | 'password' | 'tel' | 'number' | 'search' | 'email' | 'url'
2021
title?: string
@@ -28,5 +29,6 @@ export default interface SuggestFieldProps<O extends SuggestFieldOptionModel<V>,
2829
onCancel?: SuggestControlProps<O, V>['onCancel']
2930
onFocus?: SuggestControlProps<O, V>['onFocus']
3031
onBlur?: SuggestControlProps<O, V>['onBlur']
32+
onSubmit?: SuggestControlProps<O, V>['onSubmit']
3133
equals?: SuggestControlProps<O, V>['equals']
3234
}

0 commit comments

Comments
 (0)
0