npm - @itwin/presentation-frontend - Versions diffs - 3.6.0-dev.14 → 3.6.0-dev.21 - Mend

@itwin/presentation-frontend 3.6.0-dev.14 → 3.6.0-dev.21

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.

Files changed (16) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,6 +1,11 @@
 # Change Log - @itwin/presentation-frontend
-This log was last generated on Wed, 07 Dec 2022 19:12:37 GMT and should not be manually modified.
+This log was last generated on Thu, 15 Dec 2022 16:38:29 GMT and should not be manually modified.
+## 3.5.1
+Thu, 15 Dec 2022 16:38:29 GMT
+_Version update only_
 ## 3.5.0
 Wed, 07 Dec 2022 19:12:37 GMT

package/lib/cjs/presentation-frontend/IpcRequestsHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IpcRequestsHandler.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EAAwE,eAAe,EAAuB,wBAAwB,EAC7I,0BAA0B,EAAE,0BAA0B,EACvD,MAAM,4BAA4B,CAAC;AAEpC,gBAAgB;AAChB,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAErB,QAAQ,EAAE,MAAM;YAId,IAAI;IAIL,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IAStF,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,EAAE,UAAU,CAAC;IAQzE,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;~~CAQhG~~"}
1	+ {"version":3,"file":"IpcRequestsHandler.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EAAwE,eAAe,EAAuB,wBAAwB,EAC7I,0BAA0B,EAAE,0BAA0B,EACvD,MAAM,4BAA4B,CAAC;AAEpC,gBAAgB;AAChB,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAErB,QAAQ,EAAE,MAAM;YAId,IAAI;IAIL,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IAStF,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,EAAE,UAAU,CAAC;IAQzE,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;CAWhG"}

package/lib/cjs/presentation-frontend/IpcRequestsHandler.js CHANGED Viewed

@@ -34,7 +34,10 @@ class IpcRequestsHandler {
         const jsonParams = {
             ...params,
             clientId: this.clientId,
-            nodeKeys: params.nodeKeys.map(presentation_common_1.NodeKey.toJSON),
+            stateChanges: params.stateChanges.map((sc) => ({
+                ...sc,
+                ...(sc.nodeKey ? { nodeKey: presentation_common_1.NodeKey.toJSON(sc.nodeKey) } : undefined),
+            })),
         };
         return this.call("updateHierarchyState", jsonParams);
     }

package/lib/cjs/presentation-frontend/IpcRequestsHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IpcRequestsHandler.js","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAG/F,wDAA8C;AAC9C,oEAGoC;AAEpC,gBAAgB;AAChB,MAAa,kBAAkB;IAG7B,YAAY,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,IAAI,CAAqD,UAAa,EAAE,GAAG,IAA6C;QACpI,OAAO,sBAAM,CAAC,cAAc,CAAC,mDAA6B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;IACnF,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,MAAmE;QACjG,MAAM,UAAU,GAAkD;YAChE,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,qCAAe,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;SAClD,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAoD;QACpF,MAAM,UAAU,GAA+B;YAC7C,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAA6D;QAC7F,MAAM,UAAU,GAA4C;YAC1D,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,~~QAAQ~~,EAAE,MAAM,CAAC,~~QAAQ~~,CAAC,GAAG,CAAC,6BAAO,CAAC,MAAM,CAAC;~~SAC9C~~,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;CACF;~~AApCD~~,~~gDAoCC~~","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n\r\nimport { AsyncMethodsOf, PromiseReturnType } from \"@itwin/core-bentley\";\r\nimport { IpcApp } from \"@itwin/core-frontend\";\r\nimport {\r\n NodeKey, NodeKeyJSON, PRESENTATION_IPC_CHANNEL_NAME, PresentationIpcInterface, RulesetVariable, RulesetVariableJSON, SetRulesetVariableParams,\r\n UnsetRulesetVariableParams, UpdateHierarchyStateParams,\r\n} from \"@itwin/presentation-common\";\r\n\r\n/** @internal */\r\nexport class IpcRequestsHandler {\r\n public readonly clientId: string;\r\n\r\n constructor(clientId: string) {\r\n this.clientId = clientId;\r\n }\r\n\r\n private async call<T extends AsyncMethodsOf<PresentationIpcInterface>>(methodName: T, ...args: Parameters<PresentationIpcInterface[T]>): Promise<PromiseReturnType<PresentationIpcInterface[T]>> {\r\n return IpcApp.callIpcChannel(PRESENTATION_IPC_CHANNEL_NAME, methodName, ...args);\r\n }\r\n\r\n public async setRulesetVariable(params: Omit<SetRulesetVariableParams<RulesetVariable>, \"clientId\">) {\r\n const jsonParams: SetRulesetVariableParams<RulesetVariableJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n variable: RulesetVariable.toJSON(params.variable),\r\n };\r\n return this.call(\"setRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async unsetRulesetVariable(params: Omit<UnsetRulesetVariableParams, \"clientId\">) {\r\n const jsonParams: UnsetRulesetVariableParams = {\r\n ...params,\r\n clientId: this.clientId,\r\n };\r\n return this.call(\"unsetRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async updateHierarchyState(params: Omit<UpdateHierarchyStateParams<NodeKey>, \"clientId\">) {\r\n const jsonParams: UpdateHierarchyStateParams<NodeKeyJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n ~~nodeKeys~~: params.~~nodeKeys~~.map(NodeKey.toJSON),\r\n };\r\n return this.call(\"updateHierarchyState\", jsonParams);\r\n }\r\n}\r\n"]}
1	+ {"version":3,"file":"IpcRequestsHandler.js","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAG/F,wDAA8C;AAC9C,oEAGoC;AAEpC,gBAAgB;AAChB,MAAa,kBAAkB;IAG7B,YAAY,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,IAAI,CAAqD,UAAa,EAAE,GAAG,IAA6C;QACpI,OAAO,sBAAM,CAAC,cAAc,CAAC,mDAA6B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;IACnF,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,MAAmE;QACjG,MAAM,UAAU,GAAkD;YAChE,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,qCAAe,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;SAClD,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAoD;QACpF,MAAM,UAAU,GAA+B;YAC7C,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAA6D;QAC7F,MAAM,UAAU,GAA4C;YAC1D,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC7C,GAAG,EAAE;gBACL,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,6BAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aACtE,CAAC,CAAC;SACJ,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;CACF;AAvCD,gDAuCC","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n\r\nimport { AsyncMethodsOf, PromiseReturnType } from \"@itwin/core-bentley\";\r\nimport { IpcApp } from \"@itwin/core-frontend\";\r\nimport {\r\n NodeKey, NodeKeyJSON, PRESENTATION_IPC_CHANNEL_NAME, PresentationIpcInterface, RulesetVariable, RulesetVariableJSON, SetRulesetVariableParams,\r\n UnsetRulesetVariableParams, UpdateHierarchyStateParams,\r\n} from \"@itwin/presentation-common\";\r\n\r\n/** @internal */\r\nexport class IpcRequestsHandler {\r\n public readonly clientId: string;\r\n\r\n constructor(clientId: string) {\r\n this.clientId = clientId;\r\n }\r\n\r\n private async call<T extends AsyncMethodsOf<PresentationIpcInterface>>(methodName: T, ...args: Parameters<PresentationIpcInterface[T]>): Promise<PromiseReturnType<PresentationIpcInterface[T]>> {\r\n return IpcApp.callIpcChannel(PRESENTATION_IPC_CHANNEL_NAME, methodName, ...args);\r\n }\r\n\r\n public async setRulesetVariable(params: Omit<SetRulesetVariableParams<RulesetVariable>, \"clientId\">) {\r\n const jsonParams: SetRulesetVariableParams<RulesetVariableJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n variable: RulesetVariable.toJSON(params.variable),\r\n };\r\n return this.call(\"setRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async unsetRulesetVariable(params: Omit<UnsetRulesetVariableParams, \"clientId\">) {\r\n const jsonParams: UnsetRulesetVariableParams = {\r\n ...params,\r\n clientId: this.clientId,\r\n };\r\n return this.call(\"unsetRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async updateHierarchyState(params: Omit<UpdateHierarchyStateParams<NodeKey>, \"clientId\">) {\r\n const jsonParams: UpdateHierarchyStateParams<NodeKeyJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n stateChanges: params.stateChanges.map((sc) => ({\r\n ...sc,\r\n ...(sc.nodeKey ? { nodeKey: NodeKey.toJSON(sc.nodeKey) } : undefined),\r\n })),\r\n };\r\n return this.call(\"updateHierarchyState\", jsonParams);\r\n }\r\n}\r\n"]}

