@vertexvis/viewer 0.21.0-testing.2 → 0.21.0-testing.3

package/dist/components/queries.js

@@ -351,15 +351,41 @@ function buildQueryExpression(query, context) {
         },
       };
     case 'metadata':
-      return {
-        operand: {
-          metadata: {
-            valueFilter: query.filter,
-            keys: query.keys,
-            exactMatch: query.exactMatch,
+      if (query.removeHiddenItems) {
+        return {
+          and: {
+            first: {
+              operand: {
+                metadata: {
+                  valueFilter: query.filter,
+                  keys: query.keys,
+                  exactMatch: query.exactMatch,
+                },
+              },
+            },
+            second: {
+              operand: {
+                override: {
+                  visibility: {
+                    visibilityState: true,
+                  },
+                },
+              },
+            },
           },
-        },
-      };
+        };
+      }
+      else {
+        return {
+          operand: {
+            metadata: {
+              valueFilter: query.filter,
+              keys: query.keys,
+              exactMatch: query.exactMatch,
+            },
+          },
+        };
+      }
     case 'all-selected':
       return {
         operand: {
@@ -2040,8 +2066,8 @@ class RootQuery {
    * ]).execute();
    * ```
    */
-  withMetadata(filter, keys, exactMatch) {
-    return new MetadataQuery(filter, keys, exactMatch, this.inverted);
+  withMetadata(filter, keys, exactMatch, removeHiddenItems) {
+    return new MetadataQuery(filter, keys, exactMatch, this.inverted, removeHiddenItems);
   }
   /**
    * Specifies that the operation should be performed on any item that has been selected.
@@ -2160,11 +2186,12 @@ class SceneTreeRangeQuery extends TerminalQuery {
   }
 }
 class MetadataQuery extends TerminalQuery {
-  constructor(filter, keys, exactMatch, inverted) {
+  constructor(filter, keys, exactMatch, inverted, removeHiddenItems) {
     super(inverted);
     this.filter = filter;
     this.keys = keys;
     this.exactMatch = exactMatch;
+    this.removeHiddenItems = removeHiddenItems;
   }
   queryExpressionBuilder() {
     return {
@@ -2172,6 +2199,7 @@ class MetadataQuery extends TerminalQuery {
       filter: this.filter,
       keys: this.keys,
       exactMatch: this.exactMatch,
+      removeHiddenItems: this.removeHiddenItems,
     };
   }
 }