Skip to content
This repository has been archived by the owner on Apr 1, 2023. It is now read-only.

Commit

Permalink
solve rebase conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@GabrielNSD
GabrielNSD committed Feb 16, 2023
1 parent eed12b6 commit a49c6a3
Showing 1 changed file with 6 additions and 23 deletions.
29 changes: 6 additions & 23 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,12 @@ Only available on Android and iOS.

#### PickFilesOptions

<<<<<<< HEAD
<<<<<<< HEAD
| Prop | Type | Description | Default |
| -------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
| **`types`** | <code>string[]</code> | List of accepted file types. Look at [IANA Media Types](https://www.iana.org/assignments/media-types/media-types.xhtml) for a complete list of standard media types. This option cannot be used with `multiple: true` on Android. | |
| **`multiple`** | <code>boolean</code> | Whether multiple files may be selected. | <code>false</code> |
| **`readData`** | <code>boolean</code> | Whether to read the file data. | <code>false</code> |
| Prop | Type | Description | Default |
| ---------------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
| **`types`** | <code>string[]</code> | List of accepted file types. Look at [IANA Media Types](https://www.iana.org/assignments/media-types/media-types.xhtml) for a complete list of standard media types. This option cannot be used with `multiple: true` on Android. | |
| **`customExtensions`** | <code>string[]</code> | iOS only. List of custom file name extensions (without leading dot '.'). Necessary in iOS since custom mimetypes are not supported. Example: `['cs2']` | |
| **`multiple`** | <code>boolean</code> | Whether multiple files may be selected. | <code>false</code> |
| **`readData`** | <code>boolean</code> | Whether to read the file data. | <code>false</code> |


#### PickMediaOptions
Expand Down Expand Up @@ -302,22 +301,6 @@ Only available on Android and iOS.
#### PickVideosResult

<code><a href="#pickmediaresult">PickMediaResult</a></code>
=======
| Prop | Type | Description |
| -------------- | --------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **`types`** | <code>string[]</code> | List of accepted file types. Look at [IANA Media Types](https://www.iana.org/assignments/media-types/media-types.xhtml) for a complete list of standard media types. This option cannot be used with `multiple: true` on Android. Example: `['image/png', 'application/pdf']` |
| **`customExtensions`** | <code>string[]</code> | List of custom extensions. Necessary in iOS since the mimetype alone is not enought Example: `['cs2']` |
| **`multiple`** | <code>boolean</code> | Whether multiple files may be selected. Default: `false` |
| **`readData`** | <code>boolean</code> | Whether to read the file data. Default: `false` |
>>>>>>> bd956c9 (add customExtensions picking capacity for iOS)
=======
| Prop | Type | Description |
| ---------------------- | --------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **`types`** | <code>string[]</code> | List of accepted file types. Look at [IANA Media Types](https://www.iana.org/assignments/media-types/media-types.xhtml) for a complete list of standard media types. This option cannot be used with `multiple: true` on Android. Example: `['image/png', 'application/pdf']` |
| **`customExtensions`** | <code>string[]</code> | iOS only. List of custom file name extensions (without leading dot '.'). Necessary in iOS since custom mimetypes are not supported. Example: `['cs2']` |
| **`multiple`** | <code>boolean</code> | Whether multiple files may be selected. Default: `false` |
| **`readData`** | <code>boolean</code> | Whether to read the file data. Default: `false` |
>>>>>>> e31b1e2 (improve function naming, fix empty types fallback, fix fallback to startAccessingSecurityScopedResource)

</docgen-api>

Expand Down

0 comments on commit a49c6a3

Please sign in to comment.