From e41216ab75115b509180cfedadf1ff21cbee1f20 Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Tue, 15 Oct 2024 08:18:16 +0300
Subject: [PATCH] use shared pointer for page id string

---
 src/app/browser/window/tab.rs           | 2 +-
 src/app/browser/window/tab/item.rs      | 6 +++---
 src/app/browser/window/tab/item/page.rs | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/browser/window/tab.rs b/src/app/browser/window/tab.rs
index d54271ed..f55e29e1 100644
--- a/src/app/browser/window/tab.rs
+++ b/src/app/browser/window/tab.rs
@@ -26,7 +26,7 @@ pub struct Tab {
     action_tab_page_navigation_reload: Arc<SimpleAction>,
     action_update: Arc<SimpleAction>,
     // Dynamically allocated reference index
-    index: Arc<RefCell<HashMap<GString, Arc<Item>>>>,
+    index: Arc<RefCell<HashMap<Arc<GString>, Arc<Item>>>>,
     // GTK
     widget: Arc<Widget>,
 }
diff --git a/src/app/browser/window/tab/item.rs b/src/app/browser/window/tab/item.rs
index 3d4ebe8a..c31e7e25 100644
--- a/src/app/browser/window/tab/item.rs
+++ b/src/app/browser/window/tab/item.rs
@@ -17,7 +17,7 @@ use std::sync::Arc;
 pub struct Item {
     // Auto-generated unique item ID
     // useful as widget name in GTK actions callback
-    id: GString,
+    id: Arc<GString>,
     // Components
     page: Arc<Page>,
     widget: Arc<Widget>,
@@ -39,7 +39,7 @@ impl Item {
         is_selected: bool,
     ) -> Arc<Self> {
         // Generate unique ID for new page components
-        let id = uuid_string_random();
+        let id = Arc::new(uuid_string_random());
 
         // Init components
         let page = Page::new_arc(
@@ -201,7 +201,7 @@ impl Item {
     }
 
     // Getters
-    pub fn id(&self) -> GString {
+    pub fn id(&self) -> Arc<GString> {
         self.id.clone()
     }
 
diff --git a/src/app/browser/window/tab/item/page.rs b/src/app/browser/window/tab/item/page.rs
index 75ce64b2..be8fb4e7 100644
--- a/src/app/browser/window/tab/item/page.rs
+++ b/src/app/browser/window/tab/item/page.rs
@@ -27,6 +27,7 @@ use sqlite::Transaction;
 use std::{cell::RefCell, path::Path, sync::Arc};
 
 pub struct Page {
+    id: Arc<GString>,
     // Actions
     action_page_open: Arc<SimpleAction>,
     action_tab_page_navigation_reload: Arc<SimpleAction>,
@@ -43,7 +44,7 @@ pub struct Page {
 impl Page {
     // Construct
     pub fn new_arc(
-        id: GString,
+        id: Arc<GString>,
         action_tab_open: Arc<SimpleAction>,
         action_tab_page_navigation_base: Arc<SimpleAction>,
         action_tab_page_navigation_history_back: Arc<SimpleAction>,
@@ -102,6 +103,7 @@ impl Page {
 
         // Return activated structure
         Arc::new(Self {
+            id,
             // Actions
             action_page_open,
             action_tab_page_navigation_reload,