Skip to content

Commit

Permalink
Update to iTwin 4.8.1 (#77)
Browse files Browse the repository at this point in the history
Ignore new AppUI deprecations
  • Loading branch information
tcobbs-bentley authored Aug 13, 2024
1 parent 439300a commit d9f36c7
Show file tree
Hide file tree
Showing 8 changed files with 296 additions and 175 deletions.
425 changes: 272 additions & 153 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,23 @@
},
"dependencies": {
"@bentley/icons-generic-webfont": "1.0.34",
"@itwin/appui-abstract": "4.7.8",
"@itwin/appui-react": "4.15.5",
"@itwin/components-react": "4.15.5",
"@itwin/core-bentley": "4.7.8",
"@itwin/core-common": "4.7.8",
"@itwin/core-frontend": "4.7.8",
"@itwin/core-geometry": "4.7.8",
"@itwin/core-i18n": "4.7.8",
"@itwin/core-markup": "4.7.8",
"@itwin/core-orbitgt": "4.7.8",
"@itwin/core-quantity": "4.7.8",
"@itwin/core-react": "4.15.5",
"@itwin/imodel-components-react": "4.15.5",
"@itwin/appui-abstract": "4.8.1",
"@itwin/appui-react": "4.16.0",
"@itwin/components-react": "4.16.0",
"@itwin/core-bentley": "4.8.1",
"@itwin/core-common": "4.8.1",
"@itwin/core-frontend": "4.8.1",
"@itwin/core-geometry": "4.8.1",
"@itwin/core-i18n": "4.8.1",
"@itwin/core-markup": "4.8.1",
"@itwin/core-orbitgt": "4.8.1",
"@itwin/core-quantity": "4.8.1",
"@itwin/core-react": "4.16.0",
"@itwin/imodel-components-react": "4.16.0",
"@itwin/mobile-sdk-core": "0.22.11",
"@itwin/presentation-common": "4.7.8",
"@itwin/presentation-frontend": "4.7.8",
"@itwin/webgl-compatibility": "4.7.8",
"@itwin/presentation-common": "4.8.1",
"@itwin/presentation-frontend": "4.8.1",
"@itwin/webgl-compatibility": "4.8.1",
"classnames": "^2.2.6",
"react": "^17.0.0",
"react-dom": "^17.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/mobile-ui-react/ActionSheetButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { NavigationButton } from "./NavigationPanel";
// eslint-disable-next-line deprecation/deprecation
export interface ActionSheetButtonProps extends ActionSheetProps, CommonProps {
/** The icon to show on the {@link ActionSheetButton}, default is three vertical dots. */
iconSpec?: IconSpec;
iconSpec?: IconSpec; // eslint-disable-line deprecation/deprecation
/** The size of the {@link ActionSheetButton}, default is "42px". */
size?: string;
/** The width of the {@link ActionSheetButton}, default is size if specified, "42px" otherwise. */
Expand Down
2 changes: 1 addition & 1 deletion src/mobile-ui-react/CircularButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface CircularButtonProps {
/** The size of the circle, defaults to 50 pixels */
size?: number;
/** The icon to display in the circle */
iconSpec?: IconSpec;
iconSpec?: IconSpec; // eslint-disable-line deprecation/deprecation
/** The icon size, defalts to 29 pixels */
iconSize?: string;
/** The icon color, defaults to white */
Expand Down
2 changes: 1 addition & 1 deletion src/mobile-ui-react/CountNotification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export interface CountNotificationProps extends CommonProps {
/** Click handler: ignored if moreButtonProps is set. */
onClick?: () => void;
/** IconSpec for icon to use on the right side: ignored if moreButtonProps is set. */
iconSpec?: IconSpec;
iconSpec?: IconSpec; // eslint-disable-line deprecation/deprecation
/** The icon size, if iconSpec is specified, default is "24px". */
iconSize?: string;
/**
Expand Down
3 changes: 2 additions & 1 deletion src/mobile-ui-react/IconImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface IconImageProps {
/** Optional font size used if [[iconSpec]] specifies a glyph from the Bentley icon font, default is [[size]]. */
fontSize?: string;
/** [[IconSpec]] of the icon to be shown. */
iconSpec: IconSpec;
iconSpec: IconSpec; // eslint-disable-line deprecation/deprecation
/** Optional CSS id. */
id?: string;
/** Optional CSS margin. */
Expand All @@ -48,6 +48,7 @@ export function IconImage(props: IconImageProps) {
}
return (
<div id={props.id} className="mui-icon-image" style={divStyle}>
{/* eslint-disable-next-line deprecation/deprecation */}
<Icon iconSpec={props.iconSpec} />
</div>
);
Expand Down
3 changes: 2 additions & 1 deletion src/mobile-ui-react/NavigationPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function NavigationPanel(props: NavigationPanelProps) {
// eslint-disable-next-line deprecation/deprecation
export interface NavigationButtonProps extends CommonProps {
/** The icon. */
iconSpec: IconSpec;
iconSpec: IconSpec; // eslint-disable-line deprecation/deprecation
/** The button size, default is "42px". */
size?: string;
/** The width, default is size if specified, "42px" otherwise. */
Expand Down Expand Up @@ -152,6 +152,7 @@ export interface ConditionalNavigationButtonProps extends NavigationButtonProps
export function ConditionalNavigationButton(props: ConditionalNavigationButtonProps) {
const { isVisible = true, iconSpec, ...others } = props;
const [displayed, setDisplayed] = React.useState<boolean>();
// eslint-disable-next-line deprecation/deprecation
const [localIconSpec, setLocalIconSpec] = React.useState<IconSpec>();

React.useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/mobile-ui-react/VisibleBackButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Back as BackSvg } from "./images-tsx";
* Override NavigationButtonProps without iconSpec, then add iconSpec back in as optional.
*/
export interface VisibleBackButtonProps extends Omit<NavigationButtonProps, "iconSpec"> {
iconSpec?: IconSpec;
iconSpec?: IconSpec; // eslint-disable-line deprecation/deprecation
}

/**
Expand Down

0 comments on commit d9f36c7

Please sign in to comment.