Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ packages/modules/imodel-browser/ @aruniverse @ben-polinsky
common/changes/@itwin/imodel-browser-react/ @aruniverse @ben-polinsky
packages/apps/storybook/src/imodel-browser/ @aruniverse @ben-polinsky

# imodel-browser MUI/Stratakit components (alpha)
packages/modules/imodel-browser/src/mui/ @alexdunae @toddsouthenbentley @kckst8
packages/apps/storybook/src/imodel-browser/mui/ @alexdunae @toddsouthenbentley @kckst8

# delete-imodel
packages/modules/delete-imodel/ @veekeys
common/changes/@itwin/delete-imodel-react/ @veekeys
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/imodel-browser-react",
"comment": "Reorganize internal paths of Stratakit MUI components",
"type": "none"
}
],
"packageName": "@itwin/imodel-browser-react"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import React from "react";
import {
BaseCard,
BaseCardProps,
} from "../../../../modules/imodel-browser/src/components/baseCard/BaseCard";
import { ThumbnailIconButton } from "../../../../modules/imodel-browser/src/components/baseCard/ThumbnailIconButton";
import bridgeThumbnail from "../utils/bridge.jpg";
import nightThumbnail from "../utils/night.jpg";
} from "../../../../../modules/imodel-browser/src/mui/components/baseCard/BaseCard";
import { ThumbnailIconButton } from "../../../../../modules/imodel-browser/src/mui/components/baseCard/ThumbnailIconButton";
import bridgeThumbnail from "../../utils/bridge.jpg";
import nightThumbnail from "../../utils/night.jpg";

