Skip to content

[Tree widget]: use IdSet instead of InVirtualSet on next #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JonasDov wants to merge 7 commits into
base: tree-widget/next
Choose a base branch
from
Draft

[Tree widget]: use IdSet instead of InVirtualSet on next #1629

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed4c493
Use ids set
JonasDov Mar 17, 2026
c232bcb
Fix issues
JonasDov Mar 19, 2026
c7f32f6
Merge branch 'tree-widget/next' into JonasD/ids-set
JonasDov Mar 19, 2026
eeb15f1
Remove joinId64Arg
JonasDov Mar 19, 2026
27796e5
Run install
JonasDov Mar 19, 2026
fa70f3b
extract api?
JonasDov Mar 19, 2026
a4e06f4
Use IdSet with JOIN
JonasDov Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@
"Descr",
"ecschema",
"ecsql",
"ECSQLOPTIONS",
"frontstage",
"frontstages",
"hilite",
"hilited",
"idset",
"IFNULL",
"IMJS",
"imodel",
"imodels",
"IMJS",
"itwin",
"itwins",
"itwinui",
Expand Down
144 changes: 25 additions & 119 deletions packages/itwin/tree-widget/api/tree-widget-react.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ export const CategoriesTreeComponent: {
HideAllButton: CategoriesTreeHeaderButtonType;
InvertAllButton: CategoriesTreeHeaderButtonType;
id: string;
getLabel({
standardLabels
}: {
getLabel(input: {
standardLabels: StandardTreeLabels;
}): string;
};
Expand Down Expand Up @@ -125,9 +123,7 @@ interface CategoriesTreeHierarchyConfiguration {
}

// @beta (undocumented)
export function CategoriesTreeIcon({
node
}: {
export function CategoriesTreeIcon(input: {
node: TreeNode;
}): react_jsx_runtime0.JSX.Element | undefined;

Expand Down Expand Up @@ -203,9 +199,7 @@ type ClassGroupingHierarchyNode = GroupingHierarchyNode & {
export const ClassificationsTreeComponent: {
(props: ClassificationsTreeComponentProps): react_jsx_runtime0.JSX.Element | null;
id: string;
getLabel({
standardLabels
}: {
getLabel(input: {
standardLabels: StandardTreeLabels;
}): string;
isSupportedByIModel(imodel: IModelConnection): Promise<boolean>;
Expand All @@ -226,9 +220,7 @@ interface ClassificationsTreeHierarchyConfiguration {
}

// @beta (undocumented)
export function ClassificationsTreeIcon({
node
}: {
export function ClassificationsTreeIcon(input: {
node: TreeNode;
}): react_jsx_runtime0.JSX.Element | undefined;

Expand Down Expand Up @@ -300,16 +292,9 @@ type ExtendedVisibilityTreeRendererProps = CallbacksWithCommonTreeRendererProps<

// @beta
export const ExternalSourcesTreeComponent: {
({
onFeatureUsed,
onPerformanceMeasured,
treeLabel,
...props
}: ExternalSourcesTreeComponentProps): react_jsx_runtime0.JSX.Element | null;
(input: ExternalSourcesTreeComponentProps): react_jsx_runtime0.JSX.Element | null;
id: string;
getLabel({
standardLabels
}: {
getLabel(input: {
standardLabels: StandardTreeLabels;
}): string;
};
Expand All @@ -323,9 +308,7 @@ interface ExternalSourcesTreeComponentProps extends Pick<ExternalSourcesTreeProp
}

// @beta (undocumented)
export function ExternalSourcesTreeIcon({
node
}: {
export function ExternalSourcesTreeIcon(input: {
node: TreeNode;
}): react_jsx_runtime0.JSX.Element | undefined;

Expand All @@ -344,11 +327,7 @@ interface FocusedInstancesContext {
}

// @public
export function FocusedInstancesContextProvider({
selectionStorage,
imodelKey,
children
}: PropsWithChildren<{
export function FocusedInstancesContextProvider(input: PropsWithChildren<{
selectionStorage: SelectionStorage;
imodelKey: string;
}>): react_jsx_runtime0.JSX.Element;
Expand All @@ -374,16 +353,9 @@ type HierarchyVisibilityHandlerOverridableMethodProps<TFunc> = TFunc extends ((p

// @beta
export const IModelContentTreeComponent: {
({
onFeatureUsed,
onPerformanceMeasured,
treeLabel,
...props
}: IModelContentTreeComponentProps): react_jsx_runtime0.JSX.Element | null;
(input: IModelContentTreeComponentProps): react_jsx_runtime0.JSX.Element | null;
id: string;
getLabel({
standardLabels
}: {
getLabel(input: {
standardLabels: StandardTreeLabels;
}): string;
};
Expand All @@ -402,9 +374,7 @@ interface IModelContentTreeHierarchyConfiguration {
}

// @beta (undocumented)
export function IModelContentTreeIcon({
node
}: {
export function IModelContentTreeIcon(input: {
node: TreeNode;
}): react_jsx_runtime0.JSX.Element | undefined;

Expand All @@ -428,10 +398,7 @@ interface LoadedTreeItemVisibilityButtonState {
export const LOCALIZATION_NAMESPACES: string[];

// @beta
export function LocalizationContextProvider({
localization,
children
}: PropsWithChildren<LocalizationContextProviderProps>): JSX_2.Element;
export function LocalizationContextProvider(input: PropsWithChildren<LocalizationContextProviderProps>): JSX_2.Element;

// @beta
interface LocalizationContextProviderProps {
Expand All @@ -456,9 +423,7 @@ export const ModelsTreeComponent: {
View3DButton: ModelsTreeHeaderButtonType;
ToggleInstancesFocusButton: ModelsTreeHeaderButtonType;
id: string;
getLabel({
standardLabels
}: {
getLabel(input: {
standardLabels: StandardTreeLabels;
}): string;
};
Expand Down Expand Up @@ -491,9 +456,7 @@ interface ModelsTreeHierarchyConfiguration {
}

// @beta (undocumented)
export function ModelsTreeIcon({
node
}: {
export function ModelsTreeIcon(input: {
node: TreeNode;
}): react_jsx_runtime0.JSX.Element | undefined;

Expand Down Expand Up @@ -574,15 +537,10 @@ export class SearchLimitExceededError extends Error {
}

// @beta (undocumented)
export function SelectableTree({
buttons,
children
}: PropsWithChildren<TreeHeaderProps>): react_jsx_runtime0.JSX.Element;
export function SelectableTree(input: PropsWithChildren<TreeHeaderProps>): react_jsx_runtime0.JSX.Element;

// @beta
export function SharedTreeContextProvider({
children
}: PropsWithChildren<{}>): react_jsx_runtime0.JSX.Element;
export function SharedTreeContextProvider(input: PropsWithChildren<{}>): react_jsx_runtime0.JSX.Element;

// @beta
export function SkeletonTree(): react_jsx_runtime0.JSX.Element;
Expand All @@ -602,12 +560,7 @@ interface StandardTreeLabels {
}

// @beta (undocumented)
export function TelemetryContextProvider({
children,
onPerformanceMeasured,
onFeatureUsed,
componentIdentifier
}: PropsWithChildren<TelemetryContextProviderProps>): react_jsx_runtime0.JSX.Element;
export function TelemetryContextProvider(input: PropsWithChildren<TelemetryContextProviderProps>): react_jsx_runtime0.JSX.Element;

// @beta (undocumented)
interface TelemetryContextProviderProps {
Expand All @@ -617,16 +570,7 @@ interface TelemetryContextProviderProps {
}

// @beta
export function Tree({
hierarchyLevelSizeLimit,
getHierarchyDefinition,
getSearchPaths,
selectionStorage,
imodelAccess: providedIModelAccess,
treeName,
onReload,
...props
}: TreeProps): react_jsx_runtime0.JSX.Element;
export function Tree(input: TreeProps): react_jsx_runtime0.JSX.Element;

export { TreeActionBase }

Expand Down Expand Up @@ -709,10 +653,7 @@ export class TreeWidget {
}

// @public
export function TreeWidgetComponent({
localization,
...props
}: TreeWidgetProps): react_jsx_runtime0.JSX.Element;
export function TreeWidgetComponent(input: TreeWidgetProps): react_jsx_runtime0.JSX.Element;

// @public
interface TreeWidgetProps {
Expand Down Expand Up @@ -780,19 +721,10 @@ export interface TreeWidgetViewport {
}

// @beta
export function useCategoriesTree({
searchText,
activeView,
onCategoriesFiltered,
emptyTreeContent,
hierarchyConfig,
getTreeItemProps
}: UseCategoriesTreeProps): UseCategoriesTreeResult;
export function useCategoriesTree(input: UseCategoriesTreeProps): UseCategoriesTreeResult;

// @public
export function useCategoriesTreeButtonProps({
viewport
}: {
export function useCategoriesTreeButtonProps(input: {
viewport: TreeWidgetViewport;
}): {
buttonProps: Pick<CategoriesTreeHeaderButtonProps, "categories" | "viewport" | "models">;
Expand Down Expand Up @@ -830,14 +762,7 @@ interface UseCategoriesTreeResult {
}

// @alpha
export function useClassificationsTree({
activeView,
emptyTreeContent,
searchText,
getTreeItemProps,
visibilityHandlerConfig,
...rest
}: UseClassificationsTreeProps): UseClassificationsTreeResult;
export function useClassificationsTree(input: UseClassificationsTreeProps): UseClassificationsTreeResult;

// @alpha
export function useClassificationsTreeDefinition(props: UseClassificationsTreeDefinitionProps): UseClassificationsTreeDefinitionResult;
Expand Down Expand Up @@ -890,24 +815,10 @@ interface UseClassificationsTreeResult {
export function useFocusedInstancesContext(): FocusedInstancesContext;

// @beta
export function useModelsTree({
activeView,
searchText,
hierarchyConfig,
visibilityHandlerOverrides,
getSearchPaths,
onModelsFiltered,
selectionPredicate: nodeTypeSelectionPredicate,
emptyTreeContent,
getSubTreePaths,
getTreeItemProps
}: UseModelsTreeProps): UseModelsTreeResult;
export function useModelsTree(input: UseModelsTreeProps): UseModelsTreeResult;

// @public
export function useModelsTreeButtonProps({
imodel,
viewport
}: {
export function useModelsTreeButtonProps(input: {
imodel: IModelConnection;
viewport: TreeWidgetViewport;
}): {
Expand Down Expand Up @@ -975,12 +886,7 @@ export interface VisibilityStatus {
}

// @beta
export function VisibilityTree({
visibilityHandlerFactory,
treeRenderer,
hierarchyLevelSizeLimit,
...props
}: VisibilityTreeProps): react_jsx_runtime0.JSX.Element;
export function VisibilityTree(input: VisibilityTreeProps): react_jsx_runtime0.JSX.Element;

// @beta (undocumented)
type VisibilityTreeProps = Omit<TreeProps, "treeRenderer" | "imodelAccess"> & {
Expand Down
46 changes: 23 additions & 23 deletions packages/itwin/tree-widget/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@
"check-extractions": "node ../../../scripts/updateExtractions.js --targets=./README.md --check"
},
"peerDependencies": {
"@itwin/appui-abstract": "^5.0.0",
"@itwin/appui-abstract": "^5.7.0",
"@itwin/appui-react": "^5.5.0",
"@itwin/core-bentley": "^5.0.0",
"@itwin/components-react": "^5.5.0",
"@itwin/core-common": "^5.0.0",
"@itwin/core-frontend": "^5.0.0",
"@itwin/ecschema-metadata": "^5.0.0",
"@itwin/core-common": "^5.7.0",
"@itwin/core-frontend": "^5.7.0",
"@itwin/ecschema-metadata": "^5.7.0",
"@stratakit/foundations": "^0.4.5",
"@stratakit/bricks": "^0.5.4",
"@stratakit/structures": "^0.5.4",
"@stratakit/icons": "^0.2.2",
"@itwin/presentation-common": "^5.0.0",
"@itwin/presentation-common": "^5.7.0",
"@itwin/presentation-components": "^5.12.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
Expand All @@ -79,32 +79,32 @@
},
"devDependencies": {
"@bentley/classification-systems-schema": "1.0.4",
"@itwin/appui-abstract": "^5.7.0-dev.14",
"@itwin/appui-abstract": "^5.7.2",
"@itwin/appui-react": "^5.24.1",
"@itwin/build-tools": "^5.7.0-dev.14",
"@itwin/build-tools": "^5.7.2",
"@itwin/components-react": "^5.24.1",
"@itwin/core-backend": "^5.7.0-dev.14",
"@itwin/core-bentley": "^5.7.0-dev.14",
"@itwin/core-common": "^5.7.0-dev.14",
"@itwin/core-frontend": "^5.7.0-dev.14",
"@itwin/core-geometry": "^5.7.0-dev.14",
"@itwin/core-i18n": "^5.7.0-dev.14",
"@itwin/core-markup": "^5.7.0-dev.14",
"@itwin/core-orbitgt": "^5.7.0-dev.14",
"@itwin/core-quantity": "^5.7.0-dev.14",
"@itwin/core-backend": "^5.7.2",
"@itwin/core-bentley": "^5.7.2",
"@itwin/core-common": "^5.7.2",
"@itwin/core-frontend": "^5.7.2",
"@itwin/core-geometry": "^5.7.2",
"@itwin/core-i18n": "^5.7.2",
"@itwin/core-markup": "^5.7.2",
"@itwin/core-orbitgt": "^5.7.2",
"@itwin/core-quantity": "^5.7.2",
"@itwin/core-react": "^5.24.1",
"@itwin/ecschema-metadata": "^5.7.0-dev.14",
"@itwin/ecschema-rpcinterface-common": "^5.7.0-dev.14",
"@itwin/ecschema-rpcinterface-impl": "^5.7.0-dev.14",
"@itwin/ecschema-metadata": "^5.7.2",
"@itwin/ecschema-rpcinterface-common": "^5.7.2",
"@itwin/ecschema-rpcinterface-impl": "^5.7.2",
"@itwin/eslint-plugin": "^6.0.0",
"@itwin/imodel-components-react": "^5.24.1",
"@itwin/oidc-signin-tool": "^5.1.0",
"@itwin/presentation-backend": "^5.7.0-dev.14",
"@itwin/presentation-common": "^5.7.0-dev.14",
"@itwin/presentation-backend": "^5.7.2",
"@itwin/presentation-common": "^5.7.2",
"@itwin/presentation-components": "^5.12.18",
"@itwin/presentation-frontend": "^5.7.0-dev.14",
"@itwin/presentation-frontend": "^5.7.2",
"@itwin/presentation-testing": "^5.4.16",
"@itwin/webgl-compatibility": "^5.7.0-dev.14",
"@itwin/webgl-compatibility": "^5.7.2",
"@rollup/plugin-babel": "^7.0.0",
"@stratakit/foundations": "^0.4.5",
"@stratakit/bricks": "^0.5.4",
Expand Down
Loading
Loading