package/lib/cjs/presentation-frontend/StateTracker.d.ts CHANGED Viewed

@@ -12,13 +12,28 @@ export interface NodeIdentifier {
     id: string;
     key: NodeKey;
 }
-/** @internal */
+/**
+ * @internal
+ */
+export interface NodeState {
+    isExpanded?: boolean;
+    instanceFilter?: string;
+}
+/**
+ * The tracker stores up-to-date UI state of the hierarchies on the frontend and reports
+ * just the state changes to the backend as soon as component sends in a new hierarchy state.
+ *
+ * @internal
+ */
 export declare class StateTracker {
-    private _expandedHierarchies;
+    private _hierarchyStates;
     private _ipcRequestsHandler;
     constructor(ipcRequestsHandler: IpcRequestsHandler);
     private updateHierarchyStateIfNeeded;
     onHierarchyClosed(imodel: IModelConnection, rulesetId: string, sourceId: string): Promise<void>;
-    onExpandedNodesChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, expandedNodes: NodeIdentifier[]): Promise<void>;
+    onHierarchyStateChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, newHierarchyState: Array<{
+        node: NodeIdentifier | undefined;
+        state: NodeState;
+    }>): Promise<void>;
 }
 //# sourceMappingURL=StateTracker.d.ts.map

package/lib/cjs/presentation-frontend/StateTracker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StateTracker.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"AAIA;;GAEG;~~AAEH~~,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,OAAO,CAAC;CACd;~~AAcD~~,~~gBAAgB~~;~~AAChB~~,qBAAa,YAAY;~~IACvB~~,OAAO,CAAC,~~oBAAoB~~,~~CAAiC~~;~~IAC7D~~,OAAO,CAAC,mBAAmB,CAAqB;gBAEpC,kBAAkB,EAAE,kBAAkB;YAKpC,4BAA4B;IAM7B,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;~~IAsB~~/E,~~sBAAsB~~,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,~~aAAa~~,EAAE,cAAc,EAAE;~~CAwCnI~~"}
1	+ {"version":3,"file":"StateTracker.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,OAAO,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAgBD;;;;;GAKG;AACH,qBAAa,YAAY;IAEvB,OAAO,CAAC,gBAAgB,CAAwD;IAChF,OAAO,CAAC,mBAAmB,CAAqB;gBAEpC,kBAAkB,EAAE,kBAAkB;YAKpC,4BAA4B;IAM7B,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAmB/E,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,cAAc,GAAG,SAAS,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,CAAC;CA+DrL"}

package/lib/cjs/presentation-frontend/StateTracker.js CHANGED Viewed

@@ -8,68 +8,123 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateTracker = void 0;
-/** @internal */
+const core_bentley_1 = require("@itwin/core-bentley");
+/**
+ * The tracker stores up-to-date UI state of the hierarchies on the frontend and reports
+ * just the state changes to the backend as soon as component sends in a new hierarchy state.
+ *
+ * @internal
+ */
 class StateTracker {
     constructor(ipcRequestsHandler) {
         this._ipcRequestsHandler = ipcRequestsHandler;
-        this._expandedHierarchies = new Map();
+        this._hierarchyStates = new Map();
     }
-    async updateHierarchyStateIfNeeded(imodelKey, rulesetId, changeType, nodeKeys) {
-        if (nodeKeys.length === 0)
+    async updateHierarchyStateIfNeeded(imodelKey, rulesetId, stateChanges) {
+        if (stateChanges.length === 0)
             return;
-        await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, changeType, nodeKeys });
+        await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, stateChanges });
     }
     async onHierarchyClosed(imodel, rulesetId, sourceId) {
-        const hierarchy = this._expandedHierarchies.get(rulesetId);
-        if (!hierarchy)
+        const hierarchyState = this._hierarchyStates.get(rulesetId);
+        if (!hierarchyState)
             return;
-        const removedKeys = [];
-        for (const [nodeId, expandedNode] of hierarchy) {
-            expandedNode.expandedIn.delete(sourceId);
-            // if there are other sources that have this node expanded leave it.
-            if (expandedNode.expandedIn.size !== 0)
-                continue;
-            hierarchy.delete(nodeId);
-            removedKeys.push(expandedNode.key);
-        }
-        if (hierarchy.size === 0)
-            this._expandedHierarchies.delete(rulesetId);
-        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, "nodesCollapsed", removedKeys);
+        const stateChanges = [];
+        hierarchyState.forEach((entry) => {
+            if (!entry.states.has(sourceId)) {
+                // the node has no state for this source - nothing to do
+                return;
+            }
+            (0, core_bentley_1.using)(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {
+                entry.states.delete(sourceId);
+            });
+        });
+        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);
     }
-    async onExpandedNodesChanged(imodel, rulesetId, sourceId, expandedNodes) {
-        let hierarchy = this._expandedHierarchies.get(rulesetId);
-        if (expandedNodes.length === 0 && !hierarchy)
-            return;
-        if (!hierarchy) {
-            hierarchy = new Map();
-            this._expandedHierarchies.set(rulesetId, hierarchy);
+    async onHierarchyStateChanged(imodel, rulesetId, sourceId, newHierarchyState) {
+        let hierarchyState = this._hierarchyStates.get(rulesetId);
+        if (!hierarchyState) {
+            if (newHierarchyState.length === 0)
+                return;
+            hierarchyState = new Map();
+            this._hierarchyStates.set(rulesetId, hierarchyState);
         }
-        const removedKeys = [];
-        const addedKeys = [];
-        for (const [key, existingNode] of hierarchy) {
-            // existing node is in new expanded nodes list. Add current source
-            if (expandedNodes.find((expandedNode) => expandedNode.id === key)) {
-                existingNode.expandedIn.add(sourceId);
-                continue;
+        const handledNodeIds = new Set();
+        const stateChanges = [];
+        // step 1: walk over new state and report all changes
+        newHierarchyState.forEach(({ node, state }) => {
+            const nodeId = node === null || node === void 0 ? void 0 : node.id;
+            const nodeKey = node === null || node === void 0 ? void 0 : node.key;
+            const existingNodeEntry = hierarchyState.get(nodeId);
+            if (existingNodeEntry) {
+                (0, core_bentley_1.using)(new MergedNodeStateChangeReporter(existingNodeEntry, stateChanges), (_) => {
+                    existingNodeEntry.states.set(sourceId, state);
+                });
             }
-            // node was not found in expanded nodes list. Remove current source
-            existingNode.expandedIn.delete(sourceId);
-            if (existingNode.expandedIn.size !== 0)
-                continue;
-            removedKeys.push(existingNode.key);
-            hierarchy.delete(key);
-        }
-        // add any new nodes that were not in expanded nodes hierarchy already
-        for (const expandedNode of expandedNodes) {
-            const existingNode = hierarchy.get(expandedNode.id);
-            if (existingNode)
-                continue;
-            hierarchy.set(expandedNode.id, { key: expandedNode.key, expandedIn: new Set([sourceId]) });
-            addedKeys.push(expandedNode.key);
+            else {
+                hierarchyState.set(nodeId, { key: nodeKey, states: new Map([[sourceId, state]]) });
+                stateChanges.push({ ...calculateMergedNodeState([state].values()), nodeKey });
+            }
+            handledNodeIds.add(nodeId);
+        });
+        // step 2: walk over old state and remove all state that's not in the new state
+        const erasedNodeIds = new Set();
+        hierarchyState.forEach((entry, nodeId) => {
+            if (handledNodeIds.has(nodeId)) {
+                // the node was handled with the new state - nothing to do here
+                return;
+            }
+            if (!entry.states.has(sourceId)) {
+                // the node had no state for this source, so it's not affected by this report
+                return;
+            }
+            (0, core_bentley_1.using)(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {
+                entry.states.delete(sourceId);
+            });
+            // istanbul ignore next
+            if (entry.states.size === 0) {
+                // there are no more components holding state for this node
+                erasedNodeIds.add(nodeId);
+            }
+        });
+        // step 3: cleanup erased node ids and possibly the whole hierarchy state
+        for (const nodeId of erasedNodeIds) {
+            hierarchyState.delete(nodeId);
         }
-        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, "nodesCollapsed", removedKeys);
-        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, "nodesExpanded", addedKeys);
+        if (hierarchyState.size === 0)
+            this._hierarchyStates.delete(rulesetId);
+        // finally, report
+        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);
     }
 }
 exports.StateTracker = StateTracker;
