plusui-native-core 0.1.38 → 0.1.40

package/Core/CMakeLists.txt

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

package/Core/Features/Window/webview.cpp

@@ -25,6 +25,29 @@ using namespace Microsoft::WRL;
 
 namespace plusui {
 
+namespace {
+constexpr char kHideScrollbarsScript[] = R"(
+  (function() {
+    var css = "::-webkit-scrollbar{display:none!important;width:0!important;height:0!important;}::-webkit-scrollbar-track{background:transparent!important;}::-webkit-scrollbar-thumb{background:transparent!important;}*{-ms-overflow-style:none!important;scrollbar-width:none!important;scrollbar-color:transparent transparent!important;}";
+    var styleId = "__plusui_hide_scrollbars";
+    var ensureStyle = function() {
+      if (document.getElementById(styleId)) return;
+      var style = document.createElement("style");
+      style.id = styleId;
+      style.type = "text/css";
+      style.appendChild(document.createTextNode(css));
+      var container = document.head || document.documentElement || document.body;
+      if (container) {
+        container.appendChild(style);
+      }
+    };
+    ensureStyle();
+    document.addEventListener("DOMContentLoaded", ensureStyle);
+    window.addEventListener("load", ensureStyle);
+  })();
+)";
+} // namespace
+
 // Note: Window::Impl is defined in window.cpp
 // This file only provides implementations for webview-specific methods
 
@@ -90,51 +113,9 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                 .c_str(),
                             nullptr);
 
