@itwin/tree-widget-react 3.4.0 → 3.4.2

package/lib/cjs/tree-widget-react/components/trees/models-tree/internal/ModelsTreeVisibilityHandler.js

@@ -158,7 +158,12 @@ class ModelsTreeVisibilityHandlerImpl {
                 return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("disabled", getTooltipOptions("modelsTree.model.nonSpatialView", ignoreTooltip)));
             }
             if (!viewport.view.viewsModel(modelId)) {
-                return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.model.hiddenThroughModelSelector", ignoreTooltip)));
+                return (0, rxjs_1.from)(this._idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.mergeMap)((categoryIds) => (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(modelId, categoryIds))), this.getSubModeledElementsVisibilityStatus({
+                    ignoreTooltips: ignoreTooltip,
+                    haveSubModel: "yes",
+                    tooltips: { visible: undefined, hidden: "modelsTree.model.hiddenThroughModelSelector", partial: "modelsTree.model.someSubModelsVisible" },
+                    parentNodeVisibilityStatus: (0, Tooltip_js_1.createVisibilityStatus)("hidden"),
+                }));
             }
             return (0, rxjs_1.from)(this._idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.concatAll)(), (0, rxjs_1.mergeMap)((categoryId) => this.getCategoryDisplayStatus({ modelId, categoryId, ignoreTooltip: true })), (0, rxjs_1.map)((x) => x.state), getVisibilityFromTreeNodeChildren, (0, rxjs_1.map)((visibilityByCategories) => {
                 const state = visibilityByCategories === "empty" ? "visible" : visibilityByCategories;
@@ -186,7 +191,16 @@ class ModelsTreeVisibilityHandlerImpl {
     getCategoryDisplayStatus({ ignoreTooltip, ...props }) {
         const result = (0, rxjs_1.defer)(() => {
             if (!this._props.viewport.view.viewsModel(props.modelId)) {
-                return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.category.hiddenThroughModel", ignoreTooltip)));
+                return (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(props.modelId, [props.categoryId])).pipe(this.getSubModeledElementsVisibilityStatus({
+                    ignoreTooltips: ignoreTooltip,
+                    parentNodeVisibilityStatus: (0, Tooltip_js_1.createVisibilityStatus)("hidden"),
+                    tooltips: {
+                        visible: undefined,
+                        hidden: "modelsTree.category.hiddenThroughModel",
+                        partial: "modelsTree.category.someElementsOrSubModelsHidden",
+                    },
+                    haveSubModel: "yes",
+                }));
             }
             return this.getVisibilityFromAlwaysAndNeverDrawnElements({
                 queryProps: props,
@@ -198,7 +212,18 @@ class ModelsTreeVisibilityHandlerImpl {
                 },
                 defaultStatus: () => this.getDefaultCategoryVisibilityStatus(props),
                 ignoreTooltip,
-            });
+            }).pipe((0, rxjs_1.mergeMap)((visibilityStatusAlwaysAndNeverDraw) => {
+                return (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(props.modelId, [props.categoryId])).pipe(this.getSubModeledElementsVisibilityStatus({
+                    tooltips: {
+                        visible: undefined,
+                        hidden: "modelsTree.category.allElementsAndSubModelsHidden",
+                        partial: "modelsTree.category.someElementsOrSubModelsHidden",
+                    },
+                    haveSubModel: "yes",
+                    parentNodeVisibilityStatus: visibilityStatusAlwaysAndNeverDraw,
+                    ignoreTooltips: ignoreTooltip,
+                }));
+            }));
         });
         return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.getCategoryDisplayStatus);
     }