+function calculateMergedNodeState(perComponentStates) {
+    const merged = {};
+    for (const state of perComponentStates) {
+        if (state.isExpanded)
+            merged.isExpanded = true;
+        if (state.instanceFilter) {
+            if (!merged.instanceFilters)
+                merged.instanceFilters = [state.instanceFilter];
+            else if (!merged.instanceFilters.includes(state.instanceFilter))
+                merged.instanceFilters.push(state.instanceFilter);
+        }
+    }
+    return merged;
+}
+class MergedNodeStateChangeReporter {
+    constructor(entry, outStateChanges) {
+        this._entry = entry;
+        this._stateBefore = calculateMergedNodeState(this._entry.states.values());
+        this._outStateChanges = outStateChanges;
+    }
+    dispose() {
+        var _a, _b, _c, _d;
+        const stateAfter = calculateMergedNodeState(this._entry.states.values());
+        const expandedFlagsDiffer = !!stateAfter.isExpanded !== !!this._stateBefore.isExpanded;
+        const instanceFiltersDiffer = ((_b = (_a = stateAfter.instanceFilters) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) !== ((_d = (_c = this._stateBefore.instanceFilters) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0);
+        if (expandedFlagsDiffer || instanceFiltersDiffer)
+            this._outStateChanges.push({ ...stateAfter, nodeKey: this._entry.key });
+    }
+}
 //# sourceMappingURL=StateTracker.js.map

package/lib/cjs/presentation-frontend/StateTracker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StateTracker.js","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"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","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Core\r\n /\r\n\r\nimport { IModelConnection } from \"@itwin/core-frontend\";\r\nimport { NodeKey } from \"@itwin/presentation-common\";\r\nimport { IpcRequestsHandler } from \"./IpcRequestsHandler\";\r\n\r\n/\r\n Data structure that describes information used by [[StateTracker]] to identify node.\r\n * @internal\r\n /\r\nexport interface NodeIdentifier {\r\n id: string;\r\n key: NodeKey;\r\n}\r\n\r\n/\r\n Data structure that describes expanded node.\r\n /\r\ninterface ExpandedNode {\r\n key: NodeKey;\r\n /* Set of source ids in which this node is expanded. /\r\n expandedIn: Set<string>;\r\n}\r\n\r\n/* Maps node ids to expanded nodes. /\r\ntype ExpandedHierarchy = Map<string, ExpandedNode>;\r\n\r\n/* @internal */\r\nexport class StateTracker {\r\n private _expandedHierarchies: Map<string, ExpandedHierarchy>;\r\n private _ipcRequestsHandler: IpcRequestsHandler;\r\n\r\n constructor(ipcRequestsHandler: IpcRequestsHandler) {\r\n this._ipcRequestsHandler = ipcRequestsHandler;\r\n this._expandedHierarchies = new Map<string, ExpandedHierarchy>();\r\n }\r\n\r\n private async updateHierarchyStateIfNeeded(imodelKey: string, rulesetId: string, changeType: \"nodesExpanded\" \| \"nodesCollapsed\", nodeKeys: NodeKey[]) {\r\n if (nodeKeys.length === 0)\r\n return;\r\n await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, changeType, nodeKeys });\r\n }\r\n\r\n public async onHierarchyClosed(imodel: IModelConnection, rulesetId: string, sourceId: string) {\r\n const hierarchy = this._expandedHierarchies.get(rulesetId);\r\n if (!hierarchy)\r\n return;\r\n\r\n const removedKeys: NodeKey[] = [];\r\n for (const [nodeId, expandedNode] of hierarchy) {\r\n expandedNode.expandedIn.delete(sourceId);\r\n // if there are other sources that have this node expanded leave it.\r\n if (expandedNode.expandedIn.size !== 0)\r\n continue;\r\n\r\n hierarchy.delete(nodeId);\r\n removedKeys.push(expandedNode.key);\r\n }\r\n\r\n if (hierarchy.size === 0)\r\n this._expandedHierarchies.delete(rulesetId);\r\n\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, \"nodesCollapsed\", removedKeys);\r\n }\r\n\r\n public async onExpandedNodesChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, expandedNodes: NodeIdentifier[]) {\r\n let hierarchy = this._expandedHierarchies.get(rulesetId);\r\n if (expandedNodes.length === 0 && !hierarchy)\r\n return;\r\n if (!hierarchy) {\r\n hierarchy = new Map<string, ExpandedNode>();\r\n this._expandedHierarchies.set(rulesetId, hierarchy);\r\n }\r\n\r\n const removedKeys: NodeKey[] = [];\r\n const addedKeys: NodeKey[] = [];\r\n for (const [key, existingNode] of hierarchy) {\r\n // existing node is in new expanded nodes list. Add current source\r\n if (expandedNodes.find((expandedNode) => expandedNode.id === key)) {\r\n existingNode.expandedIn.add(sourceId);\r\n continue;\r\n }\r\n\r\n // node was not found in expanded nodes list. Remove current source\r\n existingNode.expandedIn.delete(sourceId);\r\n if (existingNode.expandedIn.size !== 0)\r\n continue;\r\n\r\n removedKeys.push(existingNode.key);\r\n hierarchy.delete(key);\r\n }\r\n\r\n // add any new nodes that were not in expanded nodes hierarchy already\r\n for (const expandedNode of expandedNodes) {\r\n const existingNode = hierarchy.get(expandedNode.id);\r\n if (existingNode)\r\n continue;\r\n\r\n hierarchy.set(expandedNode.id, { key: expandedNode.key, expandedIn: new Set<string>([sourceId]) });\r\n addedKeys.push(expandedNode.key);\r\n }\r\n\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, \"nodesCollapsed\", removedKeys);\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, \"nodesExpanded\", addedKeys);\r\n }\r\n}\r\n"]}
1	+ {"version":3,"file":"StateTracker.js","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"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","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Core\r\n /\r\n\r\nimport { IDisposable, using } from \"@itwin/core-bentley\";\r\nimport { IModelConnection } from \"@itwin/core-frontend\";\r\nimport { NodeKey } from \"@itwin/presentation-common\";\r\nimport { IpcRequestsHandler } from \"./IpcRequestsHandler\";\r\n\r\n/\r\n Data structure that describes information used by [[StateTracker]] to identify node.\r\n * @internal\r\n /\r\nexport interface NodeIdentifier {\r\n id: string;\r\n key: NodeKey;\r\n}\r\n\r\n/\r\n @internal\r\n /\r\nexport interface NodeState {\r\n isExpanded?: boolean;\r\n instanceFilter?: string;\r\n}\r\n\r\ninterface MergedNodeState {\r\n isExpanded?: boolean;\r\n instanceFilters?: string[];\r\n}\r\n\r\ninterface ReportedNodeState extends MergedNodeState {\r\n nodeKey: NodeKey \| undefined;\r\n}\r\n\r\ninterface NodeStatesEntry {\r\n key: NodeKey \| undefined;\r\n states: Map<string, NodeState>; // per-component node state\r\n}\r\n\r\n/\r\n The tracker stores up-to-date UI state of the hierarchies on the frontend and reports\r\n * just the state changes to the backend as soon as component sends in a new hierarchy state.\r\n \r\n @internal\r\n */\r\nexport class StateTracker {\r\n // Ruleset ID => Node ID => Node state info\r\n private _hierarchyStates: Map<string, Map<string \| undefined, NodeStatesEntry>>;\r\n private _ipcRequestsHandler: IpcRequestsHandler;\r\n\r\n constructor(ipcRequestsHandler: IpcRequestsHandler) {\r\n this._ipcRequestsHandler = ipcRequestsHandler;\r\n this._hierarchyStates = new Map();\r\n }\r\n\r\n private async updateHierarchyStateIfNeeded(imodelKey: string, rulesetId: string, stateChanges: ReportedNodeState[]) {\r\n if (stateChanges.length === 0)\r\n return;\r\n await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, stateChanges });\r\n }\r\n\r\n public async onHierarchyClosed(imodel: IModelConnection, rulesetId: string, sourceId: string) {\r\n const hierarchyState = this._hierarchyStates.get(rulesetId);\r\n if (!hierarchyState)\r\n return;\r\n\r\n const stateChanges: ReportedNodeState[] = [];\r\n hierarchyState.forEach((entry) => {\r\n if (!entry.states.has(sourceId)) {\r\n // the node has no state for this source - nothing to do\r\n return;\r\n }\r\n using(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {\r\n entry.states.delete(sourceId);\r\n });\r\n });\r\n\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);\r\n }\r\n\r\n public async onHierarchyStateChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, newHierarchyState: Array<{ node: NodeIdentifier \| undefined, state: NodeState }>) {\r\n let hierarchyState = this._hierarchyStates.get(rulesetId);\r\n if (!hierarchyState) {\r\n if (newHierarchyState.length === 0)\r\n return;\r\n\r\n hierarchyState = new Map();\r\n this._hierarchyStates.set(rulesetId, hierarchyState);\r\n }\r\n\r\n const handledNodeIds = new Set<string \| undefined>();\r\n const stateChanges: ReportedNodeState[] = [];\r\n\r\n // step 1: walk over new state and report all changes\r\n newHierarchyState.forEach(({ node, state }) => {\r\n const nodeId = node?.id;\r\n const nodeKey = node?.key;\r\n const existingNodeEntry = hierarchyState!.get(nodeId);\r\n if (existingNodeEntry) {\r\n using(new MergedNodeStateChangeReporter(existingNodeEntry, stateChanges), (_) => {\r\n existingNodeEntry.states.set(sourceId, state);\r\n });\r\n } else {\r\n hierarchyState!.set(nodeId, { key: nodeKey, states: new Map([[sourceId, state]]) });\r\n stateChanges.push({ ...calculateMergedNodeState([state].values()), nodeKey });\r\n }\r\n handledNodeIds.add(nodeId);\r\n });\r\n\r\n // step 2: walk over old state and remove all state that's not in the new state\r\n const erasedNodeIds = new Set<string \| undefined>();\r\n hierarchyState.forEach((entry, nodeId) => {\r\n if (handledNodeIds.has(nodeId)) {\r\n // the node was handled with the new state - nothing to do here\r\n return;\r\n }\r\n\r\n if (!entry.states.has(sourceId)) {\r\n // the node had no state for this source, so it's not affected by this report\r\n return;\r\n }\r\n\r\n using(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {\r\n entry.states.delete(sourceId);\r\n });\r\n\r\n // istanbul ignore next\r\n if (entry.states.size === 0) {\r\n // there are no more components holding state for this node\r\n erasedNodeIds.add(nodeId);\r\n }\r\n });\r\n\r\n // step 3: cleanup erased node ids and possibly the whole hierarchy state\r\n for (const nodeId of erasedNodeIds) {\r\n hierarchyState.delete(nodeId);\r\n }\r\n if (hierarchyState.size === 0)\r\n this._hierarchyStates.delete(rulesetId);\r\n\r\n // finally, report\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);\r\n }\r\n}\r\n\r\nfunction calculateMergedNodeState(perComponentStates: IterableIterator<NodeState>): MergedNodeState {\r\n const merged: MergedNodeState = {};\r\n for (const state of perComponentStates) {\r\n if (state.isExpanded)\r\n merged.isExpanded = true;\r\n if (state.instanceFilter) {\r\n if (!merged.instanceFilters)\r\n merged.instanceFilters = [state.instanceFilter];\r\n else if (!merged.instanceFilters.includes(state.instanceFilter))\r\n merged.instanceFilters.push(state.instanceFilter);\r\n }\r\n }\r\n return merged;\r\n}\r\n\r\nclass MergedNodeStateChangeReporter implements IDisposable {\r\n private _entry: NodeStatesEntry;\r\n private _stateBefore: MergedNodeState;\r\n private _outStateChanges: ReportedNodeState[];\r\n public constructor(entry: NodeStatesEntry, outStateChanges: ReportedNodeState[]) {\r\n this._entry = entry;\r\n this._stateBefore = calculateMergedNodeState(this._entry.states.values());\r\n this._outStateChanges = outStateChanges;\r\n }\r\n public dispose() {\r\n const stateAfter = calculateMergedNodeState(this._entry.states.values());\r\n const expandedFlagsDiffer = !!stateAfter.isExpanded !== !!this._stateBefore.isExpanded;\r\n const instanceFiltersDiffer = (stateAfter.instanceFilters?.length ?? 0) !== (this._stateBefore.instanceFilters?.length ?? 0);\r\n if (expandedFlagsDiffer \|\| instanceFiltersDiffer)\r\n this._outStateChanges.push({ ...stateAfter, nodeKey: this._entry.key });\r\n }\r\n}\r\n"]}

