plusui-native-core 0.1.45 → 0.1.48

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,113 @@ 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);
+
+        POINT dropPoint = {0, 0};
+        DragQueryPoint(hDrop, &dropPoint);
+
+        std::string zoneHitScript =
+            "(function(){try{"
+            "var el=document.elementFromPoint(" +
+            std::to_string(dropPoint.x) + "," + std::to_string(dropPoint.y) +
+            ");"
+            "if(!el) return false;"
+            "if(!el.closest) return false;"
+            "return !!el.closest('[data-dropzone=\\\"true\\\"], .filedrop-zone, .dropzone');"
+            "}catch(_){return false;}})();";
+
+        targetImpl->webview->ExecuteScript(
+            std::wstring(zoneHitScript.begin(), zoneHitScript.end()).c_str(),
+            Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
+                [targetImpl, filesJson](HRESULT errorCode,
+                                        LPCWSTR resultJson) -> HRESULT {
+                  if (FAILED(errorCode) || !targetImpl || !targetImpl->webview)
+                    return S_OK;
+
+                  bool overDropZone = false;
+                  if (resultJson) {
+                    std::wstring wres(resultJson);
+                    overDropZone = (wres.find(L"true") != std::wstring::npos);
+                  }
+                  if (!overDropZone)
+                    return S_OK;
+
+                  std::string eventScript =
+                      "window.dispatchEvent(new CustomEvent('plusui:fileDrop.filesDropped',"
+                      " { detail: { files: " +
+                      filesJson + " } }));";
+
+                  event::emit("fileDrop.filesDropped", filesJson);
+
+                  targetImpl->webview->ExecuteScript(
+                      std::wstring(eventScript.begin(), eventScript.end())
+                          .c_str(),
+                      nullptr);
+                  return S_OK;
+                })
+                .Get());
+        return 0;
+      }
       case WM_SETFOCUS:
         impl->state.isFocused = true;
         for (auto &cb : impl->focusCallbacks)
@@ -151,6 +308,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 +368,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 +964,20 @@ 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();
+
+                        ComPtr<ICoreWebView2Controller4> controller4;
+                        if (controller &&
+                          SUCCEEDED(controller->QueryInterface(
+                            IID_PPV_ARGS(&controller4))) &&
+                          controller4) {
+                          bool allowExternalDrop =
+                              !(pImpl->config.enableFileDrop ||
+                                pImpl->config.disableWebviewDragDrop);
+                          controller4->put_AllowExternalDrop(
+                              allowExternalDrop ? TRUE : FALSE);
+                        }
 
                         pImpl->nativeWebView = pImpl->webview.Get();
                         pImpl->ready = true;
@@ -839,15 +1016,41 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                               if (window.__plusui_nativeFileDropOnly) return;
                               window.__plusui_nativeFileDropOnly = true;
 
+                              var isOverDropZone = function(e) {
+                                if (!e) return false;
+                                var target = null;
+                                if (typeof e.clientX === 'number' && typeof e.clientY === 'number' && document.elementFromPoint) {
+                                  target = document.elementFromPoint(e.clientX, e.clientY);
+                                }
+                                if (!target && e.target && e.target.nodeType === 1) {
+                                  target = e.target;
+                                }
+                                if (!target || !target.closest) return false;
+                                return !!target.closest('[data-dropzone="true"], .filedrop-zone, .dropzone');
+                              };
+
+                              var zoneActive = false;
+                              var emitZoneState = function(next) {
+                                if (next === zoneActive) return;
+                                zoneActive = next;
+                                window.dispatchEvent(new CustomEvent(next ? 'plusui:fileDrop.dragEnter' : 'plusui:fileDrop.dragLeave', { detail: {} }));
+                              };
+
                               var block = function(e) {
                                 if (!e) return false;
+                                var overDropZone = isOverDropZone(e);
+                                if (e.type === 'drop') {
+                                  emitZoneState(false);
+                                } else {
+                                  emitZoneState(overDropZone);
+                                }
                                 e.preventDefault();
                                 e.stopPropagation();
                                 if (typeof e.stopImmediatePropagation === 'function') {
                                   e.stopImmediatePropagation();
                                 }
                                 if (e.dataTransfer) {
-                                  try { e.dataTransfer.dropEffect = 'none'; } catch (_) {}
+                                  try { e.dataTransfer.dropEffect = overDropZone ? 'copy' : 'none'; } catch (_) {}
                                 }
                                 return false;
                               };
