Merge branch 'master' into patch-1

react-native-progress-view · Dec 13, 2023 · 710c0fc · 710c0fc
2 parents cdee145 + 0e6a959
commit 710c0fc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/js/ProgressView.windows.js b/js/ProgressView.windows.js
@@ -20,6 +20,7 @@ const styles = StyleSheet.create({
 
 export default function ProgressViewWindows(props: WindowsNativeProps) {
   const nativeProps = {
+    accessibilityLabel: props.accessibilityLabel,
     testID: props.testID,
     progressViewStyle: props.progressViewStyle,
     progress: props.progress,

diff --git a/js/index.d.ts b/js/index.d.ts
@@ -36,5 +36,6 @@ export type ProgressViewProps = ViewProps & {
    * Turns the progress bar into an indeterminate progress bar
    */
   isIndeterminate?: boolean,
+  accessibilityLabel?: String,
 };
 export class ProgressView extends React.Component<ProgressViewProps> {}
diff --git a/windows/progress-view/ProgressViewView.cpp b/windows/progress-view/ProgressViewView.cpp
@@ -51,6 +51,11 @@ namespace winrt::progress_view::implementation {
             else if (propertyName == "isIndeterminate") {
                 this->IsIndeterminate(propertyValue.AsBoolean());
             }
+            else if (propertyName == "accessibilityLabel") {
+                if (!propertyValue.IsNull()) {
+                    this->Name(to_hstring(propertyValue.AsString()));
+                }
+            }
             else if (propertyName == "progressImage") {
                 if (!propertyValue.IsNull()) {
                     auto imgUriString = propertyValue.AsObject()["uri"].AsString();

diff --git a/windows/progress-view/ProgressViewViewManager.cpp b/windows/progress-view/ProgressViewViewManager.cpp
@@ -37,6 +37,7 @@ namespace winrt::progress_view::implementation {
     // IViewManagerWithNativeProperties
     IMapView<hstring, ViewManagerPropertyType> ProgressViewViewManager::NativeProps() noexcept {
         auto nativeProps = winrt::single_threaded_map<hstring, ViewManagerPropertyType>();
+        nativeProps.Insert(L"accessibilityLabel", ViewManagerPropertyType::String);
         nativeProps.Insert(L"progress", ViewManagerPropertyType::Number);
         nativeProps.Insert(L"progressTintColor", ViewManagerPropertyType::Color);
         nativeProps.Insert(L"trackTintColor", ViewManagerPropertyType::Color);

diff --git a/yarn.lock b/yarn.lock
@@ -9608,9 +9608,9 @@ [email protected]:
     unpipe "1.0.0"
 
 react-devtools-core@^4.23.0:
-  version "4.26.0"
-  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.26.0.tgz#d3d0f59d62ccf1ac03017a7e92f0fe71455019cc"
-  integrity sha512-OO0Q+vXtHYCXvRQ6elLiOUph3MjsCpuYktGTLnBpizYm46f8tAPuJKihGkwsceitHSJNpzNIjJaYHgX96CyTUQ==
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.28.4.tgz#fb8183eada77093f4c2f9830e664bf22255abe27"
+  integrity sha512-IUZKLv3CimeM07G3vX4H4loxVpByrzq3HvfTX7v9migalwvLs9ZY5D3S3pKR33U+GguYfBBdMMZyToFhsSE/iQ==
   dependencies:
     shell-quote "^1.6.1"
     ws "^7"