package/lib/esm/presentation-frontend/IpcRequestsHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IpcRequestsHandler.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EAAwE,eAAe,EAAuB,wBAAwB,EAC7I,0BAA0B,EAAE,0BAA0B,EACvD,MAAM,4BAA4B,CAAC;AAEpC,gBAAgB;AAChB,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAErB,QAAQ,EAAE,MAAM;YAId,IAAI;IAIL,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IAStF,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,EAAE,UAAU,CAAC;IAQzE,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;~~CAQhG~~"}
1	+ {"version":3,"file":"IpcRequestsHandler.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EAAwE,eAAe,EAAuB,wBAAwB,EAC7I,0BAA0B,EAAE,0BAA0B,EACvD,MAAM,4BAA4B,CAAC;AAEpC,gBAAgB;AAChB,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAErB,QAAQ,EAAE,MAAM;YAId,IAAI;IAIL,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IAStF,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,EAAE,UAAU,CAAC;IAQzE,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;CAWhG"}

package/lib/esm/presentation-frontend/IpcRequestsHandler.js CHANGED Viewed

@@ -31,7 +31,10 @@ export class IpcRequestsHandler {
         const jsonParams = {
             ...params,
             clientId: this.clientId,
-            nodeKeys: params.nodeKeys.map(NodeKey.toJSON),
+            stateChanges: params.stateChanges.map((sc) => ({
+                ...sc,
+                ...(sc.nodeKey ? { nodeKey: NodeKey.toJSON(sc.nodeKey) } : undefined),
+            })),
         };
         return this.call("updateHierarchyState", jsonParams);
     }

