react-native-google-maps-plus 1.8.6 → 1.8.7

package/README.md

@@ -25,47 +25,14 @@ Add this to your Podfile only for bare React Native apps.
 ```ruby
 post_install do |installer|
   react_native_post_install(
-    installer,
-    config[:reactNativePath],
-    :mac_catalyst_enabled => false,
-  )
-  # Force iOS 16+ to avoid deployment target warnings
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
-    end
-  end
-
-  # --- SVGKit Patch ---
-  require 'fileutils'
-  svgkit_path = File.join(installer.sandbox.pod_dir('SVGKit'), 'Source')
-
-  # node fix
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "Node.h"', '#import "SVGKit/Node.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-    # puts "Patched Node import in: #{file}"
-  end
-
-  # import CSSValue.h
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "CSSValue.h"', '#import "SVGKit/CSSValue.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-    # puts "Patched CSSValue import in: #{file}"
-  end
-
-  # import SVGLength.h
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "SVGLength.h"', '#import "SVGKit/SVGLength.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-    # puts "Patched SVGLength import in: #{file}"
-  end
+      installer,
+      config[:reactNativePath],
+      :mac_catalyst_enabled => false,
+      # :ccache_enabled => true
+    )
+
+  require_relative '../node_modules/react-native-google-maps-plus/scripts/svgkit_patch'
+  apply_svgkit_patch(installer)
 end
 ```
 

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -345,7 +345,14 @@ class GoogleMapsViewImpl(
   var userInterfaceStyle: Int? = null
     set(value) {
       field = value
-      onUi { googleMap?.mapColorScheme = value ?: MapColorScheme.FOLLOW_SYSTEM }
+      onUi {
+        try {
+          // / not supported when liteMode enabled on latest renderer
+          googleMap?.mapColorScheme = value ?: MapColorScheme.FOLLOW_SYSTEM
+        } catch (_: UnsupportedOperationException) {
+          // / ignore
+        }
+      }
     }
 
   var mapZoomConfig: RNMapZoomConfig? = null

package/expoConfig/build/ios/withIosGoogleMapsPlus.js

@@ -26,16 +26,16 @@ var withIosGoogleMapsPlus = function (config, props) {
                 comment: '#',
             }).contents;
         }
-        var patchSnippet = "\n  # Force iOS 16+ to avoid deployment target warnings\n  installer.pods_project.targets.each do |target|\n    target.build_configurations.each do |config|\n      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'\n    end\n  end\n\n  # --- SVGKit Patch ---\n  require 'fileutils'\n  svgkit_path = File.join(installer.sandbox.pod_dir('SVGKit'), 'Source')\n\n  # --- Patch Node.h imports ---\n  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|\n    FileUtils.chmod(\"u+w\", file)\n    text = File.read(file)\n    new_contents = text.gsub('#import \"Node.h\"', '#import \"SVGKit/Node.h\"')\n    File.open(file, 'w') { |f| f.write(new_contents) }\n  end\n\n  # --- Patch CSSValue.h imports ---\n  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|\n    FileUtils.chmod(\"u+w\", file)\n    text = File.read(file)\n    new_contents = text.gsub('#import \"CSSValue.h\"', '#import \"SVGKit/CSSValue.h\"')\n    File.open(file, 'w') { |f| f.write(new_contents) }\n  end\n\n  # --- Patch SVGLength.h imports ---\n  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|\n    FileUtils.chmod(\"u+w\", file)\n    text = File.read(file)\n    new_contents = text.gsub('#import \"SVGLength.h\"', '#import \"SVGKit/SVGLength.h\"')\n    File.open(file, 'w') { |f| f.write(new_contents) }\n  end\n  ";
+        var podFilePatch = "\n  require_relative '../node_modules/react-native-google-maps-plus/scripts/svgkit_patch'\n  apply_svgkit_patch(installer)\n  ";
         if (src.includes('post_install do |installer|')) {
             src = src.replace(/post_install do \|installer\|([\s\S]*?)end/, function (match, inner) {
                 if (inner.includes('SVGKit Patch'))
                     return match; // idempotent
-                return "post_install do |installer|".concat(inner, "\n").concat(patchSnippet, "\nend");
+                return "post_install do |installer|".concat(inner, "\n").concat(podFilePatch, "\nend");
             });
         }
         else {
-            src += "\npost_install do |installer|\n".concat(patchSnippet, "\nend\n");
+            src += "\npost_install do |installer|\n".concat(podFilePatch, "\nend\n");
         }
         conf.modResults.contents = src;
         return conf;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -63,6 +63,7 @@
     "ios/**/*.swift",
     "app.plugin.js",
     "*.podspec",
