refactor: add theme_id field to Config struct in emscripten_bindings.…

…cpp and dotlottie_player.rs
LottieFiles · Nov 13, 2024 · 6e471b9 · 6e471b9
1 parent 52ab983
commit 6e471b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/dotlottie-ffi/emscripten_bindings.cpp b/dotlottie-ffi/emscripten_bindings.cpp
@@ -75,7 +75,8 @@ EMSCRIPTEN_BINDINGS(DotLottiePlayer)
         .field("segment", &Config::segment)
         .field("backgroundColor", &Config::background_color)
         .field("layout", &Config::layout)
-        .field("marker", &Config::marker);
+        .field("marker", &Config::marker)
+        .field("themeId", &Config::theme_id);
 
     function("createDefaultConfig", &create_default_config);
     function("transformThemeToLottieSlots", &transform_theme_to_lottie_slots);

diff --git a/dotlottie-rs/src/dotlottie_player.rs b/dotlottie-rs/src/dotlottie_player.rs
@@ -596,12 +596,14 @@ impl DotLottieRuntime {
         self.update_speed(&new_config);
         self.update_loop_animation(&new_config);
         self.update_layout(&new_config.layout);
+        self.set_theme(&new_config.theme_id);
 
         // directly updating fields that don't require special handling
         self.config.use_frame_interpolation = new_config.use_frame_interpolation;
         self.config.segment = new_config.segment;
         self.config.autoplay = new_config.autoplay;
         self.config.marker = new_config.marker;
+        self.config.theme_id = new_config.theme_id;
     }
 
     pub fn update_layout(&mut self, layout: &Layout) {
@@ -723,30 +725,28 @@ impl DotLottieRuntime {
         self.active_animation_id.clear();
         self.active_theme_id.clear();
 
-        let loaded = match DotLottieManager::new(file_data) {
+        match DotLottieManager::new(file_data) {
             Ok(manager) => {
                 self.dotlottie_manager = Some(manager);
                 if let Some(manager) = &mut self.dotlottie_manager {
                     let first_animation = manager.get_active_animation();
                     if let Ok(animation_data) = first_animation {
                         self.markers = extract_markers(animation_data.as_str());
-                        return self.load_animation_common(
+                        let animation_loaded = self.load_animation_common(
                             |renderer, w, h| renderer.load_data(&animation_data, w, h, false),
                             width,
                             height,
                         );
+                        if animation_loaded && !self.config.theme_id.is_empty() {
+                            self.set_theme(&self.config.theme_id.clone());
+                        }
+                        return animation_loaded;
                     }
                 }
                 false
             }
             Err(_) => false,
-        };
-
-        if loaded && !self.config.theme_id.is_empty() {
-            self.set_theme(&self.config.theme_id.clone());
         }
-
-        loaded
     }
 
     pub fn load_animation(&mut self, animation_id: &str, width: u32, height: u32) -> bool {
@@ -798,6 +798,14 @@ impl DotLottieRuntime {
     }
 
     pub fn set_theme(&mut self, theme_id: &str) -> bool {
+        if self.active_theme_id == theme_id {
+            return true;
+        }
+
+        if self.dotlottie_manager.is_none() {
+            return false;
+        }
+
         self.active_theme_id.clear();
 
         if theme_id.is_empty() {