package/lib/esm/presentation-frontend/IpcRequestsHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IpcRequestsHandler.js","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAG/F,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EACL,OAAO,EAAe,6BAA6B,EAA4B,eAAe,GAE/F,MAAM,4BAA4B,CAAC;AAEpC,gBAAgB;AAChB,MAAM,OAAO,kBAAkB;IAG7B,YAAY,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,IAAI,CAAqD,UAAa,EAAE,GAAG,IAA6C;QACpI,OAAO,MAAM,CAAC,cAAc,CAAC,6BAA6B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;IACnF,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,MAAmE;QACjG,MAAM,UAAU,GAAkD;YAChE,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;SAClD,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAoD;QACpF,MAAM,UAAU,GAA+B;YAC7C,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAA6D;QAC7F,MAAM,UAAU,GAA4C;YAC1D,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,~~QAAQ~~,EAAE,MAAM,CAAC,~~QAAQ~~,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;~~SAC9C~~,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;CACF","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n\r\nimport { AsyncMethodsOf, PromiseReturnType } from \"@itwin/core-bentley\";\r\nimport { IpcApp } from \"@itwin/core-frontend\";\r\nimport {\r\n NodeKey, NodeKeyJSON, PRESENTATION_IPC_CHANNEL_NAME, PresentationIpcInterface, RulesetVariable, RulesetVariableJSON, SetRulesetVariableParams,\r\n UnsetRulesetVariableParams, UpdateHierarchyStateParams,\r\n} from \"@itwin/presentation-common\";\r\n\r\n/** @internal */\r\nexport class IpcRequestsHandler {\r\n public readonly clientId: string;\r\n\r\n constructor(clientId: string) {\r\n this.clientId = clientId;\r\n }\r\n\r\n private async call<T extends AsyncMethodsOf<PresentationIpcInterface>>(methodName: T, ...args: Parameters<PresentationIpcInterface[T]>): Promise<PromiseReturnType<PresentationIpcInterface[T]>> {\r\n return IpcApp.callIpcChannel(PRESENTATION_IPC_CHANNEL_NAME, methodName, ...args);\r\n }\r\n\r\n public async setRulesetVariable(params: Omit<SetRulesetVariableParams<RulesetVariable>, \"clientId\">) {\r\n const jsonParams: SetRulesetVariableParams<RulesetVariableJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n variable: RulesetVariable.toJSON(params.variable),\r\n };\r\n return this.call(\"setRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async unsetRulesetVariable(params: Omit<UnsetRulesetVariableParams, \"clientId\">) {\r\n const jsonParams: UnsetRulesetVariableParams = {\r\n ...params,\r\n clientId: this.clientId,\r\n };\r\n return this.call(\"unsetRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async updateHierarchyState(params: Omit<UpdateHierarchyStateParams<NodeKey>, \"clientId\">) {\r\n const jsonParams: UpdateHierarchyStateParams<NodeKeyJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n ~~nodeKeys~~: params.~~nodeKeys~~.map(NodeKey.toJSON),\r\n };\r\n return this.call(\"updateHierarchyState\", jsonParams);\r\n }\r\n}\r\n"]}
1	+ {"version":3,"file":"IpcRequestsHandler.js","sourceRoot":"","sources":["../../../src/presentation-frontend/IpcRequestsHandler.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAG/F,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EACL,OAAO,EAAe,6BAA6B,EAA4B,eAAe,GAE/F,MAAM,4BAA4B,CAAC;AAEpC,gBAAgB;AAChB,MAAM,OAAO,kBAAkB;IAG7B,YAAY,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,IAAI,CAAqD,UAAa,EAAE,GAAG,IAA6C;QACpI,OAAO,MAAM,CAAC,cAAc,CAAC,6BAA6B,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;IACnF,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,MAAmE;QACjG,MAAM,UAAU,GAAkD;YAChE,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;SAClD,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAoD;QACpF,MAAM,UAAU,GAA+B;YAC7C,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAA6D;QAC7F,MAAM,UAAU,GAA4C;YAC1D,GAAG,MAAM;YACT,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC7C,GAAG,EAAE;gBACL,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aACtE,CAAC,CAAC;SACJ,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC;CACF","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n\r\nimport { AsyncMethodsOf, PromiseReturnType } from \"@itwin/core-bentley\";\r\nimport { IpcApp } from \"@itwin/core-frontend\";\r\nimport {\r\n NodeKey, NodeKeyJSON, PRESENTATION_IPC_CHANNEL_NAME, PresentationIpcInterface, RulesetVariable, RulesetVariableJSON, SetRulesetVariableParams,\r\n UnsetRulesetVariableParams, UpdateHierarchyStateParams,\r\n} from \"@itwin/presentation-common\";\r\n\r\n/** @internal */\r\nexport class IpcRequestsHandler {\r\n public readonly clientId: string;\r\n\r\n constructor(clientId: string) {\r\n this.clientId = clientId;\r\n }\r\n\r\n private async call<T extends AsyncMethodsOf<PresentationIpcInterface>>(methodName: T, ...args: Parameters<PresentationIpcInterface[T]>): Promise<PromiseReturnType<PresentationIpcInterface[T]>> {\r\n return IpcApp.callIpcChannel(PRESENTATION_IPC_CHANNEL_NAME, methodName, ...args);\r\n }\r\n\r\n public async setRulesetVariable(params: Omit<SetRulesetVariableParams<RulesetVariable>, \"clientId\">) {\r\n const jsonParams: SetRulesetVariableParams<RulesetVariableJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n variable: RulesetVariable.toJSON(params.variable),\r\n };\r\n return this.call(\"setRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async unsetRulesetVariable(params: Omit<UnsetRulesetVariableParams, \"clientId\">) {\r\n const jsonParams: UnsetRulesetVariableParams = {\r\n ...params,\r\n clientId: this.clientId,\r\n };\r\n return this.call(\"unsetRulesetVariable\", jsonParams);\r\n }\r\n\r\n public async updateHierarchyState(params: Omit<UpdateHierarchyStateParams<NodeKey>, \"clientId\">) {\r\n const jsonParams: UpdateHierarchyStateParams<NodeKeyJSON> = {\r\n ...params,\r\n clientId: this.clientId,\r\n stateChanges: params.stateChanges.map((sc) => ({\r\n ...sc,\r\n ...(sc.nodeKey ? { nodeKey: NodeKey.toJSON(sc.nodeKey) } : undefined),\r\n })),\r\n };\r\n return this.call(\"updateHierarchyState\", jsonParams);\r\n }\r\n}\r\n"]}

package/lib/esm/presentation-frontend/StateTracker.d.ts CHANGED Viewed

@@ -12,13 +12,28 @@ export interface NodeIdentifier {
     id: string;
     key: NodeKey;
 }