+    "scripts",
     "README.md"
   ],
   "workspaces": [
@@ -88,6 +89,7 @@
     "@react-native/babel-preset": "0.82.1",
     "@react-native/eslint-config": "0.82.1",
     "@semantic-release/changelog": "6.0.3",
+    "@semantic-release/exec": "7.1.0",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "13.1.1",
     "@types/jest": "30.0.0",
@@ -101,12 +103,12 @@
     "eslint-plugin-prettier": "5.5.4",
     "jest": "30.2.0",
     "lefthook": "2.0.2",
-    "nitrogen": "0.31.4",
+    "nitrogen": "0.31.5",
     "prettier": "3.6.2",
     "react": "19.1.1",
     "react-native": "0.82.1",
     "react-native-builder-bob": "0.40.14",
-    "react-native-nitro-modules": "0.31.4",
+    "react-native-nitro-modules": "0.31.5",
     "semantic-release": "25.0.1",
     "typescript": "5.9.3"
   },

package/scripts/nitrogen-patch.js

@@ -0,0 +1,191 @@
+/**
+ * Recursively patches all generated Nitro files (Android & iOS):
+ *
+ * ANDROID
+ *  - Replaces 'com.margelo.nitro.rngooglemapsplus' -> 'com.rngooglemapsplus'
+ *  - Replaces 'com/margelo/nitro/rngooglemapsplus' -> 'com/rngooglemapsplus'
+ *  - Removes 'margelo/nitro/' in RNGoogleMapsPlusOnLoad.cpp
+ *  - Inserts `prepareToRecycleView()`
+ *  nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/views/HybridRNGoogleMapsPlusViewManager.kt
+ *
+ * iOS
+ *  - Inserts `+ (BOOL)shouldBeRecycled`
+ *  nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm
+ */
+import { fileURLToPath } from 'url';
+import { basename } from 'path';
+import path from 'node:path';
+import { readdir, readFile, writeFile } from 'node:fs/promises';
+import { mkdir, copyFile } from 'node:fs/promises';
+
+const ROOT_ANDROID = path.join(
+  process.cwd(),
+  'nitrogen',
+  'generated',
+  'android'
+);
+const ROOT_IOS = path.join(process.cwd(), 'nitrogen', 'generated', 'ios');
+const SRC_JSON_DIR = path.join(
+  process.cwd(),
+  'nitrogen',
+  'generated',
+  'shared',
+  'json'
+);
+const DEST_JSON_DIR = path.join(
+  process.cwd(),
+  'lib',
+  'nitrogen',
+  'generated',
+  'shared',
+  'json'
+);
+
+const ANDROID_ONLOAD_FILE = path.join(
+  ROOT_ANDROID,
+  'RNGoogleMapsPlusOnLoad.cpp'
+);
+
+const HYBRID_VIEW_MANAGER = path.join(
+  ROOT_ANDROID,
+  'kotlin/com/margelo/nitro/rngooglemapsplus/views/HybridRNGoogleMapsPlusViewManager.kt'
+);
+
+const HYBRID_VIEW_COMPONENT_IOS = path.join(
+  ROOT_IOS,
+  'c++/views/HybridRNGoogleMapsPlusViewComponent.mm'
+);
+
+const REPLACEMENTS = [
+  {
+    regex: /com\.margelo\.nitro\.rngooglemapsplus/g,
+    replacement: 'com.rngooglemapsplus',
+  },
+  {
+    regex: /com\/margelo\/nitro\/rngooglemapsplus/g,
+    replacement: 'com/rngooglemapsplus',
+  },
+];
+
+const __filename = fileURLToPath(import.meta.url);
+const filename = basename(__filename);
+
+const ANDROID_VIEW_MANAGER_METHODS =
+  /override fun onDropViewInstance\(view: View\)\s*\{\s*super\.onDropViewInstance\(view\)\s*views\.remove\(view\)\s*\}/m;
+
+const ANDROID_VIEW_MANAGER_METHODS_NEW = `
+  override fun onDropViewInstance(view: View) {
+    super.onDropViewInstance(view)
+    views.remove(view)
+  /// added by ${filename}
+    if (view is GoogleMapsViewImpl) {
+      view.destroyInternal()
+    }
+  }
+
+  /// added by ${filename}
+  override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
+    return null
+  }
+`;
+
+const RECYCLE_METHOD_IOS = `
+/// added by ${filename}
++ (BOOL)shouldBeRecycled
+{
+  return NO;
+}
+
+/// added by ${filename}
+- (void)dealloc {
+  if (_hybridView) {
+    RNGoogleMapsPlus::HybridRNGoogleMapsPlusViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+    swiftPart.dispose();
+    _hybridView.reset();
+  }
+}`;
+
+async function processFile(filePath) {
+  let content = await readFile(filePath, 'utf8');
+  let updated = content;
+
+  for (const { regex, replacement } of REPLACEMENTS) {
+    updated = updated.replace(regex, replacement);
+  }
+
+  if (path.resolve(filePath) === path.resolve(ANDROID_ONLOAD_FILE)) {
+    updated = updated.replace(/margelo\/nitro\//g, '');
+  }
+
+  if (path.resolve(filePath) === path.resolve(HYBRID_VIEW_MANAGER)) {
+    if (ANDROID_VIEW_MANAGER_METHODS.test(updated)) {
+      updated = updated.replace(
+        ANDROID_VIEW_MANAGER_METHODS,
+        ANDROID_VIEW_MANAGER_METHODS_NEW
+      );
+    } else {
+      throw new Error(
+        `Pattern for HybridRNGoogleMapsPlusViewManager not found in ${filePath}`
+      );
+    }
+  }
+
+  if (path.resolve(filePath) === path.resolve(HYBRID_VIEW_COMPONENT_IOS)) {
+    if (!/\+\s*\(BOOL\)\s*shouldBeRecycled/.test(updated)) {
+      const pattern =
+        /(- \(instancetype\)\s*init\s*\{(?:[^{}]|\{[^{}]*\})*\})/m;
+
+      if (pattern.test(updated)) {
+        updated = updated.replace(pattern, `$1\n${RECYCLE_METHOD_IOS}`);
+      } else {
+        throw new Error(`Pattern for "init" not found in ${filePath}`);
+      }
+    }
+  }
+
+  if (updated !== content) {
+    await writeFile(filePath, updated, 'utf8');
+    console.log(`Updated: ${filePath}`);
+  }
+}
+
+async function start(dir) {
+  const entries = await readdir(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      await start(fullPath);
+    } else if (entry.isFile()) {
+      await processFile(fullPath);
+    }
+  }
+}
+
+async function copyJsonFiles() {
+  try {
+    await mkdir(DEST_JSON_DIR, { recursive: true });
+    const files = await readdir(SRC_JSON_DIR);
+    for (const file of files) {
+      if (file.endsWith('.json')) {
+        const src = path.join(SRC_JSON_DIR, file);
+        const dest = path.join(DEST_JSON_DIR, file);
+        await copyFile(src, dest);
+        console.log(`Copied JSON: ${file}`);
+      }
+    }
+  } catch (err) {
+    console.warn('Failed to copy JSON view configs:', err.message);
+  }
+}
+
+(async () => {
+  try {
+    await copyJsonFiles();
+    await start(ROOT_ANDROID);
+    await start(ROOT_IOS);
+    console.log('All Nitrogen files patched successfully.');
+  } catch (err) {
+    console.error('Error while processing files:', err);
+    process.exit(1);
+  }
+})();