@@ -207,7 +232,15 @@ class ModelsTreeVisibilityHandlerImpl {
             const info = this.getGroupingNodeInfo(node);
             const { modelId, categoryId, elementIds } = info;
             if (!this._props.viewport.view.viewsModel(modelId)) {
-                return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("hidden"));
+                return (0, rxjs_1.of)([...elementIds]).pipe(this.getSubModeledElementsVisibilityStatus({
+                    tooltips: {
+                        visible: undefined,
+                        hidden: undefined,
+                        partial: "modelsTree.groupingNode.someElementsOrSubModelsHidden",
+                    },
+                    parentNodeVisibilityStatus: (0, Tooltip_js_1.createVisibilityStatus)("hidden"),
+                    haveSubModel: "unknown",
+                }));
             }
             return this.getVisibilityFromAlwaysAndNeverDrawnElements({
                 elements: elementIds,
@@ -221,7 +254,17 @@ class ModelsTreeVisibilityHandlerImpl {
                     elementsInBothAlwaysAndNeverDrawn: "modelsTree.groupingNode.someElementsAreHidden",
                     noElementsInExclusiveAlwaysDrawnList: "modelsTree.groupingNode.allElementsHidden",
                 },
-            });
+            }).pipe((0, rxjs_1.mergeMap)((visibilityStatusAlwaysAndNeverDraw) => {
+                return (0, rxjs_1.of)([...elementIds]).pipe(this.getSubModeledElementsVisibilityStatus({
+                    tooltips: {
+                        visible: undefined,
+                        hidden: "modelsTree.groupingNode.allElementsAndSubModelsHidden",
+                        partial: "modelsTree.groupingNode.someElementsOrSubModelsHidden",
+                    },
+                    parentNodeVisibilityStatus: visibilityStatusAlwaysAndNeverDraw,
+                    haveSubModel: "unknown",
+                }));
+            }));
         });
         return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { node }, result, this._props.overrides?.getElementGroupingNodeDisplayStatus);
     }
@@ -240,19 +283,46 @@ class ModelsTreeVisibilityHandlerImpl {
         }
         return undefined;
     }
+    getElementVisibility(ignoreTooltip, viewsModel, overridenVisibility, categoryVisibility, subModelVisibilityStatus) {
+        if (subModelVisibilityStatus === undefined) {
+            if (!viewsModel) {
+                return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughModel", ignoreTooltip));
+            }
+            if (overridenVisibility) {
+                return overridenVisibility;
+            }
+            return (0, Tooltip_js_1.createVisibilityStatus)(categoryVisibility.state, getTooltipOptions(categoryVisibility.state === "visible" ? undefined : "modelsTree.element.hiddenThroughCategory", ignoreTooltip));
+        }
+        if (subModelVisibilityStatus.state === "partial") {
+            return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.someElementsAreHidden", ignoreTooltip));
+        }
+        if (subModelVisibilityStatus.state === "visible") {
+            if (!viewsModel || overridenVisibility?.state === "hidden" || (categoryVisibility.state === "hidden" && !overridenVisibility)) {
+                return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.partialThroughSubModel", ignoreTooltip));
+            }
+            return (0, Tooltip_js_1.createVisibilityStatus)("visible", getTooltipOptions(undefined, ignoreTooltip));
+        }
+        if (!viewsModel) {
+            return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughModel", ignoreTooltip));
+        }
+        if (overridenVisibility) {
+            if (overridenVisibility.state === "hidden") {
+                return overridenVisibility;
+            }
+            return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.partialThroughElement", ignoreTooltip));
+        }
+        if (categoryVisibility.state === "visible") {
+            return (0, Tooltip_js_1.createVisibilityStatus)("partial", getTooltipOptions("modelsTree.element.partialThroughCategory", ignoreTooltip));
+        }
+        return (0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughCategory", ignoreTooltip));
+    }
     getElementDisplayStatus({ ignoreTooltip, ...props }) {
         const result = (0, rxjs_1.defer)(() => {
             const viewport = this._props.viewport;
             const { elementId, modelId, categoryId } = props;
-            if (!viewport.view.viewsModel(modelId)) {
-                return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)("hidden", getTooltipOptions("modelsTree.element.hiddenThroughModel", ignoreTooltip)));
-            }
-            let status = this.getElementOverriddenVisibility(elementId, ignoreTooltip);
-            if (status) {
-                return (0, rxjs_1.of)(status);
-            }
-            status = this.getDefaultCategoryVisibilityStatus({ categoryId, modelId, ignoreTooltip: true });
-            return (0, rxjs_1.of)((0, Tooltip_js_1.createVisibilityStatus)(status.state, getTooltipOptions(status.state === "visible" ? undefined : "modelsTree.element.hiddenThroughCategory", ignoreTooltip)));
+            const viewsModel = viewport.view.viewsModel(modelId);
+            const elementStatus = this.getElementOverriddenVisibility(elementId, ignoreTooltip);
+            return (0, rxjs_1.from)(this._idsCache.hasSubModel(elementId)).pipe((0, rxjs_1.mergeMap)((hasSubModel) => (hasSubModel ? this.getModelVisibilityStatus({ modelId: elementId }) : (0, rxjs_1.of)(undefined))), (0, rxjs_1.map)((subModelVisibilityStatus) => this.getElementVisibility(ignoreTooltip, viewsModel, elementStatus, this.getDefaultCategoryVisibilityStatus({ categoryId, modelId, ignoreTooltip: true }), subModelVisibilityStatus)));
         });
         return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.getElementDisplayStatus);
     }
