plusui-native-core 0.1.99 → 0.1.101

package/Core/Features/FileDrop/filedrop.ts

@@ -58,11 +58,31 @@ export function createDropZone(name: string, el?: HTMLElement | null): DropZone
   
   if (element) {
     element.setAttribute('data-dropzone', name);
+    
+    // Prevent browser default on drop (file navigation)
+    // The C++ backend handles actual file delivery via WM_DROPFILES
     element.addEventListener('drop', (e: DragEvent) => {
       e.preventDefault();
       e.stopPropagation();
       element.classList.remove('dropzone-active');
     });
+    
+    // Visual feedback: the injected C++ script manages dropzone-active
+    // via document-level listeners, but we also handle cleanup here
+    element.addEventListener('dragleave', (e: DragEvent) => {
+      // Only remove if actually leaving the element (not entering a child)
+      const related = e.relatedTarget as Node | null;
+      if (!related || !element.contains(related)) {
+        element.classList.remove('dropzone-active');
+      }
+    });
+    
+    element.addEventListener('dragover', (e: DragEvent) => {
+      e.preventDefault();
+      if (e.dataTransfer) {
+        try { e.dataTransfer.dropEffect = 'copy'; } catch (_) {}
+      }
+    });
   }
 
   return {

package/Core/Features/Window/webview.cpp

@@ -123,36 +123,75 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                               nullptr);
                         }
 
-                        // Disable webview drag & drop behavior if requested
-                        // This prevents files from being loaded in the browser
-                        // 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);
-                                  });
-                              })();
-                          )";
-                          pImpl->webview->AddScriptToExecuteOnDocumentCreated(
-                              std::wstring(disableDragDropScript.begin(),
-                                           disableDragDropScript.end())
-                                  .c_str(),
-                              nullptr);
-                        }
+                        // Block browser default drag-drop behavior (prevents
+                        // the browser from navigating to the dropped file)
+                        // while still showing visual feedback on drop zones.
+                        // File delivery is handled by WM_DROPFILES in wndProc.
+                        if (pImpl->config.disableWebviewDragDrop ||
+                            pImpl->config.enableFileDrop) {
+                          std::string disableDragDropScript = R"(
+                            (function() {
+                              if (window.__plusui_dropzone_init) return;
+                              window.__plusui_dropzone_init = true;
+
+                              var activeZone = null;
+
+                              var findDropZone = function(e) {
+                                var target = null;
+                                if (e && typeof e.clientX === 'number' && document.elementFromPoint) {
+                                  target = document.elementFromPoint(e.clientX, e.clientY);
+                                }
+                                if (!target && e && e.target) target = e.target;
+                                if (!target || !target.closest) return null;
+                                return target.closest('[data-dropzone]');
+                              };
+
+                              var updateActiveZone = function(zone) {
+                                if (activeZone === zone) return;
+                                if (activeZone) activeZone.classList.remove('dropzone-active');
+                                activeZone = zone;
+                                if (activeZone) activeZone.classList.add('dropzone-active');
+                              };
+
+                              document.addEventListener('dragenter', function(e) {
+                                e.preventDefault();
+                                var zone = findDropZone(e);
+                                updateActiveZone(zone);
+                                if (e.dataTransfer) {
+                                  try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
+                                }
+                              }, true);
+
+                              document.addEventListener('dragover', function(e) {
+                                e.preventDefault();
+                                var zone = findDropZone(e);
+                                updateActiveZone(zone);
+                                if (e.dataTransfer) {
+                                  try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
+                                }
+                              }, true);
+
+                              document.addEventListener('dragleave', function(e) {
+                                e.preventDefault();
+                                var zone = findDropZone(e);
+                                updateActiveZone(zone);
+                              }, true);
+
+                              document.addEventListener('drop', function(e) {
+                                e.preventDefault();
+                                updateActiveZone(null);
+                              }, true);
+
+                              window.addEventListener('dragover', function(e) { e.preventDefault(); }, true);
+                              window.addEventListener('drop', function(e) { e.preventDefault(); }, true);
+                            })();
+                          )";
+                          pImpl->webview->AddScriptToExecuteOnDocumentCreated(
+                              std::wstring(disableDragDropScript.begin(),
+                                           disableDragDropScript.end())
+                                  .c_str(),
+                              nullptr);
+                        }
 
                         // Set up WebMessageReceived handler for JS->C++ bridge
                         pImpl->webview->add_WebMessageReceived(
@@ -519,32 +558,30 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                           << "[PlusUI] Unknown menu method: "
                                           << menuMethod << std::endl;
                                     }
