From fd166c0ddc1b325e1a258d93cb3b102648a81430 Mon Sep 17 00:00:00 2001 From: merttekin Date: Fri, 29 Aug 2025 12:12:34 +0000 Subject: [PATCH 1/7] Updated for preSelectWithPickerIndex Signed-off-by: merttekin --- api/@ohos.file.PhotoPickerComponent.d.ets | 54 ++++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/api/@ohos.file.PhotoPickerComponent.d.ets b/api/@ohos.file.PhotoPickerComponent.d.ets index 52885ab0e0..5aa1e319c1 100644 --- a/api/@ohos.file.PhotoPickerComponent.d.ets +++ b/api/@ohos.file.PhotoPickerComponent.d.ets @@ -489,7 +489,26 @@ export declare class PickerOptions extends photoAccessHelper.BaseSelectOptions { * @atomicservice * @since 20 */ - uiComponentColorMode?: PickerColorMode; + uiComponentColorMode?: PickerColorMode; + + /** + * Support to set picker index + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 17 + */ + pickerIndex?: number; + /** + * Support to set pre-selected URIs with picker index + * + * @type { ?Array } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 17 + */ + preSelectedUrisWithPickerIndex?: Array ; } /** @@ -648,6 +667,27 @@ export declare class MaxSelected { data?: Map; } +export declare class PreSelectedInfo { + /** + * uri. The URI of the pre-selected media item. + * + * @type { string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 17 + */ + uri: string; + /** + * pickerIndex. The index of the picker where this URI was selected. + * Defaults to -1 if not specified. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 17 + */ + pickerIndex?: number; +} /** * Single-Line display mode. @@ -713,7 +753,17 @@ export declare enum DataType { * @atomicservice * @since 12 */ - SET_ALBUM_URI = 2 + SET_ALBUM_URI = 2, + + /** + * DataType: set selected uris with picker index to picker component. + * The data should be an array of PreSelectedInfo objects containing the URI and its picker index. + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 17 + */ + SET_SELECTED_URIS_AND_PICKER_INDEX = 3 } /** -- Gitee From 18ef8f820a36634c8a51d80337f710ff555f4724 Mon Sep 17 00:00:00 2001 From: merttekin Date: Tue, 2 Sep 2025 12:05:50 +0000 Subject: [PATCH 2/7] Update PreselectedInfo params and pickerOptions new params Signed-off-by: merttekin --- api/@ohos.file.PhotoPickerComponent.d.ets | 56 +++++++++++++---------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/api/@ohos.file.PhotoPickerComponent.d.ets b/api/@ohos.file.PhotoPickerComponent.d.ets index 5aa1e319c1..0b690657ad 100644 --- a/api/@ohos.file.PhotoPickerComponent.d.ets +++ b/api/@ohos.file.PhotoPickerComponent.d.ets @@ -279,7 +279,7 @@ export declare class PickerController { /** * Display the photo after edit. * - * @param { string } originalUri - Original uri + * @param { string } originalUri - Original uri * @param { string } newUri - New uri after replacement * @param { AsyncCallback } callback - Returns void * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core @@ -489,26 +489,28 @@ export declare class PickerOptions extends photoAccessHelper.BaseSelectOptions { * @atomicservice * @since 20 */ - uiComponentColorMode?: PickerColorMode; - + uiComponentColorMode?: PickerColorMode; + /** - * Support to set picker index + * Support to set a serial number to distinguish different picker components. Default value is -1. * * @type { ?number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since 17 + * @since 21 */ pickerIndex?: number; + /** - * Support to set pre-selected URIs with picker index + * Support automatically selecting the user-selected image/video on the PhotoPickerComponent + * at the specified picker index. * - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since 17 + * @since 21 */ - preSelectedUrisWithPickerIndex?: Array ; + preselectedInfos?: Array ; } /** @@ -667,26 +669,33 @@ export declare class MaxSelected { data?: Map; } -export declare class PreSelectedInfo { +/** + * PreselectedInfo + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 21 + */ +export declare class PreselectedInfo { /** - * uri. The URI of the pre-selected media item. + * Uri. Uri of the media file to be automatically selected. * * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since 17 + * @since 21 */ uri: string; + /** - * pickerIndex. The index of the picker where this URI was selected. - * Defaults to -1 if not specified. + * PreselectablePickerIndex. Serial number of the picker component that will automatically select this media file. * * @type { ?number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since 17 + * @since 21 */ - pickerIndex?: number; + preselectablePickerIndex?: number; } /** @@ -725,7 +734,7 @@ export declare class SingleLineConfig { * @atomicservice * @since 20 */ - itemGap?: Length; + itemGap?: Length; } /** @@ -756,14 +765,13 @@ export declare enum DataType { SET_ALBUM_URI = 2, /** - * DataType: set selected uris with picker index to picker component. - * The data should be an array of PreSelectedInfo objects containing the URI and its picker index. + * SET_SELECTED_INFO. Set selected information to picker component. * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since 17 + * @since 21 */ - SET_SELECTED_URIS_AND_PICKER_INDEX = 3 + SET_SELECTED_INFO = 3 } /** @@ -1100,7 +1108,7 @@ export declare enum VideoPlayerState { */ PAUSED = 1, - /** + /** * STOPPED. video is stopped * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core @@ -1109,7 +1117,7 @@ export declare enum VideoPlayerState { */ STOPPED = 2, - /** + /** * SEEK_START. seek drag is start * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core @@ -1118,7 +1126,7 @@ export declare enum VideoPlayerState { */ SEEK_START = 3, - /** + /** * SEEK_FINISH. seek drag is finish * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- Gitee From 641cf498462583e2a0acc72a296e1f8d2bfcb5f7 Mon Sep 17 00:00:00 2001 From: merttekin Date: Tue, 2 Sep 2025 14:22:31 +0000 Subject: [PATCH 3/7] Reverted unrelated parts Signed-off-by: merttekin --- api/@ohos.file.PhotoPickerComponent.d.ets | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/@ohos.file.PhotoPickerComponent.d.ets b/api/@ohos.file.PhotoPickerComponent.d.ets index 0b690657ad..9b55807680 100644 --- a/api/@ohos.file.PhotoPickerComponent.d.ets +++ b/api/@ohos.file.PhotoPickerComponent.d.ets @@ -279,7 +279,7 @@ export declare class PickerController { /** * Display the photo after edit. * - * @param { string } originalUri - Original uri + * @param { string } originalUri - Original uri * @param { string } newUri - New uri after replacement * @param { AsyncCallback } callback - Returns void * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core @@ -489,8 +489,8 @@ export declare class PickerOptions extends photoAccessHelper.BaseSelectOptions { * @atomicservice * @since 20 */ - uiComponentColorMode?: PickerColorMode; - + uiComponentColorMode?: PickerColorMode; + /** * Support to set a serial number to distinguish different picker components. Default value is -1. * @@ -734,7 +734,7 @@ export declare class SingleLineConfig { * @atomicservice * @since 20 */ - itemGap?: Length; + itemGap?: Length; } /** @@ -1108,7 +1108,7 @@ export declare enum VideoPlayerState { */ PAUSED = 1, - /** + /** * STOPPED. video is stopped * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core @@ -1117,7 +1117,7 @@ export declare enum VideoPlayerState { */ STOPPED = 2, - /** + /** * SEEK_START. seek drag is start * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core @@ -1126,7 +1126,7 @@ export declare enum VideoPlayerState { */ SEEK_START = 3, - /** + /** * SEEK_FINISH. seek drag is finish * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- Gitee From 3861a8776d94702dc6c8c127ab929c9207d631dd Mon Sep 17 00:00:00 2001 From: merttekin Date: Mon, 8 Sep 2025 06:58:24 +0000 Subject: [PATCH 4/7] whitespace fix Signed-off-by: merttekin --- api/@ohos.file.PhotoPickerComponent.d.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.file.PhotoPickerComponent.d.ets b/api/@ohos.file.PhotoPickerComponent.d.ets index 9b55807680..1af2dd0b25 100644 --- a/api/@ohos.file.PhotoPickerComponent.d.ets +++ b/api/@ohos.file.PhotoPickerComponent.d.ets @@ -510,7 +510,7 @@ export declare class PickerOptions extends photoAccessHelper.BaseSelectOptions { * @atomicservice * @since 21 */ - preselectedInfos?: Array ; + preselectedInfos?: Array; } /** -- Gitee From 5318dd226e843f7db5dd3b86913d93f0985b3796 Mon Sep 17 00:00:00 2001 From: merttekin Date: Mon, 8 Sep 2025 07:26:49 +0000 Subject: [PATCH 5/7] Removed whitespace Signed-off-by: merttekin --- api/@ohos.file.PhotoPickerComponent.d.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.file.PhotoPickerComponent.d.ets b/api/@ohos.file.PhotoPickerComponent.d.ets index 1af2dd0b25..b6131c6154 100644 --- a/api/@ohos.file.PhotoPickerComponent.d.ets +++ b/api/@ohos.file.PhotoPickerComponent.d.ets @@ -489,7 +489,7 @@ export declare class PickerOptions extends photoAccessHelper.BaseSelectOptions { * @atomicservice * @since 20 */ - uiComponentColorMode?: PickerColorMode; + uiComponentColorMode?: PickerColorMode; /** * Support to set a serial number to distinguish different picker components. Default value is -1. -- Gitee From 263009d893c347c17c2adb0cdefd78f08b83f7eb Mon Sep 17 00:00:00 2001 From: merttekin Date: Mon, 8 Sep 2025 15:03:13 +0000 Subject: [PATCH 6/7] moved PreselectedInfo after SingleLineConfig Signed-off-by: merttekin --- api/@ohos.file.PhotoPickerComponent.d.ets | 58 +++++++++++------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/api/@ohos.file.PhotoPickerComponent.d.ets b/api/@ohos.file.PhotoPickerComponent.d.ets index b6131c6154..73e99e7694 100644 --- a/api/@ohos.file.PhotoPickerComponent.d.ets +++ b/api/@ohos.file.PhotoPickerComponent.d.ets @@ -669,35 +669,6 @@ export declare class MaxSelected { data?: Map; } -/** - * PreselectedInfo - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @atomicservice - * @since 21 - */ -export declare class PreselectedInfo { - /** - * Uri. Uri of the media file to be automatically selected. - * - * @type { string } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @atomicservice - * @since 21 - */ - uri: string; - - /** - * PreselectablePickerIndex. Serial number of the picker component that will automatically select this media file. - * - * @type { ?number } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @atomicservice - * @since 21 - */ - preselectablePickerIndex?: number; -} - /** * Single-Line display mode. * @@ -737,6 +708,35 @@ export declare class SingleLineConfig { itemGap?: Length; } +/** + * PreselectedInfo + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 21 + */ +export declare class PreselectedInfo { + /** + * Uri. Uri of the media file to be automatically selected. + * + * @type { string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 21 + */ + uri: string; + + /** + * PreselectablePickerIndex. Serial number of the picker component that will automatically select this media file. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice + * @since 21 + */ + preselectablePickerIndex?: number; +} + /** * DataType represents the type of the data set to picker component * -- Gitee From 5e00ca8da3f187a8d0452040a751f8b84988c1d2 Mon Sep 17 00:00:00 2001 From: merttekin Date: Tue, 9 Sep 2025 06:53:59 +0000 Subject: [PATCH 7/7] added comma at the end of SET_SELECTED_INFO = 3 Signed-off-by: merttekin --- api/@ohos.file.PhotoPickerComponent.d.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.file.PhotoPickerComponent.d.ets b/api/@ohos.file.PhotoPickerComponent.d.ets index 73e99e7694..787a84591f 100644 --- a/api/@ohos.file.PhotoPickerComponent.d.ets +++ b/api/@ohos.file.PhotoPickerComponent.d.ets @@ -771,7 +771,7 @@ export declare enum DataType { * @atomicservice * @since 21 */ - SET_SELECTED_INFO = 3 + SET_SELECTED_INFO = 3, } /** -- Gitee