fit-webview-bridge 0.2.3a1__tar.gz → 0.2.3a2__tar.gz

{fit_webview_bridge-0.2.3a1 → fit_webview_bridge-0.2.3a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fit-webview-bridge
-Version: 0.2.3a1
+Version: 0.2.3a2
 Summary: Qt native WebView bridge with PySide6 bindings
 Author: FIT Project
 License: LGPL-3.0-or-later

{fit_webview_bridge-0.2.3a1 → fit_webview_bridge-0.2.3a2}/examples/macos/wkwebview_demo.py

@@ -11,6 +11,7 @@ from PySide6.QtCore import QUrl
 from PySide6.QtWidgets import (
     QApplication,
     QHBoxLayout,
+    QLineEdit,
     QMainWindow,
     QPushButton,
     QVBoxLayout,
@@ -27,7 +28,7 @@ except Exception:
     from _wkwebview import WKWebViewWidget
 
 
-HOME_URL = "https://google.it"
+HOME_URL = "https://github.com/fit-project"
 
 
 class Main(QMainWindow):
@@ -38,15 +39,21 @@ class Main(QMainWindow):
         root = QVBoxLayout(central)
         self.setCentralWidget(central)
 
-        # --- toolbar semplice ---
+        # --- toolbar: back/forward/home + address bar + go ---
         bar = QHBoxLayout()
         self.btnBack = QPushButton("◀︎ Back")
         self.btnFwd = QPushButton("Forward ▶︎")
         self.btnHome = QPushButton("🏠 Home")
+
+        self.address = QLineEdit()  # ← barra indirizzi
+        self.address.setPlaceholderText("Digita un URL o una ricerca…")
+        self.btnGo = QPushButton("Go")
+
         bar.addWidget(self.btnBack)
         bar.addWidget(self.btnFwd)
         bar.addWidget(self.btnHome)
-        bar.addStretch(1)
+        bar.addWidget(self.address, 1)  # ← occupa spazio elastico
+        bar.addWidget(self.btnGo)
         root.addLayout(bar)
 
         # --- webview ---
@@ -68,6 +75,20 @@ class Main(QMainWindow):
         self.btnFwd.clicked.connect(self.view.forward)
         self.btnHome.clicked.connect(lambda: self.view.setUrl(QUrl(HOME_URL)))
 
+        # --- address bar: invio / bottone Go ---
+        def navigate_from_address():
+            text = (self.address.text() or "").strip()
+            if not text:
+                return
+            url = QUrl.fromUserInput(text)  # gestisce http/https, domini, file, ecc.
+            self.view.setUrl(url)
+
+        self.address.returnPressed.connect(navigate_from_address)
+        self.btnGo.clicked.connect(navigate_from_address)
+
+        # mantieni sincronizzata la barra con la URL corrente
+        self.view.urlChanged.connect(lambda u: self.address.setText(u.toString()))
+
         # --- eventi download: print semplici ---
         self.view.downloadStarted.connect(
             lambda name, path: print(f"[download] started: name='{name}' path='{path}'")
@@ -82,7 +103,6 @@ class Main(QMainWindow):
         )
 
         def on_finished(info):
-            # Proviamo a leggere i getter se disponibili; fallback a repr
             try:
                 fname = info.fileName() if hasattr(info, "fileName") else None
                 directory = info.directory() if hasattr(info, "directory") else None
@@ -98,8 +118,9 @@ class Main(QMainWindow):
 
         self.view.downloadFinished.connect(on_finished)
 
-        # carica home
+        # carica home e imposta barra
         self.view.setUrl(QUrl(HOME_URL))
+        self.address.setText(HOME_URL)
 
 
 if __name__ == "__main__":

{fit_webview_bridge-0.2.3a1 → fit_webview_bridge-0.2.3a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fit-webview-bridge"
-version = "0.2.3a1"
+version = "0.2.3a2"
 description = "Qt native WebView bridge with PySide6 bindings"
 requires-python = ">=3.11,<3.14"
 dependencies = ["PySide6==6.9.0", "shiboken6==6.9.0", "shiboken6-generator==6.9.0"]

{fit_webview_bridge-0.2.3a1 → fit_webview_bridge-0.2.3a2}/src/macos/WKWebViewWidget.mm

@@ -73,6 +73,8 @@ static NSURL* toNSURL(QUrl u);
 @end
 
 
+static inline NSString* FITURLStr(NSURL *u) { return u ? u.absoluteString : @"(nil)"; }
+
 static NSString* FIT_CurrentLang(void) {
     NSString *lang = NSLocale.preferredLanguages.firstObject ?: @"en";
     // normalizza es. "it-IT" -> "it"
@@ -299,6 +301,9 @@ static NSString* fit_uniquePath(NSString* baseDir, NSString* filename) {
 @property(nonatomic, strong) NSMapTable<WKDownload*, NSNumber*>* expectedTotals; // weak->strong
 @property(nonatomic, strong) NSMapTable<WKDownload*, NSURL*>*     sourceURLs;      // weak->strong
 @property(nonatomic, strong) NSMapTable<WKDownload*, NSString*>*  suggestedNames;  // weak->strong
+@property(nonatomic, strong) NSURL* pendingPopupParentURL;
+@property(nonatomic, strong) NSURL* pendingPopupChildURL;
+@property(nonatomic, assign) WKWebView* webView;
 @end
 
 @implementation WKNavDelegate
@@ -316,17 +321,15 @@ static NSString* fit_uniquePath(NSString* baseDir, NSString* filename) {
 }
 
 #pragma mark - Navigazione
-
-
 // 1a) Navigation: intercetta click con targetFrame == nil (tipico di _blank)
 - (void)webView:(WKWebView *)webView
 decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
 decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
 {
-    // Se è un _blank, no-op qui: ci pensa createWebView... (sopra)
     decisionHandler(WKNavigationActionPolicyAllow);
 }
 
+
 // 1b) UI: invocato quando la pagina chiede esplicitamente una nuova webview
 - (WKWebView *)webView:(WKWebView *)webView
 createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration
@@ -334,8 +337,18 @@ createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration
           windowFeatures:(WKWindowFeatures *)windowFeatures
 {
     if (navigationAction.targetFrame == nil || !navigationAction.targetFrame.isMainFrame) {
-        [webView loadRequest:navigationAction.request]; // apri nella stessa webview
+        NSURL *parent = webView.URL;
+        NSURL *child  = navigationAction.request.URL;
+
+        // salva coppia padre/figlio per il “ritorno” post-download
+        self.pendingPopupParentURL = parent;
+        self.pendingPopupChildURL  = child;
+        
+        if (child) {
+            [webView loadRequest:navigationAction.request];   // apri nella stessa webview
+        }
     }
+
     return nil; // restituisci nil per NON creare una nuova finestra
 }
 
@@ -390,10 +403,27 @@ createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration
 decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse
 decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
 {
+    NSURLResponse *resp = navigationResponse.response;
+    NSURL *url = resp.URL;
+
+    BOOL isAttachment = NO;
+    if ([resp isKindOfClass:NSHTTPURLResponse.class]) {
+        NSHTTPURLResponse *http = (NSHTTPURLResponse *)resp;
+        NSString *cd = http.allHeaderFields[@"Content-Disposition"];
+        if (cd && [[cd lowercaseString] containsString:@"attachment"]) {
+            isAttachment = YES;
+        }
+    }
+
+    if (isAttachment) {
+        decisionHandler(WKNavigationResponsePolicyDownload);
+        return;
+    }
+
     if (navigationResponse.canShowMIMEType) {
         decisionHandler(WKNavigationResponsePolicyAllow);
     } else {
-        decisionHandler(WKNavigationResponsePolicyDownload); // API moderna
+        decisionHandler(WKNavigationResponsePolicyDownload);
     }
 }
 
@@ -582,6 +612,42 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
     DownloadInfo* info = new DownloadInfo(qFileName, qDir, qUrl, self.owner);
     emit self.owner->downloadFinished(info);
 
+    
+
+    WKWebView *webView = self.webView;
+    NSURL *srcURL = [self.sourceURLs objectForKey:download];
+
+    if (webView && self.pendingPopupChildURL && srcURL &&
+        [srcURL isEqual:self.pendingPopupChildURL]) {
+
+        WKBackForwardList *bf = webView.backForwardList;
+        NSURL *current = webView.URL;
+        NSURL *backURL = bf.backItem.URL;
+
+        // CASI:
+        // A) Sei sul FIGLIO → torna indietro alla PARENT
+        if (current && [current isEqual:self.pendingPopupChildURL]) {
+            [webView goBack];
+        }
+        // B) Sei già sulla PARENT → non fare nulla
+        else if (current && [current isEqual:self.pendingPopupParentURL]) {
+            // niente
+        }
+        // C) Non sei sul child, ma l’item precedente è la PARENT → goBack
+        else if (backURL && [backURL isEqual:self.pendingPopupParentURL]) {
+            [webView goBack];
+        }
+        // D) Fallback: carica esplicitamente la PARENT
+        else if (self.pendingPopupParentURL) {
+            [webView loadRequest:[NSURLRequest requestWithURL:self.pendingPopupParentURL]];
+        } else {
+            //Niente
+        }
+
+        // pulizia stato
+        self.pendingPopupChildURL = nil;
+        self.pendingPopupParentURL = nil;
+    }
     // 5) cleanup mappe
     if (finalPath) [self.downloadPaths removeObjectForKey:download];
     [self.progressToDownload removeObjectForKey:download.progress];
@@ -609,6 +675,20 @@ completionHandler:(void (^)(NSURL * _Nullable destination))completionHandler
         QString::fromUtf8(error.localizedDescription.UTF8String)
     );
 
+    // 🔙 Se il download proviene dal "figlio", torna alla "pagina padre"
+    WKWebView *webView = self.webView;
+    NSURL *src = [self.sourceURLs objectForKey:download];
+    if (webView && self.pendingPopupChildURL && src && [src isEqual:self.pendingPopupChildURL]) {
+        if (webView.canGoBack) {
+            [webView goBack];
+        } else if (self.pendingPopupParentURL) {
+            [webView loadRequest:[NSURLRequest requestWithURL:self.pendingPopupParentURL]];
+        }
+        // ripulisci lo stato
+        self.pendingPopupChildURL = nil;
+        self.pendingPopupParentURL = nil;
+    }
+
     // cleanup mappe
     if (finalPath) [self.downloadPaths removeObjectForKey:download];
     [self.progressToDownload removeObjectForKey:download.progress];
@@ -656,6 +736,11 @@ WKWebViewWidget::WKWebViewWidget(QWidget* parent)
         cfg.defaultWebpagePreferences.allowsContentJavaScript = YES;
     }
 
+    // ✅ Consenti window.open() senza creare una nuova finestra UI
+    @try {
+        cfg.preferences.javaScriptCanOpenWindowsAutomatically = YES;
+    } @catch (...) {}
+
     // --- Fullscreen HTML5 (via KVC tollerante) ---
     @try {
         [cfg.preferences setValue:@YES forKey:@"fullScreenEnabled"];
@@ -722,8 +807,8 @@ WKWebViewWidget::WKWebViewWidget(QWidget* parent)
 
     d->delegate = [WKNavDelegate new];
     d->delegate.owner = this;
+    d->delegate.webView = d->wk;
     [d->wk setNavigationDelegate:d->delegate];
-
     [d->wk setUIDelegate:d->delegate];
 }