-                        // Hide scrollbars if disabled via comprehensive CSS injection
+                        // Disable scrollbars if configured
                         if (!pImpl->config.scrollbars) {
-                          std::string scrollbarScript = R"(
-                                (function() {
-                                    // Critical: Apply inline styles to prevent scrollbars
-                                    if (document.documentElement) {
-                                        document.documentElement.style.cssText = 'margin:0 !important;padding:0 !important;overflow:hidden !important;width:100%;height:100%;';
-                                    }
-                                    if (document.body) {
-                                        document.body.style.cssText = 'margin:0 !important;padding:0 !important;overflow:hidden !important;width:100%;height:100%;';
-                                    }
-
-                                    // Create comprehensive style element
-                                    var style = document.createElement('style');
-                                    style.type = 'text/css';
-                                    style.textContent = 'html,body{margin:0!important;padding:0!important;overflow:hidden!important;width:100%;height:100%;position:fixed;top:0;left:0;}*{scrollbar-width:none;}::-webkit-scrollbar{display:none!important;width:0!important;height:0!important;}body *{overflow:hidden!important;}';
-
-                                    function applyStyle() {
-                                        try {
-                                            if (document.head) {
-                                                document.head.insertBefore(style, document.head.firstChild);
-                                            } else if (document.documentElement) {
-                                                document.documentElement.insertBefore(style, document.documentElement.firstChild);
-                                            } else {
-                                                setTimeout(applyStyle, 10);
-                                                return;
-                                            }
-                                        } catch (e) {}
-                                    }
-
-                                    applyStyle();
-
-                                    // Also apply when DOM is fully ready
-                                    if (document.readyState === 'loading') {
-                                        document.addEventListener('DOMContentLoaded', function() {
-                                            if (document.documentElement) {
-                                                document.documentElement.style.overflow = 'hidden';
-                                            }
-                                            if (document.body) {
-                                                document.body.style.overflow = 'hidden';
-                                            }
-                                        });
-                                    }
-                                })();
-                            )";
+                          std::string scrollbarScript = kHideScrollbarsScript;
                           pImpl->webview->AddScriptToExecuteOnDocumentCreated(
                               std::wstring(scrollbarScript.begin(),
                                            scrollbarScript.end())
@@ -706,17 +687,11 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
 
   // Hide scrollbars if disabled
   if (!win.pImpl->config.scrollbars) {
-    NSString *scrollbarScript = @"(function() {"
-      "var css = 'html, body { overflow: hidden !important; margin: 0 !important; padding: 0 !important; } ::-webkit-scrollbar { display: none !important; width: 0 !important; height: 0 !important; }';"
-      "var style = document.createElement('style');"
-      "style.type = 'text/css';"
-      "style.appendChild(document.createTextNode(css));"
-      "(document.head || document.documentElement).appendChild(style);"
-    "})();";
-    
-    WKUserScript *scrollScript = [[WKUserScript alloc] 
-      initWithSource:scrollbarScript 
-      injectionTime:WKUserScriptInjectionTimeAtDocumentEnd 
+    NSString *scrollbarScript = [NSString stringWithUTF8String:kHideScrollbarsScript];
+
+    WKUserScript *scrollScript = [[WKUserScript alloc]
+      initWithSource:scrollbarScript
+      injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
       forMainFrameOnly:NO];
     [config.userContentController addUserScript:scrollScript];
   }

package/Core/Features/Window/window.cpp

@@ -30,6 +30,29 @@ using namespace Microsoft::WRL;
 
 namespace plusui {
 
+namespace {
+constexpr char kHideScrollbarsScript[] = R"(
+  (function() {
+    var css = "::-webkit-scrollbar{display:none!important;width:0!important;height:0!important;}::-webkit-scrollbar-track{background:transparent!important;}::-webkit-scrollbar-thumb{background:transparent!important;}*{-ms-overflow-style:none!important;scrollbar-width:none!important;scrollbar-color:transparent transparent!important;}";
+    var styleId = "__plusui_hide_scrollbars";
+    var ensureStyle = function() {
+      if (document.getElementById(styleId)) return;
+      var style = document.createElement("style");
+      style.id = styleId;
+      style.type = "text/css";
+      style.appendChild(document.createTextNode(css));
+      var container = document.head || document.documentElement || document.body;
+      if (container) {
+        container.appendChild(style);
+      }
+    };
+    ensureStyle();
+    document.addEventListener("DOMContentLoaded", ensureStyle);
+    window.addEventListener("load", ensureStyle);
+  })();
+)";
+} // namespace
+
 struct Window::Impl {
   void *nativeWindow = nullptr;
   void *nativeWebView = nullptr;
@@ -793,15 +816,7 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
 
                         // Inject scrollbar hiding CSS if disabled
                         if (!pImpl->config.scrollbars) {
-                          std::string scrollbarScript = R"(
-                                (function() {
-                                    var css = 'html, body { overflow: hidden !important; margin: 0 !important; padding: 0 !important; } ::-webkit-scrollbar { display: none !important; width: 0 !important; height: 0 !important; }';
-                                    var style = document.createElement('style');
-                                    style.type = 'text/css';
-                                    style.appendChild(document.createTextNode(css));
-                                    (document.head || document.documentElement).appendChild(style);
-                                })();
-                            )";
+                          std::string scrollbarScript = kHideScrollbarsScript;
                           pImpl->webview->AddScriptToExecuteOnDocumentCreated(
                               std::wstring(scrollbarScript.begin(),
                                            scrollbarScript.end())
@@ -1183,13 +1198,7 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
 
   // Hide scrollbars if disabled
   if (!win.pImpl->config.scrollbars) {
-    NSString *scrollbarScript = @"(function() {"
-      "var css = 'html, body { overflow: hidden !important; margin: 0 !important; padding: 0 !important; } ::-webkit-scrollbar { display: none !important; width: 0 !important; height: 0 !important; }';"
-      "var style = document.createElement('style');"
-      "style.type = 'text/css';"
-      "style.appendChild(document.createTextNode(css));"
-      "(document.head || document.documentElement).appendChild(style);"
-    "})();";
+    NSString *scrollbarScript = [NSString stringWithUTF8String:kHideScrollbarsScript];
 
     WKUserScript *scrollScript = [[WKUserScript alloc]
       initWithSource:scrollbarScript
@@ -1293,16 +1302,7 @@ void Window::navigate(const std::string &url) {
 
   // Apply scrollbar hiding CSS if configured
   if (!pImpl->config.scrollbars) {
-    std::string hideScrollbars = R"(
-      (function() {
-        document.documentElement.style.overflow = 'hidden';
-        document.documentElement.style.margin = '0';
-        document.documentElement.style.padding = '0';
-        document.body.style.overflow = 'hidden';
-        document.body.style.margin = '0';
-        document.body.style.padding = '0';
-      })();
-    )";
+    std::string hideScrollbars = kHideScrollbarsScript;
     // Schedule this to run after a short delay to ensure DOM is ready
 #ifdef _WIN32
     if (pImpl->ready && pImpl->webview) {

package/package.json

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