-                                  } else if (method.find("webview.") == 0) {
-                                    // WebView API routing
-                                    std::string webviewMethod = method.substr(8);
-                                    if (webviewMethod == "setWebviewDragDropEnabled") {
-                                      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;
-                                        // Note: Need to call this on the WebView instance
-                                        // This is a placeholder - actual implementation needs WebView reference
-                                        // For now, execute script directly
-                                        std::string script;
-                                        if (enabled) {
-                                          script = "(function() { if (window.__plusui_dragDropDisabled) { delete window.__plusui_dragDropDisabled; } })();";
-                                        } else {
-                                          script = "(function() { if (window.__plusui_dragDropDisabled) return; 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); window.addEventListener(eventName, function(e) { e.preventDefault(); e.stopPropagation(); }, true); }); })();";
-                                        }
-                                        pImpl->webview->ExecuteScript(
-                                            std::wstring(script.begin(), script.end()).c_str(),
-                                            nullptr);
-                                      }
-                                      success = true;
-                                    }
+                                  } else if (method.find("webview.") == 0) {
+                                    // WebView API routing
+                                    std::string webviewMethod = method.substr(8);
+                                    if (webviewMethod == "setWebviewDragDropEnabled") {
+                                      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;
+                                        std::string script;
+                                        if (enabled) {
+                                          script = "(function() { delete window.__plusui_dropzone_init; })();";
+                                        } else {
+                                          // Re-install the dropzone blocker script
+                                          script = "(function() { if (window.__plusui_dropzone_init) return; window.__plusui_dropzone_init = true; var activeZone = null; var findDropZone = function(e) { var target = null; if (e && typeof e.clientX === 'number' && document.elementFromPoint) { target = document.elementFromPoint(e.clientX, e.clientY); } if (!target && e && e.target) target = e.target; if (!target || !target.closest) return null; return target.closest('[data-dropzone]'); }; var updateActiveZone = function(zone) { if (activeZone === zone) return; if (activeZone) activeZone.classList.remove('dropzone-active'); activeZone = zone; if (activeZone) activeZone.classList.add('dropzone-active'); }; document.addEventListener('dragenter', function(e) { e.preventDefault(); var zone = findDropZone(e); updateActiveZone(zone); if (e.dataTransfer) { try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {} } }, true); document.addEventListener('dragover', function(e) { e.preventDefault(); var zone = findDropZone(e); updateActiveZone(zone); if (e.dataTransfer) { try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {} } }, true); document.addEventListener('dragleave', function(e) { e.preventDefault(); var zone = findDropZone(e); updateActiveZone(zone); }, true); document.addEventListener('drop', function(e) { e.preventDefault(); updateActiveZone(null); }, true); window.addEventListener('dragover', function(e) { e.preventDefault(); }, true); window.addEventListener('drop', function(e) { e.preventDefault(); }, true); })();";
+                                        }
+                                        pImpl->webview->ExecuteScript(
+                                            std::wstring(script.begin(), script.end()).c_str(),
+                                            nullptr);
+                                      }
+                                      success = true;
+                                    }
                                   } else if (method.find("webgpu.") == 0) {
                                     // WebGPU API routing
                                     std::string webgpuMethod = method.substr(
@@ -661,29 +698,60 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
     [config.preferences setValue:@YES forKey:@"developerExtrasEnabled"];
   }
 
-  // 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);"
-      "});"
-    "})();";
-    
-    WKUserScript *userScript = [[WKUserScript alloc] 
-      initWithSource:disableDragDropScript 
-      injectionTime:WKUserScriptInjectionTimeAtDocumentEnd 
-      forMainFrameOnly:NO];
-    [config.userContentController addUserScript:userScript];
-  }
+  // Block browser default drag-drop while allowing drop zone visual feedback.
+  // File delivery is handled natively by macOS drag APIs, not browser events.
+  if (win.pImpl->config.disableWebviewDragDrop ||
+      win.pImpl->config.enableFileDrop) {
+    NSString *disableDragDropScript = @"(function() {"
+      "if (window.__plusui_dropzone_init) return;"
+      "window.__plusui_dropzone_init = true;"
+      "var activeZone = null;"
+      "var findDropZone = function(e) {"
+        "var target = null;"
+        "if (e && typeof e.clientX === 'number' && document.elementFromPoint) {"
+          "target = document.elementFromPoint(e.clientX, e.clientY);"
+        "}"
+        "if (!target && e && e.target) target = e.target;"
+        "if (!target || !target.closest) return null;"
+        "return target.closest('[data-dropzone]');"
+      "};"
+      "var updateActiveZone = function(zone) {"
+        "if (activeZone === zone) return;"
+        "if (activeZone) activeZone.classList.remove('dropzone-active');"
+        "activeZone = zone;"
+        "if (activeZone) activeZone.classList.add('dropzone-active');"
+      "};"
+      "document.addEventListener('dragenter', function(e) {"
+        "e.preventDefault();"
+        "var zone = findDropZone(e);"
+        "updateActiveZone(zone);"
+        "if (e.dataTransfer) { try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {} }"
+      "}, true);"
+      "document.addEventListener('dragover', function(e) {"
+        "e.preventDefault();"
+        "var zone = findDropZone(e);"
+        "updateActiveZone(zone);"
+        "if (e.dataTransfer) { try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {} }"
+      "}, true);"
+      "document.addEventListener('dragleave', function(e) {"
+        "e.preventDefault();"
+        "var zone = findDropZone(e);"
+        "updateActiveZone(zone);"
+      "}, true);"
+      "document.addEventListener('drop', function(e) {"
+        "e.preventDefault();"
+        "updateActiveZone(null);"
+      "}, true);"
+      "window.addEventListener('dragover', function(e) { e.preventDefault(); }, true);"
+      "window.addEventListener('drop', function(e) { e.preventDefault(); }, true);"
+    "})();";
+    
+    WKUserScript *userScript = [[WKUserScript alloc] 
+      initWithSource:disableDragDropScript 
+      injectionTime:WKUserScriptInjectionTimeAtDocumentEnd 
+      forMainFrameOnly:NO];
+    [config.userContentController addUserScript:userScript];
+  }
 
   // Hide scrollbars if disabled
   if (!win.pImpl->config.scrollbars) {
@@ -1104,44 +1172,73 @@ void Window::injectCSS(const std::string &css) {
   executeScript(script);
 }
 
-void Window::setWebviewDragDropEnabled(bool enabled) {
-  std::string script;
-  
-  if (enabled) {
-    // Enable webview drag-drop by removing our prevention handlers
-    script = R"(
-      (function() {
-        if (window.__plusui_dragDropDisabled) {
-          delete window.__plusui_dragDropDisabled;
-        }
-      })();
-    )";
-  } else {
-    // Disable webview drag-drop by preventing default behavior
-    script = R"(
-      (function() {
-        if (window.__plusui_dragDropDisabled) return; // Already disabled
-        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);
-          
-          window.addEventListener(eventName, function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-          }, true);
-        });
-      })();
-    )";
-  }
-  
-  executeScript(script);
-}
+void Window::setWebviewDragDropEnabled(bool enabled) {
+  if (enabled) {
+    executeScript(R"(
+      (function() {
+        delete window.__plusui_dropzone_init;
+      })();
+    )");
+  } else {
+    executeScript(R"(
+      (function() {
+        if (window.__plusui_dropzone_init) return;
+        window.__plusui_dropzone_init = true;
+
+        var activeZone = null;
+
+        var findDropZone = function(e) {
+          var target = null;
+          if (e && typeof e.clientX === 'number' && document.elementFromPoint) {
+            target = document.elementFromPoint(e.clientX, e.clientY);
+          }
+          if (!target && e && e.target) target = e.target;
+          if (!target || !target.closest) return null;
+          return target.closest('[data-dropzone]');
+        };
+
+        var updateActiveZone = function(zone) {
+          if (activeZone === zone) return;
+          if (activeZone) activeZone.classList.remove('dropzone-active');
+          activeZone = zone;
+          if (activeZone) activeZone.classList.add('dropzone-active');
+        };
+
+        document.addEventListener('dragenter', function(e) {
+          e.preventDefault();
+          var zone = findDropZone(e);
+          updateActiveZone(zone);
+          if (e.dataTransfer) {
+            try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
+          }
+        }, true);
+
+        document.addEventListener('dragover', function(e) {
+          e.preventDefault();
+          var zone = findDropZone(e);
+          updateActiveZone(zone);
+          if (e.dataTransfer) {
+            try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
+          }
+        }, true);
+
+        document.addEventListener('dragleave', function(e) {
+          e.preventDefault();
+          var zone = findDropZone(e);
+          updateActiveZone(zone);
+        }, true);
+
+        document.addEventListener('drop', function(e) {
+          e.preventDefault();
+          updateActiveZone(null);
+        }, true);
+
+        window.addEventListener('dragover', function(e) { e.preventDefault(); }, true);
+        window.addEventListener('drop', function(e) { e.preventDefault(); }, true);
+      })();
+    )");
+  }
+}
 
 void Window::onNavigationStart(NavigationCallback callback) {
   pImpl->navigationCallback = callback;

package/Core/Features/Window/window.cpp

@@ -244,58 +244,56 @@ struct Window::Impl {
                        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 + " } }));";
-
-                  if (targetImpl->fileDropCallback) {
-                    targetImpl->fileDropCallback(filesJson);
-                  }
-
-                  targetImpl->webview->ExecuteScript(
-                      std::wstring(eventScript.begin(), eventScript.end())
-                          .c_str(),
-                      nullptr);
-                  return S_OK;
-                })
-                .Get());
-        return 0;
+        filesJson += "]";
+
+        // Must query drop point BEFORE DragFinish invalidates hDrop
+        POINT dropPoint = {0, 0};
+        DragQueryPoint(hDrop, &dropPoint);
+
+        DragFinish(hDrop);
+
+        // Always fire the C++ callback regardless of zone
+        if (targetImpl->fileDropCallback) {
+          targetImpl->fileDropCallback(filesJson);
+        }
+
+        // Build the event script that dispatches to the frontend.
+        // We always fire the global CustomEvent so any listener can react.
+        // If the drop lands on a [data-dropzone] element we also call the
+        // zone-specific callback (__plusui_fileDrop__).
+        int dpx = dropPoint.x;
+        int dpy = dropPoint.y;
+
+        std::string eventScript =
+            "(function(){"
+            "var files=" +
+            filesJson +
+            ";"
+            // Global event — always fires
+            "window.dispatchEvent(new "
+            "CustomEvent('plusui:fileDrop.filesDropped',"
+            " { detail: { files: files } }));"
+            // Zone-specific delivery
+            "var el=document.elementFromPoint(" +
+            std::to_string(dpx) + "," + std::to_string(dpy) +
+            ");"
+            "var zone=el&&el.closest?el.closest('[data-dropzone]'):null;"
+            "var zoneName=zone?zone.getAttribute('data-dropzone'):null;"
+            "if(zoneName&&window.__plusui_fileDrop__){"
+            "window.__plusui_fileDrop__(zoneName,files);"
+            "}"
+            // If no zone matched but there is only one registered zone,
+            // deliver there anyway so a simple single-zone app always works.
+            "if(!zoneName&&window.__plusui_fileDrop__&&"
+            "window.__plusui_fileDrop_default__){"
+            "window.__plusui_fileDrop_default__(files);"
+            "}"
+            "})();";
+
+        targetImpl->webview->ExecuteScript(
+            std::wstring(eventScript.begin(), eventScript.end()).c_str(),
+            nullptr);
+        return 0;
       }
       case WM_SETFOCUS:
         impl->state.isFocused = true;