-/** @internal */
+/**
+ * @internal
+ */
+export interface NodeState {
+    isExpanded?: boolean;
+    instanceFilter?: string;
+}
+/**
+ * The tracker stores up-to-date UI state of the hierarchies on the frontend and reports
+ * just the state changes to the backend as soon as component sends in a new hierarchy state.
+ *
+ * @internal
+ */
 export declare class StateTracker {
-    private _expandedHierarchies;
+    private _hierarchyStates;
     private _ipcRequestsHandler;
     constructor(ipcRequestsHandler: IpcRequestsHandler);
     private updateHierarchyStateIfNeeded;
     onHierarchyClosed(imodel: IModelConnection, rulesetId: string, sourceId: string): Promise<void>;
-    onExpandedNodesChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, expandedNodes: NodeIdentifier[]): Promise<void>;
+    onHierarchyStateChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, newHierarchyState: Array<{
+        node: NodeIdentifier | undefined;
+        state: NodeState;
+    }>): Promise<void>;
 }
 //# sourceMappingURL=StateTracker.d.ts.map

package/lib/esm/presentation-frontend/StateTracker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StateTracker.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"AAIA;;GAEG;~~AAEH~~,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,OAAO,CAAC;CACd;~~AAcD~~,~~gBAAgB~~;~~AAChB~~,qBAAa,YAAY;~~IACvB~~,OAAO,CAAC,~~oBAAoB~~,~~CAAiC~~;~~IAC7D~~,OAAO,CAAC,mBAAmB,CAAqB;gBAEpC,kBAAkB,EAAE,kBAAkB;YAKpC,4BAA4B;IAM7B,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;~~IAsB~~/E,~~sBAAsB~~,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,~~aAAa~~,EAAE,cAAc,EAAE;~~CAwCnI~~"}
1	+ {"version":3,"file":"StateTracker.d.ts","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,OAAO,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAgBD;;;;;GAKG;AACH,qBAAa,YAAY;IAEvB,OAAO,CAAC,gBAAgB,CAAwD;IAChF,OAAO,CAAC,mBAAmB,CAAqB;gBAEpC,kBAAkB,EAAE,kBAAkB;YAKpC,4BAA4B;IAM7B,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAmB/E,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,cAAc,GAAG,SAAS,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,CAAC;CA+DrL"}

package/lib/esm/presentation-frontend/StateTracker.js CHANGED Viewed

@@ -5,67 +5,122 @@
 /** @packageDocumentation
  * @module Core
  */
-/** @internal */
+import { using } from "@itwin/core-bentley";
+/**
+ * The tracker stores up-to-date UI state of the hierarchies on the frontend and reports
+ * just the state changes to the backend as soon as component sends in a new hierarchy state.
+ *
+ * @internal
+ */
 export class StateTracker {
     constructor(ipcRequestsHandler) {
         this._ipcRequestsHandler = ipcRequestsHandler;
-        this._expandedHierarchies = new Map();
+        this._hierarchyStates = new Map();
     }
-    async updateHierarchyStateIfNeeded(imodelKey, rulesetId, changeType, nodeKeys) {
-        if (nodeKeys.length === 0)
+    async updateHierarchyStateIfNeeded(imodelKey, rulesetId, stateChanges) {
+        if (stateChanges.length === 0)
             return;
-        await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, changeType, nodeKeys });
+        await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, stateChanges });
     }
     async onHierarchyClosed(imodel, rulesetId, sourceId) {
-        const hierarchy = this._expandedHierarchies.get(rulesetId);
-        if (!hierarchy)
+        const hierarchyState = this._hierarchyStates.get(rulesetId);
+        if (!hierarchyState)
             return;
-        const removedKeys = [];
-        for (const [nodeId, expandedNode] of hierarchy) {
-            expandedNode.expandedIn.delete(sourceId);
-            // if there are other sources that have this node expanded leave it.
-            if (expandedNode.expandedIn.size !== 0)
-                continue;
-            hierarchy.delete(nodeId);
-            removedKeys.push(expandedNode.key);
-        }
-        if (hierarchy.size === 0)
-            this._expandedHierarchies.delete(rulesetId);
-        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, "nodesCollapsed", removedKeys);
+        const stateChanges = [];
+        hierarchyState.forEach((entry) => {
+            if (!entry.states.has(sourceId)) {
+                // the node has no state for this source - nothing to do
+                return;
+            }
+            using(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {
+                entry.states.delete(sourceId);
+            });
+        });
+        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);
     }
