plusui-native-core 0.1.47 → 0.1.48

package/Core/Features/Window/window.cpp

@@ -240,17 +240,49 @@ struct Window::Impl {
 
         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);
+        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(eventScript.begin(), eventScript.end()).c_str(),
-            nullptr);
+            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:
@@ -935,6 +967,18 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                         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;
 
@@ -972,12 +1016,33 @@ 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;
-                                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: {} }));
+                                var overDropZone = isOverDropZone(e);
+                                if (e.type === 'drop') {
+                                  emitZoneState(false);
+                                } else {
+                                  emitZoneState(overDropZone);
                                 }
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -985,7 +1050,7 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                   e.stopImmediatePropagation();
                                 }
                                 if (e.dataTransfer) {
-                                  try { e.dataTransfer.dropEffect = 'none'; } catch (_) {}
+                                  try { e.dataTransfer.dropEffect = overDropZone ? 'copy' : 'none'; } catch (_) {}
                                 }
                                 return false;
                               };
@@ -1283,6 +1348,22 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                                           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") {
@@ -1370,14 +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;"
-        "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: {} })); }"
+        "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'];"
@@ -1852,12 +1947,33 @@ 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;
-          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: {} }));
+          var overDropZone = isOverDropZone(e);
+          if (e.type === 'drop') {
+            emitZoneState(false);
+          } else {
+            emitZoneState(overDropZone);
           }
           e.preventDefault();
           e.stopPropagation();
@@ -1865,7 +1981,7 @@ void Window::setWebviewDragDropEnabled(bool enabled) {
             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.47",
+  "version": "0.1.48",
   "description": "PlusUI Core framework (frontend + backend implementations)",
   "type": "module",
   "files": [