package/scripts/svgkit_patch.rb

@@ -0,0 +1,41 @@
+def apply_svgkit_patch(installer)
+  svgkit_path = File.join(installer.sandbox.root, "SVGKit", "Source")
+  return unless Dir.exist?(svgkit_path)
+
+  package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
+  package_name = package["name"]
+
+  puts "[#{package_name}] Applying SVGKit patch..."
+
+  files = Dir.glob(File.join(svgkit_path, "**/*.{h,m}"))
+
+  replacements = {
+    '#import "Node.h"'       => '#import "SVGKit/Node.h"',
+    '#import "CSSValue.h"'   => '#import "SVGKit/CSSValue.h"',
+    '#import "SVGLength.h"'  => '#import "SVGKit/SVGLength.h"'
+  }
+
+  count = 0
+
+  files.each do |file|
+    text = File.read(file)
+    new_text = text.dup
+
+    replacements.each do |original, patched|
+      new_text.gsub!(original, patched)
+    end
+
+    next if new_text == text
+
+    File.write(file, new_text)
+    count += 1
+  end
+
+  if count > 0
+    puts "[#{package_name}] SVGKit patch applied (#{count} files modified)"
+  else
+    puts "[#{package_name}] SVGKit was already patched or no matches"
+  end
+
+
+end