-    async onExpandedNodesChanged(imodel, rulesetId, sourceId, expandedNodes) {
-        let hierarchy = this._expandedHierarchies.get(rulesetId);
-        if (expandedNodes.length === 0 && !hierarchy)
-            return;
-        if (!hierarchy) {
-            hierarchy = new Map();
-            this._expandedHierarchies.set(rulesetId, hierarchy);
+    async onHierarchyStateChanged(imodel, rulesetId, sourceId, newHierarchyState) {
+        let hierarchyState = this._hierarchyStates.get(rulesetId);
+        if (!hierarchyState) {
+            if (newHierarchyState.length === 0)
+                return;
+            hierarchyState = new Map();
+            this._hierarchyStates.set(rulesetId, hierarchyState);
         }
-        const removedKeys = [];
-        const addedKeys = [];
-        for (const [key, existingNode] of hierarchy) {
-            // existing node is in new expanded nodes list. Add current source
-            if (expandedNodes.find((expandedNode) => expandedNode.id === key)) {
-                existingNode.expandedIn.add(sourceId);
-                continue;
+        const handledNodeIds = new Set();
+        const stateChanges = [];
+        // step 1: walk over new state and report all changes
+        newHierarchyState.forEach(({ node, state }) => {
+            const nodeId = node === null || node === void 0 ? void 0 : node.id;
+            const nodeKey = node === null || node === void 0 ? void 0 : node.key;
+            const existingNodeEntry = hierarchyState.get(nodeId);
+            if (existingNodeEntry) {
+                using(new MergedNodeStateChangeReporter(existingNodeEntry, stateChanges), (_) => {
+                    existingNodeEntry.states.set(sourceId, state);
+                });
+            }
+            else {
+                hierarchyState.set(nodeId, { key: nodeKey, states: new Map([[sourceId, state]]) });
+                stateChanges.push({ ...calculateMergedNodeState([state].values()), nodeKey });
+            }
+            handledNodeIds.add(nodeId);
+        });
+        // step 2: walk over old state and remove all state that's not in the new state
+        const erasedNodeIds = new Set();
+        hierarchyState.forEach((entry, nodeId) => {
+            if (handledNodeIds.has(nodeId)) {
+                // the node was handled with the new state - nothing to do here
+                return;
+            }
+            if (!entry.states.has(sourceId)) {
+                // the node had no state for this source, so it's not affected by this report
+                return;
             }
-            // node was not found in expanded nodes list. Remove current source
-            existingNode.expandedIn.delete(sourceId);
-            if (existingNode.expandedIn.size !== 0)
-                continue;
-            removedKeys.push(existingNode.key);
-            hierarchy.delete(key);
+            using(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {
+                entry.states.delete(sourceId);
+            });
+            // istanbul ignore next
+            if (entry.states.size === 0) {
+                // there are no more components holding state for this node
+                erasedNodeIds.add(nodeId);
+            }
+        });
+        // step 3: cleanup erased node ids and possibly the whole hierarchy state
+        for (const nodeId of erasedNodeIds) {
+            hierarchyState.delete(nodeId);
         }
-        // add any new nodes that were not in expanded nodes hierarchy already
-        for (const expandedNode of expandedNodes) {
-            const existingNode = hierarchy.get(expandedNode.id);
-            if (existingNode)
-                continue;
-            hierarchy.set(expandedNode.id, { key: expandedNode.key, expandedIn: new Set([sourceId]) });
-            addedKeys.push(expandedNode.key);
+        if (hierarchyState.size === 0)
+            this._hierarchyStates.delete(rulesetId);
+        // finally, report
+        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);
+    }
+}
+function calculateMergedNodeState(perComponentStates) {
+    const merged = {};
+    for (const state of perComponentStates) {
+        if (state.isExpanded)
+            merged.isExpanded = true;
+        if (state.instanceFilter) {
+            if (!merged.instanceFilters)
+                merged.instanceFilters = [state.instanceFilter];
+            else if (!merged.instanceFilters.includes(state.instanceFilter))
+                merged.instanceFilters.push(state.instanceFilter);
         }
-        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, "nodesCollapsed", removedKeys);
-        await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, "nodesExpanded", addedKeys);
+    }
+    return merged;
+}
+class MergedNodeStateChangeReporter {
+    constructor(entry, outStateChanges) {
+        this._entry = entry;
+        this._stateBefore = calculateMergedNodeState(this._entry.states.values());
+        this._outStateChanges = outStateChanges;
+    }
+    dispose() {
+        var _a, _b, _c, _d;
+        const stateAfter = calculateMergedNodeState(this._entry.states.values());
+        const expandedFlagsDiffer = !!stateAfter.isExpanded !== !!this._stateBefore.isExpanded;
+        const instanceFiltersDiffer = ((_b = (_a = stateAfter.instanceFilters) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) !== ((_d = (_c = this._stateBefore.instanceFilters) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0);
+        if (expandedFlagsDiffer || instanceFiltersDiffer)
+            this._outStateChanges.push({ ...stateAfter, nodeKey: this._entry.key });
     }
 }
 //# sourceMappingURL=StateTracker.js.map

package/lib/esm/presentation-frontend/StateTracker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StateTracker.js","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"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","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Core\r\n /\r\n\r\nimport { IModelConnection } from \"@itwin/core-frontend\";\r\nimport { NodeKey } from \"@itwin/presentation-common\";\r\nimport { IpcRequestsHandler } from \"./IpcRequestsHandler\";\r\n\r\n/\r\n Data structure that describes information used by [[StateTracker]] to identify node.\r\n * @internal\r\n /\r\nexport interface NodeIdentifier {\r\n id: string;\r\n key: NodeKey;\r\n}\r\n\r\n/\r\n Data structure that describes expanded node.\r\n /\r\ninterface ExpandedNode {\r\n key: NodeKey;\r\n /* Set of source ids in which this node is expanded. /\r\n expandedIn: Set<string>;\r\n}\r\n\r\n/* Maps node ids to expanded nodes. /\r\ntype ExpandedHierarchy = Map<string, ExpandedNode>;\r\n\r\n/* @internal */\r\nexport class StateTracker {\r\n private _expandedHierarchies: Map<string, ExpandedHierarchy>;\r\n private _ipcRequestsHandler: IpcRequestsHandler;\r\n\r\n constructor(ipcRequestsHandler: IpcRequestsHandler) {\r\n this._ipcRequestsHandler = ipcRequestsHandler;\r\n this._expandedHierarchies = new Map<string, ExpandedHierarchy>();\r\n }\r\n\r\n private async updateHierarchyStateIfNeeded(imodelKey: string, rulesetId: string, changeType: \"nodesExpanded\" \| \"nodesCollapsed\", nodeKeys: NodeKey[]) {\r\n if (nodeKeys.length === 0)\r\n return;\r\n await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, changeType, nodeKeys });\r\n }\r\n\r\n public async onHierarchyClosed(imodel: IModelConnection, rulesetId: string, sourceId: string) {\r\n const hierarchy = this._expandedHierarchies.get(rulesetId);\r\n if (!hierarchy)\r\n return;\r\n\r\n const removedKeys: NodeKey[] = [];\r\n for (const [nodeId, expandedNode] of hierarchy) {\r\n expandedNode.expandedIn.delete(sourceId);\r\n // if there are other sources that have this node expanded leave it.\r\n if (expandedNode.expandedIn.size !== 0)\r\n continue;\r\n\r\n hierarchy.delete(nodeId);\r\n removedKeys.push(expandedNode.key);\r\n }\r\n\r\n if (hierarchy.size === 0)\r\n this._expandedHierarchies.delete(rulesetId);\r\n\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, \"nodesCollapsed\", removedKeys);\r\n }\r\n\r\n public async onExpandedNodesChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, expandedNodes: NodeIdentifier[]) {\r\n let hierarchy = this._expandedHierarchies.get(rulesetId);\r\n if (expandedNodes.length === 0 && !hierarchy)\r\n return;\r\n if (!hierarchy) {\r\n hierarchy = new Map<string, ExpandedNode>();\r\n this._expandedHierarchies.set(rulesetId, hierarchy);\r\n }\r\n\r\n const removedKeys: NodeKey[] = [];\r\n const addedKeys: NodeKey[] = [];\r\n for (const [key, existingNode] of hierarchy) {\r\n // existing node is in new expanded nodes list. Add current source\r\n if (expandedNodes.find((expandedNode) => expandedNode.id === key)) {\r\n existingNode.expandedIn.add(sourceId);\r\n continue;\r\n }\r\n\r\n // node was not found in expanded nodes list. Remove current source\r\n existingNode.expandedIn.delete(sourceId);\r\n if (existingNode.expandedIn.size !== 0)\r\n continue;\r\n\r\n removedKeys.push(existingNode.key);\r\n hierarchy.delete(key);\r\n }\r\n\r\n // add any new nodes that were not in expanded nodes hierarchy already\r\n for (const expandedNode of expandedNodes) {\r\n const existingNode = hierarchy.get(expandedNode.id);\r\n if (existingNode)\r\n continue;\r\n\r\n hierarchy.set(expandedNode.id, { key: expandedNode.key, expandedIn: new Set<string>([sourceId]) });\r\n addedKeys.push(expandedNode.key);\r\n }\r\n\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, \"nodesCollapsed\", removedKeys);\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, \"nodesExpanded\", addedKeys);\r\n }\r\n}\r\n"]}
1	+ {"version":3,"file":"StateTracker.js","sourceRoot":"","sources":["../../../src/presentation-frontend/StateTracker.ts"],"names":[],"mappings":"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","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Core\r\n /\r\n\r\nimport { IDisposable, using } from \"@itwin/core-bentley\";\r\nimport { IModelConnection } from \"@itwin/core-frontend\";\r\nimport { NodeKey } from \"@itwin/presentation-common\";\r\nimport { IpcRequestsHandler } from \"./IpcRequestsHandler\";\r\n\r\n/\r\n Data structure that describes information used by [[StateTracker]] to identify node.\r\n * @internal\r\n /\r\nexport interface NodeIdentifier {\r\n id: string;\r\n key: NodeKey;\r\n}\r\n\r\n/\r\n @internal\r\n /\r\nexport interface NodeState {\r\n isExpanded?: boolean;\r\n instanceFilter?: string;\r\n}\r\n\r\ninterface MergedNodeState {\r\n isExpanded?: boolean;\r\n instanceFilters?: string[];\r\n}\r\n\r\ninterface ReportedNodeState extends MergedNodeState {\r\n nodeKey: NodeKey \| undefined;\r\n}\r\n\r\ninterface NodeStatesEntry {\r\n key: NodeKey \| undefined;\r\n states: Map<string, NodeState>; // per-component node state\r\n}\r\n\r\n/\r\n The tracker stores up-to-date UI state of the hierarchies on the frontend and reports\r\n * just the state changes to the backend as soon as component sends in a new hierarchy state.\r\n \r\n @internal\r\n */\r\nexport class StateTracker {\r\n // Ruleset ID => Node ID => Node state info\r\n private _hierarchyStates: Map<string, Map<string \| undefined, NodeStatesEntry>>;\r\n private _ipcRequestsHandler: IpcRequestsHandler;\r\n\r\n constructor(ipcRequestsHandler: IpcRequestsHandler) {\r\n this._ipcRequestsHandler = ipcRequestsHandler;\r\n this._hierarchyStates = new Map();\r\n }\r\n\r\n private async updateHierarchyStateIfNeeded(imodelKey: string, rulesetId: string, stateChanges: ReportedNodeState[]) {\r\n if (stateChanges.length === 0)\r\n return;\r\n await this._ipcRequestsHandler.updateHierarchyState({ imodelKey, rulesetId, stateChanges });\r\n }\r\n\r\n public async onHierarchyClosed(imodel: IModelConnection, rulesetId: string, sourceId: string) {\r\n const hierarchyState = this._hierarchyStates.get(rulesetId);\r\n if (!hierarchyState)\r\n return;\r\n\r\n const stateChanges: ReportedNodeState[] = [];\r\n hierarchyState.forEach((entry) => {\r\n if (!entry.states.has(sourceId)) {\r\n // the node has no state for this source - nothing to do\r\n return;\r\n }\r\n using(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {\r\n entry.states.delete(sourceId);\r\n });\r\n });\r\n\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);\r\n }\r\n\r\n public async onHierarchyStateChanged(imodel: IModelConnection, rulesetId: string, sourceId: string, newHierarchyState: Array<{ node: NodeIdentifier \| undefined, state: NodeState }>) {\r\n let hierarchyState = this._hierarchyStates.get(rulesetId);\r\n if (!hierarchyState) {\r\n if (newHierarchyState.length === 0)\r\n return;\r\n\r\n hierarchyState = new Map();\r\n this._hierarchyStates.set(rulesetId, hierarchyState);\r\n }\r\n\r\n const handledNodeIds = new Set<string \| undefined>();\r\n const stateChanges: ReportedNodeState[] = [];\r\n\r\n // step 1: walk over new state and report all changes\r\n newHierarchyState.forEach(({ node, state }) => {\r\n const nodeId = node?.id;\r\n const nodeKey = node?.key;\r\n const existingNodeEntry = hierarchyState!.get(nodeId);\r\n if (existingNodeEntry) {\r\n using(new MergedNodeStateChangeReporter(existingNodeEntry, stateChanges), (_) => {\r\n existingNodeEntry.states.set(sourceId, state);\r\n });\r\n } else {\r\n hierarchyState!.set(nodeId, { key: nodeKey, states: new Map([[sourceId, state]]) });\r\n stateChanges.push({ ...calculateMergedNodeState([state].values()), nodeKey });\r\n }\r\n handledNodeIds.add(nodeId);\r\n });\r\n\r\n // step 2: walk over old state and remove all state that's not in the new state\r\n const erasedNodeIds = new Set<string \| undefined>();\r\n hierarchyState.forEach((entry, nodeId) => {\r\n if (handledNodeIds.has(nodeId)) {\r\n // the node was handled with the new state - nothing to do here\r\n return;\r\n }\r\n\r\n if (!entry.states.has(sourceId)) {\r\n // the node had no state for this source, so it's not affected by this report\r\n return;\r\n }\r\n\r\n using(new MergedNodeStateChangeReporter(entry, stateChanges), (_) => {\r\n entry.states.delete(sourceId);\r\n });\r\n\r\n // istanbul ignore next\r\n if (entry.states.size === 0) {\r\n // there are no more components holding state for this node\r\n erasedNodeIds.add(nodeId);\r\n }\r\n });\r\n\r\n // step 3: cleanup erased node ids and possibly the whole hierarchy state\r\n for (const nodeId of erasedNodeIds) {\r\n hierarchyState.delete(nodeId);\r\n }\r\n if (hierarchyState.size === 0)\r\n this._hierarchyStates.delete(rulesetId);\r\n\r\n // finally, report\r\n await this.updateHierarchyStateIfNeeded(imodel.key, rulesetId, stateChanges);\r\n }\r\n}\r\n\r\nfunction calculateMergedNodeState(perComponentStates: IterableIterator<NodeState>): MergedNodeState {\r\n const merged: MergedNodeState = {};\r\n for (const state of perComponentStates) {\r\n if (state.isExpanded)\r\n merged.isExpanded = true;\r\n if (state.instanceFilter) {\r\n if (!merged.instanceFilters)\r\n merged.instanceFilters = [state.instanceFilter];\r\n else if (!merged.instanceFilters.includes(state.instanceFilter))\r\n merged.instanceFilters.push(state.instanceFilter);\r\n }\r\n }\r\n return merged;\r\n}\r\n\r\nclass MergedNodeStateChangeReporter implements IDisposable {\r\n private _entry: NodeStatesEntry;\r\n private _stateBefore: MergedNodeState;\r\n private _outStateChanges: ReportedNodeState[];\r\n public constructor(entry: NodeStatesEntry, outStateChanges: ReportedNodeState[]) {\r\n this._entry = entry;\r\n this._stateBefore = calculateMergedNodeState(this._entry.states.values());\r\n this._outStateChanges = outStateChanges;\r\n }\r\n public dispose() {\r\n const stateAfter = calculateMergedNodeState(this._entry.states.values());\r\n const expandedFlagsDiffer = !!stateAfter.isExpanded !== !!this._stateBefore.isExpanded;\r\n const instanceFiltersDiffer = (stateAfter.instanceFilters?.length ?? 0) !== (this._stateBefore.instanceFilters?.length ?? 0);\r\n if (expandedFlagsDiffer \|\| instanceFiltersDiffer)\r\n this._outStateChanges.push({ ...stateAfter, nodeKey: this._entry.key });\r\n }\r\n}\r\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/presentation-frontend",
-  "version": "3.6.0-dev.14",
+  "version": "3.6.0-dev.21",
   "description": "Frontend of iModel.js Presentation library",
   "main": "lib/cjs/presentation-frontend.js",
   "module": "lib/esm/presentation-frontend.js",
@@ -22,21 +22,21 @@
     "url": "http://www.bentley.com"
   },
   "peerDependencies": {
-    "@itwin/core-bentley": "^3.6.0-dev.14",
-    "@itwin/core-common": "^3.6.0-dev.14",
-    "@itwin/core-frontend": "^3.6.0-dev.14",
-    "@itwin/core-quantity": "^3.6.0-dev.14",
-    "@itwin/presentation-common": "^3.6.0-dev.14"
+    "@itwin/core-bentley": "^3.6.0-dev.21",
+    "@itwin/core-common": "^3.6.0-dev.21",
+    "@itwin/core-frontend": "^3.6.0-dev.21",
+    "@itwin/core-quantity": "^3.6.0-dev.21",
+    "@itwin/presentation-common": "^3.6.0-dev.21"
   },
   "devDependencies": {
-    "@itwin/build-tools": "3.6.0-dev.14",
-    "@itwin/core-bentley": "3.6.0-dev.14",
-    "@itwin/core-common": "3.6.0-dev.14",
-    "@itwin/core-frontend": "3.6.0-dev.14",
-    "@itwin/core-i18n": "3.6.0-dev.14",
-    "@itwin/core-quantity": "3.6.0-dev.14",
-    "@itwin/eslint-plugin": "3.6.0-dev.14",
-    "@itwin/presentation-common": "3.6.0-dev.14",
+    "@itwin/build-tools": "3.6.0-dev.21",
+    "@itwin/core-bentley": "3.6.0-dev.21",
+    "@itwin/core-common": "3.6.0-dev.21",
+    "@itwin/core-frontend": "3.6.0-dev.21",
+    "@itwin/core-i18n": "3.6.0-dev.21",
+    "@itwin/core-quantity": "3.6.0-dev.21",
+    "@itwin/eslint-plugin": "3.6.0-dev.21",
+    "@itwin/presentation-common": "3.6.0-dev.21",
     "@types/chai": "4.3.1",
     "@types/chai-as-promised": "^7",
     "@types/chai-jest-snapshot": "^1.3.0",