plusui-native-core 0.1.44 → 0.1.47

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

@@ -3,6 +3,7 @@
 #include <iostream>
 #include <map>
 #include <plusui/display.hpp>
+#include <plusui/events.hpp>
 #include <plusui/tray.hpp>
 #include <plusui/webgpu.hpp>
 #include <plusui/window.hpp>
@@ -51,6 +52,54 @@ constexpr char kHideScrollbarsScript[] = R"(
     window.addEventListener("load", ensureStyle);
   })();
 )";
+
+#ifdef _WIN32
+static std::string jsonEscape(const std::string &input) {
+  std::string out;
+  out.reserve(input.size() + 8);
+  for (char c : input) {
+    switch (c) {
+    case '\\':
+      out += "\\\\";
+      break;
+    case '"':
+      out += "\\\"";
+      break;
+    case '\n':
+      out += "\\n";
+      break;
+    case '\r':
+      out += "\\r";
+      break;
+    case '\t':
+      out += "\\t";
+      break;
+    default:
+      out += c;
+      break;
+    }
+  }
+  return out;
+}
+
+static std::string mimeTypeFromPath(const std::string &path) {
+  size_t dot = path.find_last_of('.');
+  if (dot == std::string::npos)
+    return "application/octet-stream";
+  std::string ext = path.substr(dot);
+  for (char &ch : ext)
+    ch = static_cast<char>(tolower(static_cast<unsigned char>(ch)));
+  if (ext == ".png") return "image/png";
+  if (ext == ".jpg" || ext == ".jpeg") return "image/jpeg";
+  if (ext == ".gif") return "image/gif";
+  if (ext == ".webp") return "image/webp";
+  if (ext == ".svg") return "image/svg+xml";
+  if (ext == ".txt") return "text/plain";
+  if (ext == ".json") return "application/json";
+  if (ext == ".pdf") return "application/pdf";
+  return "application/octet-stream";
+}
+#endif
 } // namespace
 
 struct Window::Impl {
@@ -93,6 +142,7 @@ struct Window::Impl {
   WNDPROC originalProc = nullptr;
   ComPtr<ICoreWebView2Controller> controller;
   ComPtr<ICoreWebView2> webview;
+  static std::map<HWND, Impl *> embeddedWebviewByParent;
 
   static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
     Impl *impl = nullptr;
@@ -128,6 +178,81 @@ struct Window::Impl {
         for (auto &cb : impl->closeCallbacks)
           cb();
         break;
+      case WM_DROPFILES: {
+        HDROP hDrop = reinterpret_cast<HDROP>(wp);
+        Impl *targetImpl = impl;
+        if (!targetImpl->webview) {
+          auto it = embeddedWebviewByParent.find(hwnd);
+          if (it != embeddedWebviewByParent.end()) {
+            targetImpl = it->second;
+          }
+        }
+
+        if (!targetImpl || !targetImpl->config.enableFileDrop ||
+            !targetImpl->webview) {
+          DragFinish(hDrop);
+          return 0;
+        }
+
+        UINT fileCount = DragQueryFileW(hDrop, 0xFFFFFFFF, nullptr, 0);
+        std::string filesJson = "[";
+
+        for (UINT i = 0; i < fileCount; ++i) {
+          UINT pathLen = DragQueryFileW(hDrop, i, nullptr, 0);
+          std::wstring wpath(pathLen + 1, L'\0');
+          DragQueryFileW(hDrop, i, &wpath[0], pathLen + 1);
+          wpath.resize(pathLen);
+
+          int utf8Len = WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1,
+                                            nullptr, 0, nullptr, nullptr);
+          std::string path;
+          if (utf8Len > 0) {
+            path.resize(static_cast<size_t>(utf8Len - 1));
+            WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1, &path[0],
+                                utf8Len, nullptr, nullptr);
+          }
+
+          std::string name = path;
+          size_t lastSlash = path.find_last_of("\\/");
+          if (lastSlash != std::string::npos) {
+            name = path.substr(lastSlash + 1);
+          }
+
+          unsigned long long sizeBytes = 0;
+          WIN32_FILE_ATTRIBUTE_DATA fileAttr;
+          if (GetFileAttributesExW(wpath.c_str(), GetFileExInfoStandard,
+                                   &fileAttr)) {
+            ULARGE_INTEGER size;
+            size.HighPart = fileAttr.nFileSizeHigh;
+            size.LowPart = fileAttr.nFileSizeLow;
+            sizeBytes = size.QuadPart;
+          }
+
+          if (i > 0)
+            filesJson += ",";
+          filesJson +=
+              "{\"path\":\"" + jsonEscape(path) + "\",\"name\":\"" +
+              jsonEscape(name) + "\",\"type\":\"" +
+              jsonEscape(mimeTypeFromPath(path)) + "\",\"size\":" +
+              std::to_string(sizeBytes) + "}";
+        }
+        filesJson += "]";
+
+        DragFinish(hDrop);
+
+        std::string eventScript =
+            "window.dispatchEvent(new CustomEvent('plusui:fileDrop.filesDropped',"
+            " { detail: { files: " +
+            filesJson + " } }));";
+
+        // Also emit to backend event API so C++ listeners can react.
+        event::emit("fileDrop.filesDropped", filesJson);
+
+        targetImpl->webview->ExecuteScript(
+            std::wstring(eventScript.begin(), eventScript.end()).c_str(),
+            nullptr);
+        return 0;
+      }
       case WM_SETFOCUS:
         impl->state.isFocused = true;
         for (auto &cb : impl->focusCallbacks)
@@ -151,6 +276,10 @@ struct Window::Impl {
 
 Window::Window() : pImpl(std::shared_ptr<Impl>(new Impl())) {}
 
+#ifdef _WIN32
+std::map<HWND, Window::Impl *> Window::Impl::embeddedWebviewByParent;
+#endif
+
 Window::~Window() = default;
 
 Window::Window(Window &&other) noexcept = default;
@@ -207,6 +336,8 @@ Window Window::create(const WindowConfig &config) {
   w.pImpl->state.width = config.width;
   w.pImpl->state.height = config.height;
 
+  DragAcceptFiles(w.pImpl->hwnd, config.enableFileDrop ? TRUE : FALSE);
+
   if (config.center) {
     RECT screen;
     SystemParametersInfo(SPI_GETWORKAREA, 0, &screen, 0);
@@ -801,6 +932,8 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                         controller->get_ParentWindow(&parentHwnd);
                         GetClientRect(parentHwnd, &bounds);
                         controller->put_Bounds(bounds);
+                        Window::Impl::embeddedWebviewByParent[parentHwnd] =
+                          pImpl.get();
 
                         pImpl->nativeWebView = pImpl->webview.Get();
                         pImpl->ready = true;
@@ -841,6 +974,11 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
 
                               var block = function(e) {
                                 if (!e) return false;
+                                if (e.type === 'dragenter') {
+                                  window.dispatchEvent(new CustomEvent('plusui:fileDrop.dragEnter', { detail: {} }));
+                                } else if (e.type === 'dragleave') {
+                                  window.dispatchEvent(new CustomEvent('plusui:fileDrop.dragLeave', { detail: {} }));
+                                }
                                 e.preventDefault();
                                 e.stopPropagation();
                                 if (typeof e.stopImmediatePropagation === 'function') {
@@ -1117,6 +1255,48 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                       result = canForward ? "true" : "false";
                                       success = true;
                                     }
+                                  } else if (method.find("fileDrop.") == 0) {
+                                    std::string fileDropMethod = method.substr(9);
+                                    if (fileDropMethod == "setEnabled") {
+                                      size_t p1 = msg.find("[");
+                                      size_t p2 = msg.find("]");
+                                      if (p1 != std::string::npos &&
+                                          p2 != std::string::npos) {
+                                        std::string params =
+                                            msg.substr(p1 + 1, p2 - p1 - 1);
+                                        bool enabled =
+                                            params.find("true") !=
+                                            std::string::npos;
+                                        pImpl->config.enableFileDrop = enabled;
+
+                                        HWND targetHwnd = nullptr;
+                                        if (pImpl->window) {
+                                          targetHwnd = static_cast<HWND>(
+                                              pImpl->window->nativeHandle());
+                                        }
+                                        if (!targetHwnd && pImpl->controller) {
+                                          pImpl->controller->get_ParentWindow(
+                                              &targetHwnd);
+                                        }
+                                        if (targetHwnd) {
+                                          DragAcceptFiles(targetHwnd,
+                                                          enabled ? TRUE
+                                                                  : FALSE);
+                                        }
+                                      }
+                                      success = true;
+                                    } else if (fileDropMethod == "isEnabled") {
+                                      result = pImpl->config.enableFileDrop
+                                                   ? "true"
+                                                   : "false";
+                                      success = true;
+                                    } else if (fileDropMethod == "startDrag") {
+                                      result = "false";
+                                      success = true;
+                                    } else if (fileDropMethod ==
+                                               "clearCallbacks") {
+                                      success = true;
+                                    }
                                   }
 
                                   // Send response back to JS (matches
@@ -1192,6 +1372,8 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
       "window.__plusui_nativeFileDropOnly = true;"
       "var block = function(e) {"
         "if (!e) return false;"
+        "if (e.type === 'dragenter') { window.dispatchEvent(new CustomEvent('plusui:fileDrop.dragEnter', { detail: {} })); }"
+        "else if (e.type === 'dragleave') { window.dispatchEvent(new CustomEvent('plusui:fileDrop.dragLeave', { detail: {} })); }"
         "e.preventDefault();"
         "e.stopPropagation();"
         "if (typeof e.stopImmediatePropagation === 'function') e.stopImmediatePropagation();"
@@ -1672,6 +1854,11 @@ void Window::setWebviewDragDropEnabled(bool enabled) {
 
         var block = function(e) {
           if (!e) return false;
+          if (e.type === 'dragenter') {
+            window.dispatchEvent(new CustomEvent('plusui:fileDrop.dragEnter', { detail: {} }));
+          } else if (e.type === 'dragleave') {
+            window.dispatchEvent(new CustomEvent('plusui:fileDrop.dragLeave', { detail: {} }));
+          }
           e.preventDefault();
           e.stopPropagation();
           if (typeof e.stopImmediatePropagation === 'function') {

package/package.json

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