@capgo/inappbrowser 7.29.0 → 7.29.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/LICENSE CHANGED
@@ -1,21 +1,373 @@
1
- MIT License
2
-
3
- Copyright (c) 2022 Capgo
4
-
5
- Permission is hereby granted, free of charge, to any person obtaining a copy
6
- of this software and associated documentation files (the "Software"), to deal
7
- in the Software without restriction, including without limitation the rights
8
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
- copies of the Software, and to permit persons to whom the Software is
10
- furnished to do so, subject to the following conditions:
11
-
12
- The above copyright notice and this permission notice shall be included in all
13
- copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
- SOFTWARE.
1
+ Mozilla Public License Version 2.0
2
+ ==================================
3
+
4
+ 1. Definitions
5
+ --------------
6
+
7
+ 1.1. "Contributor"
8
+ means each individual or legal entity that creates, contributes to
9
+ the creation of, or owns Covered Software.
10
+
11
+ 1.2. "Contributor Version"
12
+ means the combination of the Contributions of others (if any) used
13
+ by a Contributor and that particular Contributor's Contribution.
14
+
15
+ 1.3. "Contribution"
16
+ means Covered Software of a particular Contributor.
17
+
18
+ 1.4. "Covered Software"
19
+ means Source Code Form to which the initial Contributor has attached
20
+ the notice in Exhibit A, the Executable Form of such Source Code
21
+ Form, and Modifications of such Source Code Form, in each case
22
+ including portions thereof.
23
+
24
+ 1.5. "Incompatible With Secondary Licenses"
25
+ means
26
+
27
+ (a) that the initial Contributor has attached the notice described
28
+ in Exhibit B to the Covered Software; or
29
+
30
+ (b) that the Covered Software was made available under the terms of
31
+ version 1.1 or earlier of the License, but not also under the
32
+ terms of a Secondary License.
33
+
34
+ 1.6. "Executable Form"
35
+ means any form of the work other than Source Code Form.
36
+
37
+ 1.7. "Larger Work"
38
+ means a work that combines Covered Software with other material, in
39
+ a separate file or files, that is not Covered Software.
40
+
41
+ 1.8. "License"
42
+ means this document.
43
+
44
+ 1.9. "Licensable"
45
+ means having the right to grant, to the maximum extent possible,
46
+ whether at the time of the initial grant or subsequently, any and
47
+ all of the rights conveyed by this License.
48
+
49
+ 1.10. "Modifications"
50
+ means any of the following:
51
+
52
+ (a) any file in Source Code Form that results from an addition to,
53
+ deletion from, or modification of the contents of Covered
54
+ Software; or
55
+
56
+ (b) any new file in Source Code Form that contains any Covered
57
+ Software.
58
+
59
+ 1.11. "Patent Claims" of a Contributor
60
+ means any patent claim(s), including without limitation, method,
61
+ process, and apparatus claims, in any patent Licensable by such
62
+ Contributor that would be infringed, but for the grant of the
63
+ License, by the making, using, selling, offering for sale, having
64
+ made, import, or transfer of either its Contributions or its
65
+ Contributor Version.
66
+
67
+ 1.12. "Secondary License"
68
+ means either the GNU General Public License, Version 2.0, the GNU
69
+ Lesser General Public License, Version 2.1, the GNU Affero General
70
+ Public License, Version 3.0, or any later versions of those
71
+ licenses.
72
+
73
+ 1.13. "Source Code Form"
74
+ means the form of the work preferred for making modifications.
75
+
76
+ 1.14. "You" (or "Your")
77
+ means an individual or a legal entity exercising rights under this
78
+ License. For legal entities, "You" includes any entity that
79
+ controls, is controlled by, or is under common control with You. For
80
+ purposes of this definition, "control" means (a) the power, direct
81
+ or indirect, to cause the direction or management of such entity,
82
+ whether by contract or otherwise, or (b) ownership of more than
83
+ fifty percent (50%) of the outstanding shares or beneficial
84
+ ownership of such entity.
85
+
86
+ 2. License Grants and Conditions
87
+ --------------------------------
88
+
89
+ 2.1. Grants
90
+
91
+ Each Contributor hereby grants You a world-wide, royalty-free,
92
+ non-exclusive license:
93
+
94
+ (a) under intellectual property rights (other than patent or trademark)
95
+ Licensable by such Contributor to use, reproduce, make available,
96
+ modify, display, perform, distribute, and otherwise exploit its
97
+ Contributions, either on an unmodified basis, with Modifications, or
98
+ as part of a Larger Work; and
99
+
100
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
101
+ for sale, have made, import, and otherwise transfer either its
102
+ Contributions or its Contributor Version.
103
+
104
+ 2.2. Effective Date
105
+
106
+ The licenses granted in Section 2.1 with respect to any Contribution
107
+ become effective for each Contribution on the date the Contributor first
108
+ distributes such Contribution.
109
+
110
+ 2.3. Limitations on Grant Scope
111
+
112
+ The licenses granted in this Section 2 are the only rights granted under
113
+ this License. No additional rights or licenses will be implied from the
114
+ distribution or licensing of Covered Software under this License.
115
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
116
+ Contributor:
117
+
118
+ (a) for any code that a Contributor has removed from Covered Software;
119
+ or
120
+
121
+ (b) for infringements caused by: (i) Your and any other third party's
122
+ modifications of Covered Software, or (ii) the combination of its
123
+ Contributions with other software (except as part of its Contributor
124
+ Version); or
125
+
126
+ (c) under Patent Claims infringed by Covered Software in the absence of
127
+ its Contributions.
128
+
129
+ This License does not grant any rights in the trademarks, service marks,
130
+ or logos of any Contributor (except as may be necessary to comply with
131
+ the notice requirements in Section 3.4).
132
+
133
+ 2.4. Subsequent Licenses
134
+
135
+ No Contributor makes additional grants as a result of Your choice to
136
+ distribute the Covered Software under a subsequent version of this
137
+ License (see Section 10.2) or under the terms of a Secondary License (if
138
+ permitted under the terms of Section 3.3).
139
+
140
+ 2.5. Representation
141
+
142
+ Each Contributor represents that the Contributor believes its
143
+ Contributions are its original creation(s) or it has sufficient rights
144
+ to grant the rights to its Contributions conveyed by this License.
145
+
146
+ 2.6. Fair Use
147
+
148
+ This License is not intended to limit any rights You have under
149
+ applicable copyright doctrines of fair use, fair dealing, or other
150
+ equivalents.
151
+
152
+ 2.7. Conditions
153
+
154
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
155
+ in Section 2.1.
156
+
157
+ 3. Responsibilities
158
+ -------------------
159
+
160
+ 3.1. Distribution of Source Form
161
+
162
+ All distribution of Covered Software in Source Code Form, including any
163
+ Modifications that You create or to which You contribute, must be under
164
+ the terms of this License. You must inform recipients that the Source
165
+ Code Form of the Covered Software is governed by the terms of this
166
+ License, and how they can obtain a copy of this License. You may not
167
+ attempt to alter or restrict the recipients' rights in the Source Code
168
+ Form.
169
+
170
+ 3.2. Distribution of Executable Form
171
+
172
+ If You distribute Covered Software in Executable Form then:
173
+
174
+ (a) such Covered Software must also be made available in Source Code
175
+ Form, as described in Section 3.1, and You must inform recipients of
176
+ the Executable Form how they can obtain a copy of such Source Code
177
+ Form by reasonable means in a timely manner, at a charge no more
178
+ than the cost of distribution to the recipient; and
179
+
180
+ (b) You may distribute such Executable Form under the terms of this
181
+ License, or sublicense it under different terms, provided that the
182
+ license for the Executable Form does not attempt to limit or alter
183
+ the recipients' rights in the Source Code Form under this License.
184
+
185
+ 3.3. Distribution of a Larger Work
186
+
187
+ You may create and distribute a Larger Work under terms of Your choice,
188
+ provided that You also comply with the requirements of this License for
189
+ the Covered Software. If the Larger Work is a combination of Covered
190
+ Software with a work governed by one or more Secondary Licenses, and the
191
+ Covered Software is not Incompatible With Secondary Licenses, this
192
+ License permits You to additionally distribute such Covered Software
193
+ under the terms of such Secondary License(s), so that the recipient of
194
+ the Larger Work may, at their option, further distribute the Covered
195
+ Software under the terms of either this License or such Secondary
196
+ License(s).
197
+
198
+ 3.4. Notices
199
+
200
+ You may not remove or alter the substance of any license notices
201
+ (including copyright notices, patent notices, disclaimers of warranty,
202
+ or limitations of liability) contained within the Source Code Form of
203
+ the Covered Software, except that You may alter any license notices to
204
+ the extent required to remedy known factual inaccuracies.
205
+
206
+ 3.5. Application of Additional Terms
207
+
208
+ You may choose to offer, and to charge a fee for, warranty, support,
209
+ indemnity or liability obligations to one or more recipients of Covered
210
+ Software. However, You may do so only on Your own behalf, and not on
211
+ behalf of any Contributor. You must make it absolutely clear that any
212
+ such warranty, support, indemnity, or liability obligation is offered by
213
+ You alone, and You hereby agree to indemnify every Contributor for any
214
+ liability incurred by such Contributor as a result of warranty, support,
215
+ indemnity or liability terms You offer. You may include additional
216
+ disclaimers of warranty and limitations of liability specific to any
217
+ jurisdiction.
218
+
219
+ 4. Inability to Comply Due to Statute or Regulation
220
+ ---------------------------------------------------
221
+
222
+ If it is impossible for You to comply with any of the terms of this
223
+ License with respect to some or all of the Covered Software due to
224
+ statute, judicial order, or regulation then You must: (a) comply with
225
+ the terms of this License to the maximum extent possible; and (b)
226
+ describe the limitations and the code they affect. Such description must
227
+ be placed in a text file included with all distributions of the Covered
228
+ Software under this License. Except to the extent prohibited by statute
229
+ or regulation, such description must be sufficiently detailed for a
230
+ recipient of ordinary skill to be able to understand it.
231
+
232
+ 5. Termination
233
+ --------------
234
+
235
+ 5.1. The rights granted under this License will terminate automatically
236
+ if You fail to comply with any of its terms. However, if You become
237
+ compliant, then the rights granted under this License from a particular
238
+ Contributor are reinstated (a) provisionally, unless and until such
239
+ Contributor explicitly and finally terminates Your grants, and (b) on an
240
+ ongoing basis, if such Contributor fails to notify You of the
241
+ non-compliance by some reasonable means prior to 60 days after You have
242
+ come back into compliance. Moreover, Your grants from a particular
243
+ Contributor are reinstated on an ongoing basis if such Contributor
244
+ notifies You of the non-compliance by some reasonable means, this is the
245
+ first time You have received notice of non-compliance with this License
246
+ from such Contributor, and You become compliant prior to 30 days after
247
+ Your receipt of the notice.
248
+
249
+ 5.2. If You initiate litigation against any entity by asserting a patent
250
+ infringement claim (excluding declaratory judgment actions,
251
+ counter-claims, and cross-claims) alleging that a Contributor Version
252
+ directly or indirectly infringes any patent, then the rights granted to
253
+ You by any and all Contributors for the Covered Software under Section
254
+ 2.1 of this License shall terminate.
255
+
256
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
257
+ end user license agreements (excluding distributors and resellers) which
258
+ have been validly granted by You or Your distributors under this License
259
+ prior to termination shall survive termination.
260
+
261
+ ************************************************************************
262
+ * *
263
+ * 6. Disclaimer of Warranty *
264
+ * ------------------------- *
265
+ * *
266
+ * Covered Software is provided under this License on an "as is" *
267
+ * basis, without warranty of any kind, either expressed, implied, or *
268
+ * statutory, including, without limitation, warranties that the *
269
+ * Covered Software is free of defects, merchantable, fit for a *
270
+ * particular purpose or non-infringing. The entire risk as to the *
271
+ * quality and performance of the Covered Software is with You. *
272
+ * Should any Covered Software prove defective in any respect, You *
273
+ * (not any Contributor) assume the cost of any necessary servicing, *
274
+ * repair, or correction. This disclaimer of warranty constitutes an *
275
+ * essential part of this License. No use of any Covered Software is *
276
+ * authorized under this License except under this disclaimer. *
277
+ * *
278
+ ************************************************************************
279
+
280
+ ************************************************************************
281
+ * *
282
+ * 7. Limitation of Liability *
283
+ * -------------------------- *
284
+ * *
285
+ * Under no circumstances and under no legal theory, whether tort *
286
+ * (including negligence), contract, or otherwise, shall any *
287
+ * Contributor, or anyone who distributes Covered Software as *
288
+ * permitted above, be liable to You for any direct, indirect, *
289
+ * special, incidental, or consequential damages of any character *
290
+ * including, without limitation, damages for lost profits, loss of *
291
+ * goodwill, work stoppage, computer failure or malfunction, or any *
292
+ * and all other commercial damages or losses, even if such party *
293
+ * shall have been informed of the possibility of such damages. This *
294
+ * limitation of liability shall not apply to liability for death or *
295
+ * personal injury resulting from such party's negligence to the *
296
+ * extent applicable law prohibits such limitation. Some *
297
+ * jurisdictions do not allow the exclusion or limitation of *
298
+ * incidental or consequential damages, so this exclusion and *
299
+ * limitation may not apply to You. *
300
+ * *
301
+ ************************************************************************
302
+
303
+ 8. Litigation
304
+ -------------
305
+
306
+ Any litigation relating to this License may be brought only in the
307
+ courts of a jurisdiction where the defendant maintains its principal
308
+ place of business and such litigation shall be governed by laws of that
309
+ jurisdiction, without reference to its conflict-of-law provisions.
310
+ Nothing in this Section shall prevent a party's ability to bring
311
+ cross-claims or counter-claims.
312
+
313
+ 9. Miscellaneous
314
+ ----------------
315
+
316
+ This License represents the complete agreement concerning the subject
317
+ matter hereof. If any provision of this License is held to be
318
+ unenforceable, such provision shall be reformed only to the extent
319
+ necessary to make it enforceable. Any law or regulation which provides
320
+ that the language of a contract shall be construed against the drafter
321
+ shall not be used to construe this License against a Contributor.
322
+
323
+ 10. Versions of the License
324
+ ---------------------------
325
+
326
+ 10.1. New Versions
327
+
328
+ Mozilla Foundation is the license steward. Except as provided in Section
329
+ 10.3, no one other than the license steward has the right to modify or
330
+ publish new versions of this License. Each version will be given a
331
+ distinguishing version number.
332
+
333
+ 10.2. Effect of New Versions
334
+
335
+ You may distribute the Covered Software under the terms of the version
336
+ of the License under which You originally received the Covered Software,
337
+ or under the terms of any subsequent version published by the license
338
+ steward.
339
+
340
+ 10.3. Modified Versions
341
+
342
+ If you create software not governed by this License, and you want to
343
+ create a new license for such software, you may create and use a
344
+ modified version of this License if you rename the license and remove
345
+ any references to the name of the license steward (except to note that
346
+ such modified license differs from this License).
347
+
348
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
349
+ Licenses
350
+
351
+ If You choose to distribute Source Code Form that is Incompatible With
352
+ Secondary Licenses under the terms of this version of the License, the
353
+ notice described in Exhibit B of this License must be attached.
354
+
355
+ Exhibit A - Source Code Form License Notice
356
+ -------------------------------------------
357
+
358
+ This Source Code Form is subject to the terms of the Mozilla Public
359
+ License, v. 2.0. If a copy of the MPL was not distributed with this
360
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
361
+
362
+ If it is not possible or desirable to put the notice in a particular
363
+ file, then You may include the notice in a location (such as a LICENSE
364
+ file in a relevant directory) where a recipient would be likely to look
365
+ for such a notice.
366
+
367
+ You may add additional accurate notices of copyright ownership.
368
+
369
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
370
+ ---------------------------------------------------------
371
+
372
+ This Source Code Form is "Incompatible With Secondary Licenses", as
373
+ defined by the Mozilla Public License, v. 2.0.
package/README.md CHANGED
@@ -65,6 +65,8 @@ InAppBrowser.updateDimensions({
65
65
  });