const InConstrainedContainer = ({
children,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import { Meta, Story } from "@storybook/react/types-6-0";
import SvgDelete from "@stratakit/icons/delete.svg";
import React from "react";

import bridgeThumbnail from "../utils/bridge.jpg";
import nightThumbnail from "../utils/night.jpg";
import bridgeThumbnail from "../../utils/bridge.jpg";
import nightThumbnail from "../../utils/night.jpg";
import {
accessTokenArgTypes,
withAccessTokenOverride,
withITwinIdOverride,
} from "../utils/storyHelp";
} from "../../utils/storyHelp";
import {
additionalData,
initialData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import {
type IModelTileProps,
} from "@itwin/imodel-browser-react/mui";
import React from "react";
import bridgeThumbnail from "../utils/bridge.jpg";
import nightThumbnail from "../utils/night.jpg";
import overpassThumbnail from "../utils/overpass.jpg";
import powerThumbnail from "../utils/power.jpg";

import bridgeThumbnail from "../../utils/bridge.jpg";
import nightThumbnail from "../../utils/night.jpg";
import overpassThumbnail from "../../utils/overpass.jpg";
import powerThumbnail from "../../utils/power.jpg";

export const initialData: IModelFull[] = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import svgRoad from "@stratakit/icons/road.svg";
import SvgShare from "@stratakit/icons/share.svg";
import React from "react";

import bridgeThumbnail from "../utils/bridge.jpg";
import overpassThumbnail from "../utils/overpass.jpg";
import bridgeThumbnail from "../../utils/bridge.jpg";
import overpassThumbnail from "../../utils/overpass.jpg";

const InConstrainedContainer = ({
children,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import { action } from "@storybook/addon-actions";
import { Meta, Story } from "@storybook/react/types-6-0";
import React from "react";

import bridgeThumbnail from "../utils/bridge.jpg";
import nightThumbnail from "../utils/night.jpg";
import overpassThumbnail from "../utils/overpass.jpg";
import powerThumbnail from "../utils/power.jpg";
import bridgeThumbnail from "../../utils/bridge.jpg";
import nightThumbnail from "../../utils/night.jpg";
import overpassThumbnail from "../../utils/overpass.jpg";
import powerThumbnail from "../../utils/power.jpg";
import {
accessTokenArgTypes,
withAccessTokenOverride,
} from "../utils/storyHelp";
} from "../../utils/storyHelp";

type ITwinTileType = React.ComponentPropsWithoutRef<typeof ITwinTile>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import { Meta, Story } from "@storybook/react/types-6-0";
import svgMagnet from "@stratakit/icons/magnet.svg";
import React from "react";

import { DefaultThumbnail } from "../../../../modules/imodel-browser/src/containers/ITwinGrid/ITwinTileMUI";
import bridgeThumbnail from "../utils/bridge.jpg";
import powerThumbnail from "../utils/power.jpg";
import { DefaultThumbnail } from "../../../../../modules/imodel-browser/src/mui/containers/ITwinGrid/ITwinTileMUI";
import bridgeThumbnail from "../../utils/bridge.jpg";
import powerThumbnail from "../../utils/power.jpg";

const InConstrainedContainer = ({
children,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* See LICENSE.md in the project root for license terms and full copyright notice.
*--------------------------------------------------------------------------------------------*/
import {
NoResults as ExternalComponent,
type NoResultsProps as NoResultsMUIProps,
NoResults as ExternalComponent,
} from "@itwin/imodel-browser-react/mui";
import { Meta, Story } from "@storybook/react/types-6-0";
import React from "react";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import { Icon } from "@stratakit/mui";
import React, { type ReactNode } from "react";

import {
getPrimaryCardAction,
type ResolvedCardActionItem,
} from "../../utils/_buildMenuOptions";
getPrimaryCardAction,
} from "../../../utils/_buildMenuOptions";
import { spreadSx } from "../../utils/spreadSx";
import MoreMenuMUI, {
type MoreMenuHandle,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ export const FavoriteIconMUI = ({
onMouseLeave={() => setHovered(false)}
onClick={async (event: React.MouseEvent<HTMLButtonElement>) => {
// debounce
if (pending) return;
if (pending) {
return;
}

setPending(true);
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@ import Box from "@mui/material/Box";
import React from "react";
import { InView } from "react-intersection-observer";

import { BaseCardLoading } from "../../components/baseCard/BaseCardLoading";
import { NoResultsMUI } from "../../components/noResults/NoResultsMUI";
import { type ITwinTableOverridesMUI } from "../../mui/types";
import { type ITwinFull, DataStatus } from "../../types";
import { _mergeStrings } from "../../utils/_apiOverrides";
import type {
ITwinGridProps,
ITwinGridStrings,
} from "../../../containers/ITwinGrid/ITwinGrid";
import { useITwinData } from "../../../containers/ITwinGrid/useITwinData";
import { useITwinFavorites } from "../../../containers/ITwinGrid/useITwinFavorites";
import { type ITwinFull, DataStatus } from "../../../types";
import { _mergeStrings } from "../../../utils/_apiOverrides";
import {
type CardActionsItemMUI,
MoreActionsMenuItemMUI,
resolveCardActionsItemsMUI,
} from "../../utils/_buildMenuOptions";
import type { ITwinGridProps, ITwinGridStrings } from "./ITwinGrid";
} from "../../../utils/_buildMenuOptions";
import { BaseCardLoading } from "../../components/baseCard/BaseCardLoading";
import { NoResultsMUI } from "../../components/noResults/NoResultsMUI";
import { type ITwinTableOverridesMUI } from "../../types";
import { type ITwinTableMUIStrings, ITwinTableMUI } from "./ITwinTableMUI";
import { type ITwinTilePropsMUI, ITwinTileMUI } from "./ITwinTileMUI";
import { useITwinData } from "./useITwinData";
import { useITwinFavorites } from "./useITwinFavorites";

/** @alpha */
export type IndividualITwinStateHookMUI = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import svgMore from "@stratakit/icons/more-vertical.svg";
import { Icon } from "@stratakit/mui";
import React from "react";

import MoreMenuMUI from "../../components/MoreMenuMUI";
import { FavoriteIconMUI } from "../../components/tileFavoriteIcon/FavoriteIconMUI";
import { type ITwinTableOverridesMUI } from "../../mui/types";
import { ITwinCellColumn, ITwinFull } from "../../types";
import { ITwinCellColumn, ITwinFull } from "../../../types";
import {
type MoreActionsMenuItemMUI,
type ResolvedCardActionItem,
getPrimaryCardAction,
resolveMoreActionsMenuItemsMUI,
} from "../../utils/_buildMenuOptions";
import { formatDate } from "../../utils/formatDate";
} from "../../../utils/_buildMenuOptions";
import { formatDate } from "../../../utils/formatDate";
import MoreMenuMUI from "../../components/MoreMenuMUI";
import { FavoriteIconMUI } from "../../components/tileFavoriteIcon/FavoriteIconMUI";
import { type ITwinTableOverridesMUI } from "../../types";

const EMPTY_COLUMN_OVERRIDES: NonNullable<
ITwinTableOverridesMUI["columnOverrides"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ import Chip from "@mui/material/Chip";
import svgItwin from "@stratakit/icons/itwin.svg";
import React from "react";

import { ITwinTileProps } from "../../../containers/ITwinGrid/ITwinTile";
import { ITwinFull } from "../../../types";
import { _mergeStrings } from "../../../utils/_apiOverrides";
import {
type MoreActionsMenuItemMUI,
type ResolvedMoreActionsMenuItem,
} from "../../../utils/_buildMenuOptions";
import { formatDate } from "../../../utils/formatDate";
import {
type BaseCardProps,
BaseCard,
} from "../../components/baseCard/BaseCard";
import { SvgThumbnail } from "../../components/baseCard/SvgThumbnail";
import { FavoriteIconMUI } from "../../components/tileFavoriteIcon/FavoriteIconMUI";
import { ITwinFull } from "../../types";
import { _mergeStrings } from "../../utils/_apiOverrides";
import {
type MoreActionsMenuItemMUI,
type ResolvedMoreActionsMenuItem,
} from "../../utils/_buildMenuOptions";
import { formatDate } from "../../utils/formatDate";
import { ITwinTileProps } from "./ITwinTile";

/** @alpha */
export interface ITwinTilePropsMUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,38 @@ import Box from "@mui/material/Box";
import React from "react";
import { InView } from "react-intersection-observer";

import { BaseCardLoading } from "../../components/baseCard/BaseCardLoading";
import { NoResultsMUI as NoResults } from "../../components/noResults/NoResultsMUI";
import { IModelFavoritesProvider } from "../../contexts/IModelFavoritesContext";
import { type IModelTableOverridesMUI } from "../../mui/types";
import type { IModelGridProps } from "../../../containers/iModelGrid/IModelGrid";
import {
DEFAULT_PAGE_SIZE,
useIModelData,
} from "../../../containers/iModelGrid/useIModelData";
import { IModelFavoritesProvider } from "../../../contexts/IModelFavoritesContext";
import {
type AccessTokenProvider,
type ApiOverrides,
type IModelFull,
DataStatus,
IModelSortOptions,
} from "../../types";
import { _mergeStrings } from "../../utils/_apiOverrides";
} from "../../../types";
import { _mergeStrings } from "../../../utils/_apiOverrides";
import {
type CardActionsItemMUI,
MoreActionsMenuItemMUI,
resolveCardActionsItemsMUI,
} from "../../utils/_buildMenuOptions";
} from "../../../utils/_buildMenuOptions";
import {
addIModelToRecents,
removeIModelFromRecents,
} from "../../utils/iModelApi";
} from "../../../utils/iModelApi";
import { BaseCardLoading } from "../../components/baseCard/BaseCardLoading";
import { NoResultsMUI as NoResults } from "../../components/noResults/NoResultsMUI";
import { type IModelTableOverridesMUI } from "../../types";
import {
type IModelTileMUIProps,
IModelTileMUI,
} from "../iModelTiles/IModelTileMUI";
import { clientSideIModelSort } from "./clientSideIModelSort";
import type { IModelGridProps } from "./IModelGrid";
import { type IModelTableMUIStrings, IModelTableMUI } from "./IModelTableMUI";
import { DEFAULT_PAGE_SIZE, useIModelData } from "./useIModelData";

/**
* Localized strings for the MUI IModelGrid. Extends the table-level strings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ import svgMore from "@stratakit/icons/more-vertical.svg";
import { Icon } from "@stratakit/mui";
import React from "react";

import MoreMenuMUI from "../../components/MoreMenuMUI";
import { FavoriteIconMUI } from "../../components/tileFavoriteIcon/FavoriteIconMUI";
import { useIModelFavoritesContext } from "../../contexts/IModelFavoritesContext";
import { type IModelTableOverridesMUI } from "../../mui/types";
import { type IModelFull, IModelCellColumn } from "../../types";
import { useIModelFavoritesContext } from "../../../contexts/IModelFavoritesContext";
import { type IModelFull, IModelCellColumn } from "../../../types";
import {
type MoreActionsMenuItemMUI,
type ResolvedCardActionItem,
getPrimaryCardAction,
resolveMoreActionsMenuItemsMUI,
} from "../../utils/_buildMenuOptions";
import { formatDate } from "../../utils/formatDate";
} from "../../../utils/_buildMenuOptions";
import { formatDate } from "../../../utils/formatDate";
import MoreMenuMUI from "../../components/MoreMenuMUI";
import { FavoriteIconMUI } from "../../components/tileFavoriteIcon/FavoriteIconMUI";
import { type IModelTableOverridesMUI } from "../../types";

const EMPTY_COLUMN_OVERRIDES: NonNullable<
IModelTableOverridesMUI["columnOverrides"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
* See LICENSE.md in the project root for license terms and full copyright notice.
*--------------------------------------------------------------------------------------------*/
import type { IModelFull, IModelSortOptions, ViewType } from "../../types";
import type { IModelFull, IModelSortOptions, ViewType } from "../../../types";

export interface ClientSideIModelSortOptions {
viewMode: ViewType | undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import classNames from "classnames";
import React from "react";
import { useInView } from "react-intersection-observer";

import { AccessTokenProvider, ApiOverrides } from "../../types";
import { useIModelThumbnail } from "./useIModelThumbnail";
import { useIModelThumbnail } from "../../../containers/iModelThumbnail/useIModelThumbnail";
import { AccessTokenProvider, ApiOverrides } from "../../../types";

/** @alpha */
export interface IModelThumbnailMUIProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
import svgImodel from "@stratakit/icons/imodel.svg";
import React from "react";

import { IModelTileProps } from "../../../containers/iModelTiles/IModelTile";
import { IModelFavoritesContext } from "../../../contexts/IModelFavoritesContext";
import { AccessTokenProvider, ApiOverrides, IModelFull } from "../../../types";
import { _mergeStrings } from "../../../utils/_apiOverrides";
import {
type MoreActionsMenuItemMUI,
type ResolvedMoreActionsMenuItem,
} from "../../../utils/_buildMenuOptions";
import {
type BaseCardProps,
BaseCard,
} from "../../components/baseCard/BaseCard";
import { FavoriteIconMUI } from "../../components/tileFavoriteIcon/FavoriteIconMUI";
import { IModelFavoritesContext } from "../../contexts/IModelFavoritesContext";
import { AccessTokenProvider, ApiOverrides, IModelFull } from "../../types";
import { _mergeStrings } from "../../utils/_apiOverrides";
import {
type MoreActionsMenuItemMUI,
type ResolvedMoreActionsMenuItem,
} from "../../utils/_buildMenuOptions";
import { IModelThumbnailMUI } from "../iModelThumbnail/IModelThumbnailMUI";
import { IModelTileProps } from "./IModelTile";

/** @alpha */
export interface IModelTileMUIProps
Expand Down
Loading
Loading