@nstudio/nativescript-loading-indicator 4.2.0 → 4.3.0
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/index.ios.d.ts +1 -0
- package/index.ios.js +40 -2
- package/index.ios.js.map +1 -1
- package/package.json +1 -1
package/index.ios.d.ts
CHANGED
package/index.ios.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Color, Utils } from '@nativescript/core';
|
|
1
|
+
import { Color, Utils, Frame } from '@nativescript/core';
|
|
2
2
|
import { Mode } from './common';
|
|
3
3
|
export * from './common';
|
|
4
4
|
export class LoadingIndicator {
|
|
@@ -84,13 +84,51 @@ export class LoadingIndicator {
|
|
|
84
84
|
this._hud = undefined;
|
|
85
85
|
}
|
|
86
86
|
_getRootWindow() {
|
|
87
|
-
const rootVc = Utils.ios.getRootViewController();
|
|
87
|
+
const rootVc = Utils.ios.getRootViewController() || this.findTopViewController(Frame.topmost()?.currentPage?.ios);
|
|
88
88
|
if (rootVc?.view) {
|
|
89
89
|
return rootVc.view;
|
|
90
90
|
}
|
|
91
|
+
else if (rootVc && !rootVc?.view) {
|
|
92
|
+
return rootVc;
|
|
93
|
+
}
|
|
91
94
|
else {
|
|
92
95
|
return null;
|
|
93
96
|
}
|
|
94
97
|
}
|
|
98
|
+
findTopViewController(root) {
|
|
99
|
+
const presented = root.presentedViewController;
|
|
100
|
+
if (presented !== null) {
|
|
101
|
+
return this.findTopViewController(presented);
|
|
102
|
+
}
|
|
103
|
+
if (root instanceof UISplitViewController) {
|
|
104
|
+
const last = root.viewControllers.lastObject;
|
|
105
|
+
if (last == null) {
|
|
106
|
+
return root;
|
|
107
|
+
}
|
|
108
|
+
return this.findTopViewController(last);
|
|
109
|
+
}
|
|
110
|
+
else if (root instanceof UINavigationController) {
|
|
111
|
+
const top = root.topViewController;
|
|
112
|
+
if (top == null) {
|
|
113
|
+
return root;
|
|
114
|
+
}
|
|
115
|
+
return this.findTopViewController(top);
|
|
116
|
+
}
|
|
117
|
+
else if (root instanceof UITabBarController) {
|
|
118
|
+
const selected = root.selectedViewController;
|
|
119
|
+
if (selected == null) {
|
|
120
|
+
return root;
|
|
121
|
+
}
|
|
122
|
+
return this.findTopViewController(selected);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
if (presented === root.presentedViewController) {
|
|
126
|
+
return presented;
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
return root;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
95
133
|
}
|
|
96
134
|
//# sourceMappingURL=index.ios.js.map
|
package/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../packages/nativescript-loading-indicator/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../packages/nativescript-loading-indicator/index.ios.ts"],"names":[],"mappings":"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"}
|