66
66
  ```
67
67
 
68
+ **Touch Passthrough**: When custom dimensions are set (not fullscreen), touches outside the webview bounds will pass through to the underlying Capacitor webview, allowing the user to interact with your app in the exposed areas. This enables picture-in-picture style experiences where the InAppBrowser floats above your content.
69
+
68
70
  ### Open WebView with Safe Margin
69
71
 
70
72
  To create a webView with a 20px bottom margin (safe margin area outside the browser):
@@ -50,7 +50,7 @@ import org.json.JSONObject;
50
50
  )
51
51
  public class InAppBrowserPlugin extends Plugin implements WebViewDialog.PermissionHandler {
52
52
 
53
- private final String pluginVersion = "7.29.0";
53
+ private final String pluginVersion = "7.29.3";
54
54
 
55
55
  public static final String CUSTOM_TAB_PACKAGE_NAME = "com.android.chrome"; // Change when in stable
56
56
  private CustomTabsClient customTabsClient;
@@ -653,6 +653,12 @@ public class InAppBrowserPlugin extends Plugin implements WebViewDialog.Permissi
653
653
  Integer x = call.getInt("x");
654
654
  Integer y = call.getInt("y");
655
655
 
656
+ // Validate dimension parameters
657
+ if (width != null && height == null) {
658
+ call.reject("Height must be specified when width is provided");
659
+ return;
660
+ }
661
+
656
662
  if (width != null) {
657
663
  options.setWidth(width);
658
664
  }
@@ -30,6 +30,7 @@ import android.text.TextUtils;
30
30
  import android.util.Base64;
31
31
  import android.util.Log;
32
32
  import android.util.TypedValue;
33
+ import android.view.KeyEvent;
33
34
  import android.view.View;
34
35
  import android.view.ViewGroup;
35
36
  import android.view.Window;
@@ -266,6 +267,19 @@ public class WebViewDialog extends Dialog {
266
267
  );
267
268
  setContentView(R.layout.activity_browser);
268
269
 
270
+ // If custom dimensions are set, configure for touch passthrough
271
+ if (_options != null && (_options.getWidth() != null || _options.getHeight() != null)) {
272
+ Window window = getWindow();
273
+ if (window != null) {
274
+ // Make the dialog background transparent
275
+ window.setBackgroundDrawableResource(android.R.color.transparent);
276
+ // Don't dim the background
277
+ window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
278
+ // Allow touches outside to pass through
279
+ window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
280
+ }
281
+ }
282
+
269
283
  // Set fitsSystemWindows only for Android 10 (API 29)
270
284
  if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.Q) {
271
285
  View coordinator = findViewById(R.id.coordinator_layout);
@@ -2662,6 +2676,28 @@ public class WebViewDialog extends Dialog {
2662
2676
  }
2663
2677
  }
2664
2678
 
2679
+ @Override
2680
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
2681
+ // Forward volume key events to the MainActivity
2682
+ switch (keyCode) {
2683
+ case KeyEvent.KEYCODE_VOLUME_UP:
2684
+ case KeyEvent.KEYCODE_VOLUME_DOWN:
2685
+ return activity.onKeyDown(keyCode, event);
2686
+ }
2687
+ return super.onKeyDown(keyCode, event);
2688
+ }
2689
+
2690
+ @Override
2691
+ public boolean onKeyUp(int keyCode, KeyEvent event) {
2692
+ // Forward volume key events to the MainActivity
2693
+ switch (keyCode) {
2694
+ case KeyEvent.KEYCODE_VOLUME_UP:
2695
+ case KeyEvent.KEYCODE_VOLUME_DOWN:
2696
+ return activity.onKeyUp(keyCode, event);
2697
+ }
2698
+ return super.onKeyUp(keyCode, event);
2699
+ }
2700
+
2665
2701
  public static String getReasonPhrase(int statusCode) {
2666
2702
  return switch (statusCode) {
2667
2703
  case (200) -> "OK";
@@ -2672,7 +2708,7 @@ public class WebViewDialog extends Dialog {
2672
2708
  case (205) -> "Reset Content";
2673
2709
  case (206) -> "Partial Content";
2674
2710
  case (207) -> "Partial Update OK";
2675
- case (300) -> "Mutliple Choices";
2711
+ case (300) -> "Multiple Choices";
2676
2712
  case (301) -> "Moved Permanently";
2677
2713
  case (302) -> "Moved Temporarily";
2678
2714
  case (303) -> "See Other";
@@ -2975,6 +3011,12 @@ public class WebViewDialog extends Dialog {
2975
3011
  params.height = (int) getPixels(height);
2976
3012
  params.x = (x != null) ? (int) getPixels(x) : 0;
2977
3013
  params.y = (y != null) ? (int) getPixels(y) : 0;
3014
+ } else if (height != null && width == null) {
3015
+ // If only height is specified, use custom height with fullscreen width
3016
+ params.width = WindowManager.LayoutParams.MATCH_PARENT;
3017
+ params.height = (int) getPixels(height);
3018
+ params.x = 0;
3019
+ params.y = (y != null) ? (int) getPixels(y) : 0;
2978
3020
  } else {
2979
3021
  // Default to fullscreen
2980
3022
  params.width = WindowManager.LayoutParams.MATCH_PARENT;
@@ -24,7 +24,7 @@ extension UIColor {
24
24
  */
25
25
  @objc(InAppBrowserPlugin)
26
26
  public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
27
- private let pluginVersion: String = "7.29.0"
27
+ private let pluginVersion: String = "7.29.3"
28
28
  public let identifier = "InAppBrowserPlugin"
29
29
  public let jsName = "InAppBrowser"
30
30
  public let pluginMethods: [CAPPluginMethod] = [
@@ -374,6 +374,12 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
374
374
  let x = call.getFloat("x")
375
375
  let y = call.getFloat("y")
376
376
 
377
+ // Validate dimension parameters
378
+ if width != nil && height == nil {
379
+ call.reject("Height must be specified when width is provided")
380
+ return
381
+ }
382
+
377
383
  DispatchQueue.main.async {
378
384
  guard let url = URL(string: urlString) else {
379
385
  call.reject("Invalid URL format")
@@ -603,7 +609,41 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
603
609
 
604
610
  }
605
611
 
606
- self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
612
+ // Configure modal presentation for touch passthrough if custom dimensions are set
613
+ if width != nil || height != nil {
614
+ self.navigationWebViewController?.modalPresentationStyle = .overFullScreen
615
+
616
+ // Create a pass-through container
617
+ let containerView = PassThroughView()
618
+ containerView.backgroundColor = .clear
619
+
620
+ // Calculate dimensions - use screen width if only height is provided
621
+ let finalWidth = width != nil ? CGFloat(width!) : UIScreen.main.bounds.width
622
+ let finalHeight = height != nil ? CGFloat(height!) : UIScreen.main.bounds.height
623
+
624
+ containerView.targetFrame = CGRect(
625
+ x: CGFloat(x ?? 0),
626
+ y: CGFloat(y ?? 0),
627
+ width: finalWidth,
628
+ height: finalHeight
629
+ )
630
+
631
+ // Replace the navigation controller's view with our pass-through container
632
+ if let navController = self.navigationWebViewController {
633
+ let originalView = navController.view!
634
+ navController.view = containerView
635
+ containerView.addSubview(originalView)
636
+ originalView.frame = CGRect(
637
+ x: CGFloat(x ?? 0),
638
+ y: CGFloat(y ?? 0),
639
+ width: finalWidth,
640
+ height: finalHeight
641
+ )
642
+ }
643
+ } else {
644
+ self.navigationWebViewController?.modalPresentationStyle = .overCurrentContext
645
+ }
646
+
607
647
  self.navigationWebViewController?.modalTransitionStyle = .crossDissolve
608
648
  if toolbarType == "blank" {
609
649
  self.navigationWebViewController?.navigationBar.isHidden = true
@@ -153,6 +153,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
153
153
 
154
154
  internal var preShowSemaphore: DispatchSemaphore?
155
155
  internal var preShowError: String?
156
+ private var isWebViewInitialized = false
156
157
 
157
158
  func setHeaders(headers: [String: String]) {
158
159
  self.headers = headers
@@ -394,6 +395,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
394
395
  override open func viewDidDisappear(_ animated: Bool) {
395
396
  super.viewDidDisappear(animated)
396
397
 
398
+ if self.isBeingDismissed || self.isMovingFromParent {
399
+ self.cleanupWebView()
400
+ }
401
+
397
402
  if let capacitorStatusBar = capacitorStatusBar {
398
403
  self.capBrowserPlugin?.bridge?.webView?.superview?.addSubview(capacitorStatusBar)
399
404
  self.capBrowserPlugin?.bridge?.webView?.frame.origin.y = capacitorStatusBar.frame.height
@@ -582,6 +587,10 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
582
587
  }
583
588
 
584
589
  open func initWebview(isInspectable: Bool = true) {
590
+ if self.isWebViewInitialized {
591
+ return
592
+ }
593
+ self.isWebViewInitialized = true
585
594
  self.view.backgroundColor = UIColor.white
586
595
 
587
596
  self.extendedLayoutIncludesOpaqueBars = true
@@ -589,11 +598,13 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
589
598
 
590
599
  let webConfiguration = WKWebViewConfiguration()
591
600
  let userContentController = WKUserContentController()
592
- userContentController.add(self, name: "messageHandler")
593
- userContentController.add(self, name: "preShowScriptError")
594
- userContentController.add(self, name: "preShowScriptSuccess")
595
- userContentController.add(self, name: "close")
596
- userContentController.add(self, name: "magicPrint")
601
+
602
+ let weakHandler = WeakScriptMessageHandler(self)
603
+ userContentController.add(weakHandler, name: "messageHandler")
604
+ userContentController.add(weakHandler, name: "preShowScriptError")
605
+ userContentController.add(weakHandler, name: "preShowScriptSuccess")
606
+ userContentController.add(weakHandler, name: "close")
607
+ userContentController.add(weakHandler, name: "magicPrint")
597
608
 
598
609
  // Inject JavaScript to override window.print
599
610
  let script = WKUserScript(
@@ -1914,7 +1925,7 @@ extension WKWebViewController: WKNavigationDelegate {
1914
1925
  open func applyCustomDimensions() {
1915
1926
  guard let navigationController = navigationController else { return }
1916
1927
 
1917
- // Only apply custom dimensions if both width and height are specified
1928
+ // Apply custom dimensions if both width and height are specified
1918
1929
  if let width = customWidth, let height = customHeight {
1919
1930
  let x = customX ?? 0
1920
1931
  let y = customY ?? 0
@@ -1922,6 +1933,15 @@ extension WKWebViewController: WKNavigationDelegate {
1922
1933
  // Set the frame for the navigation controller's view
1923
1934
  navigationController.view.frame = CGRect(x: x, y: y, width: width, height: height)
1924
1935
  }
1936
+ // If only height is specified, use fullscreen width
1937
+ else if let height = customHeight, customWidth == nil {
1938
+ let x = customX ?? 0
1939
+ let y = customY ?? 0
1940
+ let screenWidth = UIScreen.main.bounds.width
1941
+
1942
+ // Set the frame with fullscreen width and custom height
1943
+ navigationController.view.frame = CGRect(x: x, y: y, width: screenWidth, height: height)
1944
+ }
1925
1945
  // Otherwise, use default fullscreen behavior (no action needed)
1926
1946
  }
1927
1947
 
@@ -1951,6 +1971,36 @@ class BlockBarButtonItem: UIBarButtonItem {
1951
1971
  var block: ((WKWebViewController) -> Void)?
1952
1972
  }
1953
1973
 
1974
+ /// Custom view that passes touches outside a target frame to the underlying view
1975
+ class PassThroughView: UIView {
1976
+ var targetFrame: CGRect?
1977
+
1978
+ override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
1979
+ // If we have a target frame and the touch is outside it, pass through
1980
+ if let frame = targetFrame {
1981
+ if !frame.contains(point) {
1982
+ return nil // Pass through to underlying views
1983
+ }
1984
+ }
1985
+
1986
+ // Otherwise, handle normally
1987
+ return super.hitTest(point, with: event)
1988
+ }
1989
+ }
1990
+
1954
1991
  extension WKNavigationActionPolicy {
1955
1992
  static let preventDeeplinkActionPolicy = WKNavigationActionPolicy(rawValue: WKNavigationActionPolicy.allow.rawValue + 2)!
1956
1993
  }
1994
+
1995
+ class WeakScriptMessageHandler: NSObject, WKScriptMessageHandler {
1996
+ weak var delegate: WKScriptMessageHandler?
1997
+
1998
+ init(_ delegate: WKScriptMessageHandler) {
1999
+ self.delegate = delegate
2000
+ super.init()
2001
+ }
2002
+
2003
+ func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
2004
+ self.delegate?.userContentController(userContentController, didReceive: message)
2005
+ }
2006
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@capgo/inappbrowser",
3
- "version": "7.29.0",
3
+ "version": "7.29.3",
4
4
  "description": "Capacitor plugin in app browser",
5
5
  "main": "dist/plugin.cjs.js",
6
6
  "module": "dist/esm/index.js",
@@ -15,7 +15,7 @@
15
15
  "CapgoInappbrowser.podspec"
16
16
  ],
17
17
  "author": "Martin Donadieu <martin@capgo.app>",
18
- "license": "MIT",
18
+ "license": "MPL-2.0",
19
19
  "repository": {
20
20
  "type": "git",
21
21
  "url": "git+https://github.com/Cap-go/capacitor-inappbrowser.git"