@@ -1117,6 +1320,64 @@ 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);
+                                        }
+
+                                        if (pImpl->controller) {
+                                          ComPtr<ICoreWebView2Controller4>
+                                              controller4;
+                                          if (SUCCEEDED(pImpl->controller.As(
+                                                  &controller4)) &&
+                                              controller4) {
+                                            bool allowExternalDrop =
+                                                !(pImpl->config.enableFileDrop ||
+                                                  pImpl->config
+                                                      .disableWebviewDragDrop);
+                                            controller4->put_AllowExternalDrop(
+                                                allowExternalDrop ? 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
@@ -1190,12 +1451,28 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
     NSString *disableDragDropScript = @"(function() {"
       "if (window.__plusui_nativeFileDropOnly) return;"
       "window.__plusui_nativeFileDropOnly = true;"
+      "var isOverDropZone = function(e) {"
+        "if (!e) return false;"
+        "var target = null;"
+        "if (typeof e.clientX === 'number' && typeof e.clientY === 'number' && document.elementFromPoint) { target = document.elementFromPoint(e.clientX, e.clientY); }"
+        "if (!target && e.target && e.target.nodeType === 1) { target = e.target; }"
+        "if (!target || !target.closest) return false;"
+        "return !!target.closest('[data-dropzone=\\\"true\\\"], .filedrop-zone, .dropzone');"
+      "};"
+      "var zoneActive = false;"
+      "var emitZoneState = function(next) {"
+        "if (next === zoneActive) return;"
+        "zoneActive = next;"
+        "window.dispatchEvent(new CustomEvent(next ? 'plusui:fileDrop.dragEnter' : 'plusui:fileDrop.dragLeave', { detail: {} }));"
+      "};"
       "var block = function(e) {"
         "if (!e) return false;"
+        "var overDropZone = isOverDropZone(e);"
+        "if (e.type === 'drop') { emitZoneState(false); } else { emitZoneState(overDropZone); }"
         "e.preventDefault();"
         "e.stopPropagation();"
         "if (typeof e.stopImmediatePropagation === 'function') e.stopImmediatePropagation();"
-        "if (e.dataTransfer) { try { e.dataTransfer.dropEffect = 'none'; } catch (_) {} }"
+        "if (e.dataTransfer) { try { e.dataTransfer.dropEffect = overDropZone ? 'copy' : 'none'; } catch (_) {} }"
         "return false;"
       "};"
       "window.__plusui_dragDropEvents = ['dragenter','dragover','dragleave','drop'];"
@@ -1670,15 +1947,41 @@ void Window::setWebviewDragDropEnabled(bool enabled) {
         window.__plusui_nativeFileDropOnly = true;
         window.__plusui_dragDropDisabled = true;
 
+        var isOverDropZone = function(e) {
+          if (!e) return false;
+          var target = null;
+          if (typeof e.clientX === 'number' && typeof e.clientY === 'number' && document.elementFromPoint) {
+            target = document.elementFromPoint(e.clientX, e.clientY);
+          }
+          if (!target && e.target && e.target.nodeType === 1) {
+            target = e.target;
+          }
+          if (!target || !target.closest) return false;
+          return !!target.closest('[data-dropzone="true"], .filedrop-zone, .dropzone');
+        };
+
+        var zoneActive = false;
+        var emitZoneState = function(next) {
+          if (next === zoneActive) return;
+          zoneActive = next;
+          window.dispatchEvent(new CustomEvent(next ? 'plusui:fileDrop.dragEnter' : 'plusui:fileDrop.dragLeave', { detail: {} }));
+        };
+
         var block = function(e) {
           if (!e) return false;
+          var overDropZone = isOverDropZone(e);
+          if (e.type === 'drop') {
+            emitZoneState(false);
+          } else {
+            emitZoneState(overDropZone);
+          }
           e.preventDefault();
           e.stopPropagation();
           if (typeof e.stopImmediatePropagation === 'function') {
             e.stopImmediatePropagation();
           }
           if (e.dataTransfer) {
-            try { e.dataTransfer.dropEffect = 'none'; } catch (_) {}
+            try { e.dataTransfer.dropEffect = overDropZone ? 'copy' : 'none'; } catch (_) {}
           }
           return false;
         };

package/package.json

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