Skip to content

Commit b5e7a8c

Browse files
committed
Fix TS typings (and tests)
1 parent 0cc5cab commit b5e7a8c

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

src/components/assets/GraphCMSAsset.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ const GraphCMSAsset = (props: Props): JSX.Element => {
120120
key={id}
121121
id={id}
122122
src={resolvedAssetProps.url}
123-
title={resolvedAssetProps.title}
124-
alt={resolvedAssetProps.alt || resolvedAssetProps.title || resolvedAssetProps.url}
123+
title={resolvedAssetProps.filename}
124+
alt={resolvedAssetProps.filename || resolvedAssetProps.url}
125125
className={classnames(`asset-${id}`, className, resolvedAssetProps.classes)}
126126
style={deepmerge(style || {}, resolvedAssetProps.style || {})}
127127
/>

src/components/assets/Logo.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ const Logo = (props: Props): JSX.Element => {
6363
}
6464

6565
const sizes = generateSizes({
66-
baseWidth: parseFloat(resolvedLogoProps.width as string),
67-
baseHeight: parseFloat(resolvedLogoProps.height as string),
66+
baseWidth: resolvedLogoProps.thumbnails.small.width,
67+
baseHeight: resolvedLogoProps.thumbnails.small.height,
6868
sizesMultipliers,
6969
});
7070

@@ -89,9 +89,9 @@ const Logo = (props: Props): JSX.Element => {
8989
key={id}
9090
id={id}
9191
src={resolvedLogoProps.url}
92-
title={resolvedLogoProps.title}
93-
alt={resolvedLogoProps.alt || resolvedLogoProps.title || resolvedLogoProps.url}
94-
className={classnames(`logo-${id}`, className, resolvedLogoProps.classes)}
92+
title={resolvedLogoProps.filename}
93+
alt={resolvedLogoProps.filename || resolvedLogoProps.url}
94+
className={classnames(`logo-${id}`, className)}
9595
style={deepmerge(style || {}, resolvedLogoProps.style || {})}
9696
onClick={onClick}
9797
/>

src/types/data/AirtableSystemFields.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* Those fields are available on any Airtable record.
55
*/
66
export declare type AirtableSystemFields = {
7-
id: string;
8-
createdTime: string;
7+
id?: string;
8+
createdTime?: string;
99
}

src/types/data/Asset.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,20 @@ export type AssetThumbnail = {
1212
* All fields are managed internally by Airtable and we have no control over them (they're not columns)
1313
*/
1414
export declare type Asset = {
15-
url: string;
16-
filename: string;
15+
url?: string;
16+
filename?: string;
1717
size?: number;
1818
type?: string;
1919
thumbnails?: {
2020
small?: AssetThumbnail;
2121
large?: AssetThumbnail;
22-
}
22+
};
23+
24+
// NRN own fields, dynamically set when manipulating assets
25+
classes?: string;
26+
defaultTransformations?: object;
27+
linkTarget?: string;
28+
linkUrl?: string;
29+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
30+
style?: string | object | any;
2331
} & AirtableSystemFields;

0 commit comments

Comments
 (0)