Skip to content

Commit

Permalink
fix build on newest heroku stack (22)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nasicus committed Sep 13, 2022
1 parent 0627e1f commit 477f077
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
25 changes: 15 additions & 10 deletions client/src/areas/grail/TabRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,16 @@ class TabRendererInternal extends React.Component<Props, ITabRendererState> {
super(props);
this.state = {
activeTab: TabType.Statistics,
hasActiveSearch: this.renderAsSearchResult
hasActiveSearch: this.renderAsSearchResult,
};
}

public static getDerivedStateFromProps(
props: ITabRendererProps,
state: ITabRendererState
) {
const renderAsSearchResult = TabRendererInternal.shouldRenderAsSearchResult(
props
);
const renderAsSearchResult =
TabRendererInternal.shouldRenderAsSearchResult(props);
if (renderAsSearchResult && !state.hasActiveSearch) {
state.activeTab = TabType.SearchResults;
} else if (!renderAsSearchResult && state.hasActiveSearch) {
Expand Down Expand Up @@ -88,7 +87,9 @@ class TabRendererInternal extends React.Component<Props, ITabRendererState> {
}

private get renderAsSearchResult(): boolean {
return TabRendererInternal.shouldRenderAsSearchResult(this.props);
return TabRendererInternal.shouldRenderAsSearchResult(
this.props as ITabRendererProps
);
}

private static shouldRenderAsSearchResult(props: ITabRendererProps): boolean {
Expand Down Expand Up @@ -127,11 +128,15 @@ class TabRendererInternal extends React.Component<Props, ITabRendererState> {
label="Unique Other"
key="tabUniqueOther"
value={TabType.UniqueOther}
/>
/>,
];
case GrailMode.Runeword:
return [
<Tab label="Runewords" key="tabRunewords" value={TabType.Runewords} />
<Tab
label="Runewords"
key="tabRunewords"
value={TabType.Runewords}
/>,
];
default:
return [
Expand All @@ -150,7 +155,7 @@ class TabRendererInternal extends React.Component<Props, ITabRendererState> {
key="tabUniqueOther"
value={TabType.UniqueOther}
/>,
<Tab label="Sets" key="tabSets" value={TabType.Sets} />
<Tab label="Sets" key="tabSets" value={TabType.Sets} />,
];
}
}
Expand Down Expand Up @@ -227,7 +232,7 @@ class TabRendererInternal extends React.Component<Props, ITabRendererState> {

export const TabRenderer = withRouter(TabRendererInternal);

const TabContainer: React.FunctionComponent<{}> = props => {
const TabContainer: React.FunctionComponent<{}> = (props) => {
return (
<Typography component="div" style={{ padding: 8 * 3 }}>
{props.children}
Expand All @@ -236,5 +241,5 @@ const TabContainer: React.FunctionComponent<{}> = props => {
};

const RootContainer = styled.div`
background-color: ${p => p.theme.palette.background.paper};
background-color: ${(p) => p.theme.palette.background.paper};
`;
8 changes: 2 additions & 6 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"@types/express": "^4.17.13",
"@types/mongodb": "^4.0.7",
"body-parser": "^1.19.0",
"cors": "^2.8.5",
"express": "^4.17.1",
"mongodb": "^4.1.2",
"typescript": "^4.4.3"
},
"devDependencies": {
"@types/node": "^16.9.1",
"cors": "^2.8.5",
"nodemon": "^2.0.12",
"ts-node-dev": "^1.1.8"
}
Expand Down

0 comments on commit 477f077

Please sign in to comment.