Skip to content

Commit f19f126

Browse files
matyasfHerrTopi
authored andcommitted
refactor(many): fix types after rebase
1 parent 336fde9 commit f19f126

8 files changed

Lines changed: 11 additions & 10 deletions

File tree

packages/__docs__/src/Document/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,9 @@ class Document extends Component<DocumentProps, DocumentState> {
175175
</code>
176176
</View>
177177
) : null}
178-
<ComponentTheme componentTheme={componentTheme} />
178+
<ComponentTheme
179+
componentTheme={componentTheme as any /* TODO-theme-types check */}
180+
/>
179181

180182
<View margin="x-large 0 0" display="block">
181183
<Heading

packages/emotion/src/withStyle.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,8 @@ const withStyle = decorator(
225225
const baseComponentTheme = mergeDeep(
226226
theme.newTheme.components[
227227
componentWithTokensId as keyof NewComponentTypes
228-
// TODO-theme-types: fix typing
229-
// @ts-expect-error fix
230228
]?.(semantics),
229+
// @ts-ignore TODO-theme-types: fix typing
231230
themeOverride?.components?.[
232231
componentWithTokensId as keyof NewComponentTypes
233232
]

packages/ui-byline/src/Byline/v2/styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import type { BylineProps, BylineStyle } from './props'
3636
* @return The final style object, which will be used in the component
3737
*/
3838
const generateStyle = (
39-
componentTheme: NewComponentTypes['Byline'],
39+
componentTheme: ReturnType<NewComponentTypes['Byline']>,
4040
params: BylineProps,
4141
_sharedTokens: SharedTokens
4242
): BylineStyle => {

packages/ui-drilldown/src/Drilldown/v2/styles.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ import type {
3535
* ---
3636
* Generates the style object from the theme and provided additional information
3737
* @param {Object} componentTheme The theme variable object.
38-
* @param {Object} props the props of the component, the style is applied to
38+
* @param {Object} _props the props of the component, the style is applied to
3939
* @param {Object} state the state of the component, the style is applied to
4040
* @return {Object} The final style object, which will be used in the component
4141
*/
4242
const generateStyle = (
43-
componentTheme: NewComponentTypes['Drilldown'],
43+
componentTheme: ReturnType<NewComponentTypes['Drilldown']>,
4444
_props: DrilldownProps,
4545
state: DrilldownStyleProps
4646
): DrilldownStyle => {

packages/ui-instructure/src/DataPermissionLevels/v2/styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import type {
3939
* @return The final style object, which will be used in the component
4040
*/
4141
const generateStyle = (
42-
componentTheme: NewComponentTypes['DataPermissionLevels'],
42+
componentTheme: ReturnType<NewComponentTypes['DataPermissionLevels']>,
4343
_params: DataPermissionLevelsProps,
4444
_sharedTokens: SharedTokens
4545
): DataPermissionLevelsStyle => {

packages/ui-instructure/src/NutritionFacts/v2/styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import type { NutritionFactsProps, NutritionFactsStyle } from './props'
3636
* @return The final style object, which will be used in the component
3737
*/
3838
const generateStyle = (
39-
componentTheme: NewComponentTypes['NutritionFacts'],
39+
componentTheme: ReturnType<NewComponentTypes['NutritionFacts']>,
4040
_params: NutritionFactsProps,
4141
_sharedTokens: SharedTokens
4242
): NutritionFactsStyle => {

packages/ui-overlays/src/Mask/v2/styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import type { MaskProps, MaskStyle } from './props'
3737
* @return {Object} The final style object, which will be used in the component
3838
*/
3939
const generateStyle = (
40-
componentTheme: NewComponentTypes['Mask'],
40+
componentTheme: ReturnType<NewComponentTypes['Mask']>,
4141
props: MaskProps
4242
): MaskStyle => {
4343
const { placement, fullscreen } = props

packages/ui-rating/src/RatingIcon/v2/styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import type { RatingIconProps, RatingIconState, RatingIconStyle } from './props'
3636
* @return {Object} The final style object, which will be used in the component
3737
*/
3838
const generateStyle = (
39-
componentTheme: NewComponentTypes['RatingIcon'],
39+
componentTheme: ReturnType<NewComponentTypes['RatingIcon']>,
4040
_props: RatingIconProps,
4141
state: RatingIconState,
4242
_sharedTokens: SharedTokens

0 commit comments

Comments
 (0)