@@ -333,20 +403,24 @@ class ModelsTreeVisibilityHandlerImpl {
         return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { ids, on }, result, this._props.overrides?.changeSubjectNodeState);
     }
     changeModelState(props) {
+        const { ids, on } = props;
+        if (core_bentley_1.Id64.sizeOf(ids) === 0) {
+            return rxjs_1.EMPTY;
+        }
         const result = (0, rxjs_1.defer)(() => {
             const viewport = this._props.viewport;
             if (!viewport.view.isSpatialView()) {
                 return rxjs_1.EMPTY;
             }
-            const { ids, on } = props;
+            const idsObs = (0, rxjs_1.from)(core_bentley_1.Id64.iterable(ids));
             if (!on) {
                 viewport.changeModelDisplay(ids, false);
-                return rxjs_1.EMPTY;
+                return idsObs.pipe((0, rxjs_1.mergeMap)(async (modelId) => ({ modelId, categoryIds: await this._idsCache.getModelCategories(modelId) })), (0, rxjs_1.mergeMap)(({ modelId, categoryIds }) => (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(modelId, categoryIds))), (0, rxjs_1.mergeMap)((modeledElementIds) => this.changeModelState({ ids: modeledElementIds, on })));
             }
             return (0, rxjs_1.concat)((0, rxjs_1.defer)(() => {
                 viewport.perModelCategoryVisibility.clearOverrides(ids);
                 return (0, rxjs_1.from)(viewport.addViewedModels(ids));
-            }), (typeof ids === "string" ? (0, rxjs_1.of)(ids) : (0, rxjs_1.from)(ids)).pipe((0, rxjs_1.mergeMap)((modelId) => {
+            }), idsObs.pipe((0, rxjs_1.mergeMap)((modelId) => {
                 return (0, rxjs_1.from)(this._idsCache.getModelCategories(modelId)).pipe((0, rxjs_1.concatAll)(), (0, rxjs_1.mergeMap)((categoryId) => this.changeCategoryState({ categoryId, modelId, on: true })));
             })));
         });
@@ -390,25 +464,27 @@ class ModelsTreeVisibilityHandlerImpl {
             return (0, rxjs_1.concat)(props.on && !viewport.view.viewsModel(modelId) ? this.showModelWithoutAnyCategoriesOrElements(modelId) : rxjs_1.EMPTY, (0, rxjs_1.defer)(() => {
                 this.changeCategoryStateInViewportAccordingToModelVisibility(modelId, categoryId, on);
                 return this.clearAlwaysAndNeverDrawnElements(props);
-            }));
+            }), (0, rxjs_1.from)(this._idsCache.getCategoriesModeledElements(modelId, [categoryId])).pipe((0, rxjs_1.mergeMap)((modeledElementIds) => this.changeModelState({ ids: modeledElementIds, on }))));
         });
         return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.changeCategoryState);
     }