@@ -980,17 +978,17 @@ 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);
-                        }
+                        // Always allow external drops at the WebView2 level
+                        // so that WM_DROPFILES on the parent HWND fires.
+                        // Browser-level drop behavior (navigating to the file)
+                        // is blocked by the injected JS below instead.
+                        ComPtr<ICoreWebView2Controller4> controller4;
+                        if (controller &&
+                            SUCCEEDED(controller->QueryInterface(
+                                IID_PPV_ARGS(&controller4))) &&
+                            controller4) {
+                          controller4->put_AllowExternalDrop(TRUE);
+                        }
 
                         pImpl->nativeWebView = pImpl->webview.Get();
                         pImpl->ready = true;
@@ -1020,10 +1018,11 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                               nullptr);
                         }
 
-                        // Disable webview drag & drop behavior if requested
-                        // This prevents files from being loaded in the browser
-                        // and allows the native FileDrop API to handle them
-                        // instead
+                        // Block browser default drag-drop behavior (prevents
+                        // the browser from navigating to the dropped file) while
+                        // still allowing visual feedback on drop zones.
+                        // The actual file delivery happens via WM_DROPFILES
+                        // handled by the C++ WndProc, not by browser events.
                         std::string dropzoneScript = R"(
                           (function() {
                             if (window.__plusui_dropzone_init) return;
@@ -1048,35 +1047,49 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                               if (activeZone) activeZone.classList.add('dropzone-active');
                             };
 
-                            var handleDrag = function(e) {
+                            // Always preventDefault to stop browser from navigating to file,
+                            // but show visual feedback when over a drop zone
+                            document.addEventListener('dragenter', function(e) {
+                              e.preventDefault();
                               var zone = findDropZone(e);
                               updateActiveZone(zone);
                               if (e.dataTransfer) {
                                 try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
                               }
-                              if (!zone) {
-                                e.preventDefault();
-                                e.stopPropagation();
+                            }, true);
+
+                            document.addEventListener('dragover', function(e) {
+                              e.preventDefault();
+                              var zone = findDropZone(e);
+                              updateActiveZone(zone);
+                              if (e.dataTransfer) {
+                                try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
                               }
-                            };
+                            }, true);
 
-                            ['dragenter', 'dragover', 'dragleave'].forEach(function(ev) {
-                              document.addEventListener(ev, handleDrag, true);
-                            });
+                            document.addEventListener('dragleave', function(e) {
+                              e.preventDefault();
+                              var zone = findDropZone(e);
+                              updateActiveZone(zone);
+                            }, true);
 
                             document.addEventListener('drop', function(e) {
+                              e.preventDefault();
                               updateActiveZone(null);
                             }, true);
+
+                            // Also block at window level as a safety net
+                            window.addEventListener('dragover', function(e) { e.preventDefault(); }, true);
+                            window.addEventListener('drop', function(e) { e.preventDefault(); }, true);
                           })();
                         )";
