Skip to content

Use correct data types in FileReaderTurboModule::ReadAs* #11902

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

Merged
JunielKatarn merged 2 commits into from
Jul 18, 2023
Merged

Use correct data types in FileReaderTurboModule::ReadAs* #11902

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
e21a143
Use ReadAs* data argument as JSValueObject
JunielKatarn Jul 17, 2023
75ba170
Change files
JunielKatarn Jul 17, 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
7 changes: 7 additions & 0 deletions change/react-native-windows-ea809b99-bf6d-4902-9c4f-5b35c6a7996f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Use correct data types in FileReaderTurboModule::ReadAs*",
"packageName": "react-native-windows",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "patch"
}
41 changes: 26 additions & 15 deletions vnext/Shared/Modules/FileReaderModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,26 @@ void FileReaderTurboModule::Initialize(msrn::ReactContext const &reactContext) n
}

///
/// <param name="args">
/// Array of arguments passed from the JavaScript layer.
/// [0] - dynamic blob object { blobId, offset, size[, type] }
/// <param name="data">
/// Blob object with the following fields:
/// - blobId
/// - offset
/// - size
/// - type (optional)
/// </param>
/// <param name="result">
/// Either resolves or rejects the current method with a given text message.
/// </param>
///
void FileReaderTurboModule::ReadAsDataUrl(msrn::JSValue &&data, msrn::ReactPromise<string> &&result) noexcept {
auto &array = data.AsArray();
auto &blob = data[0].AsObject();
auto &blob = data.AsObject();
auto blobId = blob["blobId"].AsString();
auto offset = blob["offset"].AsInt64();
auto size = blob["size"].AsInt64();

auto typeItr = blob.find("type");
string type{};
if (typeItr == blob.end()) { // TODO: .items() ?
if (typeItr == blob.end()) {
type = "application/octet-stream";
} else {
type = (*typeItr).second.AsString();
Expand All @@ -155,20 +160,26 @@ void FileReaderTurboModule::ReadAsDataUrl(msrn::JSValue &&data, msrn::ReactPromi
[&result](string &&message) { result.Reject(winrt::to_hstring(std::move(message)).c_str()); });
}

/// TODO: update (folly not used)
/// <param name="args">
/// Array of arguments passed from the JavaScript layer.
/// [0] - dynamic blob object { blobId, offset, size }
/// [1] - string encoding
/// </param>
///
/// <param name="data">
/// Blob object with the following fields:
/// - blobId
/// - offset
/// - size
/// - type (optional)
/// </param>
/// <param name="encoding">
/// Text encoding to proces data with.
/// </param>
/// <param name="result">
/// Either resolves or rejects the current method with a given text message.
/// </param>
///
void FileReaderTurboModule::ReadAsText(
msrn::JSValue &&data,
string &&encoding,
msrn::ReactPromise<string> &&result) noexcept {
auto &args = data.AsArray();
auto &blob = args[0].AsObject();

auto &blob = data.AsObject();
auto blobId = blob["blobId"].AsString();
auto offset = blob["offset"].AsInt64();
auto size = blob["size"].AsInt64();
Expand Down