@itwin/core-frontend 4.5.0-dev.37 → 4.5.0-dev.39

package/lib/esm/Viewport.js

@@ -658,20 +658,25 @@ class Viewport {
     */
     async getToolTip(hit) {
         const promises = new Array();
-        if (this.displayStyle) {
-            this.displayStyle.forEachTileTreeRef(async (tree) => {
-                promises.push(tree.getToolTip(hit).catch(() => undefined));
-            });
-        }
-        this.forEachMapTreeRef(async (tree) => promises.push(tree.getToolTip(hit)));
+        this.view.forEachTileTreeRef((ref) => {
+            const promise = ref.getToolTipPromise(hit);
+            if (promise)
+                promises.push(promise);
+        });
+        this.forEachMapTreeRef((ref) => {
+            const promise = ref.getToolTipPromise(hit);
+            if (promise)
+                promises.push(promise);
+        });
         for (const provider of this.tiledGraphicsProviders) {
-            provider.forEachTileTreeRef(this, (ref) => promises.push(ref.getToolTip(hit)));
+            provider.forEachTileTreeRef(this, (ref) => {
+                const promise = ref.getToolTipPromise(hit);
+                if (promise)
+                    promises.push(promise);
+            });
         }
         const results = await Promise.all(promises);
-        for (const result of results)
-            if (result !== undefined)
-                return result;
-        return "";
+        return results.find((result) => undefined !== result) ?? "";
     }
     /** Obtain feature information from a map layer model, if any, identified by the specified [[HitDetail]].
      * @see [[ElementLocateManager]]