fix: the global options overriding issue on getValidatedOptions

Author: Mhp23

android/src/main/java/com/speech/SpeechModule.kt

@@ -263,9 +263,10 @@ class SpeechModule(reactContext: ReactApplicationContext) :
   }
 
   private fun getValidatedOptions(options: ReadableMap): Map<String, Any> {
-    val validated = mutableMapOf<String, Any>()
+    val validated = globalOptions.toMutableMap()
+
     if (options.hasKey("voice")) {
-      validated["voice"] = options.getString("voice") ?: ""
+      options.getString("voice")?.let { validated["voice"] = it }
     }
     if (options.hasKey("language")) {
       validated["language"] = options.getString("language")

ios/Speech.mm

@@ -33,9 +33,8 @@ - (instancetype)init {
   return self;
 }
 
-- (void)configureAudioSessionWithOptions:(NSDictionary *)options {
+- (void)configureSilentModeSession:(NSString *)silentMode {
   NSError *error = nil;
-  NSString *silentMode = options[@"silentMode"] ?: @"obey";
 
   if ([silentMode isEqualToString:@"ignore"]) {
     [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:&error];
@@ -63,8 +62,8 @@ - (NSDictionary *)getVoiceItem:(AVSpeechSynthesisVoice *)voice {
 }
 
 - (NSDictionary *)getValidatedOptions:(VoiceOptions &)options {
-  NSMutableDictionary *validatedOptions = [NSMutableDictionary new];
-  
+  NSMutableDictionary *validatedOptions = [self.globalOptions mutableCopy];
+
   if (options.voice()) {
     validatedOptions[@"voice"] = options.voice();
   }
@@ -90,22 +89,20 @@ - (NSDictionary *)getValidatedOptions:(VoiceOptions &)options {
   return validatedOptions;
 }
 
-- (AVSpeechUtterance *)getDefaultUtterance:(NSString *)text {
+- (AVSpeechUtterance *)getUtterance:(NSString *)text withOptions:(NSDictionary *)options {
   AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text];
-  
-  if (self.globalOptions[@"voice"]) {
-    AVSpeechSynthesisVoice *voice = [AVSpeechSynthesisVoice voiceWithIdentifier:self.globalOptions[@"voice"]];
+
+  if (options[@"voice"]) {
+    AVSpeechSynthesisVoice *voice = [AVSpeechSynthesisVoice voiceWithIdentifier:options[@"voice"]];
     if (voice) {
       utterance.voice = voice;
-    } else if (self.globalOptions[@"language"]) {
-      utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:self.globalOptions[@"language"]];
     }
-  } else {
-    utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:self.globalOptions[@"language"]];
+  } else if (options[@"language"]) {
+    utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:options[@"language"]];
   }
-  utterance.rate = [self.globalOptions[@"rate"] floatValue];
-  utterance.volume = [self.globalOptions[@"volume"] floatValue];
-  utterance.pitchMultiplier = [self.globalOptions[@"pitch"] floatValue];
+  utterance.rate = [options[@"rate"] floatValue];
+  utterance.volume = [options[@"volume"] floatValue];
+  utterance.pitchMultiplier = [options[@"pitch"] floatValue];
 
   return utterance;
 }
@@ -123,7 +120,7 @@ - (void)reset {
 
 - (void)getAvailableVoices:(NSString *)language
                   resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject
+                   reject:(RCTPromiseRejectBlock)reject
 {
   NSMutableArray *voicesArray = [NSMutableArray new];
   NSArray *speechVoices = [AVSpeechSynthesisVoice speechVoices];
@@ -132,9 +129,7 @@ - (void)getAvailableVoices:(NSString *)language
     NSString *lowercaseLanguage = [language lowercaseString];
 
     for (AVSpeechSynthesisVoice *voice in speechVoices) {
-      NSString *voiceLanguage = [voice.language lowercaseString];
-
-      if ([voiceLanguage hasPrefix:lowercaseLanguage]) {
+      if ([[voice.language lowercaseString] hasPrefix:lowercaseLanguage]) {
         [voicesArray addObject:[self getVoiceItem:voice]];
       }
     }
@@ -152,13 +147,12 @@ - (void)getEngines:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock
 
 - (void)setEngine:(NSString *)engineName
           resolve:(RCTPromiseResolveBlock)resolve
-          reject:(RCTPromiseRejectBlock)reject {
+           reject:(RCTPromiseRejectBlock)reject {
   resolve(nil);
 }
 
 - (void)isSpeaking:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
-  BOOL speaking = self.synthesizer.isSpeaking;
-  resolve(@(speaking));
+  resolve(@(self.synthesizer.isSpeaking));
 }
 
 - (void)stop:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
@@ -198,9 +192,9 @@ - (void)speak:(NSString *)text
   AVSpeechUtterance *utterance;
 
   @try {
-    [self configureAudioSessionWithOptions:self.globalOptions];
+    [self configureSilentModeSession:self.globalOptions[@"silentMode"]];
 
-    utterance = [self getDefaultUtterance:text];
+    utterance = [self getUtterance:text withOptions:self.globalOptions];
     [self.synthesizer speakUtterance:utterance];
     resolve(nil);
   }
@@ -224,28 +218,9 @@ - (void)speakWithOptions:(NSString *)text
 
   @try {
     NSDictionary *validatedOptions = [self getValidatedOptions:options];
-    [self configureAudioSessionWithOptions:validatedOptions];
+    [self configureSilentModeSession:validatedOptions[@"silentMode"]];
 
-    utterance = [self getDefaultUtterance:text];
-
-    if (validatedOptions[@"voice"]) {
-      AVSpeechSynthesisVoice *voice = [AVSpeechSynthesisVoice voiceWithIdentifier:validatedOptions[@"voice"]];
-      if (voice) {
-        utterance.voice = voice;
-      }
-    } else if (validatedOptions[@"language"]) {
-      utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:validatedOptions[@"language"]];
-    }
-    if (validatedOptions[@"pitch"]) {
-      utterance.pitchMultiplier = [validatedOptions[@"pitch"] floatValue];
-    }
-    if (validatedOptions[@"volume"]) {
-      utterance.volume = [validatedOptions[@"volume"] floatValue];
-    }
-    if (validatedOptions[@"rate"]) {
-      utterance.rate = [validatedOptions[@"rate"] floatValue];
-    }
-
+    utterance = [self getUtterance:text withOptions:validatedOptions];
     [self.synthesizer speakUtterance:utterance];
     resolve(nil);
   }