mirror of
https://github.com/status-im/react-native-dialogs.git
synced 2025-03-01 08:40:26 +00:00
Differentiate OptionsCheckboxList, close #111
* At same time, fix up OptionsPicker * Got rid of OptionsCheckbox - made it apart of OptionsCommon
This commit is contained in:
Noitidart
parent
7e8f9667b5
commit
92a68ae1b4
@ -9,13 +9,7 @@ type LabelKey = string | 'label';
|
||||
type ListItem = { label:string, id?:any };
|
||||
|
||||
type OptionsAlert = {|
|
||||
...OptionsCheckbox,
|
||||
...OptionsCommon
|
||||
|}
|
||||
|
||||
type OptionsCheckbox = {|
|
||||
checkboxLabel?: string,
|
||||
checkboxDefaultValue?: boolean
|
||||
...OptionsCommon,
|
||||
|}
|
||||
|
||||
type OptionsCommon = {|
|
||||
@ -33,7 +27,8 @@ type OptionsCommon = {|
|
||||
cancelable?: boolean,
|
||||
linkColor?: ColorValue, // applies if contentIsHtml is true, and there are <a> elements in content string
|
||||
forceStacking?: boolean,
|
||||
maxNumberOfItems?: int
|
||||
checkboxLabel?: string,
|
||||
checkboxDefaultValue?: boolean
|
||||
|}
|
||||
|
||||
type ListItemJustLabel = { label:string };
|
||||
@ -41,13 +36,13 @@ type ListItemJustId = { id:string };
|
||||
type ListItemFull = { label:string, id:any };
|
||||
type ListItemBare = {};
|
||||
|
||||
type OptionsRadio = {|
|
||||
maxNumberOfItems?: int,
|
||||
type OptionsRadioList = {|
|
||||
maxNumberOfItems?: number,
|
||||
type: typeof ListType.listRadio,
|
||||
widgetColor?: ColorValue // radio color
|
||||
|}
|
||||
type OptionsCheckbox = {|
|
||||
maxNumberOfItems?: int,
|
||||
type OptionsCheckboxList = {|
|
||||
maxNumberOfItems?: number,
|
||||
type: typeof ListType.listCheckbox,
|
||||
neutralIsClear?: boolean,
|
||||
widgetColor?: ColorValue // checkbox color
|
||||
@ -56,49 +51,49 @@ type OptionsCheckbox = {|
|
||||
type OptionsPicker = {|
|
||||
...OptionsCommon,
|
||||
type?: typeof ListType.listPlain,
|
||||
maxNumberOfItems?: int,
|
||||
maxNumberOfItems?: number,
|
||||
items: ListItemJustLabel[],
|
||||
|} | {|
|
||||
...OptionsCommon,
|
||||
type?: typeof ListType.listPlain,
|
||||
maxNumberOfItems?: int,
|
||||
maxNumberOfItems?: number,
|
||||
items: ListItemBare[],
|
||||
labelKey: string
|
||||
|} | {|
|
||||
// radio - no preselected
|
||||
...OptionsCommon,
|
||||
...OptionsRadio,
|
||||
...OptionsRadioList,
|
||||
items: ListItemJustLabel[],
|
||||
|} | {|
|
||||
// radio - no preselected
|
||||
...OptionsCommon,
|
||||
...OptionsRadio,
|
||||
...OptionsRadioList,
|
||||
items: ListItemBare[],
|
||||
labelKey: string
|
||||
|} | {|
|
||||
// radio - preselected - ListItemFull
|
||||
...OptionsCommon,
|
||||
...OptionsRadio,
|
||||
...OptionsRadioList,
|
||||
items: ListItemFull[],
|
||||
selectedId: any
|
||||
|} | {|
|
||||
// radio - preselected - ListItemJustlabel
|
||||
...OptionsCommon,
|
||||
...OptionsRadio,
|
||||
...OptionsRadioList,
|
||||
items: ListItemJustLabel[],
|
||||
idKey: string,
|
||||
selectedId: any
|
||||
|} | {|
|
||||
// radio - preselected - ListItemJustId
|
||||
...OptionsCommon,
|
||||
...OptionsRadio,
|
||||
...OptionsRadioList,
|
||||
items: ListItemJustId[],
|
||||
labelKey: string,
|
||||
selectedId: any
|
||||
|} | {|
|
||||
// radio - preselected - ListItemBare
|
||||
...OptionsCommon,
|
||||
...OptionsRadio,
|
||||
...OptionsRadioList,
|
||||
items: ListItemBare[],
|
||||
idKey: string,
|
||||
labelKey: string,
|
||||
@ -106,38 +101,38 @@ type OptionsPicker = {|
|
||||
|} | {|
|
||||
// checklist - no preselected - ListItemJustLabel
|
||||
...OptionsCommon,
|
||||
...OptionsCheckbox,
|
||||
...OptionsCheckboxList,
|
||||
items: ListItemJustLabel[]
|
||||
|} | {|
|
||||
// checklist - no preselected - ListItemBare
|
||||
...OptionsCommon,
|
||||
...OptionsCheckbox,
|
||||
...OptionsCheckboxList,
|
||||
items: ListItemBare[],
|
||||
labelKey: string
|
||||
|} | {|
|
||||
// checklist - preselected - ListItemFull
|
||||
...OptionsCommon,
|
||||
...OptionsCheckbox,
|
||||
...OptionsCheckboxList,
|
||||
items: ListItemFull[],
|
||||
selectedIds: any[]
|
||||
|} | {|
|
||||
// checklist - preselected - ListItemJustlabel
|
||||
...OptionsCommon,
|
||||
...OptionsCheckbox,
|
||||
...OptionsCheckboxList,
|
||||
items: ListItemJustLabel[],
|
||||
idKey: string,
|
||||
selectedIds: any
|
||||
|} | {|
|
||||
// checklist - preselected - ListItemJustId
|
||||
...OptionsCommon,
|
||||
...OptionsCheckbox,
|
||||
...OptionsCheckboxList,
|
||||
items: ListItemJustId[],
|
||||
labelKey: string,
|
||||
selectedIds: any
|
||||
|} | {|
|
||||
// checklist - preselected - ListItemBare
|
||||
...OptionsCommon,
|
||||
...OptionsCheckbox,
|
||||
...OptionsCheckboxList,
|
||||
items: ListItemBare[],
|
||||
idKey: string,
|
||||
labelKey: string,
|
||||
@ -156,7 +151,7 @@ type ActionType =
|
||||
| typeof DialogAndroid.actionPositive
|
||||
| typeof DialogAndroid.actionSelect;
|
||||
|
||||
type Options = OptionsCommon | OptionsPicker | OptionsProgress | OptionsPrompt;
|
||||
type Options = OptionsAlert | OptionsPicker | OptionsProgress | OptionsPrompt;
|
||||
|
||||
type OptionsProgress = {|
|
||||
contentColor?: $PropertyType<OptionsCommon, 'contentColor'>,
|
||||
|
||||
149
README.md
149
README.md
@ -31,7 +31,6 @@ An Android only module for Material Design dialogs. This is a wrapper over [afol
|
||||
- [`type ListItem`](#type-listitem)
|
||||
- [`type ListType`](#type-listtype)
|
||||
- [`type OptionsAlert`](#type-optionsalert)
|
||||
- [`type OptionsCheckbox`](#type-optionscheckbox)
|
||||
- [`type OptionsCommon`](#type-optionscommon)
|
||||
- [`type OptionsProgress`](#type-optionsprogress)
|
||||
- [`type OptionsPicker`](#type-optionspicker)
|
||||
@ -325,31 +324,19 @@ Shows a progress dialog. By default no buttons are shown, and hardware back butt
|
||||
##### `type OptionsAlert`
|
||||
|
||||
> {
|
||||
> ...OptionsCommon,
|
||||
> ...OptionsAlert
|
||||
> ...OptionsCommon
|
||||
> }
|
||||
|
||||
| Key | Type | Default | Required | Description |
|
||||
|--------------------|--------------------------------------------|---------|----------|------------------------------------------------|
|
||||
| ...OptionsCheckbox | [`OptionsCheckbox`](#type-optionscheckbox) | | | See [`OptionsCheckbox`](#type-optionscheckbox) |
|
||||
|------------------|----------------------------------------|---------|----------|--------------------------------------------|
|
||||
| ...OptionsCommon | [`OptionsCommon`](#type-optionscommon) | | | See [`OptionsCommon`](#type-optionscommon) |
|
||||
|
||||
##### `type OptionsCheckbox`
|
||||
|
||||
> {
|
||||
> checkboxLabel?: string,
|
||||
> checkboxDefaultValue?: boolean
|
||||
> }
|
||||
|
||||
| Key | Type | Default | Required | Description |
|
||||
|----------------------|-----------|---------|----------|------------------------------------------------------------------------------------|
|
||||
| checkboxLabel | `string` | | | If set, then there is a checkbox shown at the bottom of the dialog with this label |
|
||||
| checkboxDefaultValue | `boolean` | `false` | | The initial state of the checkbox. Does nothing if `checkboxLabel` is not set |
|
||||
|
||||
##### `type OptionsCommon`
|
||||
|
||||
> {
|
||||
> cancelable?: boolean,
|
||||
> checkboxDefaultValue?: boolean
|
||||
> checkboxLabel?: string,
|
||||
> content?: string,
|
||||
> contentColor?: string,
|
||||
> contentIsHtml?: boolean,
|
||||
@ -363,12 +350,13 @@ Shows a progress dialog. By default no buttons are shown, and hardware back butt
|
||||
> positiveText?: string, // default "OK"
|
||||
> title?: string,
|
||||
> titleColor?: ColorValue,
|
||||
> maxNumberOfItems?: boolean,
|
||||
> }
|
||||
|
||||
| Key | Type | Default | Required | Description |
|
||||
|---------------|--------------------------------------------------------------------------|---------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
|----------------------|--------------------------------------------------------------------------|---------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
| cancelable | `boolean` | | | If tapping outside of dialog area, or hardware back button, should dismiss dialog. |
|
||||
| checkboxDefaultValue | `boolean` | `false` | | The initial state of the checkbox. Does nothing if `checkboxLabel` is not set. |
|
||||
| checkboxLabel | `string` | | | If set, then there is a checkbox shown at the bottom of the dialog with this label |
|
||||
| content | `string` | | | Dialog message |
|
||||
| contentColor | [`ColorValue`](https://facebook.github.io/react-native/docs/colors.html) | | | Color of dialog message |
|
||||
| contentIsHtml | `boolean` | | | If dialog message should be parsed as html. (supported tags include: `<a>`, `<img>`, etc) |
|
||||
@ -382,7 +370,6 @@ Shows a progress dialog. By default no buttons are shown, and hardware back butt
|
||||
| positiveText | `string` | | | If falsy, button is not shown. |
|
||||
| title | `string` | | | Title of dialog |
|
||||
| titleColor | [`ColorValue`](https://facebook.github.io/react-native/docs/colors.html) | | | Color of title |
|
||||
| maxNumberOfItems | `int` | | | If you want to set a max amount of visible items in a list |
|
||||
|
||||
##### `type OptionsProgress`
|
||||
|
||||
@ -408,25 +395,122 @@ Shows a progress dialog. By default no buttons are shown, and hardware back butt
|
||||
|
||||
##### `type OptionsPicker`
|
||||
|
||||
> {
|
||||
> {|
|
||||
> ...OptionsCommon,
|
||||
> idKey?: string,
|
||||
> items: ListItem[],
|
||||
> labelKey?: string,
|
||||
> type?: typeof ListType.listPlain,
|
||||
> maxNumberOfItems?: number,
|
||||
> items: ListItemJustLabel[],
|
||||
> |} | {|
|
||||
> ...OptionsCommon,
|
||||
> type?: typeof ListType.listPlain,
|
||||
> maxNumberOfItems?: number,
|
||||
> items: ListItemBare[],
|
||||
> labelKey: string
|
||||
> |} | {|
|
||||
> // radio - no preselected
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listRadio,
|
||||
> widgetColor?: ColorValue // radio color
|
||||
> items: ListItemJustLabel[],
|
||||
> |} | {|
|
||||
> // radio - no preselected
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listRadio,
|
||||
> widgetColor?: ColorValue // radio color
|
||||
> items: ListItemBare[],
|
||||
> labelKey: string
|
||||
> |} | {|
|
||||
> // radio - preselected - ListItemFull
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listRadio,
|
||||
> widgetColor?: ColorValue // radio color
|
||||
> items: ListItemFull[],
|
||||
> selectedId: any
|
||||
> |} | {|
|
||||
> // radio - preselected - ListItemJustlabel
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listRadio,
|
||||
> widgetColor?: ColorValue // radio color
|
||||
> items: ListItemJustLabel[],
|
||||
> idKey: string,
|
||||
> selectedId: any
|
||||
> |} | {|
|
||||
> // radio - preselected - ListItemJustId
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listRadio,
|
||||
> widgetColor?: ColorValue // radio color
|
||||
> items: ListItemJustId[],
|
||||
> labelKey: string,
|
||||
> selectedId: any
|
||||
> |} | {|
|
||||
> // radio - preselected - ListItemBare
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listRadio,
|
||||
> widgetColor?: ColorValue // radio color
|
||||
> items: ListItemBare[],
|
||||
> idKey: string,
|
||||
> labelKey: string,
|
||||
> selectedId: any
|
||||
> |} | {|
|
||||
> // checklist - no preselected - ListItemJustLabel
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listCheckbox,
|
||||
> neutralIsClear?: boolean,
|
||||
> selectedId?: any,
|
||||
> selectedIds?: any[],
|
||||
> type?: string,
|
||||
> widgetColor?: ColorValue
|
||||
> }
|
||||
> widgetColor?: ColorValue, // checkbox color
|
||||
> items: ListItemJustLabel[]
|
||||
> |} | {|
|
||||
> // checklist - no preselected - ListItemBare
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listCheckbox,
|
||||
> neutralIsClear?: boolean,
|
||||
> widgetColor?: ColorValue, // checkbox color
|
||||
> items: ListItemBare[],
|
||||
> labelKey: string
|
||||
> |} | {|
|
||||
> // checklist - preselected - ListItemFull
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listCheckbox,
|
||||
> neutralIsClear?: boolean,
|
||||
> widgetColor?: ColorValue, // checkbox color
|
||||
> items: ListItemFull[],
|
||||
> selectedIds: any[]
|
||||
> |} | {|
|
||||
> // checklist - preselected - ListItemJustlabel
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listCheckbox,
|
||||
> neutralIsClear?: boolean,
|
||||
> widgetColor?: ColorValue, // checkbox color
|
||||
> items: ListItemJustLabel[],
|
||||
> idKey: string,
|
||||
> selectedIds: any
|
||||
> |} | {|
|
||||
> // checklist - preselected - ListItemJustId
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listCheckbox,
|
||||
> neutralIsClear?: boolean,
|
||||
> widgetColor?: ColorValue, // checkbox color
|
||||
> items: ListItemJustId[],
|
||||
> labelKey: string,
|
||||
> selectedIds: any
|
||||
> |} | {|
|
||||
> // checklist - preselected - ListItemBare
|
||||
> ...OptionsCommon,
|
||||
> type: typeof ListType.listCheckbox,
|
||||
> neutralIsClear?: boolean,
|
||||
> widgetColor?: ColorValue, // checkbox color
|
||||
> items: ListItemBare[],
|
||||
> idKey: string,
|
||||
> labelKey: string,
|
||||
> selectedIds: any
|
||||
> |}
|
||||
|
||||
| Key | Type | Default | Required | Description |
|
||||
|-----------------|--------------------------------------------------------------------------|---------------------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
| OptionsCheckbox | [`OptionsCheckbox`](#type-optionscheckbox) | | | See [`OptionsCheckbox`](#type-optionscheckbox) |
|
||||
|------------------|--------------------------------------------------------------------------|---------------------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
| OptionsCommon | [`OptionsCommon`](#type-optionscommon) | | | See [`OptionsCommon`](#type-optionscommon) |
|
||||
| idKey | `string` | "id" | | |
|
||||
| items | [`ListItem`](#type-listitem)[] | | Yes | See [`ListItem`](#type-listitem) |
|
||||
| labelKey | `string` | "label" | | |
|
||||
| maxNumberOfItems | `number` | | | If you want to set a max amount of visible items in a list |
|
||||
| neutralIsClear | `boolean` | | | Pressing the neutral button causes the dialog to be closed and `selectedItems` to be an empty array. Only works if `neutralText` is also supplied. |
|
||||
| selectedId | `any` | | | The respective radio will be selected on dialog show. If no such id is found, then nothing is selected. Only applicable if `type` is `DialogAndroid.listRadio`. Requires that `items[]` contain key described by `idKey`. |
|
||||
| selectedIds | `any[]` | | | The respective checkbox will be selected on dialog show. If no such id is found, nothing is selected for that id. Only applicable if `type` is `DialogAndroid.listCheckbox`. Requires that `items[]` contain key described by `idKey`. |
|
||||
@ -455,8 +539,7 @@ Shows a progress dialog. By default no buttons are shown, and hardware back butt
|
||||
> }
|
||||
|
||||
| Key | Type | Default | Required | Description |
|
||||
|-----------------|--------------------------------------------------------------------------|---------|----------|------------------------------------------------|
|
||||
| OptionsCheckbox | [`OptionsCheckbox`](#type-optionscheckbox) | | | See [`OptionsCheckbox`](#type-optionscheckbox) |
|
||||
|---------------|--------------------------------------------------------------------------|---------|----------|--------------------------------------------|
|
||||
| OptionsCommon | [`OptionsCommon`](#type-optionscommon) | | | See [`OptionsCommon`](#type-optionscommon) |
|
||||
| widgetColor | [`ColorValue`](https://facebook.github.io/react-native/docs/colors.html) | | | Color of field underline and cursor |
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user