plusui-native-core 0.1.25 → 0.1.27

package/Core/CMakeLists.txt

@@ -24,8 +24,8 @@ add_library(plusui STATIC
     Features/Bindings/CustomBindings/custom_bindings.cpp
     Features/App/app.cpp
     Features/Window/window.cpp
-    Features/WindowManager/window_manager.cpp
-    Features/WebView/webview.cpp
+    Features/Window/window_manager.cpp
+    Features/Window/webview.cpp
     Features/Browser/browser.cpp
     Features/Display/display.cpp
     Features/Tray/tray.cpp

package/Core/Features/Browser/browser.cpp

@@ -2,7 +2,6 @@
 #include <iostream>
 #include <plusui/browser.hpp>
 #include <plusui/window.hpp>
-#include <plusui/window.hpp>
 #include <vector>
 
 
@@ -17,10 +16,10 @@ namespace plusui {
 
 // Keep secondary windows alive
 static std::vector<std::shared_ptr<Window>> g_windows;
-static std::vector<std::shared_ptr<WebView>> g_webviews;
+static std::vector<std::shared_ptr<Window>> g_webviews;
 
 struct Browser::Impl {
-  WebView *webview = nullptr;
+  Window *window = nullptr;
   std::map<std::string, std::string> routes;
   std::string currentRoute;
   BrowserState state;
@@ -32,12 +31,12 @@ struct Browser::Impl {
   std::vector<std::function<void(const std::string &)>> loadErrorCallbacks;
 
   void updateState() {
-    if (webview) {
-      state.url = webview->getURL();
-      state.title = webview->getTitle();
-      state.canGoBack = webview->canGoBack();
-      state.canGoForward = webview->canGoForward();
-      state.isLoading = webview->isLoading();
+    if (window) {
+      state.url = window->getURL();
+      state.title = window->getTitle();
+      state.canGoBack = window->canGoBack();
+      state.canGoForward = window->canGoForward();
+      state.isLoading = window->isLoading();
 
       for (auto &cb : stateCallbacks) {
         cb(state);
@@ -58,24 +57,24 @@ Browser::Browser() : pImpl(std::make_shared<Impl>()) {}
 
 Browser::~Browser() = default;
 
-Browser Browser::create(WebView *webview) {
+Browser Browser::create(Window *window) {
   Browser browser;
-  browser.pImpl->webview = webview;
+  browser.pImpl->window = window;
 
-  if (webview) {
-    webview->onNavigationStart([impl = browser.pImpl](const std::string &url) {
+  if (window) {
+    window->onNavigationStart([impl = browser.pImpl](const std::string &url) {
       impl->notifyNavigate(url);
       return true;
     });
 
-    webview->onLoadStart([impl = browser.pImpl]() {
+    window->onLoadStart([impl = browser.pImpl]() {
       impl->state.isLoading = true;
       for (auto &cb : impl->loadStartCallbacks) {
         cb();
       }
     });
 
-    webview->onLoadEnd([impl = browser.pImpl]() {
+    window->onLoadEnd([impl = browser.pImpl]() {
       impl->state.isLoading = false;
       impl->updateState();
       for (auto &cb : impl->loadEndCallbacks) {
@@ -83,7 +82,7 @@ Browser Browser::create(WebView *webview) {
       }
     });
 
-    webview->onLoadError(
+    window->onLoadError(
         [impl = browser.pImpl](const std::string &error, int code) {
           (void)code; // Suppress unused warning
           impl->state.isLoading = false;
@@ -97,35 +96,35 @@ Browser Browser::create(WebView *webview) {
 }
 
 void Browser::navigate(const std::string &url) {
-  if (pImpl->webview) {
-    pImpl->webview->navigate(url);
+  if (pImpl->window) {
+    pImpl->window->navigate(url);
     pImpl->notifyNavigate(url);
   }
 }
 
 void Browser::goBack() {
-  if (pImpl->webview && pImpl->webview->canGoBack()) {
-    pImpl->webview->goBack();
+  if (pImpl->window && pImpl->window->canGoBack()) {
+    pImpl->window->goBack();
     pImpl->updateState();
   }
 }
 
 void Browser::goForward() {
-  if (pImpl->webview && pImpl->webview->canGoForward()) {
-    pImpl->webview->goForward();
+  if (pImpl->window && pImpl->window->canGoForward()) {
+    pImpl->window->goForward();
     pImpl->updateState();
   }
 }
 
 void Browser::reload() {
-  if (pImpl->webview) {
-    pImpl->webview->reload();
+  if (pImpl->Window) {
+    pImpl->Window->reload();
   }
 }
 
 void Browser::stop() {
-  if (pImpl->webview) {
-    pImpl->webview->stop();
+  if (pImpl->Window) {
+    pImpl->Window->stop();
   }
 }
 
@@ -149,9 +148,9 @@ void Browser::openNewWindow(const std::string &url) {
   win->show();
   g_windows.push_back(win);
 
-  WebViewConfig webConfig;
-  auto wv = std::make_shared<WebView>(
-      WebView::create(win->nativeHandle(), webConfig));
+  WindowConfig webConfig;
+  auto wv = std::make_shared<Window>(
+      Window::create(win->nativeHandle(), webConfig));
   wv->setWindow(win);
   wv->navigate(url);
   g_webviews.push_back(wv);
@@ -168,21 +167,21 @@ void Browser::openNewWindow(const std::string &url) {
 }
 
 std::string Browser::getURL() const {
-  return pImpl->webview ? pImpl->webview->getURL() : "";
+  return pImpl->window ? pImpl->window->getURL() : "";
 }
 
 std::string Browser::getTitle() const {
-  return pImpl->webview ? pImpl->webview->getTitle() : "";
+  return pImpl->window ? pImpl->window->getTitle() : "";
 }
 
 BrowserState Browser::getState() const { return pImpl->state; }
 
 bool Browser::canGoBack() const {
-  return pImpl->webview ? pImpl->webview->canGoBack() : false;
+  return pImpl->window ? pImpl->window->canGoBack() : false;
 }
 
 bool Browser::canGoForward() const {
-  return pImpl->webview ? pImpl->webview->canGoForward() : false;
+  return pImpl->window ? pImpl->window->canGoForward() : false;
 }
 
 bool Browser::isLoading() const { return pImpl->state.isLoading; }

package/Core/Features/Menu/menu.cpp

@@ -63,9 +63,9 @@ static bool extractJsonBool(const std::string &json, const std::string &key,
   return defaultVal;
 }
 
-void MenuBindings::registerBindings(WebView &webview) {
+void MenuBindings::registerBindings(Window &window) {
   // Binding: menu.create
-  webview.bind("plusui_menu_create",
+  window.bind("plusui_menu_create",
                [this](const std::string &args) -> std::string {
                  auto items = parseMenuItems(args);
                  std::string menuId = MenuManager::instance().createMenu(items);
@@ -73,7 +73,7 @@ void MenuBindings::registerBindings(WebView &webview) {
                });
 
   // Binding: menu.popup
-  webview.bind("plusui_menu_popup", [](const std::string &args) -> std::string {
+  window.bind("plusui_menu_popup", [](const std::string &args) -> std::string {
     // Parse: [menuId, x, y]
     std::string menuId = extractJsonString(args, "menuId");
 
@@ -103,7 +103,7 @@ void MenuBindings::registerBindings(WebView &webview) {
   });
 
   // Binding: menu.setApplicationMenu
-  webview.bind("plusui_menu_setAppMenu",
+  window.bind("plusui_menu_setAppMenu",
                [this](const std::string &args) -> std::string {
                  auto items = parseMenuItems(args);
                  MenuBarData data;
@@ -113,7 +113,7 @@ void MenuBindings::registerBindings(WebView &webview) {
                });
 
   // Binding: menu.destroy
-  webview.bind("plusui_menu_destroy",
+  window.bind("plusui_menu_destroy",
                [](const std::string &args) -> std::string {
                  std::string menuId = extractJsonString(args, "menuId");
                  MenuManager::instance().destroyMenu(menuId);
@@ -121,7 +121,7 @@ void MenuBindings::registerBindings(WebView &webview) {
                });
 
   // Binding: menu.close
-  webview.bind("plusui_menu_close", [](const std::string &args) -> std::string {
+  window.bind("plusui_menu_close", [](const std::string &args) -> std::string {
     std::string menuId = extractJsonString(args, "menuId");
     Menu *menu = MenuManager::instance().getMenu(menuId);
     if (menu) {
@@ -131,7 +131,7 @@ void MenuBindings::registerBindings(WebView &webview) {
   });
 
   // Inject JavaScript bridge for context menu handling
-  webview.eval(R"(
+  window.eval(R"(
         // PlusUI Context Menu Bridge
         window.__plusui_contextMenu = {
             enabled: false,
@@ -184,7 +184,7 @@ void MenuBindings::registerBindings(WebView &webview) {
     )");
 
   // Binding: Show context menu
-  webview.bind("plusui_menu_showContext",
+  window.bind("plusui_menu_showContext",
                [this](const std::string &args) -> std::string {
                  if (!contextMenuEnabled_ || contextMenuItems_.empty()) {
                    return "null";
@@ -223,20 +223,20 @@ void MenuBindings::registerBindings(WebView &webview) {
                });
 
   // Binding: Enable custom context menu
-  webview.bind("plusui_menu_enableContext",
-               [this, &webview](const std::string &args) -> std::string {
+  window.bind("plusui_menu_enableContext",
+               [this, &window](const std::string &args) -> std::string {
                  (void)args; // Suppress unused warning
                  contextMenuEnabled_ = true;
-                 webview.eval("window.__plusui_contextMenu.enabled = true;");
+                 window.eval("window.__plusui_contextMenu.enabled = true;");
                  return "null";
                });
 
   // Binding: Disable custom context menu
-  webview.bind("plusui_menu_disableContext",
-               [this, &webview](const std::string &args) -> std::string {
+  window.bind("plusui_menu_disableContext",
+               [this, &window](const std::string &args) -> std::string {
                  (void)args; // Suppress unused warning
                  contextMenuEnabled_ = false;
-                 webview.eval("window.__plusui_contextMenu.enabled = false;");
+                 window.eval("window.__plusui_contextMenu.enabled = false;");
                  return "null";
                });
 }
@@ -419,9 +419,9 @@ void ContextMenuManager::setMenuForSelector(
   selectorMenus_[selector] = items;
 }
 
-void ContextMenuManager::attachToWebView(WebView &webview) {
+void ContextMenuManager::attachToWebView(Window &window) {
   // Inject context menu override script
-  webview.eval(R"(
+  window.eval(R"(
         (function() {
             document.addEventListener('contextmenu', function(e) {
                 // Check if we should use custom context menu

package/Core/include/plusui/browser.hpp

@@ -7,7 +7,7 @@
 
 namespace plusui {
 
-class WebView;
+class Window;
 
 struct BrowserState {
   std::string url;
@@ -31,7 +31,7 @@ public:
   Browser();
   ~Browser();
 
-  static Browser create(WebView *webview);
+  static Browser create(Window *window);
 
   void navigate(const std::string &url);
   void goBack();

package/Core/include/plusui/menu.hpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 namespace plusui {
-class WebView;
+class Window;
 }
 
 namespace plusui {
@@ -105,7 +105,7 @@ public:
   MenuBindings() = default;
   ~MenuBindings() = default;
 
-  void registerBindings(WebView &webview);
+  void registerBindings(Window &window);
   void setItemClickCallback(
       std::function<void(const std::string &menuId, const std::string &itemId)>
           callback);
@@ -131,7 +131,7 @@ public:
   void setDefaultMenu(const std::vector<MenuItem> &items);
   void setMenuForSelector(const std::string &selector,
                           const std::vector<MenuItem> &items);
-  void attachToWebView(WebView &webview);
+  void attachToWebView(Window &window);
   void handleRightClick(int x, int y, const std::string &targetSelector);
   void onItemClick(std::function<void(const std::string &itemId,
                                       const std::string &targetSelector)>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native-core",
-  "version": "0.1.25",
+  "version": "0.1.27",
   "description": "PlusUI Core framework (frontend + backend implementations)",
   "type": "module",
   "files": [