-    /**
-     * Updates visibility of all grouping node's elements.
-     * @see `changeElementState`
-     */
-    changeElementGroupingNodeState(node, on) {
-        const result = (0, rxjs_1.defer)(() => {
-            const info = this.getGroupingNodeInfo(node);
-            const { modelId, categoryId, elementIds } = info;
+    doChangeElementsState(props) {
+        return (0, rxjs_1.defer)(() => {
+            const { modelId, categoryId, elementIds, on } = props;
             const viewport = this._props.viewport;
             return (0, rxjs_1.concat)(on && !viewport.view.viewsModel(modelId) ? this.showModelWithoutAnyCategoriesOrElements(modelId) : rxjs_1.EMPTY, (0, rxjs_1.defer)(() => {
                 const categoryVisibility = this.getDefaultCategoryVisibilityStatus({ categoryId, modelId, ignoreTooltip: true });
                 const isDisplayedByDefault = categoryVisibility.state === "visible";
                 return this.queueElementsVisibilityChange(elementIds, on, isDisplayedByDefault);
-            }));
+            }), (0, rxjs_1.from)(elementIds).pipe((0, rxjs_1.mergeMap)(async (elementId) => ({ elementId, isSubModel: await this._idsCache.hasSubModel(elementId) })), (0, rxjs_1.filter)(({ isSubModel }) => isSubModel), (0, rxjs_1.map)(({ elementId }) => elementId), (0, rxjs_1.toArray)(), (0, rxjs_1.mergeMap)((subModelIds) => this.changeModelState({ ids: subModelIds, on }))));
         });
+    }
+    /**
+     * Updates visibility of all grouping node's elements.
+     * @see `changeElementState`
+     */
+    changeElementGroupingNodeState(node, on) {
+        const result = this.doChangeElementsState({ ...this.getGroupingNodeInfo(node), on });
         return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, { node, on }, result, this._props.overrides?.changeElementGroupingNodeState);
     }
     /**
@@ -416,15 +492,7 @@ class ModelsTreeVisibilityHandlerImpl {
      * @note If element is to be enabled and model is hidden, it will be enabled.
      */
     changeElementsState(props) {
-        const result = (0, rxjs_1.defer)(() => {
-            const { elementIds, on, modelId, categoryId } = props;
-            const viewport = this._props.viewport;
-            return (0, rxjs_1.concat)(props.on && !viewport.view.viewsModel(modelId) ? this.showModelWithoutAnyCategoriesOrElements(modelId) : rxjs_1.EMPTY, (0, rxjs_1.defer)(() => {
-                const categoryVisibility = this.getDefaultCategoryVisibilityStatus({ categoryId, modelId, ignoreTooltip: true });
-                const isDisplayedByDefault = categoryVisibility.state === "visible";
-                return this.queueElementsVisibilityChange(elementIds, on, isDisplayedByDefault);
-            }));
-        });
+        const result = this.doChangeElementsState(props);
         return (0, UseHierarchyVisibility_js_1.createVisibilityHandlerResult)(this, props, result, this._props.overrides?.changeElementsState);
     }
     queueElementsVisibilityChange(elementIds, on, visibleByDefault) {
@@ -568,6 +636,25 @@ class ModelsTreeVisibilityHandlerImpl {
         const elementIds = new Set(node.groupedInstanceKeys.map((key) => key.id));
         return { modelId, categoryId, elementIds };
     }
+    getSubModeledElementsVisibilityStatus({ parentNodeVisibilityStatus, haveSubModel, tooltips, ignoreTooltips, }) {
+        return (obs) => {
+            return obs.pipe(
+            // ensure we're only looking at elements that have a sub-model
+            (0, rxjs_1.mergeMap)((modeledElementIds) => {
+                if (haveSubModel === "yes") {
+                    return (0, rxjs_1.of)(modeledElementIds);
+                }
+                return (0, rxjs_1.from)(modeledElementIds).pipe((0, rxjs_1.mergeMap)(async (elementId) => ({ elementId, hasSubModel: await this._idsCache.hasSubModel(elementId) })), (0, rxjs_1.filter)(({ hasSubModel }) => hasSubModel), (0, rxjs_1.map)(({ elementId }) => elementId), (0, rxjs_1.toArray)());
+            }), 
+            // combine visibility status of sub-models with visibility status of parent node
+            (0, rxjs_1.mergeMap)((modeledElementIds) => {
+                if (modeledElementIds.length === 0) {
+                    return (0, rxjs_1.of)(parentNodeVisibilityStatus);
+                }
+                return (0, rxjs_1.from)(modeledElementIds).pipe((0, rxjs_1.mergeMap)((modeledElementId) => this.getModelVisibilityStatus({ modelId: modeledElementId })), (0, rxjs_1.startWith)(parentNodeVisibilityStatus), (0, rxjs_1.map)((visibilityStatus) => visibilityStatus.state), getVisibilityStatusFromTreeNodeChildren(tooltips, ignoreTooltips));
+            }));
+        };
+    }
 }
 function getVisibilityFromTreeNodeChildren(obs) {
     return obs.pipe((0, Rxjs_js_1.reduceWhile)((x) => x.allVisible || x.allHidden, (acc, val) => {