-                          pImpl->webview->AddScriptToExecuteOnDocumentCreated(
-                              std::wstring(dropzoneScript.begin(),
-                                           dropzoneScript.end())
-                                  .c_str(),
-                              nullptr);
-                        }
-
-                        // Set up WebMessageReceived handler for JS->C++ bridge
+                        pImpl->webview->AddScriptToExecuteOnDocumentCreated(
+                            std::wstring(dropzoneScript.begin(),
+                                         dropzoneScript.end())
+                                .c_str(),
+                            nullptr);
+
+                        // Set up WebMessageReceived handler for JS->C++ bridge
                         pImpl->webview->add_WebMessageReceived(
                             Callback<
                                 ICoreWebView2WebMessageReceivedEventHandler>(
@@ -1495,21 +1508,19 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
                                                                   : 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);
-                                          }
-                                        }
+                                        // Always keep external drops allowed
+                                        // at the WebView2 level so WM_DROPFILES
+                                        // fires on the parent HWND
+                                        if (pImpl->controller) {
+                                          ComPtr<ICoreWebView2Controller4>
+                                              controller4;
+                                          if (SUCCEEDED(pImpl->controller.As(
+                                                  &controller4)) &&
+                                              controller4) {
+                                            controller4->put_AllowExternalDrop(
+                                                TRUE);
+                                          }
+                                        }
                                       }
                                       success = true;
                                     } else if (fileDropMethod == "isEnabled") {
@@ -1616,60 +1627,61 @@ Window Window::create(void *windowHandle, const WindowConfig &config) {
     [config.preferences setValue:@YES forKey:@"developerExtrasEnabled"];
   }
 
-  // Disable webview drag & drop behavior to allow native FileDrop API
-  if (win.pImpl->config.disableWebviewDragDrop) {
-    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 = overDropZone "
-         "? 'copy' : '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);"
-         "});"
-         "})();";
-
-    WKUserScript *userScript = [[WKUserScript alloc]
-          initWithSource:disableDragDropScript
-           injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
-        forMainFrameOnly:NO];
-    [config.userContentController addUserScript:userScript];
-  }
+  // Block browser default drag-drop while allowing drop zone visual feedback.
+  // File delivery is handled natively by macOS drag APIs, not browser events.
+  if (win.pImpl->config.disableWebviewDragDrop ||
+      win.pImpl->config.enableFileDrop) {
+    NSString *disableDragDropScript =
+        @"(function() {"
+         "if (window.__plusui_dropzone_init) return;"
+         "window.__plusui_dropzone_init = true;"
+         "var activeZone = null;"
+         "var findDropZone = function(e) {"
+         "var target = null;"
+         "if (e && typeof e.clientX === 'number' && document.elementFromPoint) {"
+         "target = document.elementFromPoint(e.clientX, e.clientY);"
+         "}"
+         "if (!target && e && e.target) target = e.target;"
+         "if (!target || !target.closest) return null;"
+         "return target.closest('[data-dropzone]');"
+         "};"
+         "var updateActiveZone = function(zone) {"
+         "if (activeZone === zone) return;"
+         "if (activeZone) activeZone.classList.remove('dropzone-active');"
+         "activeZone = zone;"
+         "if (activeZone) activeZone.classList.add('dropzone-active');"
+         "};"
+         "document.addEventListener('dragenter', function(e) {"
+         "e.preventDefault();"
+         "var zone = findDropZone(e);"
+         "updateActiveZone(zone);"
+         "if (e.dataTransfer) { try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {} }"
+         "}, true);"
+         "document.addEventListener('dragover', function(e) {"
+         "e.preventDefault();"
+         "var zone = findDropZone(e);"
+         "updateActiveZone(zone);"
+         "if (e.dataTransfer) { try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {} }"
+         "}, true);"
+         "document.addEventListener('dragleave', function(e) {"
+         "e.preventDefault();"
+         "var zone = findDropZone(e);"
+         "updateActiveZone(zone);"
+         "}, true);"
+         "document.addEventListener('drop', function(e) {"
+         "e.preventDefault();"
+         "updateActiveZone(null);"
+         "}, true);"
+         "window.addEventListener('dragover', function(e) { e.preventDefault(); }, true);"
+         "window.addEventListener('drop', function(e) { e.preventDefault(); }, true);"
+         "})();";
+
+    WKUserScript *userScript = [[WKUserScript alloc]
+          initWithSource:disableDragDropScript
+           injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
+        forMainFrameOnly:NO];
+    [config.userContentController addUserScript:userScript];
+  }
 
   // Hide scrollbars if disabled
   if (!win.pImpl->config.scrollbars) {
@@ -2114,87 +2126,75 @@ void Window::injectCSS(const std::string &css) {
   executeScript(script);
 }
 
-void Window::setWebviewDragDropEnabled(bool enabled) {
-  std::string script;
-
-  if (enabled) {
-    // Enable webview drag-drop by removing our prevention handlers
-    script = R"(
-      (function() {
-        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_nativeFileDropOnly) return;
-        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 = overDropZone ? 'copy' : '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);
-        });
-      })();
-    )";
-  }
-
-  executeScript(script);
-}
+void Window::setWebviewDragDropEnabled(bool enabled) {
+  if (enabled) {
+    // Remove the dropzone init so it can be re-applied if needed later
+    executeScript(R"(
+      (function() {
+        delete window.__plusui_dropzone_init;
+      })();
+    )");
+  } else {
+    // Install the same dropzone script used at init time
+    executeScript(R"(
+      (function() {
+        if (window.__plusui_dropzone_init) return;
+        window.__plusui_dropzone_init = true;
+
+        var activeZone = null;
+
+        var findDropZone = function(e) {
+          var target = null;
+          if (e && typeof e.clientX === 'number' && document.elementFromPoint) {
+            target = document.elementFromPoint(e.clientX, e.clientY);
+          }
+          if (!target && e && e.target) target = e.target;
+          if (!target || !target.closest) return null;
+          return target.closest('[data-dropzone]');
+        };
+
+        var updateActiveZone = function(zone) {
+          if (activeZone === zone) return;
+          if (activeZone) activeZone.classList.remove('dropzone-active');
+          activeZone = zone;
+          if (activeZone) activeZone.classList.add('dropzone-active');
+        };
+
+        document.addEventListener('dragenter', function(e) {
+          e.preventDefault();
+          var zone = findDropZone(e);
+          updateActiveZone(zone);
+          if (e.dataTransfer) {
+            try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
+          }
+        }, true);
+
+        document.addEventListener('dragover', function(e) {
+          e.preventDefault();
+          var zone = findDropZone(e);
+          updateActiveZone(zone);
+          if (e.dataTransfer) {
+            try { e.dataTransfer.dropEffect = zone ? 'copy' : 'none'; } catch(_) {}
+          }
+        }, true);
+
+        document.addEventListener('dragleave', function(e) {
+          e.preventDefault();
+          var zone = findDropZone(e);
+          updateActiveZone(zone);
+        }, true);
+
+        document.addEventListener('drop', function(e) {
+          e.preventDefault();
+          updateActiveZone(null);
+        }, true);
+
+        window.addEventListener('dragover', function(e) { e.preventDefault(); }, true);
+        window.addEventListener('drop', function(e) { e.preventDefault(); }, true);
+      })();
+    )");
+  }
+}
 
 void Window::onNavigationStart(NavigationCallback callback) {
   pImpl->navigationCallback = callback;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native-core",
-  "version": "0.1.99",
+  "version": "0.1.101",
   "description": "PlusUI Core framework (frontend + backend implementations)",
   "type": "module",
   "main": "./Core/Features/API/index.ts",