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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "Upgrade @stratakit/mui to 1.0.0, add @stratakit/foundations peer dependency, bump @mui/material to ^9.4.0, and update @stratakit/icons to ^0.4.3",
"type": "minor",
"packageName": "@itwin/imodel-browser-react"
}
],
"packageName": "@itwin/imodel-browser-react",
"email": "toddsouthenbentley@users.noreply.github.com"
}
222 changes: 129 additions & 93 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions packages/apps/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
"@itwin/delete-imodel-react": "workspace:*",
"@itwin/delete-itwin-react": "workspace:*",
"@itwin/imodel-browser-react": "workspace:*",
"@mui/material": "~9.0.0",
"@mui/system": "~9.0.0",
"@mui/material": "~9.4.0",
"@mui/system": "~9.4.0",
"@mui/x-data-grid": "~9.3.0",
"@stratakit/icons": "~0.3.1",
"@stratakit/mui": "~0.4.1",
"@stratakit/foundations": "~1.0.0",
"@stratakit/icons": "~0.4.3",
"@stratakit/mui": "~1.0.0",
"@itwin/itwinui-icons-react": "2.10.0",
"@itwin/itwinui-react": "^3.19.4",
"@itwin/manage-versions-react": "workspace:*",
Expand Down
17 changes: 11 additions & 6 deletions packages/modules/imodel-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@
},
"devDependencies": {
"@itwin/itwinui-react": "^3.19.4",
"@mui/material": "^9.0.0",
"@mui/material": "^9.4.0",
"@mui/x-data-grid": "^9.3.0",
"@rollup/plugin-commonjs": "~17.1.0",
"@rollup/plugin-url": "^8.0.1",
"@stratakit/icons": "^0.3.1",
"@stratakit/mui": "^0.4.1",
"@stratakit/foundations": "^1.0.0",
"@stratakit/icons": "^0.4.3",
"@stratakit/mui": "^1.0.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^11.1.0",
"@testing-library/react-hooks": "^5.1.0",
Expand Down Expand Up @@ -97,10 +98,11 @@
},
"peerDependencies": {
"@itwin/itwinui-react": "^3.17.3",
"@mui/material": "^9.0.0",
"@mui/material": "^9.4.0",
"@mui/x-data-grid": "^9.3.0",
"@stratakit/icons": "^0.3.1",
"@stratakit/mui": "^0.4.1",
"@stratakit/foundations": "^1.0.0",
"@stratakit/icons": "^0.4.3",
"@stratakit/mui": "^1.0.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
Expand All @@ -111,6 +113,9 @@
"@mui/x-data-grid": {
"optional": true
},
"@stratakit/foundations": {
"optional": true
},
"@stratakit/icons": {
"optional": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface ThumbnailIconButtonProps

// our attempt at making icons that can be overlayed with some contrast on top of thumbnails
const activeBgColor = "var(--stratakit-color-bg-positive-muted)";
const mutedBgColor = "var(--stratakit-color-bg-neutral-muted)";
const mutedBgColor = "var(--stratakit-color-bg-neutral-base)";

/**
* Icon button intended for overlaying on top of a thumbnail image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ exports[`BaseCard renders with all the props 1`] = `
data-_sk-color-scheme="light"
>
<article
aria-labelledby=":r3:"
class="MuiPaper-root MuiPaper-outlined MuiPaper-rounded MuiCard-root css-11apm71-MuiPaper-root-MuiCard-root"
aria-labelledby=":r5:"
class="MuiPaper-root MuiPaper-outlined MuiPaper-rounded MuiCard-root mui-eb71mb-MuiPaper-root-MuiCard-root"
data-_sk-actionable=""
>
<div
class="MuiBox-root css-j4m9l"
class="MuiBox-root mui-j4m9l"
>
<div
class="MuiBox-root css-1a24o1e"
class="MuiBox-root mui-1a24o1e"
>
<div
class="MuiBox-root css-1vuaec4"
class="MuiBox-root mui-1vuaec4"
>
<div
class="MuiChip-root MuiChip-filled MuiChip-sizeSmall MuiChip-colorDefault css-l1x84v-MuiChip-root"
class="MuiChip-root MuiChip-filled MuiChip-sizeSmall MuiChip-colorDefault mui-16a082u-MuiChip-root"
>
<span
class="MuiChip-label css-eccknh-MuiChip-label"
id=":r5:"
class="MuiChip-label mui-eccknh-MuiChip-label"
id=":r7:"
>
Top Left
</span>
</div>
<div
class="MuiAvatarGroup-root css-1y0l2ft-MuiAvatarGroup-root"
class="MuiAvatarGroup-root mui-1y0l2ft-MuiAvatarGroup-root"
role="list"
style="--AvatarGroup-spacing: -8px;"
>
Expand All @@ -39,11 +39,11 @@ exports[`BaseCard renders with all the props 1`] = `
role="listitem"
>
<div
class="MuiAvatar-root MuiAvatar-circular MuiAvatarGroup-avatar css-an7b4o-MuiAvatar-root"
class="MuiAvatar-root MuiAvatar-circular MuiAvatarGroup-avatar mui-an7b4o-MuiAvatar-root"
>
<img
alt="User 1"
class="MuiAvatar-img css-1su80sj-MuiAvatar-img"
class="MuiAvatar-img mui-1su80sj-MuiAvatar-img"
draggable="false"
src="https://i.pravatar.cc/150?img=1"
/>
Expand All @@ -54,11 +54,11 @@ exports[`BaseCard renders with all the props 1`] = `
role="listitem"
>
<div
class="MuiAvatar-root MuiAvatar-circular MuiAvatarGroup-avatar css-an7b4o-MuiAvatar-root"
class="MuiAvatar-root MuiAvatar-circular MuiAvatarGroup-avatar mui-an7b4o-MuiAvatar-root"
>
<img
alt="User 2"
class="MuiAvatar-img css-1su80sj-MuiAvatar-img"
class="MuiAvatar-img mui-1su80sj-MuiAvatar-img"
draggable="false"
src="https://i.pravatar.cc/150?img=2"
/>
Expand All @@ -69,29 +69,25 @@ exports[`BaseCard renders with all the props 1`] = `
role="listitem"
>
<div
class="MuiAvatar-root MuiAvatar-circular MuiAvatarGroup-avatar css-an7b4o-MuiAvatar-root"
class="MuiAvatar-root MuiAvatar-circular MuiAvatarGroup-avatar mui-an7b4o-MuiAvatar-root"
>
<img
alt="User 3"
class="MuiAvatar-img css-1su80sj-MuiAvatar-img"
class="MuiAvatar-img mui-1su80sj-MuiAvatar-img"
draggable="false"
src="https://i.pravatar.cc/150?img=3"
/>
</div>
</div>
<div
class="🥝MuiAvatarGroupItem"
role="listitem"
/>
</div>
</div>
</div>
<div
class="MuiBox-root css-n4fbak"
class="MuiBox-root mui-n4fbak"
>
<button
aria-label="Add to favorites"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorSecondary MuiIconButton-sizeSmall css-qvmoi4-MuiButtonBase-root-MuiIconButton-root"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorSecondary MuiIconButton-sizeSmall mui-gzrzk4-MuiButtonBase-root-MuiIconButton-root"
tabindex="0"
type="button"
>
Expand All @@ -106,7 +102,7 @@ exports[`BaseCard renders with all the props 1`] = `
</button>
<button
aria-label="Muted icon button"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorSecondary MuiIconButton-sizeSmall css-vjaiy1-MuiButtonBase-root-MuiIconButton-root"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorSecondary MuiIconButton-sizeSmall mui-2p5fww-MuiButtonBase-root-MuiIconButton-root"
tabindex="0"
type="button"
>
Expand All @@ -121,47 +117,47 @@ exports[`BaseCard renders with all the props 1`] = `
</button>
</div>
<div
class="MuiBox-root css-1i04t5p"
class="MuiBox-root mui-1i04t5p"
>
<div
class="MuiChip-root MuiChip-filled MuiChip-sizeSmall MuiChip-colorDefault css-l1x84v-MuiChip-root"
class="MuiChip-root MuiChip-filled MuiChip-sizeSmall MuiChip-colorDefault mui-16a082u-MuiChip-root"
>
<span
class="MuiChip-label css-eccknh-MuiChip-label"
id=":rb:"
class="MuiChip-label mui-eccknh-MuiChip-label"
id=":rd:"
>
Bottom left
</span>
</div>
</div>
<div
class="MuiBox-root css-17hjogf"
class="MuiBox-root mui-17hjogf"
>
<div
class="MuiChip-root MuiChip-filled MuiChip-sizeSmall MuiChip-colorDefault css-l1x84v-MuiChip-root"
class="MuiChip-root MuiChip-filled MuiChip-sizeSmall MuiChip-colorDefault mui-16a082u-MuiChip-root"
>
<span
class="MuiChip-label css-eccknh-MuiChip-label"
id=":rd:"
class="MuiChip-label mui-eccknh-MuiChip-label"
id=":rf:"
>
Bottom right
</span>
</div>
</div>
</div>
<hr
class="MuiDivider-root MuiDivider-fullWidth css-4icces-MuiDivider-root"
<div
class="MuiDivider-root MuiDivider-fullWidth mui-4icces-MuiDivider-root"
role="presentation"
/>
<div
class="MuiCardHeader-root css-qpjmc7-MuiCardHeader-root"
class="MuiCardHeader-root mui-qpjmc7-MuiCardHeader-root"
>
<div
class="MuiCardHeader-avatar css-1r9wl67-MuiCardHeader-avatar"
class="MuiCardHeader-avatar mui-1r9wl67-MuiCardHeader-avatar"
>
<div
aria-hidden="true"
class="MuiBox-root css-1fru31a"
class="MuiBox-root mui-1fru31a"
data-testid="status-icon"
role="img"
>
Expand All @@ -177,39 +173,36 @@ exports[`BaseCard renders with all the props 1`] = `
</div>
</div>
<div
class="MuiCardHeader-content css-17kxlwy-MuiCardHeader-content"
class="MuiCardHeader-content mui-17kxlwy-MuiCardHeader-content"
>
<h2
class="MuiTypography-root MuiTypography-body2 MuiCardHeader-title css-19x7l83-MuiTypography-root"
id=":r3:"
class="MuiTypography-root MuiTypography-body2 MuiCardHeader-title mui-19x7l83-MuiTypography-root"
id=":r5:"
>
<button
class="MuiButtonBase-root MuiCardActionArea-root css-faos08-MuiButtonBase-root-MuiCardActionArea-root"
class="MuiButtonBase-root MuiCardActionArea-root mui-6cx05u-MuiButtonBase-root-MuiCardActionArea-root"
tabindex="0"
type="button"
>
Test Card
<span
class="MuiCardActionArea-focusHighlight css-1h5un5t-MuiCardActionArea-focusHighlight"
/>
</button>
</h2>
<h3
class="MuiTypography-root MuiTypography-caption css-1578r2f-MuiTypography-root"
class="MuiTypography-root MuiTypography-caption mui-1578r2f-MuiTypography-root"
>
This is a subheader
</h3>
</div>
<div
class="MuiCardHeader-action css-116l9hl-MuiCardHeader-action"
class="MuiCardHeader-action mui-116l9hl-MuiCardHeader-action"
>
<button
aria-expanded="false"
aria-haspopup="true"
aria-label="More options"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorSecondary MuiIconButton-sizeSmall css-1ron3nm-MuiButtonBase-root-MuiIconButton-root"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorSecondary MuiIconButton-sizeSmall mui-yzbewk-MuiButtonBase-root-MuiIconButton-root"
data-testid="more-options-button"
id=":rf:"
id=":rh:"
tabindex="0"
type="button"
>
Expand All @@ -225,34 +218,34 @@ exports[`BaseCard renders with all the props 1`] = `
</div>
</div>
<div
class="MuiCardContent-root css-1li13yv-MuiCardContent-root"
class="MuiCardContent-root mui-1li13yv-MuiCardContent-root"
data-testid="card-description"
>
<p
class="MuiTypography-root MuiTypography-body2 css-72qc7z-MuiTypography-root"
class="MuiTypography-root MuiTypography-body2 mui-72qc7z-MuiTypography-root"
>
When there is more than one \`action\` prop they will be rendered as buttons in the footer of the card and the whole card is not clickable.
</p>
</div>
<div
class="MuiCardActions-root MuiCardActions-spacing css-1q4nm6f-MuiCardActions-root"
class="MuiCardActions-root MuiCardActions-spacing mui-1q4nm6f-MuiCardActions-root"
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-sizeMedium MuiButton-colorPrimary css-1wyu1lz-MuiButtonBase-root-MuiButton-root"
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-sizeMedium MuiButton-colorPrimary mui-2k21b6-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="button"
>
Open
</button>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-sizeMedium MuiButton-colorSecondary css-1pk93v4-MuiButtonBase-root-MuiButton-root"
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-sizeMedium MuiButton-colorSecondary mui-egn2xp-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="button"
>
Share
</button>
<button
class="MuiButtonBase-root Mui-disabled MuiButton-root MuiButton-contained MuiButton-sizeMedium MuiButton-colorSecondary css-1pk93v4-MuiButtonBase-root-MuiButton-root"
class="MuiButtonBase-root Mui-disabled MuiButton-root MuiButton-contained MuiButton-sizeMedium MuiButton-colorSecondary mui-egn2xp-MuiButtonBase-root-MuiButton-root"
disabled=""
tabindex="-1"
type="button"
Expand All @@ -270,35 +263,35 @@ exports[`BaseCard renders with only a title 1`] = `
data-_sk-color-scheme="light"
>
<article
aria-labelledby=":r1:"
class="MuiPaper-root MuiPaper-outlined MuiPaper-rounded MuiCard-root css-11apm71-MuiPaper-root-MuiCard-root"
aria-labelledby=":r2:"
class="MuiPaper-root MuiPaper-outlined MuiPaper-rounded MuiCard-root mui-eb71mb-MuiPaper-root-MuiCard-root"
>
<div
class="MuiBox-root css-j4m9l"
class="MuiBox-root mui-j4m9l"
/>
<hr
class="MuiDivider-root MuiDivider-fullWidth css-4icces-MuiDivider-root"
<div
class="MuiDivider-root MuiDivider-fullWidth mui-4icces-MuiDivider-root"
role="presentation"
/>
<div
class="MuiCardHeader-root css-qpjmc7-MuiCardHeader-root"
class="MuiCardHeader-root mui-qpjmc7-MuiCardHeader-root"
>
<div
class="MuiCardHeader-content css-17kxlwy-MuiCardHeader-content"
class="MuiCardHeader-content mui-17kxlwy-MuiCardHeader-content"
>
<h2
class="MuiTypography-root MuiTypography-h5 MuiCardHeader-title css-pt4l7i-MuiTypography-root"
id=":r1:"
class="MuiTypography-root MuiTypography-h5 MuiCardHeader-title mui-ej25ov-MuiTypography-root"
id=":r2:"
>
Test Card
</h2>
<h3
class="MuiTypography-root MuiTypography-caption css-1578r2f-MuiTypography-root"
class="MuiTypography-root MuiTypography-caption mui-1578r2f-MuiTypography-root"
/>
</div>
</div>
<div
class="MuiCardContent-root css-1li13yv-MuiCardContent-root"
class="MuiCardContent-root mui-1li13yv-MuiCardContent-root"
/>
</article>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const NoResultsMUI = ({
style={{
width: "5rem",
height: "5rem",
color: "var(--stratakit-color-text-muted)",
color: "var(--stratakit-color-text-neutral-tertiary)",
}}
/>
{/* eslint-disable-next-line jsx-a11y/heading-has-content */}
Expand Down
Loading