diff --git a/README.md b/README.md
index 9dada829..fb4249b1 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@
   </picture>
 </a>
 <p align="center">
-  <strong><a href="https://callstackincubator.github.io/react-native-bottom-tabs/">React Native Bottom Tabs</a> that use native platform primitives.</strong><br>
+  <strong><a href="https://oss.callstack.com/react-native-bottom-tabs/">React Native Bottom Tabs</a> that use native platform primitives.</strong><br>
 </p>
 
 <div align="center">
 
-[![mit licence](https://img.shields.io/dub/l/vibe-d.svg?style=for-the-badge)](https://github.com/okwasniewski/react-native-bottom-tabs/blob/main/LICENSE)
+[![mit licence](https://img.shields.io/dub/l/vibe-d.svg?style=for-the-badge)](https://github.com/callstack/react-native-bottom-tabs/blob/main/LICENSE)
 [![npm version](https://img.shields.io/npm/v/react-native-bottom-tabs?style=for-the-badge)](https://www.npmjs.org/package/react-native-bottom-tabs)
 [![npm downloads](https://img.shields.io/npm/dt/react-native-bottom-tabs.svg?style=for-the-badge)](https://www.npmjs.org/package/react-native-bottom-tabs)
 [![npm downloads](https://img.shields.io/npm/dm/react-native-bottom-tabs.svg?style=for-the-badge)](https://www.npmjs.org/package/react-native-bottom-tabs)
@@ -40,7 +40,7 @@ https://github.com/user-attachments/assets/09e96ac3-827d-4ac0-add0-e7b88ee9197c
 
 ## Documentation
 
-The full documentation can be found on our [website](http://incubator.callstack.com/react-native-bottom-tabs/).
+The full documentation can be found on our [website](https://oss.callstack.com/react-native-bottom-tabs/).
 
 ## Contributing
 
diff --git a/apps/example/ios/Podfile.lock b/apps/example/ios/Podfile.lock
index 5706e709..66760fdf 100644
--- a/apps/example/ios/Podfile.lock
+++ b/apps/example/ios/Podfile.lock
@@ -1748,7 +1748,7 @@ PODS:
     - React-RCTFBReactNativeSpec
     - ReactCommon/turbomodule/core
     - SocketRocket
-  - react-native-bottom-tabs (1.0.2):
+  - react-native-bottom-tabs (1.0.5):
     - boost
     - DoubleConversion
     - fast_float
@@ -1766,7 +1766,7 @@ PODS:
     - React-graphics
     - React-ImageManager
     - React-jsi
-    - react-native-bottom-tabs/common (= 1.0.2)
+    - react-native-bottom-tabs/common (= 1.0.5)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-renderercss
@@ -1778,7 +1778,7 @@ PODS:
     - SocketRocket
     - SwiftUIIntrospect (~> 1.0)
     - Yoga
-  - react-native-bottom-tabs/common (1.0.2):
+  - react-native-bottom-tabs/common (1.0.5):
     - boost
     - DoubleConversion
     - fast_float
@@ -2461,7 +2461,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - RNScreens (4.16.0):
+  - RNScreens (4.18.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -2488,10 +2488,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNScreens/common (= 4.16.0)
+    - RNScreens/common (= 4.18.0)
     - SocketRocket
     - Yoga
-  - RNScreens/common (4.16.0):
+  - RNScreens/common (4.18.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -2809,81 +2809,81 @@ SPEC CHECKSUMS:
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
   hermes-engine: 35c763d57c9832d0eef764316ca1c4d043581394
-  RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
+  RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
   RCTDeprecation: c0ed3249a97243002615517dff789bf4666cf585
   RCTRequired: 58719f5124f9267b5f9649c08bf23d9aea845b23
   RCTTypeSafety: 4aefa8328ab1f86da273f08517f1f6b343f6c2cc
   React: 2073376f47c71b7e9a0af7535986a77522ce1049
   React-callinvoker: 751b6f2c83347a0486391c3f266f291f0f53b27e
-  React-Core: 7195661f0b48e7ea46c3360ccb575288a20c932c
-  React-CoreModules: 14f0054ab46000dd3b816d6528af3bd600d82073
-  React-cxxreact: 7f602425c63096c398dac13cd7a300efd7c281ae
+  React-Core: dff5d29973349b11dd6631c9498456d75f846d5e
+  React-CoreModules: c0ae04452e4c5d30e06f8e94692a49107657f537
+  React-cxxreact: 376fd672c95dfb64ad5cc246e6a1e9edb78dec4c
   React-debug: 7b56a0a7da432353287d2eedac727903e35278f5
-  React-defaultsnativemodule: 695d8a0b40f735edb3c4031e0f049e567fdac47a
-  React-domnativemodule: 6d66c1f61f277d008d98cae650ce2c025b89d3b9
-  React-Fabric: 997d4115d688f483cb409a1290171bff3c93dab4
-  React-FabricComponents: 8167e5e363ca3a3fe394d8afee355e4072bea1db
-  React-FabricImage: f8f9f2c97657116702acc670e3f4357bc842bed3
-  React-featureflags: dfb4d0d527d55dd968231370f6832b9197ee653d
-  React-featureflagsnativemodule: c63cfd8fe95cd98f12ebb37daa919c4544810a45
-  React-graphics: fd795f1c2a1133a08dde31725b20949edd545dca
-  React-hermes: 0a167bbb02c242664745e82154578c64e90a88e5
-  React-idlecallbacksnativemodule: 1798c6aa33ddc7c2e9fa3c3d67729728639889e9
-  React-ImageManager: c498ee6945dffacc82bfa175aa3264212f27c70b
-  React-jserrorhandler: 216951fea62fc26c600f4c96f0dc4fd53d1e7a9b
-  React-jsi: 9c27d27d3007b73c702ad3fd5a6166557c741020
-  React-jsiexecutor: 2b24f4ed4026344a27f717bf947a434cbbeeff7a
-  React-jsinspector: 02394b059c48805780f7d977366317a24168d00e
-  React-jsinspectorcdp: f4b6d5c5c9db05ef44d082716714f90cfeed96bb
-  React-jsinspectornetwork: e7c77d01b5f0664e24c0bec1aea27d5e3d7fb746
-  React-jsinspectortracing: aaa96a4e53abb88dc6d47da3b5744c710652fef9
-  React-jsitooling: 226e5f4147c7b6f1ae1954a8406ffa713f3da828
-  React-jsitracing: 8a2fbeaa9c53c3f0b23904ccffefc890eae48d71
-  React-logger: 1767babce2d28c3251039ce05556714a2c8c6ded
-  React-Mapbuffer: 33f678ee25b6c0ee2b01b1ecec08e3e02424cefe
-  React-microtasksnativemodule: 44b44a4d3cd6ffb85d928abf741acdc26722de2e
-  react-native-bottom-tabs: 448809f8b7a7bd14b39769c29287631d51aec171
-  react-native-safe-area-context: 6d8a7b750e496e37bda47c938320bf2c734d441f
-  React-NativeModulesApple: b5d18bc109c45c9a1c6b71664991b5cc3adc4e48
+  React-defaultsnativemodule: 393b81aaa6211408f50a6ef00a277847256dd881
+  React-domnativemodule: 5fb5829baa7a7a0f217019cbad1eb226d94f7062
+  React-Fabric: a17c4ae35503673b57b91c2d1388429e7cbee452
+  React-FabricComponents: a76572ddeba78ebe4ec58615291e9db4a55cd46a
+  React-FabricImage: d806eb2695d7ef355ec28d1a21f5a14ac26b1cae
+  React-featureflags: 1690ec3c453920b6308e23a4e24eb9c3632f9c75
+  React-featureflagsnativemodule: 7b7e8483fc671c5a33aefd699b7c7a3c0bdfdfec
+  React-graphics: ea146ee799dc816524a3a0922fc7be0b5a52dcc1
+  React-hermes: fcbdc45ecf38259fe3b12642bd0757c52270a107
+  React-idlecallbacksnativemodule: a353f9162eaa7ad787e68aba9f52a1cfa8154098
+  React-ImageManager: ec5cf55ce9cc81719eb5f1f51d23d04db851c86c
+  React-jserrorhandler: 594c593f3d60f527be081e2cace7710c2bd9f524
+  React-jsi: 59ec3190dd364cca86a58869e7755477d2468948
+  React-jsiexecutor: b87d78a2e8dd7a6f56e9cdac038da45de98c944f
+  React-jsinspector: b9204adf1af622c98e78af96ec1bca615c2ce2bd
+  React-jsinspectorcdp: 4a356fa69e412d35d3a38c44d4a6cc555c5931e8
+  React-jsinspectornetwork: 7820056773178f321cbf18689e1ffcd38276a878
+  React-jsinspectortracing: b341c5ef6e031a33e0bd462d67fd397e8e9cd612
+  React-jsitooling: 401655e05cb966b0081225c5201d90734a567cb9
+  React-jsitracing: 67eff6dea0cb58a1e7bd8b49243012d88c0f511e
+  React-logger: a3cb5b29c32b8e447b5a96919340e89334062b48
+  React-Mapbuffer: 9d2434a42701d6144ca18f0ca1c4507808ca7696
+  React-microtasksnativemodule: 75b6604b667d297292345302cc5bfb6b6aeccc1b
+  react-native-bottom-tabs: 8e918142554e3878f043b23bdf93049b34a78ca6
+  react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616
+  React-NativeModulesApple: 879fbdc5dcff7136abceb7880fe8a2022a1bd7c3
   React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d
-  React-perflogger: a03d913e3205b00aee4128082abe42fd45ce0c98
-  React-performancetimeline: 9b5986cc15afafb9bf246d7dd55bdd138df94451
+  React-perflogger: 5536d2df3d18fe0920263466f7b46a56351c0510
+  React-performancetimeline: 9041c53efa07f537164dcfe7670a36642352f4c2
   React-RCTActionSheet: 42195ae666e6d79b4af2346770f765b7c29435b9
-  React-RCTAnimation: 5c10527683128c56ff2c09297fb080f7c35bd293
-  React-RCTAppDelegate: c616bd5b0d12f0b21dfacee9cd2d512c6df013aa
-  React-RCTBlob: 6e3757bdd7dce6fd9788c0dd675fd6b6c432db9d
-  React-RCTFabric: e8f3b9da97477710bf0904a62eb5b5209c964694
-  React-RCTFBReactNativeSpec: c042f8d60d44ad9e2c722da89323c0bdab7a37af
-  React-RCTImage: a3482fe1ae562d1bab08b42d4670a7c9a21813cd
-  React-RCTLinking: d82b9adb141aef9d2b38d446b837ae7017ab60aa
-  React-RCTNetwork: fa9350dd99354c5695964f589bd4790bdd4f6a85
-  React-RCTRuntime: be99a38cd23388c08921d8969c82a1997a11ec90
-  React-RCTSettings: b7f4a03f44dba1d3a4dc6770843547b203ca9129
-  React-RCTText: 91dc597a5f6b27fd1048bb287c41ea05eeca9333
-  React-RCTVibration: 27b09ddf74bddfa30a58d20e48f885ea6ed6c9d9
+  React-RCTAnimation: fa103ccc3503b1ed8dedca7e62e7823937748843
+  React-RCTAppDelegate: 665d4baf19424cef08276e9ac0d8771eec4519f9
+  React-RCTBlob: 0fa9530c255644db095f2c4fd8d89738d9d9ecc0
+  React-RCTFabric: 1fcd8af6e25f92532f56b4ba092e58662c14d156
+  React-RCTFBReactNativeSpec: db171247585774f9f0a30f75109cc51568686213
+  React-RCTImage: ba824e61ce2e920a239a65d130b83c3a1d426dff
+  React-RCTLinking: d2dc199c37e71e6f505d9eca3e5c33be930014d4
+  React-RCTNetwork: 87137d4b9bd77e5068f854dd5c1f30d4b072faf6
+  React-RCTRuntime: 137fafaa808a8b7e76a510e8be45f9f827899daa
+  React-RCTSettings: 71f5c7fd7b5f4e725a4e2114a4b4373d0e46048f
+  React-RCTText: b94d4699b49285bee22b8ebf768924d607eccee3
+  React-RCTVibration: 6e3993c4f6c36a3899059f9a9ead560ddaf5a7d7
   React-rendererconsistency: b4785e5ed837dc7c242bbc5fdd464b33ef5bfae7
-  React-renderercss: cef3f26df2ddec558ce3c0790fc574b4fb62ce67
-  React-rendererdebug: e68433ae67738caeb672a6c8cc993e9276b298a9
-  React-RuntimeApple: dc1d4709bf847bc695dbe6e8aaf3e22ef25aef02
-  React-RuntimeCore: ca3473c8b6578693fa3bad4d44240098d49d6723
-  React-runtimeexecutor: 0db3ca0b09cd72489cef3a3729349b3c2cf13320
-  React-RuntimeHermes: f92cabaf97ef2546a74360eddfc1c74a34cb9ff8
-  React-runtimescheduler: 06aea75069e0d556a75d258bfc89eb0ebd5d557e
-  React-timing: 1a90df9a04d8e7fd165ff7fa0918b9595c776373
-  React-utils: 92115441fb55ce01ded4abfb5e9336a74cd93e9c
-  ReactAppDependencyProvider: b20fba6c3d091a393925890009999472c8f94d95
-  ReactCodegen: cf03d376a26d393f818d511240b026fc8c95313c
-  ReactCommon: 00df7b9f859c9d02181844255bb89a8bca544374
-  ReactNativeHost: 8491ce845ecc9eb31ab529290c0cc21ff21e9fc8
-  ReactTestApp-DevSupport: c7bff1aee7663f2fb1eefcf60c41573f02916c41
+  React-renderercss: e6fb0ba387b389c595ffa86b8b628716d31f58dc
+  React-rendererdebug: 60a03de5c7ea59bf2d39791eb43c4c0f5d8b24e3
+  React-RuntimeApple: 3df6788cd9b938bb8cb28298d80b5fbd98a4d852
+  React-RuntimeCore: fad8adb4172c414c00ff6980250caf35601a0f5d
+  React-runtimeexecutor: d2db7e72d97751855ea0bf5273d2ac84e5ea390c
+  React-RuntimeHermes: 04faa4cf9a285136a6d73738787fe36020170613
+  React-runtimescheduler: f6a1c9555e7131b4a8b64cce01489ad0405f6e8d
+  React-timing: 1e6a8acb66e2b7ac9d418956617fd1fdb19322fd
+  React-utils: 52bbb03f130319ef82e4c3bc7a85eaacdb1fec87
+  ReactAppDependencyProvider: 433ddfb4536948630aadd5bd925aff8a632d2fe3
+  ReactCodegen: 64dbbed4e9e0264d799578ea78492479a66fba4a
+  ReactCommon: 394c6b92765cf6d211c2c3f7f6bc601dffb316a6
+  ReactNativeHost: 40e374201201cc54f9ef41458f2e412fbdde0d62
+  ReactTestApp-DevSupport: 9b7bbba5e8fed998e763809171d9906a1375f9d3
   ReactTestApp-Resources: 4f6dff3b157f879757cd750caccd1d34a7eda647
-  RNGestureHandler: 4f7cc97a71d4fe0fcba38c94acdd969f5f17c91c
-  RNScreens: 74985ca8e102294a60cec7513fa84c936fa0b20b
-  RNVectorIcons: 34d8572dadd436893d712d12c2400cb8c0b610e3
+  RNGestureHandler: 3a73f098d74712952870e948b3d9cf7b6cae9961
+  RNScreens: d821082c6dd1cb397cc0c98b026eeafaa68be479
+  RNVectorIcons: c13cc1db346e960ecd0aafcdd5d0bb458133b9c1
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SwiftUIIntrospect: fee9aa07293ee280373a591e1824e8ddc869ba5d
   Yoga: a3ed390a19db0459bd6839823a6ac6d9c6db198d
 
 PODFILE CHECKSUM: d61a3255405492afdb755f6ddd335fd0f5a84cd3
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/apps/example/package.json b/apps/example/package.json
index aec4e3b5..f278c83f 100644
--- a/apps/example/package.json
+++ b/apps/example/package.json
@@ -13,6 +13,7 @@
   "dependencies": {
     "@bottom-tabs/react-navigation": "*",
     "@react-navigation/bottom-tabs": "^7.4.7",
+    "@react-navigation/devtools": "^7.0.44",
     "@react-navigation/native": "^7.1.17",
     "@react-navigation/native-stack": "^7.3.26",
     "@react-navigation/stack": "^7.4.8",
@@ -24,7 +25,7 @@
     "react-native-gesture-handler": "^2.28.0",
     "react-native-paper": "^5.14.5",
     "react-native-safe-area-context": "^5.6.1",
-    "react-native-screens": "^4.16.0",
+    "react-native-screens": "^4.18.0",
     "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {
diff --git a/apps/example/src/App.tsx b/apps/example/src/App.tsx
index a3e5de64..ba1f7606 100644
--- a/apps/example/src/App.tsx
+++ b/apps/example/src/App.tsx
@@ -12,7 +12,11 @@ import {
   Alert,
   Platform,
 } from 'react-native';
-import { NavigationContainer, useNavigation } from '@react-navigation/native';
+import {
+  NavigationContainer,
+  useNavigation,
+  useNavigationContainerRef,
+} from '@react-navigation/native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
@@ -31,6 +35,7 @@ import NativeBottomTabsUnmounting from './Examples/NativeBottomTabsUnmounting';
 import NativeBottomTabsCustomTabBar from './Examples/NativeBottomTabsCustomTabBar';
 import NativeBottomTabsFreezeOnBlur from './Examples/NativeBottomTabsFreezeOnBlur';
 import BottomAccessoryView from './Examples/BottomAccessoryView';
+import { useLogger } from '@react-navigation/devtools';
 
 const HiddenTab = () => {
   return <FourTabs hideOneTab />;
@@ -194,9 +199,13 @@ export default function Navigation() {
 
   const NavigationStack = mode === 'js' ? Stack : NativeStack;
 
+  const navigationRef = useNavigationContainerRef();
+
+  useLogger(navigationRef);
+
   return (
     <SafeAreaProvider>
-      <NavigationContainer>
+      <NavigationContainer ref={navigationRef}>
         <NavigationStack.Navigator initialRouteName="BottomTabs Example">
           <NavigationStack.Screen
             name="BottomTabs Example"
diff --git a/packages/expo-template/CHANGELOG.md b/packages/expo-template/CHANGELOG.md
index 77d0db1c..285af425 100644
--- a/packages/expo-template/CHANGELOG.md
+++ b/packages/expo-template/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @bottom-tabs/expo-template
 
+## 1.0.6
+
+### Patch Changes
+
+- Updated dependencies [[`ddfeefb`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/ddfeefb43e958bcc085b2b82f560576144d46a92), [`fc8b828`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/fc8b8289ac1a219714ef1f7affe3d1828947d46a), [`b2be24d`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/b2be24d0b4b4e103dab1d92aefb4574bfe6a65e6)]:
+  - react-native-bottom-tabs@1.1.0
+  - @bottom-tabs/react-navigation@1.1.0
+
+## 1.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`2b70882`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/2b70882f12e707761b381bb648f5c4050b780d6e)]:
+  - react-native-bottom-tabs@1.0.5
+  - @bottom-tabs/react-navigation@1.0.5
+
+## 1.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`ccadbdd`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/ccadbddfa50a54f009239ef543decc1ffe46b7e9)]:
+  - react-native-bottom-tabs@1.0.4
+  - @bottom-tabs/react-navigation@1.0.4
+
 ## 1.0.3
 
 ### Patch Changes
diff --git a/packages/expo-template/package.json b/packages/expo-template/package.json
index e578893c..cae9aac0 100644
--- a/packages/expo-template/package.json
+++ b/packages/expo-template/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bottom-tabs/expo-template",
   "main": "expo-router/entry",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "scripts": {
     "start": "expo start",
     "reset-project": "node ./scripts/reset-project.js",
@@ -18,7 +18,7 @@
     "preset": "jest-expo"
   },
   "dependencies": {
-    "@bottom-tabs/react-navigation": "1.0.3",
+    "@bottom-tabs/react-navigation": "1.1.0",
     "@expo/vector-icons": "^14.0.2",
     "@react-navigation/native": "^7.1.17",
     "expo": "^54.0.1",
@@ -37,7 +37,7 @@
     "react": "^19.1.0",
     "react-dom": "18.3.1",
     "react-native": "0.81.4",
-    "react-native-bottom-tabs": "1.0.3",
+    "react-native-bottom-tabs": "1.1.0",
     "react-native-gesture-handler": "^2.28.0",
     "react-native-reanimated": "^4.1.0",
     "react-native-safe-area-context": "^5.6.1",
diff --git a/packages/react-native-bottom-tabs/CHANGELOG.md b/packages/react-native-bottom-tabs/CHANGELOG.md
index a3154ae9..ed1de861 100644
--- a/packages/react-native-bottom-tabs/CHANGELOG.md
+++ b/packages/react-native-bottom-tabs/CHANGELOG.md
@@ -1,5 +1,29 @@
 # react-native-bottom-tabs
 
+## 1.1.0
+
+### Minor Changes
+
+- [#485](https://github.com/callstackincubator/react-native-bottom-tabs/pull/485) [`ddfeefb`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/ddfeefb43e958bcc085b2b82f560576144d46a92) Thanks [@okwasniewski](https://github.com/okwasniewski)! - fix: properly pop to top to resolve freezing issues
+
+### Patch Changes
+
+- [#486](https://github.com/callstackincubator/react-native-bottom-tabs/pull/486) [`fc8b828`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/fc8b8289ac1a219714ef1f7affe3d1828947d46a) Thanks [@okwasniewski](https://github.com/okwasniewski)! - fix: macos bottom accessory view compilation
+
+- [#488](https://github.com/callstackincubator/react-native-bottom-tabs/pull/488) [`b2be24d`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/b2be24d0b4b4e103dab1d92aefb4574bfe6a65e6) Thanks [@okwasniewski](https://github.com/okwasniewski)! - fix(expo): use dynamic require for config-plugins ESM/CJS interop
+
+## 1.0.5
+
+### Patch Changes
+
+- [#482](https://github.com/callstackincubator/react-native-bottom-tabs/pull/482) [`2b70882`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/2b70882f12e707761b381bb648f5c4050b780d6e) Thanks [@joshkeldam](https://github.com/joshkeldam)! - fix(android): add missing badgeBackgroundColor and badgeTextColor to TabInfo data class
+
+## 1.0.4
+
+### Patch Changes
+
+- [#479](https://github.com/callstackincubator/react-native-bottom-tabs/pull/479) [`ccadbdd`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/ccadbddfa50a54f009239ef543decc1ffe46b7e9) Thanks [@okwasniewski](https://github.com/okwasniewski)! - fix: add bottom accessory view nil check for iOS 26+ compatibility
+
 ## 1.0.3
 
 ### Patch Changes
diff --git a/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabView.kt b/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabView.kt
index 9ed6de7a..23cd8759 100644
--- a/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabView.kt
+++ b/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabView.kt
@@ -256,31 +256,9 @@ class ReactBottomNavigationView(context: Context) : LinearLayout(context) {
         if (item.badge != " ") {
           badge.text = item.badge
         }
-        // Apply badge colors if provided, or reset to theme defaults if null
-        if (item.badgeBackgroundColor != null) {
-          badge.backgroundColor = item.badgeBackgroundColor
-        } else {
-          // Reset to theme default color by resolving the colorError attribute
-          val typedValue = TypedValue()
-          context.theme.resolveAttribute(
-            com.google.android.material.R.attr.colorError,
-            typedValue,
-            true
-          )
-          badge.backgroundColor = typedValue.data
-        }
-        if (item.badgeTextColor != null) {
-          badge.badgeTextColor = item.badgeTextColor
-        } else {
-          // Reset to theme default text color by resolving the colorOnError attribute
-          val typedValue = TypedValue()
-          context.theme.resolveAttribute(
-            com.google.android.material.R.attr.colorOnError,
-            typedValue,
-            true
-          )
-          badge.badgeTextColor = typedValue.data
-        }
+        // Apply badge colors if provided (Material will use its default theme colors otherwise)
+        item.badgeBackgroundColor?.let { badge.backgroundColor = it }
+        item.badgeTextColor?.let { badge.badgeTextColor = it }
       } else {
         bottomNavigation.removeBadge(index)
       }
diff --git a/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabViewManager.kt b/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabViewManager.kt
index d2b97dc1..dad16c28 100644
--- a/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabViewManager.kt
+++ b/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabViewManager.kt
@@ -21,6 +21,8 @@ data class TabInfo(
   val key: String,
   val title: String,
   val badge: String?,
+  val badgeBackgroundColor: Int?,
+  val badgeTextColor: Int?,
   val activeTintColor: Int?,
   val hidden: Boolean,
   val testID: String?
@@ -99,6 +101,8 @@ class RCTTabViewManager(context: ReactApplicationContext) :
                 key = item.getString("key") ?: "",
                 title = item.getString("title") ?: "",
                 badge = if (item.hasKey("badge")) item.getString("badge") else null,
+                badgeBackgroundColor = if (item.hasKey("badgeBackgroundColor")) item.getInt("badgeBackgroundColor") else null,
+                badgeTextColor = if (item.hasKey("badgeTextColor")) item.getInt("badgeTextColor") else null,
                 activeTintColor = if (item.hasKey("activeTintColor")) item.getInt("activeTintColor") else null,
                 hidden = if (item.hasKey("hidden")) item.getBoolean("hidden") else false,
                 testID = item.getString("testID")
diff --git a/packages/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift b/packages/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift
index 31914b17..539efee7 100644
--- a/packages/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift
+++ b/packages/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift
@@ -8,6 +8,7 @@ import SwiftUI
     self.delegate = delegate
   }
 
+  #if !os(macOS)
   @available(iOS 26.0, *)
   public func emitPlacementChanged(_ placement: TabViewBottomAccessoryPlacement?) {
     var placementValue = "none"
@@ -18,6 +19,7 @@ import SwiftUI
     }
     self.delegate?.onPlacementChanged(placement: placementValue)
   }
+  #endif
 }
 
 @objc public protocol BottomAccessoryProviderDelegate {
diff --git a/packages/react-native-bottom-tabs/ios/TabItemEventModifier.swift b/packages/react-native-bottom-tabs/ios/TabItemEventModifier.swift
index 21d17829..42eb1e64 100644
--- a/packages/react-native-bottom-tabs/ios/TabItemEventModifier.swift
+++ b/packages/react-native-bottom-tabs/ios/TabItemEventModifier.swift
@@ -17,6 +17,16 @@ private final class TabBarDelegate: NSObject, UITabBarControllerDelegate {
     }
 #endif
 
+    let isReselectingSameTab = tabBarController.selectedViewController == viewController
+
+    if isReselectingSameTab {
+      if let index = tabBarController.viewControllers?.firstIndex(of: viewController) {
+        _ = onClick?(index)
+      }
+
+      return false
+    }
+
     // Unfortunately, due to iOS 26 new tab switching animations, controlling state from JavaScript is causing significant delays when switching tabs.
     // See: https://github.com/callstackincubator/react-native-bottom-tabs/issues/383
     // Due to this, whether the tab prevents default has to be defined statically.
diff --git a/packages/react-native-bottom-tabs/ios/TabView/NewTabView.swift b/packages/react-native-bottom-tabs/ios/TabView/NewTabView.swift
index a0106ad7..d6993158 100644
--- a/packages/react-native-bottom-tabs/ios/TabView/NewTabView.swift
+++ b/packages/react-native-bottom-tabs/ios/TabView/NewTabView.swift
@@ -67,26 +67,34 @@ struct ConditionalBottomAccessoryModifier: ViewModifier {
   }
 
   func body(content: Content) -> some View {
-    if #available(iOS 26.0, macOS 26.0, tvOS 26.0, visionOS 3.0, *) {
-        content
+    #if os(macOS)
+    // tabViewBottomAccessory is not available on macOS
+    content
+    #else
+    if #available(iOS 26.0, tvOS 26.0, visionOS 3.0, *), bottomAccessoryView != nil {
+      content
         .tabViewBottomAccessory {
           renderBottomAccessoryView()
         }
     } else {
       content
     }
+    #endif
   }
 
   @ViewBuilder
   private func renderBottomAccessoryView() -> some View {
+    #if !os(macOS)
     if let bottomAccessoryView {
       if #available(iOS 26.0, *) {
         BottomAccessoryRepresentableView(view: bottomAccessoryView)
       }
     }
+    #endif
   }
 }
 
+#if !os(macOS)
 @available(iOS 26.0, *)
 struct BottomAccessoryRepresentableView: PlatformViewRepresentable {
   @Environment(\.tabViewBottomAccessoryPlacement) var tabViewBottomAccessoryPlacement
@@ -115,3 +123,4 @@ struct BottomAccessoryRepresentableView: PlatformViewRepresentable {
     }
   }
 }
+#endif
diff --git a/packages/react-native-bottom-tabs/package.json b/packages/react-native-bottom-tabs/package.json
index be14dc9d..45ffee50 100644
--- a/packages/react-native-bottom-tabs/package.json
+++ b/packages/react-native-bottom-tabs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-bottom-tabs",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Native Bottom Tabs for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
diff --git a/packages/react-native-bottom-tabs/src/expo.ts b/packages/react-native-bottom-tabs/src/expo.ts
index b199b8fb..d3375070 100644
--- a/packages/react-native-bottom-tabs/src/expo.ts
+++ b/packages/react-native-bottom-tabs/src/expo.ts
@@ -1,7 +1,12 @@
-import ConfigPlugins from '@expo/config-plugins';
 import { type ConfigPlugin } from '@expo/config-plugins';
+import { createRequire } from 'node:module';
 
-const { createRunOncePlugin, withAndroidStyles } = ConfigPlugins;
+const require = createRequire(import.meta.url);
+
+const ConfigPlugins = require('@expo/config-plugins');
+
+const { createRunOncePlugin, withAndroidStyles } =
+  ConfigPlugins as typeof import('@expo/config-plugins');
 
 const MATERIAL3_THEME_DYANMIC =
   'Theme.Material3.DynamicColors.DayNight.NoActionBar';
diff --git a/packages/react-navigation/CHANGELOG.md b/packages/react-navigation/CHANGELOG.md
index 2273610d..ccaf1917 100644
--- a/packages/react-navigation/CHANGELOG.md
+++ b/packages/react-navigation/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @bottom-tabs/react-navigation
 
+## 1.1.0
+
+### Minor Changes
+
+- [#485](https://github.com/callstackincubator/react-native-bottom-tabs/pull/485) [`ddfeefb`](https://github.com/callstackincubator/react-native-bottom-tabs/commit/ddfeefb43e958bcc085b2b82f560576144d46a92) Thanks [@okwasniewski](https://github.com/okwasniewski)! - fix: properly pop to top to resolve freezing issues
+
+## 1.0.5
+
+## 1.0.4
+
 ## 1.0.3
 
 ## 1.0.2
diff --git a/packages/react-navigation/package.json b/packages/react-navigation/package.json
index 1475b23a..a869f14d 100644
--- a/packages/react-navigation/package.json
+++ b/packages/react-navigation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bottom-tabs/react-navigation",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "React Native Bottom Tabs React Navigation integration",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
diff --git a/packages/react-navigation/src/views/NativeBottomTabView.tsx b/packages/react-navigation/src/views/NativeBottomTabView.tsx
index 9be0922f..8f1838bd 100644
--- a/packages/react-navigation/src/views/NativeBottomTabView.tsx
+++ b/packages/react-navigation/src/views/NativeBottomTabView.tsx
@@ -89,6 +89,7 @@ export default function NativeBottomTabView({
         descriptors[route.key]?.options.preventsDefault
       }
       onIndexChange={(index) => {
+        const focused = index === state.index;
         const route = state.routes[index];
         if (!route) {
           return;
@@ -101,6 +102,7 @@ export default function NativeBottomTabView({
         });
 
         if (
+          focused ||
           event.defaultPrevented ||
           descriptors[route.key]?.options.preventsDefault
         ) {
diff --git a/yarn.lock b/yarn.lock
index c90cec27..a33a6828 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2721,7 +2721,7 @@ __metadata:
   resolution: "@bottom-tabs/expo-template@workspace:packages/expo-template"
   dependencies:
     "@babel/core": "npm:^7.28.4"
-    "@bottom-tabs/react-navigation": "npm:1.0.3"
+    "@bottom-tabs/react-navigation": "npm:1.1.0"
     "@expo/vector-icons": "npm:^14.0.2"
     "@react-navigation/native": "npm:^7.1.17"
     "@types/jest": "npm:^29.5.12"
@@ -2745,7 +2745,7 @@ __metadata:
     react: "npm:^19.1.0"
     react-dom: "npm:18.3.1"
     react-native: "npm:0.81.4"
-    react-native-bottom-tabs: "npm:1.0.3"
+    react-native-bottom-tabs: "npm:1.1.0"
     react-native-gesture-handler: "npm:^2.28.0"
     react-native-reanimated: "npm:^4.1.0"
     react-native-safe-area-context: "npm:^5.6.1"
@@ -2778,7 +2778,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@bottom-tabs/react-navigation@npm:*, @bottom-tabs/react-navigation@npm:1.0.3, @bottom-tabs/react-navigation@workspace:packages/react-navigation":
+"@bottom-tabs/react-navigation@npm:*, @bottom-tabs/react-navigation@npm:1.1.0, @bottom-tabs/react-navigation@workspace:packages/react-navigation":
   version: 0.0.0-use.local
   resolution: "@bottom-tabs/react-navigation@workspace:packages/react-navigation"
   dependencies:
@@ -5614,6 +5614,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-navigation/devtools@npm:^7.0.44":
+  version: 7.0.44
+  resolution: "@react-navigation/devtools@npm:7.0.44"
+  dependencies:
+    fast-deep-equal: "npm:^3.1.3"
+    nanoid: "npm:^3.3.11"
+    stacktrace-parser: "npm:^0.1.11"
+  peerDependencies:
+    react: ">= 18.2.0"
+  checksum: 10/67f7f7ebac0e222437b78cd3dc7d7ac5a00bad706809b18f02ceec716a077e7d5a851cbe6573fbd4828d9b4b6001f1b81564f28c705977581a6b6f080672ff3a
+  languageName: node
+  linkType: hard
+
 "@react-navigation/elements@npm:^2.6.4":
   version: 2.6.4
   resolution: "@react-navigation/elements@npm:2.6.4"
@@ -15950,6 +15963,7 @@ __metadata:
     "@react-native/metro-config": "npm:0.81.4"
     "@react-native/typescript-config": "npm:0.81.4"
     "@react-navigation/bottom-tabs": "npm:^7.4.7"
+    "@react-navigation/devtools": "npm:^7.0.44"
     "@react-navigation/native": "npm:^7.1.17"
     "@react-navigation/native-stack": "npm:^7.3.26"
     "@react-navigation/stack": "npm:^7.4.8"
@@ -15965,13 +15979,13 @@ __metadata:
     react-native-gesture-handler: "npm:^2.28.0"
     react-native-paper: "npm:^5.14.5"
     react-native-safe-area-context: "npm:^5.6.1"
-    react-native-screens: "npm:^4.16.0"
+    react-native-screens: "npm:^4.18.0"
     react-native-test-app: "npm:^4.4.10"
     react-native-vector-icons: "npm:^10.2.0"
   languageName: unknown
   linkType: soft
 
-"react-native-bottom-tabs@npm:*, react-native-bottom-tabs@npm:1.0.3, react-native-bottom-tabs@workspace:packages/react-native-bottom-tabs":
+"react-native-bottom-tabs@npm:*, react-native-bottom-tabs@npm:1.1.0, react-native-bottom-tabs@workspace:packages/react-native-bottom-tabs":
   version: 0.0.0-use.local
   resolution: "react-native-bottom-tabs@workspace:packages/react-native-bottom-tabs"
   dependencies:
@@ -16133,6 +16147,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-native-screens@npm:^4.18.0":
+  version: 4.18.0
+  resolution: "react-native-screens@npm:4.18.0"
+  dependencies:
+    react-freeze: "npm:^1.0.0"
+    warn-once: "npm:^0.1.0"
+  peerDependencies:
+    react: "*"
+    react-native: "*"
+  checksum: 10/456c18069ab8fee1d6c341d6bd13cba477fcda10f266844fb5f486ad5ac2c7336a5181956e261be010318be53585d4a72fd9bd00289117bbbdea681309de21f4
+  languageName: node
+  linkType: hard
+
 "react-native-test-app@npm:^4.4.10":
   version: 4.4.10
   resolution: "react-native-test-app@npm:4.4.10"
@@ -17764,7 +17791,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stacktrace-parser@npm:^0.1.10":
+"stacktrace-parser@npm:^0.1.10, stacktrace-parser@npm:^0.1.11":
   version: 0.1.11
   resolution: "stacktrace-parser@npm:0.1.11"
   dependencies: