plusui-native-core 0.1.43 → 0.1.45

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/FileDrop/filedrop.cpp
     Features/Browser/browser.cpp
     Features/Display/display.cpp
     Features/Tray/tray.cpp

package/Core/Features/FileDrop/filedrop.cpp

@@ -3,6 +3,8 @@
 #include <mutex>
 #include <filesystem>
 #include <fstream>
+#include <unordered_map>
+#include <cctype>
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -171,8 +173,10 @@ static std::string getMimeType(const std::string& filePath) {
 // Platform-specific helper to handle dropped files
 #ifdef _WIN32
 // Windows implementation for handling WM_DROPFILES message
-void HandleDropFiles(FileDrop::Impl* impl, HDROP hDrop) {
-    if (!impl->enabled || !impl->filesDroppedCallback) {
+void HandleDropFiles(bool enabled,
+                     const std::function<void(const std::vector<FileInfo>&)>& filesDroppedCallback,
+                     HDROP hDrop) {
+    if (!enabled || !filesDroppedCallback) {
         return;
     }
 
@@ -215,8 +219,8 @@ void HandleDropFiles(FileDrop::Impl* impl, HDROP hDrop) {
 
     DragFinish(hDrop);
 
-    if (!files.empty() && impl->filesDroppedCallback) {
-        impl->filesDroppedCallback(files);
+    if (!files.empty() && filesDroppedCallback) {
+        filesDroppedCallback(files);
     }
 }
 #endif
@@ -225,8 +229,10 @@ void HandleDropFiles(FileDrop::Impl* impl, HDROP hDrop) {
 // macOS implementation using NSPasteboard and drag&drop APIs
 // This would be implemented with Objective-C++ integration with NSView
 // For now, providing the interface structure
-void HandleMacDropFiles(FileDrop::Impl* impl, NSArray<NSURL*>* urls) {
-    if (!impl->enabled || !impl->filesDroppedCallback) {
+void HandleMacDropFiles(bool enabled,
+                        const std::function<void(const std::vector<FileInfo>&)>& filesDroppedCallback,
+                        NSArray<NSURL*>* urls) {
+    if (!enabled || !filesDroppedCallback) {
         return;
     }
 
@@ -256,16 +262,18 @@ void HandleMacDropFiles(FileDrop::Impl* impl, NSArray<NSURL*>* urls) {
         files.push_back(info);
     }
     
-    if (!files.empty() && impl->filesDroppedCallback) {
-        impl->filesDroppedCallback(files);
+    if (!files.empty() && filesDroppedCallback) {
+        filesDroppedCallback(files);
     }
 }
 #endif
 
 #ifdef __linux__
 // Linux/GTK implementation
-void HandleGtkDropFiles(FileDrop::Impl* impl, GtkSelectionData* data) {
-    if (!impl->enabled || !impl->filesDroppedCallback) {
+void HandleGtkDropFiles(bool enabled,
+                        const std::function<void(const std::vector<FileInfo>&)>& filesDroppedCallback,
+                        GtkSelectionData* data) {
+    if (!enabled || !filesDroppedCallback) {
         return;
     }
 
@@ -307,8 +315,8 @@ void HandleGtkDropFiles(FileDrop::Impl* impl, GtkSelectionData* data) {
         g_strfreev(uris);
     }
     
-    if (!files.empty() && impl->filesDroppedCallback) {
-        impl->filesDroppedCallback(files);
+    if (!files.empty() && filesDroppedCallback) {
+        filesDroppedCallback(files);
     }
 }
 #endif

package/Core/Features/Window/window.cpp

@@ -767,6 +767,12 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
   Window win;
   win.pImpl->config = config;
 
+  // Pure native file-drop mode: when native FileDrop is enabled,
+  // fully disable browser/WebView drag-drop handling.
+  if (win.pImpl->config.enableFileDrop) {
+    win.pImpl->config.disableWebviewDragDrop = true;
+  }
+
 #ifdef _WIN32
   HWND hwnd = static_cast<HWND>(windowHandle);
 
@@ -829,24 +835,31 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                         // and allows the native FileDrop API to handle them instead
                         if (pImpl->config.disableWebviewDragDrop) {
                           std::string disableDragDropScript = R"(
-                              (function() {
-                                  // Prevent default drag and drop behavior on document/window
-                                  ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(function(eventName) {
-                                      document.addEventListener(eventName, function(e) {
-                                          // Only prevent default on document.body or document.documentElement
-                                          // to allow custom drop zones to still work
-                                          if (e.target === document.body || e.target === document.documentElement || e.target === document) {
-                                              e.preventDefault();
-                                              e.stopPropagation();
-                                          }
-                                      }, true);
-
-                                      window.addEventListener(eventName, function(e) {
-                                          e.preventDefault();
-                                          e.stopPropagation();
-                                      }, true);
-                                  });
-                              })();
+                            (function() {
+                              if (window.__plusui_nativeFileDropOnly) return;
+                              window.__plusui_nativeFileDropOnly = true;
+
+                              var block = function(e) {
+                                if (!e) return false;
+                                e.preventDefault();
+                                e.stopPropagation();
+                                if (typeof e.stopImmediatePropagation === 'function') {
+                                  e.stopImmediatePropagation();
+                                }
+                                if (e.dataTransfer) {
+                                  try { e.dataTransfer.dropEffect = 'none'; } catch (_) {}
+                                }
+                                return false;
+                              };
+
+                              window.__plusui_dragDropEvents = ['dragenter', 'dragover', 'dragleave', 'drop'];
+                              window.__plusui_dragDropBlocker = block;
+
+                              window.__plusui_dragDropEvents.forEach(function(eventName) {
+                                window.addEventListener(eventName, block, true);
+                                document.addEventListener(eventName, block, true);
+                              });
+                            })();
                           )";
                           pImpl->webview->AddScriptToExecuteOnDocumentCreated(
                               std::wstring(disableDragDropScript.begin(),
@@ -1175,17 +1188,21 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
   // Disable webview drag & drop behavior to allow native FileDrop API
   if (win.pImpl->config.disableWebviewDragDrop) {
     NSString *disableDragDropScript = @"(function() {"
-      "['dragenter', 'dragover', 'dragleave', 'drop'].forEach(function(eventName) {"
-        "document.addEventListener(eventName, function(e) {"
-          "if (e.target === document.body || e.target === document.documentElement || e.target === document) {"
-            "e.preventDefault();"
-            "e.stopPropagation();"
-          "}"
-        "}, true);"
-        "window.addEventListener(eventName, function(e) {"
-          "e.preventDefault();"
-          "e.stopPropagation();"
-        "}, true);"
+      "if (window.__plusui_nativeFileDropOnly) return;"
+      "window.__plusui_nativeFileDropOnly = true;"
+      "var block = function(e) {"
+        "if (!e) return false;"
+        "e.preventDefault();"
+        "e.stopPropagation();"
+        "if (typeof e.stopImmediatePropagation === 'function') e.stopImmediatePropagation();"
+        "if (e.dataTransfer) { try { e.dataTransfer.dropEffect = 'none'; } catch (_) {} }"
+        "return false;"
+      "};"
+      "window.__plusui_dragDropEvents = ['dragenter','dragover','dragleave','drop'];"
+      "window.__plusui_dragDropBlocker = block;"
+      "window.__plusui_dragDropEvents.forEach(function(eventName) {"
+        "window.addEventListener(eventName, block, true);"
+        "document.addEventListener(eventName, block, true);"
       "});"
     "})();";
 
@@ -1631,30 +1648,47 @@ void Window::setWebviewDragDropEnabled(bool enabled) {
     // Enable webview drag-drop by removing our prevention handlers
     script = R"(
       (function() {
-        if (window.__plusui_dragDropDisabled) {
-          delete window.__plusui_dragDropDisabled;
+        var events = window.__plusui_dragDropEvents || ['dragenter', 'dragover', 'dragleave', 'drop'];
+        var blocker = window.__plusui_dragDropBlocker;
+        if (blocker) {
+          events.forEach(function(eventName) {
+            window.removeEventListener(eventName, blocker, true);
+            document.removeEventListener(eventName, blocker, true);
+          });
         }
+        delete window.__plusui_dragDropBlocker;
+        delete window.__plusui_dragDropEvents;
+        delete window.__plusui_dragDropDisabled;
+        delete window.__plusui_nativeFileDropOnly;
       })();
     )";
   } else {
     // Disable webview drag-drop by preventing default behavior
     script = R"(
       (function() {
-        if (window.__plusui_dragDropDisabled) return; // Already disabled
+        if (window.__plusui_nativeFileDropOnly) return;
+        window.__plusui_nativeFileDropOnly = true;
         window.__plusui_dragDropDisabled = true;
 
-        ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(function(eventName) {
-          document.addEventListener(eventName, function(e) {
-            if (e.target === document.body || e.target === document.documentElement || e.target === document) {
-              e.preventDefault();
-              e.stopPropagation();
-            }
-          }, true);
+        var block = function(e) {
+          if (!e) return false;
+          e.preventDefault();
+          e.stopPropagation();
+          if (typeof e.stopImmediatePropagation === 'function') {
+            e.stopImmediatePropagation();
+          }
+          if (e.dataTransfer) {
+            try { e.dataTransfer.dropEffect = 'none'; } catch (_) {}
+          }
+          return false;
+        };
+
+        window.__plusui_dragDropEvents = ['dragenter', 'dragover', 'dragleave', 'drop'];
+        window.__plusui_dragDropBlocker = block;
 
-          window.addEventListener(eventName, function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-          }, true);
+        window.__plusui_dragDropEvents.forEach(function(eventName) {
+          window.addEventListener(eventName, block, true);
+          document.addEventListener(eventName, block, true);
         });
       })();
     )";

package/package.json

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